diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-03-26 13:02:33 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-03-26 20:32:24 +0100 |
| commit | 1a2f871729a65c3be1e31ea041188fe76ae346d5 (patch) | |
| tree | ca872feaaadebd2734b859e806d5275752ba3712 | |
| parent | 0bc94479d65f79805c7441608eec269aac9492f6 (diff) | |
| download | tdelibs-1a2f871729a65c3be1e31ea041188fe76ae346d5.tar.gz tdelibs-1a2f871729a65c3be1e31ea041188fe76ae346d5.zip | |
Bring printer1 icon into XDG compliance
(cherry picked from commit 61f6eb5a1e6d7094d993d6e26f4c02c94b3fa1c3)
| -rw-r--r-- | pics/crystalsvg/cr128-device-printer.png (renamed from pics/crystalsvg/cr128-device-printer1.png) | bin | 8472 -> 8472 bytes | |||
| -rw-r--r-- | pics/crystalsvg/cr16-device-printer.png (renamed from pics/crystalsvg/cr16-device-printer1.png) | bin | 684 -> 684 bytes | |||
| -rw-r--r-- | pics/crystalsvg/cr22-device-printer.png (renamed from pics/crystalsvg/cr22-device-printer1.png) | bin | 1003 -> 1003 bytes | |||
| -rw-r--r-- | pics/crystalsvg/cr32-device-printer.png (renamed from pics/crystalsvg/cr32-device-printer1.png) | bin | 1633 -> 1633 bytes | |||
| -rw-r--r-- | pics/crystalsvg/cr48-device-printer.png (renamed from pics/crystalsvg/cr48-device-printer1.png) | bin | 2588 -> 2588 bytes | |||
| -rw-r--r-- | pics/crystalsvg/cr64-device-printer.png (renamed from pics/crystalsvg/cr64-device-printer1.png) | bin | 3720 -> 3720 bytes | |||
| -rw-r--r-- | tdecore/tdehw/tdehardwaredevices.cpp | 2 | ||||
| -rw-r--r-- | tdeprint/management/kmmainview.cpp | 2 |
8 files changed, 2 insertions, 2 deletions
diff --git a/pics/crystalsvg/cr128-device-printer1.png b/pics/crystalsvg/cr128-device-printer.png Binary files differindex 7db5f56b1..7db5f56b1 100644 --- a/pics/crystalsvg/cr128-device-printer1.png +++ b/pics/crystalsvg/cr128-device-printer.png diff --git a/pics/crystalsvg/cr16-device-printer1.png b/pics/crystalsvg/cr16-device-printer.png Binary files differindex d6defce21..d6defce21 100644 --- a/pics/crystalsvg/cr16-device-printer1.png +++ b/pics/crystalsvg/cr16-device-printer.png diff --git a/pics/crystalsvg/cr22-device-printer1.png b/pics/crystalsvg/cr22-device-printer.png Binary files differindex a71ee2817..a71ee2817 100644 --- a/pics/crystalsvg/cr22-device-printer1.png +++ b/pics/crystalsvg/cr22-device-printer.png diff --git a/pics/crystalsvg/cr32-device-printer1.png b/pics/crystalsvg/cr32-device-printer.png Binary files differindex d554b554f..d554b554f 100644 --- a/pics/crystalsvg/cr32-device-printer1.png +++ b/pics/crystalsvg/cr32-device-printer.png diff --git a/pics/crystalsvg/cr48-device-printer1.png b/pics/crystalsvg/cr48-device-printer.png Binary files differindex 13adbd006..13adbd006 100644 --- a/pics/crystalsvg/cr48-device-printer1.png +++ b/pics/crystalsvg/cr48-device-printer.png diff --git a/pics/crystalsvg/cr64-device-printer1.png b/pics/crystalsvg/cr64-device-printer.png Binary files differindex 5d22d215e..5d22d215e 100644 --- a/pics/crystalsvg/cr64-device-printer1.png +++ b/pics/crystalsvg/cr64-device-printer.png diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp index 4fec70e9b..475f47014 100644 --- a/tdecore/tdehw/tdehardwaredevices.cpp +++ b/tdecore/tdehw/tdehardwaredevices.cpp @@ -4167,7 +4167,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE ret = DesktopIcon("kcmpci", size); } else if (query == TDEGenericDeviceType::Printer) { - ret = DesktopIcon("printer1", size); + ret = DesktopIcon("printer", size); } else if (query == TDEGenericDeviceType::Scanner) { ret = DesktopIcon("scanner", size); diff --git a/tdeprint/management/kmmainview.cpp b/tdeprint/management/kmmainview.cpp index 879c00e2b..ce3f356d8 100644 --- a/tdeprint/management/kmmainview.cpp +++ b/tdeprint/management/kmmainview.cpp @@ -286,7 +286,7 @@ void KMMainView::initActions() m_actions->action("printer_tool")->plug( menu ); menu->insertSeparator(); //m_menubar->insertItem( i18n( "Printer" ), menu ); - m_menubar->insertButton( "printer1", 1, true, i18n( "Printer" ) ); + m_menubar->insertButton( "printer", 1, true, i18n( "Printer" ) ); m_menubar->getButton( 1 )->setPopup( menu, true ); menu = new TQPopupMenu( this ); m_actions->action("server_restart")->plug( menu ); |
