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

List:       kde-commits
Subject:    kdebase/kdesktop/lock
From:       Chris Howells <howells () kde ! org>
Date:       2004-10-26 2:18:27
Message-ID: 20041026021827.BDBC916C3E () office ! kde ! org
[Download RAW message or body]

CVS commit by howells: 

nearly unfoobarred the layout with aseigo's help


  M +5 -5      autologout.cc   1.2


--- kdebase/kdesktop/lock/autologout.cc  #1.1:1.2
@@ -37,6 +37,6 @@ AutoLogout::AutoLogout(LockProcess *pare
     pixLabel->setPixmap(DesktopIcon("exit"));
 
-    QLabel *greetLabel = new QLabel(i18n("<nobr><qt><b>An automatic logout has been \
                configured</b></qt><nobr>"), frame);
-    QLabel *infoLabel = new QLabel(i18n("<qt>If you do not want to be logged out, \
resume using this session before the timeout expires</qt>"), frame); +    QLabel \
*greetLabel = new QLabel(i18n("<nobr><qt><b>Automatic Logout</b></qt><nobr>"), \
frame); +    QLabel *infoLabel = new QLabel(i18n("<qt>To prevent being logged out, \
resume using this session by moving the mouse or pressing a key.</qt>"), frame);  
     mStatusLabel = new QLabel("<b> </b>", frame);
@@ -47,8 +47,8 @@ AutoLogout::AutoLogout(LockProcess *pare
 
     frameLayout = new QGridLayout(frame, 1, 1, KDialog::marginHint(), \
                KDialog::spacingHint());
-    frameLayout->addWidget(pixLabel, 0, 0);
+    frameLayout->addMultiCellWidget(pixLabel, 0, 2, 0, 0, Qt::AlignCenter | \
Qt::AlignTop);  frameLayout->addWidget(greetLabel, 0, 1);
-    frameLayout->addMultiCellWidget(mStatusLabel, 1, 1, 0, 1, AlignTop);
-    frameLayout->addMultiCellWidget(infoLabel, 2, 2, 0, 1, AlignTop);
+    frameLayout->addWidget(mStatusLabel, 1, 1);
+    frameLayout->addWidget(infoLabel, 2, 1);
 
     // get the time remaining in seconds for the status label


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