Branch: r14.0.x

fb463a0c 2015-03-26 14:32:25 Timothy Pearson
Bring printer1 icon into XDG compliance
(cherry picked from commit bd1f48e21af502a0f86602a19c33b9d52bc3fd8f)
M korganizer/journalentry.cpp
M korganizer/koeventpopupmenu.cpp
M korganizer/kotodoview.cpp
diff --git a/korganizer/journalentry.cpp b/korganizer/journalentry.cpp
index 566719f..0ceec95 100644
--- a/korganizer/journalentry.cpp
+++ b/korganizer/journalentry.cpp
@@ -229,7 +229,7 @@
 
 #ifndef KORG_NOPRINTER
   mPrintButton = new TQToolButton( this, "printButton" );
-  mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer1" ) );
+  mPrintButton->setPixmap( KOGlobals::self()->smallIcon( "printer" ) );
   mPrintButton->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   TQToolTip::add( mPrintButton, i18n("Print this journal entry") );
   TQWhatsThis::add( mPrintButton, i18n("Opens the print dialog for this journal entry") );
diff --git a/korganizer/koeventpopupmenu.cpp b/korganizer/koeventpopupmenu.cpp
index 6ab2818..73a0942 100644
--- a/korganizer/koeventpopupmenu.cpp
+++ b/korganizer/koeventpopupmenu.cpp
@@ -54,7 +54,7 @@
   mEditOnlyItems.append(
     insertItem(i18n("&Edit..."), this, TQT_SLOT( popupEdit() ) ) );
 #ifndef KORG_NOPRINTER
-  insertItem( KOGlobals::self()->smallIcon("printer1"), i18n("&Print..."),
+  insertItem( KOGlobals::self()->smallIcon("printer"), i18n("&Print..."),
               this, TQT_SLOT( print() ) );
 #endif
   //------------------------------------------------------------------------
diff --git a/korganizer/kotodoview.cpp b/korganizer/kotodoview.cpp
index 60d22b4..8ae2703 100644
--- a/korganizer/kotodoview.cpp
+++ b/korganizer/kotodoview.cpp
@@ -456,7 +456,7 @@
   mItemPopupMenu->insertItem(i18n("&Edit..."), this,
                              TQT_SLOT (editTodo()), 0, ePopupEdit );
 #ifndef KORG_NOPRINTER
-  mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer1"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) );
+  mItemPopupMenu->insertItem(KOGlobals::self()->smallIcon("printer"), i18n("&Print..."), this, TQT_SLOT( printTodo() ) );
 #endif
   mItemPopupMenu->insertItem(KOGlobals::self()->smallIconSet("edit-delete"), i18n("&Delete"), this,
                              TQT_SLOT (deleteTodo()), 0, ePopupDelete );