[kde-doc-english] KDE/kdebase/workspace/kcontrol/screensaver
Davide Bettio
davide.bettio at kdemail.net
Thu Jan 7 13:52:30 CET 2010
SVN commit 1071055 by bettio:
GUI: removed a couple of labels: less space is wasted.
M +78 -131 screensaver.ui
M +0 -9 scrnsave.cpp
--- trunk/KDE/kdebase/workspace/kcontrol/screensaver/screensaver.ui #1071054:1071055
@@ -12,12 +12,25 @@
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="1" column="3" rowspan="3">
+ <item row="1" column="2" rowspan="2">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QWidget" name="mPreviewAreaWidget" native="true">
<layout class="QVBoxLayout" name="verticalLayout_3">
<item>
+ <spacer name="verticalSpacer_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>145</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
<widget class="QWidget" name="widget" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -58,135 +71,69 @@
</item>
</layout>
</item>
- <item row="3" column="0" colspan="3">
+ <item row="2" column="0" colspan="2">
<widget class="QGroupBox" name="mSettingsGroup">
<property name="title">
<string>Settings</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
<widget class="QCheckBox" name="mEnabledCheckBox">
<property name="whatsThis">
<string>Automatically start the screen saver after a period of inactivity.</string>
</property>
<property name="text">
- <string>Start a&utomatically</string>
+ <string>Start a&utomatically after:</string>
</property>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>13</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="mActivateLbl">
- <property name="whatsThis">
- <string>The period of inactivity after which the screen saver should start.</string>
- </property>
- <property name="text">
- <string>After:</string>
- </property>
- <property name="buddy">
- <cstring>mWaitEdit</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KIntSpinBox" name="mWaitEdit"/>
- </item>
- <item>
- <spacer name="horizontalSpacer_6">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <item row="0" column="1">
+ <widget class="KIntSpinBox" name="mWaitEdit"/>
</item>
- <item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>243</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
<widget class="QCheckBox" name="mLockCheckBox">
<property name="whatsThis">
<string>Prevent potential unauthorized use by requiring a password to stop the screen saver.</string>
</property>
<property name="text">
- <string>&Require password to stop</string>
+ <string>&Require password after:</string>
</property>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <spacer name="horizontalSpacer_4">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>13</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="mLockLbl">
- <property name="whatsThis">
- <string>The amount of time, after the screen saver has started, to ask for the unlock password.</string>
- </property>
- <property name="text">
- <string>After:</string>
- </property>
- <property name="buddy">
- <cstring>mWaitLockEdit</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KIntSpinBox" name="mWaitLockEdit">
- <property name="whatsThis">
- <string>The amount of time, after the screen saver has started, to ask for the unlock password.</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <item row="1" column="1">
+ <widget class="KIntSpinBox" name="mWaitLockEdit">
+ <property name="whatsThis">
+ <string>The amount of time, after the screen saver has started, to ask for the unlock password.</string>
+ </property>
+ </widget>
</item>
- <item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>243</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="mPlasmaCheckBox">
<property name="whatsThis">
<string>Add widgets to your screensaver.</string>
@@ -196,7 +143,7 @@
</property>
</widget>
</item>
- <item>
+ <item row="3" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_5">
@@ -239,8 +186,8 @@
</layout>
</widget>
</item>
- <item row="1" column="0" colspan="3">
- <widget class="QGroupBox" name="mScrenSaverGroup">
+ <item row="1" column="0">
+ <widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Screen Saver</string>
</property>
@@ -252,18 +199,18 @@
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="KPushButton" name="mSetupBt">
- <property name="enabled">
- <bool>false</bool>
+ <item row="1" column="0">
+ <spacer name="horizontalSpacer_8">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="whatsThis">
- <string>Configure the screen saver's options, if any.</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
</property>
- <property name="text">
- <string>&Setup...</string>
- </property>
- </widget>
+ </spacer>
</item>
<item row="1" column="1">
<widget class="KPushButton" name="mTestBt">
@@ -284,18 +231,18 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <spacer name="horizontalSpacer_8">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="2">
+ <widget class="KPushButton" name="mSetupBt">
+ <property name="enabled">
+ <bool>false</bool>
</property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
+ <property name="whatsThis">
+ <string>Configure the screen saver's options, if any.</string>
</property>
- </spacer>
+ <property name="text">
+ <string>&Setup...</string>
+ </property>
+ </widget>
</item>
</layout>
</widget>
--- trunk/KDE/kdebase/workspace/kcontrol/screensaver/scrnsave.cpp #1071054:1071055
@@ -132,9 +132,6 @@
connect(mEnabledCheckBox, SIGNAL(toggled(bool)),
this, SLOT(slotEnable(bool)));
-
- mActivateLbl->setEnabled(mEnabled);
-
mWaitEdit->setRange(1, INT_MAX);
mWaitEdit->setSuffix(ki18np(" minute", " minutes"));
mWaitEdit->setValue(mTimeout/60);
@@ -147,9 +144,6 @@
connect( mLockCheckBox, SIGNAL( toggled( bool ) ),
this, SLOT( slotLock( bool ) ) );
-
- mLockLbl->setEnabled(mEnabled && mLock);
-
mWaitLockEdit->setRange(1, 300);
mWaitLockEdit->setSuffix(ki18np(" second", " seconds"));
mWaitLockEdit->setValue(mLockTimeout/1000);
@@ -519,10 +513,8 @@
void KScreenSaver::slotEnable(bool e)
{
mEnabled = e;
- mActivateLbl->setEnabled( e );
mWaitEdit->setEnabled( e );
mLockCheckBox->setEnabled( e );
- mLockLbl->setEnabled( e && mLock );
mWaitLockEdit->setEnabled( e && mLock );
mChanged = true;
emit changed(true);
@@ -753,7 +745,6 @@
void KScreenSaver::slotLock( bool l )
{
mLock = l;
- mLockLbl->setEnabled( l );
mWaitLockEdit->setEnabled( l );
mChanged = true;
emit changed(true);
More information about the kde-doc-english
mailing list