[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/ksmserver
From:       Stephan Binner <binner () kde ! org>
Date:       2004-04-10 15:21:36
Message-ID: 20040410152136.4F94499F1 () office ! kde ! org
[Download RAW message or body]

CVS commit by binner: 

Use KPushButton and K[Std]GuiItem aka respect icon on button setting


  M +4 -10     shutdown.cpp   1.48


--- kdebase/ksmserver/shutdown.cpp  #1.47:1.48
@@ -118,22 +118,16 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
 
         // End session
-        QPushButton* btnLogout = new QPushButton( i18n("&End Current Session"), \
frame ); +        KPushButton* btnLogout = new KPushButton( KGuiItem( i18n("&End \
Current Session"), "undo"), frame );  QFont btnFont = btnLogout->font();
-        btnLogout->setIconSet( KGlobal::iconLoader()->loadIconSet(
-            "undo", KIcon::NoGroup, KIcon::SizeSmall ) );
         buttonlay->addWidget( btnLogout );
 
         // Shutdown
-        QPushButton* btnHalt = new QPushButton( i18n("&Turn Off Computer"), frame );
+        KPushButton* btnHalt = new KPushButton( KGuiItem( i18n("&Turn Off \
Computer"), "exit"), frame );  btnHalt->setFont( btnFont );
-        btnHalt->setIconSet( KGlobal::iconLoader()->loadIconSet(
-            "exit", KIcon::NoGroup, KIcon::SizeSmall ) );
         buttonlay->addWidget( btnHalt );
 
         // Reboot
-        QPushButton* btnReboot = new QPushButton( i18n("&Restart Computer"), frame \
); +        KPushButton* btnReboot = new KPushButton( KGuiItem( i18n("&Restart \
Computer"), "reload"), frame );  btnReboot->setFont( btnFont );
-        btnReboot->setIconSet( KGlobal::iconLoader()->loadIconSet(
-            "reload", KIcon::NoGroup, KIcon::SizeSmall ) );
         buttonlay->addWidget( btnReboot );
 
@@ -145,5 +139,5 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
 
         // Back to Desktop
-        QPushButton* btnBack = new QPushButton( SmallIcon("cancel"), \
i18n("&Cancel"), frame ); +        KPushButton* btnBack = new KPushButton( \
KStdGuiItem::cancel(), frame );  buttonlay->addWidget( btnBack );
 


[prev in list] [next in list] [prev in thread] [next in thread]