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

List:       kde-commits
Subject:    KDE/kdebase/workspace/ksmserver
From:       Oswald Buddenhagen <ossi () kde ! org>
Date:       2009-05-31 17:08:17
Message-ID: 1243789697.027274.27397.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 976023 by ossi:

reset the auto-press timer when the focued button changes

 M  +5 -0      shutdowndlg.cpp  
 M  +1 -0      shutdowndlg.h  


--- trunk/KDE/kdebase/workspace/ksmserver/shutdowndlg.cpp #976022:976023
@@ -337,6 +337,7 @@
 KSMShutdownDlg::KSMShutdownDlg( QWidget* parent,
                                 bool maysd, KWorkSpace::ShutdownType sdtype )
   : QDialog( parent, Qt::Popup ), //krazy:exclude=qclasses
+    m_lastButton(0),
     m_btnLogout(0),
     m_btnHalt(0),
     m_btnReboot(0),
@@ -524,6 +525,10 @@
 void KSMShutdownDlg::automaticallyDoTimeout()
 {
     QPushButton *focusedButton = qobject_cast<QPushButton *>(focusWidget());
+    if (focusedButton != m_lastButton) {
+        m_lastButton = focusedButton;
+        m_automaticallyDoSeconds = 30;
+    }
     if (focusedButton) {
         if (m_automaticallyDoSeconds <= 0) { // timeout is at 0, do selected action
                 focusedButton->click();
--- trunk/KDE/kdebase/workspace/ksmserver/shutdowndlg.h #976022:976023
@@ -129,6 +129,7 @@
     QPixmap m_renderedSvg;
     Plasma::FrameSvg* m_svg;
     QLabel *m_automaticallyDoLabel;
+    QPushButton *m_lastButton;
     KSMPushButton *m_btnLogout;
     KSMPushButton *m_btnHalt;
     KSMPushButton *m_btnReboot;

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