Bring printer1 icon into XDG compliance

(cherry picked from commit 61f6eb5a1e)
pull/16/head
Timothy Pearson 10 years ago committed by Slávek Banko
parent 0bc94479d6
commit 1a2f871729

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

Before

Width:  |  Height:  |  Size: 684 B

After

Width:  |  Height:  |  Size: 684 B

Before

Width:  |  Height:  |  Size: 1003 B

After

Width:  |  Height:  |  Size: 1003 B

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

@ -4167,7 +4167,7 @@ TQPixmap TDEHardwareDevices::getDeviceTypeIconFromType(TDEGenericDeviceType::TDE
ret = DesktopIcon("kcmpci", size); ret = DesktopIcon("kcmpci", size);
} }
else if (query == TDEGenericDeviceType::Printer) { else if (query == TDEGenericDeviceType::Printer) {
ret = DesktopIcon("printer1", size); ret = DesktopIcon("printer", size);
} }
else if (query == TDEGenericDeviceType::Scanner) { else if (query == TDEGenericDeviceType::Scanner) {
ret = DesktopIcon("scanner", size); ret = DesktopIcon("scanner", size);

@ -286,7 +286,7 @@ void KMMainView::initActions()
m_actions->action("printer_tool")->plug( menu ); m_actions->action("printer_tool")->plug( menu );
menu->insertSeparator(); menu->insertSeparator();
//m_menubar->insertItem( i18n( "Printer" ), menu ); //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 ); m_menubar->getButton( 1 )->setPopup( menu, true );
menu = new TQPopupMenu( this ); menu = new TQPopupMenu( this );
m_actions->action("server_restart")->plug( menu ); m_actions->action("server_restart")->plug( menu );

Loading…
Cancel
Save