[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: kdebase/ksmserver
From: Oswald Buddenhagen <ossi () kde ! org>
Date: 2004-08-13 7:52:28
Message-ID: 20040813075228.5FAF59A68 () office ! kde ! org
[Download RAW message or body]
CVS commit by ossi:
konq for president! ... uhm, no ... anyway, use the konq logout dialog
even if system shutdown is not available.
M +40 -79 shutdown.cpp 1.50
--- kdebase/ksmserver/shutdown.cpp #1.49:1.50
@@ -94,6 +94,4 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
vbox->addWidget( label, 0, AlignHCenter );
- if (maysd)
- {
QHBoxLayout* hbox = new QHBoxLayout( vbox, 2 * KDialog::spacingHint() );
@@ -113,7 +111,5 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
buttonlay->setAlignment( Qt::AlignHCenter );
- QSpacerItem* item1 = new QSpacerItem(
- 0, KDialog::marginHint(), QSizePolicy::MinimumExpanding );
- buttonlay->addItem( item1 );
+ buttonlay->addStretch( 1 );
// End session
@@ -121,4 +117,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
QFont btnFont = btnLogout->font();
buttonlay->addWidget( btnLogout );
+ connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout()));
+
+ if (maysd) {
// Shutdown
@@ -126,4 +125,7 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
btnHalt->setFont( btnFont );
buttonlay->addWidget( btnHalt );
+ connect(btnHalt, SIGNAL(clicked()), SLOT(slotHalt()));
+ if ( sdtype == KApplication::ShutdownTypeHalt )
+ btnHalt->setFocus();
// Reboot
@@ -131,61 +133,20 @@ KSMShutdownDlg::KSMShutdownDlg( QWidget*
btnReboot->setFont( btnFont );
buttonlay->addWidget( btnReboot );
-
- // Separator
- QSpacerItem* item2 = new QSpacerItem( 0, KDialog::spacingHint(), \
QSizePolicy::MinimumExpanding );
- buttonlay->addItem( item2 );
- KSeparator* sep = new KSeparator( frame );
- buttonlay->addWidget( sep );
-
- // Back to Desktop
- KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
- buttonlay->addWidget( btnBack );
-
- QObject::connect(btnLogout, SIGNAL(clicked()),
- this, SLOT(slotLogout()));
- QObject::connect(btnHalt, SIGNAL(clicked()),
- this, SLOT(slotHalt()));
- QObject::connect(btnReboot, SIGNAL(clicked()),
- this, SLOT(slotReboot()));
- QObject::connect(btnBack, SIGNAL(clicked()),
- this, SLOT(reject()));
-
- if ( sdtype == KApplication::ShutdownTypeHalt )
- btnHalt->setFocus();
- else if ( sdtype == KApplication::ShutdownTypeReboot )
+ connect(btnReboot, SIGNAL(clicked()), SLOT(slotReboot()));
+ if ( sdtype == KApplication::ShutdownTypeReboot )
btnReboot->setFocus();
- else
- btnLogout->setFocus();
- #if 0
- mgrp = new QVButtonGroup( i18n("Shutdown Mode"), frame );
- rSched = new QRadioButton( i18n("Sch&edule"), mgrp );
- if (maynuke)
- rForce = new QRadioButton( i18n("&Force now"), mgrp );
- rTry = new QRadioButton( i18n("&Try now"), mgrp );
- hbox->addWidget( mgrp, AlignTop );
- #endif
}
- vbox->addStretch();
+ buttonlay->addStretch( 1 );
- if ( !maysd ) {
- QHBoxLayout* hbox = new QHBoxLayout( vbox );
- hbox->addStretch();
+ // Separator
+ buttonlay->addWidget( new KSeparator( frame ) );
- // logout
- KPushButton* btnLogout = new KPushButton( i18n("&Logout"), frame );
- btnLogout->setIconSet( QIconSet( SmallIconSet("exit") ) );
- btnLogout->setFocus();
- connect( btnLogout, SIGNAL( clicked() ), SLOT( slotLogout() ) );
- hbox->addWidget( btnLogout );
- hbox->addStretch();
+ // Back to Desktop
+ KPushButton* btnBack = new KPushButton( KStdGuiItem::cancel(), frame );
+ buttonlay->addWidget( btnBack );
+ connect(btnBack, SIGNAL(clicked()), SLOT(reject()));
- // cancel
- KPushButton* cancel = new KPushButton( KStdGuiItem::cancel(), frame );
- connect( cancel, SIGNAL( clicked() ), SLOT( reject() ) );
- hbox->addWidget( cancel );
- hbox->addStretch();
- }
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic