From 61f6eb5a1e6d7094d993d6e26f4c02c94b3fa1c3 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 26 Mar 2015 13:02:33 -0500 Subject: Bring printer1 icon into XDG compliance --- pics/crystalsvg/cr128-device-printer.png | Bin 0 -> 8472 bytes pics/crystalsvg/cr128-device-printer1.png | Bin 8472 -> 0 bytes pics/crystalsvg/cr16-device-printer.png | Bin 0 -> 684 bytes pics/crystalsvg/cr16-device-printer1.png | Bin 684 -> 0 bytes pics/crystalsvg/cr22-device-printer.png | Bin 0 -> 1003 bytes pics/crystalsvg/cr22-device-printer1.png | Bin 1003 -> 0 bytes pics/crystalsvg/cr32-device-printer.png | Bin 0 -> 1633 bytes pics/crystalsvg/cr32-device-printer1.png | Bin 1633 -> 0 bytes pics/crystalsvg/cr48-device-printer.png | Bin 0 -> 2588 bytes pics/crystalsvg/cr48-device-printer1.png | Bin 2588 -> 0 bytes pics/crystalsvg/cr64-device-printer.png | Bin 0 -> 3720 bytes pics/crystalsvg/cr64-device-printer1.png | Bin 3720 -> 0 bytes tdecore/tdehw/tdehardwaredevices.cpp | 2 +- tdeprint/management/kmmainview.cpp | 2 +- 14 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 pics/crystalsvg/cr128-device-printer.png delete mode 100644 pics/crystalsvg/cr128-device-printer1.png create mode 100644 pics/crystalsvg/cr16-device-printer.png delete mode 100644 pics/crystalsvg/cr16-device-printer1.png create mode 100644 pics/crystalsvg/cr22-device-printer.png delete mode 100644 pics/crystalsvg/cr22-device-printer1.png create mode 100644 pics/crystalsvg/cr32-device-printer.png delete mode 100644 pics/crystalsvg/cr32-device-printer1.png create mode 100644 pics/crystalsvg/cr48-device-printer.png delete mode 100644 pics/crystalsvg/cr48-device-printer1.png create mode 100644 pics/crystalsvg/cr64-device-printer.png delete mode 100644 pics/crystalsvg/cr64-device-printer1.png diff --git a/pics/crystalsvg/cr128-device-printer.png b/pics/crystalsvg/cr128-device-printer.png new file mode 100644 index 000000000..7db5f56b1 Binary files /dev/null and b/pics/crystalsvg/cr128-device-printer.png differ diff --git a/pics/crystalsvg/cr128-device-printer1.png b/pics/crystalsvg/cr128-device-printer1.png deleted file mode 100644 index 7db5f56b1..000000000 Binary files a/pics/crystalsvg/cr128-device-printer1.png and /dev/null differ diff --git a/pics/crystalsvg/cr16-device-printer.png b/pics/crystalsvg/cr16-device-printer.png new file mode 100644 index 000000000..d6defce21 Binary files /dev/null and b/pics/crystalsvg/cr16-device-printer.png differ diff --git a/pics/crystalsvg/cr16-device-printer1.png b/pics/crystalsvg/cr16-device-printer1.png deleted file mode 100644 index d6defce21..000000000 Binary files a/pics/crystalsvg/cr16-device-printer1.png and /dev/null differ diff --git a/pics/crystalsvg/cr22-device-printer.png b/pics/crystalsvg/cr22-device-printer.png new file mode 100644 index 000000000..a71ee2817 Binary files /dev/null and b/pics/crystalsvg/cr22-device-printer.png differ diff --git a/pics/crystalsvg/cr22-device-printer1.png b/pics/crystalsvg/cr22-device-printer1.png deleted file mode 100644 index a71ee2817..000000000 Binary files a/pics/crystalsvg/cr22-device-printer1.png and /dev/null differ diff --git a/pics/crystalsvg/cr32-device-printer.png b/pics/crystalsvg/cr32-device-printer.png new file mode 100644 index 000000000..d554b554f Binary files /dev/null and b/pics/crystalsvg/cr32-device-printer.png differ diff --git a/pics/crystalsvg/cr32-device-printer1.png b/pics/crystalsvg/cr32-device-printer1.png deleted file mode 100644 index d554b554f..000000000 Binary files a/pics/crystalsvg/cr32-device-printer1.png and /dev/null differ diff --git a/pics/crystalsvg/cr48-device-printer.png b/pics/crystalsvg/cr48-device-printer.png new file mode 100644 index 000000000..13adbd006 Binary files /dev/null and b/pics/crystalsvg/cr48-device-printer.png differ diff --git a/pics/crystalsvg/cr48-device-printer1.png b/pics/crystalsvg/cr48-device-printer1.png deleted file mode 100644 index 13adbd006..000000000 Binary files a/pics/crystalsvg/cr48-device-printer1.png and /dev/null differ diff --git a/pics/crystalsvg/cr64-device-printer.png b/pics/crystalsvg/cr64-device-printer.png new file mode 100644 index 000000000..5d22d215e Binary files /dev/null and b/pics/crystalsvg/cr64-device-printer.png differ diff --git a/pics/crystalsvg/cr64-device-printer1.png b/pics/crystalsvg/cr64-device-printer1.png deleted file mode 100644 index 5d22d215e..000000000 Binary files a/pics/crystalsvg/cr64-device-printer1.png and /dev/null differ 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 ); -- cgit v1.2.3