summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2015-03-26 18:02:33 (GMT)
committer Timothy Pearson <kb9vqf@pearsoncomputing.net>2015-03-26 18:02:33 (GMT)
commit61f6eb5a1e6d7094d993d6e26f4c02c94b3fa1c3 (patch)
tree2287c9ca8973135a05ecac4e995f3058f7f7fa74
parent7286a57c6c4c3b7f454da41952f955612b669b31 (diff)
downloadtdelibs-61f6eb5a.zip
tdelibs-61f6eb5a.tar.gz
Bring printer1 icon into XDG compliance
-rw-r--r--pics/crystalsvg/cr128-device-printer.png (renamed from pics/crystalsvg/cr128-device-printer1.png)bin8472 -> 8472 bytes
-rw-r--r--pics/crystalsvg/cr16-device-printer.png (renamed from pics/crystalsvg/cr16-device-printer1.png)bin684 -> 684 bytes
-rw-r--r--pics/crystalsvg/cr22-device-printer.png (renamed from pics/crystalsvg/cr22-device-printer1.png)bin1003 -> 1003 bytes
-rw-r--r--pics/crystalsvg/cr32-device-printer.png (renamed from pics/crystalsvg/cr32-device-printer1.png)bin1633 -> 1633 bytes
-rw-r--r--pics/crystalsvg/cr48-device-printer.png (renamed from pics/crystalsvg/cr48-device-printer1.png)bin2588 -> 2588 bytes
-rw-r--r--pics/crystalsvg/cr64-device-printer.png (renamed from pics/crystalsvg/cr64-device-printer1.png)bin3720 -> 3720 bytes
-rw-r--r--tdecore/tdehw/tdehardwaredevices.cpp2
-rw-r--r--tdeprint/management/kmmainview.cpp2
8 files changed, 2 insertions, 2 deletions
diff --git a/pics/crystalsvg/cr128-device-printer1.png b/pics/crystalsvg/cr128-device-printer.png
index 7db5f56..7db5f56 100644
--- a/pics/crystalsvg/cr128-device-printer1.png
+++ b/pics/crystalsvg/cr128-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr16-device-printer1.png b/pics/crystalsvg/cr16-device-printer.png
index d6defce..d6defce 100644
--- a/pics/crystalsvg/cr16-device-printer1.png
+++ b/pics/crystalsvg/cr16-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr22-device-printer1.png b/pics/crystalsvg/cr22-device-printer.png
index a71ee28..a71ee28 100644
--- a/pics/crystalsvg/cr22-device-printer1.png
+++ b/pics/crystalsvg/cr22-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr32-device-printer1.png b/pics/crystalsvg/cr32-device-printer.png
index d554b55..d554b55 100644
--- a/pics/crystalsvg/cr32-device-printer1.png
+++ b/pics/crystalsvg/cr32-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr48-device-printer1.png b/pics/crystalsvg/cr48-device-printer.png
index 13adbd0..13adbd0 100644
--- a/pics/crystalsvg/cr48-device-printer1.png
+++ b/pics/crystalsvg/cr48-device-printer.png
Binary files differ
diff --git a/pics/crystalsvg/cr64-device-printer1.png b/pics/crystalsvg/cr64-device-printer.png
index 5d22d21..5d22d21 100644
--- a/pics/crystalsvg/cr64-device-printer1.png
+++ b/pics/crystalsvg/cr64-device-printer.png
Binary files differ
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 4fec70e..475f470 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 879c00e..ce3f356 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 );