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

List:       kde-commits
Subject:    extragear/utils/rsibreak/src
From:       Juan Luis Baptiste <juan.baptiste () kdemail ! net>
Date:       2010-08-11 15:24:55
Message-ID: 20100811152455.3D257AC7E9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1162178 by jbaptiste:

Change dim widget and passive popup to have bigger and spaced buttons, with icons \
(for the dim screen widget) and more descriptive texts. CCBUG:226891 GUI

 M  +12 -2     breakcontrol.cpp  
 M  +6 -6      rsirelaxpopup.cpp  


--- trunk/extragear/utils/rsibreak/src/breakcontrol.cpp #1162177:1162178
@@ -29,6 +29,7 @@
 #include <KDebug>
 #include <KHBox>
 #include <KLocale>
+#include <KIconLoader>
 
 BreakControl::BreakControl( QWidget* parent, Qt::WindowType type )
         : QWidget( parent, type )
@@ -38,10 +39,18 @@
     m_textLabel->setAlignment( Qt::AlignHCenter );
 
     KHBox* hbox = new KHBox( this );
-    m_skipButton = new QPushButton( i18n( "Skip" ), hbox );
+    hbox->setSpacing(25);
+    
+    m_skipButton = new QPushButton( i18n( "Skip Break" ), hbox );    
+    QSize sizeSkip(m_skipButton->size());
+    m_skipButton->setIcon(SmallIcon("dialog-cancel"));    
+    m_skipButton->setFixedHeight(sizeSkip.height());
     connect( m_skipButton, SIGNAL( clicked() ), SIGNAL( skip() ) );
 
-    m_lockButton = new QPushButton( i18n( "Lock" ), hbox );
+    m_lockButton = new QPushButton( i18n( "Lock Screen" ), hbox );
+    QSize sizeLock(m_skipButton->size());
+    m_lockButton->setFixedHeight(sizeLock.height());
+    m_lockButton->setIcon(SmallIcon("system-lock-screen"));
     connect( m_lockButton, SIGNAL( clicked() ), SLOT( slotLock() ) );
 
     m_vbox->addWidget( m_textLabel );
@@ -49,6 +58,7 @@
 
     setLayout( m_vbox );
 
+    
     //center it!
     const QRect r( QApplication::desktop()->screenGeometry(
                        QApplication::desktop()->primaryScreen() ) );
--- trunk/extragear/utils/rsibreak/src/rsirelaxpopup.cpp #1162177:1162178
@@ -42,20 +42,20 @@
     m_message = new QLabel( vbox );
 
     KHBox *hbox = new KHBox( vbox );
-    hbox->setSpacing( 5 );
+    hbox->setSpacing( 15 );
 
     m_progress = new QProgressBar( hbox );
     m_progress->setFormat( "%v" );
     m_progress->setRange( 0, 0 );
 
-    m_lockbutton = new QPushButton( SmallIcon( "system-lock-screen" ), QString(), \
hbox ); +    m_skipbutton = new QPushButton( SmallIcon( "dialog-cancel" ), i18n( \
"Skip Break" ), hbox ); +    m_skipbutton->setToolTip( i18n( "Skip this break" ) );
+    connect( m_skipbutton, SIGNAL( clicked() ), SIGNAL( skip() ) );
+
+    m_lockbutton = new QPushButton( SmallIcon( "system-lock-screen" ), i18n( "Lock \
Screen" ), hbox );  m_lockbutton->setToolTip( i18n( "Lock the session" ) );
     connect( m_lockbutton, SIGNAL( clicked() ), SIGNAL( lock() ) );
 
-    m_skipbutton = new QPushButton( SmallIcon( "dialog-cancel" ), QString(), hbox );
-    m_skipbutton->setToolTip( i18n( "Skip this break" ) );
-    connect( m_skipbutton, SIGNAL( clicked() ), SIGNAL( skip() ) );
-
     m_popup->setTimeout( 0 ); // no auto close
     m_popup->setView( vbox );
     readSettings();


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