9b6b6c10 | 2015-03-26 14:32:25 | Timothy Pearson |
Bring printer1 icon into XDG compliance (cherry picked from commit fc1a94d86cc30ca3ddc2c47097664fbd8f6a44b7) |
||
M filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h M filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp |
||
diff --git a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h index e1984fa..95bbde7 100644 --- a/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h +++ b/filesharing/advanced/kcm_sambaconf/kcmprinterdlg.ui.h @@ -28,7 +28,7 @@ void KcmPrinterDlg::init() { - printerPixLbl->setPixmap(DesktopIcon("printer1")); + printerPixLbl->setPixmap(DesktopIcon("printer")); } void KcmPrinterDlg::accept() diff --git a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp index 55baa27..81c95f6 100644 --- a/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp +++ b/filesharing/advanced/kcm_sambaconf/printerdlgimpl.cpp @@ -203,7 +203,7 @@ TQPixmap pix(w,h); pix.fill(); // fill with white - TQPixmap pix2 = DesktopIcon("printer1"); + TQPixmap pix2 = DesktopIcon("printer"); // Draw the printericon three times TQPainter p(&pix); @@ -233,7 +233,7 @@ { shareNameEdit->setEnabled(true); shareNameEdit->setText( _share->getName() ); - printerPixLbl->setPixmap(DesktopIcon("printer1")); + printerPixLbl->setPixmap(DesktopIcon("printer")); pixFrame->layout()->setMargin( 11 ); } } |