| a6095731 | 2014-10-13 15:43:48 | Timothy Pearson |
Bring filenew, fileopen, fileprint, filequickprint, filesave, filesaveas, fileclose, editclear, editcopy, editcut, editdelete, editpaste, folder_new, and gohome icons into XDG compliance |
||
|
M krecipes/src/dialogs/dietwizarddialog.cpp M krecipes/src/dialogs/ingredientmatcherdialog.cpp M krecipes/src/dialogs/recipeinputdialog.cpp M krecipes/src/dialogs/shoppinglistdialog.cpp M krecipes/src/krecipes.cpp M krecipes/src/krecipesview.cpp M krecipes/src/recipeactionshandler.cpp M krecipes/src/setupwizard.cpp M krecipes/src/widgets/authorlistview.cpp M krecipes/src/widgets/categorylistview.cpp M krecipes/src/widgets/headerlistview.cpp M krecipes/src/widgets/ingredientlistview.cpp M krecipes/src/widgets/prepmethodlistview.cpp M krecipes/src/widgets/propertylistview.cpp M krecipes/src/widgets/unitlistview.cpp |
||
diff --git a/krecipes/src/dialogs/dietwizarddialog.cpp b/krecipes/src/dialogs/dietwizarddialog.cpp
index 17f96d6..a5d8192 100644
--- a/krecipes/src/dialogs/dietwizarddialog.cpp
+++ b/krecipes/src/dialogs/dietwizarddialog.cpp
@@ -87,7 +87,7 @@
okButton->setText( i18n( "Create the diet" ) );
TQPushButton *clearButton = new TQPushButton( bottom_layout );
- clearButton->setIconSet( il.loadIconSet( "editclear", TDEIcon::Small ) );
+ clearButton->setIconSet( il.loadIconSet( "edit-clear", TDEIcon::Small ) );
clearButton->setText( i18n( "Clear" ) );
// Create Tabs
diff --git a/krecipes/src/dialogs/ingredientmatcherdialog.cpp b/krecipes/src/dialogs/ingredientmatcherdialog.cpp
index ac5b0f8..dc823b0 100644
--- a/krecipes/src/dialogs/ingredientmatcherdialog.cpp
+++ b/krecipes/src/dialogs/ingredientmatcherdialog.cpp
@@ -117,7 +117,7 @@
//buttonBox->layout()->addItem( new TQSpacerItem( 10,10, TQSizePolicy::MinimumExpanding, TQSizePolicy::Fixed ) );
clearButton = new TQPushButton( buttonBox );
- clearButton->setIconSet( il.loadIconSet( "editclear", TDEIcon::Small ) );
+ clearButton->setIconSet( il.loadIconSet( "edit-clear", TDEIcon::Small ) );
clearButton->setText( i18n( "Clear" ) );
dialogLayout->addWidget(buttonBox);
diff --git a/krecipes/src/dialogs/recipeinputdialog.cpp b/krecipes/src/dialogs/recipeinputdialog.cpp
index 1a47507..3b54fff 100644
--- a/krecipes/src/dialogs/recipeinputdialog.cpp
+++ b/krecipes/src/dialogs/recipeinputdialog.cpp
@@ -324,7 +324,7 @@
ingParserButton = new KPushButton( ingredientGBox );
ingParserButton->setFixedSize( TQSize( 31, 31 ) );
ingParserButton->setFlat( true );
- pm = il->loadIcon( "editpaste", TDEIcon::NoGroup, 16 );
+ pm = il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 );
ingParserButton->setPixmap( pm );
ingParserButton->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
ingredientsLayout->addWidget( ingParserButton, 8, 5 );
@@ -435,12 +435,12 @@
functionsBox->setFrameStyle( TQFrame::NoFrame );
saveButton = new TQToolButton( functionsBox );
- saveButton->setIconSet( il->loadIconSet( "filesave", TDEIcon::Small ) );
+ saveButton->setIconSet( il->loadIconSet( "document-save", TDEIcon::Small ) );
saveButton->setEnabled( false );
showButton = new TQToolButton( functionsBox );
showButton->setIconSet( il->loadIconSet( "viewmag", TDEIcon::Small ) );
closeButton = new TQToolButton( functionsBox );
- closeButton->setIconSet( il->loadIconSet( "fileclose", TDEIcon::Small ) );
+ closeButton->setIconSet( il->loadIconSet( "window-close", TDEIcon::Small ) );
resizeButton = new TQToolButton( functionsBox );
resizeButton->setIconSet( il->loadIconSet( "2uparrow", TDEIcon::Small ) ); //TODO: give me an icon :)
diff --git a/krecipes/src/dialogs/shoppinglistdialog.cpp b/krecipes/src/dialogs/shoppinglistdialog.cpp
index 87848a7..e18e846 100644
--- a/krecipes/src/dialogs/shoppinglistdialog.cpp
+++ b/krecipes/src/dialogs/shoppinglistdialog.cpp
@@ -132,7 +132,7 @@
clearButton = new TQPushButton( buttonBar, "clearButton" );
clearButton->setText( i18n( "Clear" ) );
- pm = il.loadIcon( "editclear", TDEIcon::NoGroup, 16 );
+ pm = il.loadIcon( "edit-clear", TDEIcon::NoGroup, 16 );
clearButton->setIconSet( pm );
//Takes care of all recipe actions and provides a popup menu to 'recipeListView'
diff --git a/krecipes/src/krecipes.cpp b/krecipes/src/krecipes.cpp
index 73ac09e..4d5e6e1 100644
--- a/krecipes/src/krecipes.cpp
+++ b/krecipes/src/krecipes.cpp
@@ -212,7 +212,7 @@
this, SLOT( fileExport() ),
actionCollection(), "export_action" );
- copyToClipboardAction = new TDEAction( i18n( "&Copy to Clipboard" ), "editcopy",
+ copyToClipboardAction = new TDEAction( i18n( "&Copy to Clipboard" ), "edit-copy",
CTRL + Key_C,
this, SLOT( fileToClipboard() ),
actionCollection(), "copy_to_clipboard_action" );
diff --git a/krecipes/src/krecipesview.cpp b/krecipes/src/krecipesview.cpp
index 39324c9..9f40129 100644
--- a/krecipes/src/krecipesview.cpp
+++ b/krecipes/src/krecipesview.cpp
@@ -694,7 +694,7 @@
if ( !recipeButton ) {
recipeButton = new KreMenuButton( leftPanel, RecipeEdit );
- recipeButton->setIconSet( il.loadIconSet( "filesave", TDEIcon::Small ) );
+ recipeButton->setIconSet( il.loadIconSet( "document-save", TDEIcon::Small ) );
TQString short_title = title.left( 20 );
if ( title.length() > 20 )
diff --git a/krecipes/src/recipeactionshandler.cpp b/krecipes/src/recipeactionshandler.cpp
index 7d57c58..65720af 100644
--- a/krecipes/src/recipeactionshandler.cpp
+++ b/krecipes/src/recipeactionshandler.cpp
@@ -61,7 +61,7 @@
if ( actions & AddToShoppingList )
kpop->insertItem( il->loadIcon( "trolley", TDEIcon::NoGroup, 16 ), i18n( "&Add to Shopping List" ), this, SLOT( addToShoppingList() ), CTRL + Key_A );
if ( actions & CopyToClipboard )
- kpop->insertItem( il->loadIcon( "editcopy", TDEIcon::NoGroup, 16 ), i18n( "&Copy to Clipboard" ), this, SLOT( recipesToClipboard() ), CTRL + Key_C );
+ kpop->insertItem( il->loadIcon( "edit-copy", TDEIcon::NoGroup, 16 ), i18n( "&Copy to Clipboard" ), this, SLOT( recipesToClipboard() ), CTRL + Key_C );
if ( actions & Categorize )
categorize_item = kpop->insertItem( il->loadIcon( "categories", TDEIcon::NoGroup, 16 ), i18n( "Ca&tegorize..." ), this, SLOT(categorize()), CTRL + Key_T );
diff --git a/krecipes/src/setupwizard.cpp b/krecipes/src/setupwizard.cpp
index ec92043..ec179d5 100644
--- a/krecipes/src/setupwizard.cpp
+++ b/krecipes/src/setupwizard.cpp
@@ -557,7 +557,7 @@
hbox->setStretchFactor( fileEdit, 2 );
TDEIconLoader il;
- TQPushButton *file_select = new TQPushButton( il.loadIcon( "fileopen", TDEIcon::NoGroup, 16 ), TQString::null, hbox );
+ TQPushButton *file_select = new TQPushButton( il.loadIcon( "document-open", TDEIcon::NoGroup, 16 ), TQString::null, hbox );
TQToolTip::add
( file_select, i18n( "Open file dialog" ) );
file_select->setFixedWidth( 25 );
diff --git a/krecipes/src/widgets/authorlistview.cpp b/krecipes/src/widgets/authorlistview.cpp
index b2a9770..f92f90c 100644
--- a/krecipes/src/widgets/authorlistview.cpp
+++ b/krecipes/src/widgets/authorlistview.cpp
@@ -67,8 +67,8 @@
TDEIconLoader *il = new TDEIconLoader;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_N );
- kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_N );
+ kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->polish();
diff --git a/krecipes/src/widgets/categorylistview.cpp b/krecipes/src/widgets/categorylistview.cpp
index 4841e06..2807689 100644
--- a/krecipes/src/widgets/categorylistview.cpp
+++ b/krecipes/src/widgets/categorylistview.cpp
@@ -314,14 +314,14 @@
TDEIconLoader *il = new TDEIconLoader;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
- kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+ kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->insertSeparator();
- kpop->insertItem( il->loadIcon( "editcut", TDEIcon::NoGroup, 16 ), i18n( "Cu&t" ), this, SLOT( cut() ), CTRL + Key_X );
- kpop->insertItem( il->loadIcon( "editpaste", TDEIcon::NoGroup, 16 ), i18n( "&Paste" ), this, SLOT( paste() ), CTRL + Key_V );
- kpop->insertItem( il->loadIcon( "editpaste", TDEIcon::NoGroup, 16 ), i18n( "Paste as Subcategory" ), this, SLOT( pasteAsSub() ), CTRL + SHIFT + Key_V );
+ kpop->insertItem( il->loadIcon( "edit-cut", TDEIcon::NoGroup, 16 ), i18n( "Cu&t" ), this, SLOT( cut() ), CTRL + Key_X );
+ kpop->insertItem( il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 ), i18n( "&Paste" ), this, SLOT( paste() ), CTRL + Key_V );
+ kpop->insertItem( il->loadIcon( "edit-paste", TDEIcon::NoGroup, 16 ), i18n( "Paste as Subcategory" ), this, SLOT( pasteAsSub() ), CTRL + SHIFT + Key_V );
kpop->polish();
delete il;
diff --git a/krecipes/src/widgets/headerlistview.cpp b/krecipes/src/widgets/headerlistview.cpp
index 16795f5..fe65348 100644
--- a/krecipes/src/widgets/headerlistview.cpp
+++ b/krecipes/src/widgets/headerlistview.cpp
@@ -70,8 +70,8 @@
TDEIconLoader *il = new TDEIconLoader;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
- kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+ kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->polish();
diff --git a/krecipes/src/widgets/ingredientlistview.cpp b/krecipes/src/widgets/ingredientlistview.cpp
index 51366cf..4cc52d6 100644
--- a/krecipes/src/widgets/ingredientlistview.cpp
+++ b/krecipes/src/widgets/ingredientlistview.cpp
@@ -119,8 +119,8 @@
TDEIconLoader *il = new TDEIconLoader;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
- kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+ kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->polish();
diff --git a/krecipes/src/widgets/prepmethodlistview.cpp b/krecipes/src/widgets/prepmethodlistview.cpp
index 63569f8..341fc65 100644
--- a/krecipes/src/widgets/prepmethodlistview.cpp
+++ b/krecipes/src/widgets/prepmethodlistview.cpp
@@ -67,8 +67,8 @@
TDEIconLoader *il = new TDEIconLoader;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
- kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+ kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->polish();
diff --git a/krecipes/src/widgets/propertylistview.cpp b/krecipes/src/widgets/propertylistview.cpp
index 5abc5a9..f86bed6 100644
--- a/krecipes/src/widgets/propertylistview.cpp
+++ b/krecipes/src/widgets/propertylistview.cpp
@@ -130,8 +130,8 @@
TDEIconLoader *il = new TDEIconLoader;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il->loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
- kpop->insertItem( il->loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il->loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+ kpop->insertItem( il->loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il->loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->polish();
diff --git a/krecipes/src/widgets/unitlistview.cpp b/krecipes/src/widgets/unitlistview.cpp
index a0c67f3..e903fc7 100644
--- a/krecipes/src/widgets/unitlistview.cpp
+++ b/krecipes/src/widgets/unitlistview.cpp
@@ -134,8 +134,8 @@
TDEIconLoader il;
kpop = new TDEPopupMenu( this );
- kpop->insertItem( il.loadIcon( "filenew", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
- kpop->insertItem( il.loadIcon( "editdelete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
+ kpop->insertItem( il.loadIcon( "document-new", TDEIcon::NoGroup, 16 ), i18n( "&Create" ), this, SLOT( createNew() ), CTRL + Key_C );
+ kpop->insertItem( il.loadIcon( "edit-delete", TDEIcon::NoGroup, 16 ), i18n( "&Delete" ), this, SLOT( remove
() ), Key_Delete );
kpop->insertItem( il.loadIcon( "edit", TDEIcon::NoGroup, 16 ), i18n( "&Rename" ), this, SLOT( rename() ), CTRL + Key_R );
kpop->polish();
|
||