|
|
a59559 |
diff --git a/kcontrol/screensaver/screensaver.ui b/kcontrol/screensaver/screensaver.ui
|
|
|
a59559 |
index 6524e27..5cf64d6 100644
|
|
|
a59559 |
--- a/kcontrol/screensaver/screensaver.ui
|
|
|
a59559 |
+++ b/kcontrol/screensaver/screensaver.ui
|
|
|
a59559 |
@@ -21,6 +21,9 @@
|
|
|
a59559 |
</sizepolicy>
|
|
|
a59559 |
</property>
|
|
|
a59559 |
<layout class="QFormLayout" name="formLayout">
|
|
|
a59559 |
+ <property name="fieldGrowthPolicy">
|
|
|
a59559 |
+ <enum>QFormLayout::ExpandingFieldsGrow</enum>
|
|
|
a59559 |
+ </property>
|
|
|
a59559 |
<item row="0" column="1">
|
|
|
a59559 |
<layout class="QGridLayout" name="gridLayout_2">
|
|
|
a59559 |
<item row="0" column="0">
|
|
|
a59559 |
@@ -102,34 +105,13 @@
|
|
|
a59559 |
</widget>
|
|
|
a59559 |
</item>
|
|
|
a59559 |
<item row="2" column="1">
|
|
|
a59559 |
- <layout class="QHBoxLayout" name="horizontalLayout">
|
|
|
a59559 |
- <item>
|
|
|
a59559 |
- <widget class="QRadioButton" name="mPlasmaWidgetsRadio">
|
|
|
a59559 |
- <property name="text">
|
|
|
a59559 |
- <string>&Desktop Widgets</string>
|
|
|
a59559 |
- </property>
|
|
|
a59559 |
- </widget>
|
|
|
a59559 |
- </item>
|
|
|
a59559 |
- <item>
|
|
|
a59559 |
- <widget class="KPushButton" name="mPlasmaSetup">
|
|
|
a59559 |
- <property name="enabled">
|
|
|
a59559 |
- <bool>false</bool>
|
|
|
a59559 |
- </property>
|
|
|
a59559 |
- <property name="text">
|
|
|
a59559 |
- <string>Configure...</string>
|
|
|
a59559 |
- </property>
|
|
|
a59559 |
- </widget>
|
|
|
a59559 |
- </item>
|
|
|
a59559 |
- </layout>
|
|
|
a59559 |
- </item>
|
|
|
a59559 |
- <item row="3" column="1">
|
|
|
a59559 |
<widget class="QRadioButton" name="mScreenSaverRadio">
|
|
|
a59559 |
<property name="text">
|
|
|
a59559 |
<string>S&creen saver</string>
|
|
|
a59559 |
</property>
|
|
|
a59559 |
</widget>
|
|
|
a59559 |
</item>
|
|
|
a59559 |
- <item row="4" column="1">
|
|
|
a59559 |
+ <item row="3" column="1">
|
|
|
a59559 |
<widget class="QWidget" name="mScreenSaverSettings" native="true">
|
|
|
a59559 |
<property name="enabled">
|
|
|
a59559 |
<bool>false</bool>
|
|
|
a59559 |
@@ -292,16 +274,16 @@
|
|
|
a59559 |
</layout>
|
|
|
a59559 |
</widget>
|
|
|
a59559 |
<customwidgets>
|
|
|
a59559 |
- <customwidget>
|
|
|
a59559 |
- <class>KIntSpinBox</class>
|
|
|
a59559 |
- <extends>QSpinBox</extends>
|
|
|
a59559 |
- <header>knuminput.h</header>
|
|
|
a59559 |
- </customwidget>
|
|
|
a59559 |
<customwidget>
|
|
|
a59559 |
<class>KPushButton</class>
|
|
|
a59559 |
<extends>QPushButton</extends>
|
|
|
a59559 |
<header>kpushbutton.h</header>
|
|
|
a59559 |
</customwidget>
|
|
|
a59559 |
+ <customwidget>
|
|
|
a59559 |
+ <class>KIntSpinBox</class>
|
|
|
a59559 |
+ <extends>QSpinBox</extends>
|
|
|
a59559 |
+ <header>knuminput.h</header>
|
|
|
a59559 |
+ </customwidget>
|
|
|
a59559 |
</customwidgets>
|
|
|
a59559 |
<tabstops>
|
|
|
a59559 |
<tabstop>mEnabledCheckBox</tabstop>
|
|
|
a59559 |
@@ -309,29 +291,11 @@
|
|
|
a59559 |
<tabstop>mLockCheckBox</tabstop>
|
|
|
a59559 |
<tabstop>mWaitLockEdit</tabstop>
|
|
|
a59559 |
<tabstop>mSimpleLockerRadio</tabstop>
|
|
|
a59559 |
- <tabstop>mPlasmaWidgetsRadio</tabstop>
|
|
|
a59559 |
- <tabstop>mPlasmaSetup</tabstop>
|
|
|
a59559 |
<tabstop>mScreenSaverRadio</tabstop>
|
|
|
a59559 |
<tabstop>mSaverListView</tabstop>
|
|
|
a59559 |
</tabstops>
|
|
|
a59559 |
<resources/>
|
|
|
a59559 |
<connections>
|
|
|
a59559 |
- <connection>
|
|
|
a59559 |
- <sender>mPlasmaWidgetsRadio</sender>
|
|
|
a59559 |
- <signal>toggled(bool)</signal>
|
|
|
a59559 |
- <receiver>mPlasmaSetup</receiver>
|
|
|
a59559 |
- <slot>setEnabled(bool)</slot>
|
|
|
a59559 |
- <hints>
|
|
|
a59559 |
- <hint type="sourcelabel">
|
|
|
a59559 |
- <x>175</x>
|
|
|
a59559 |
- <y>147</y>
|
|
|
a59559 |
- </hint>
|
|
|
a59559 |
- <hint type="destinationlabel">
|
|
|
a59559 |
- <x>283</x>
|
|
|
a59559 |
- <y>147</y>
|
|
|
a59559 |
- </hint>
|
|
|
a59559 |
- </hints>
|
|
|
a59559 |
- </connection>
|
|
|
a59559 |
<connection>
|
|
|
a59559 |
<sender>mScreenSaverRadio</sender>
|
|
|
a59559 |
<signal>toggled(bool)</signal>
|
|
|
a59559 |
diff --git a/kcontrol/screensaver/scrnsave.cpp b/kcontrol/screensaver/scrnsave.cpp
|
|
|
a59559 |
index 0125620..a9e5c4a 100644
|
|
|
a59559 |
--- a/kcontrol/screensaver/scrnsave.cpp
|
|
|
a59559 |
+++ b/kcontrol/screensaver/scrnsave.cpp
|
|
|
a59559 |
@@ -167,12 +167,8 @@ KScreenSaver::KScreenSaver(QWidget *parent, const QVariantList&)
|
|
|
a59559 |
connect(mWaitLockEdit, SIGNAL(valueChanged(int)),
|
|
|
a59559 |
this, SLOT(slotLockTimeoutChanged(int)));
|
|
|
a59559 |
|
|
|
a59559 |
- connect(mPlasmaWidgetsRadio, SIGNAL(toggled(bool)), this, SLOT(slotEnablePlasma(bool)));
|
|
|
a59559 |
connect(mScreenSaverRadio, SIGNAL(toggled(bool)), this, SLOT(slotEnableLegacyScreenSaver(bool)));
|
|
|
a59559 |
|
|
|
a59559 |
- mPlasmaSetup->setEnabled(mPlasmaEnabled);
|
|
|
a59559 |
- connect(mPlasmaSetup, SIGNAL(clicked()), this, SLOT(slotPlasmaSetup()));
|
|
|
a59559 |
-
|
|
|
a59559 |
mMonitorPreview = new ScreenPreviewWidget(this);
|
|
|
a59559 |
mMonitorPreview->setFixedSize(200,220);
|
|
|
a59559 |
QDesktopWidget *desktop = QApplication::desktop();
|
|
|
a59559 |
@@ -300,13 +296,8 @@ void KScreenSaver::readSettings()
|
|
|
a59559 |
|
|
|
a59559 |
bool legacyScreenSaver = config.readEntry("LegacySaverEnabled", false);
|
|
|
a59559 |
mScreenSaverRadio->setChecked(legacyScreenSaver);
|
|
|
a59559 |
+
|
|
|
a59559 |
if (!legacyScreenSaver) {
|
|
|
a59559 |
- mPlasmaEnabled = config.readEntry("PlasmaEnabled", false);
|
|
|
a59559 |
- mPlasmaWidgetsRadio->setChecked(mPlasmaEnabled);
|
|
|
a59559 |
- } else {
|
|
|
a59559 |
- mPlasmaEnabled = false;
|
|
|
a59559 |
- }
|
|
|
a59559 |
- if (!legacyScreenSaver && !mPlasmaEnabled) {
|
|
|
a59559 |
mSimpleLockerRadio->setChecked(true);
|
|
|
a59559 |
}
|
|
|
a59559 |
|
|
|
a59559 |
@@ -351,7 +342,6 @@ void KScreenSaver::defaults()
|
|
|
a59559 |
slotLock( false );
|
|
|
a59559 |
mEnabledCheckBox->setChecked(false);
|
|
|
a59559 |
mSimpleLockerRadio->setChecked(true);
|
|
|
a59559 |
- mPlasmaSetup->setEnabled(false);
|
|
|
a59559 |
|
|
|
a59559 |
updateValues();
|
|
|
a59559 |
|
|
|
a59559 |
@@ -371,7 +361,6 @@ void KScreenSaver::save()
|
|
|
a59559 |
config.writeEntry("Timeout", mTimeout);
|
|
|
a59559 |
config.writeEntry("LockGrace", mLockTimeout);
|
|
|
a59559 |
config.writeEntry("Lock", mLock);
|
|
|
a59559 |
- config.writeEntry("PlasmaEnabled", mPlasmaEnabled);
|
|
|
a59559 |
config.writeEntry("LegacySaverEnabled", mScreenSaverRadio->isChecked());
|
|
|
a59559 |
|
|
|
a59559 |
if ( !mSaver.isEmpty() )
|
|
|
a59559 |
@@ -558,17 +547,6 @@ void KScreenSaver::slotEnable(bool e)
|
|
|
a59559 |
emit changed(true);
|
|
|
a59559 |
}
|
|
|
a59559 |
|
|
|
a59559 |
-void KScreenSaver::slotEnablePlasma(bool enable)
|
|
|
a59559 |
-{
|
|
|
a59559 |
- mPlasmaEnabled = enable;
|
|
|
a59559 |
- //FIXME even though the button's enabled, plasma isn't until the user hits apply
|
|
|
a59559 |
- //so the button will just show the screensaver, no plasma.
|
|
|
a59559 |
- //what should I do about this?
|
|
|
a59559 |
- mPlasmaSetup->setEnabled(mPlasmaEnabled);
|
|
|
a59559 |
- mChanged = true;
|
|
|
a59559 |
- emit changed(true);
|
|
|
a59559 |
-}
|
|
|
a59559 |
-
|
|
|
a59559 |
void KScreenSaver::slotEnableLegacyScreenSaver(bool enable)
|
|
|
a59559 |
{
|
|
|
a59559 |
if (mMonitor) {
|
|
|
a59559 |
@@ -578,12 +556,6 @@ void KScreenSaver::slotEnableLegacyScreenSaver(bool enable)
|
|
|
a59559 |
emit changed(true);
|
|
|
a59559 |
}
|
|
|
a59559 |
|
|
|
a59559 |
-void KScreenSaver::slotPlasmaSetup()
|
|
|
a59559 |
-{
|
|
|
a59559 |
- org::kde::screensaver kscreensaver("org.kde.screensaver", "/ScreenSaver", QDBusConnection::sessionBus());
|
|
|
a59559 |
- kscreensaver.setupPlasma();
|
|
|
a59559 |
-}
|
|
|
a59559 |
-
|
|
|
a59559 |
|
|
|
a59559 |
//---------------------------------------------------------------------------
|
|
|
a59559 |
//
|
|
|
a59559 |
diff --git a/kcontrol/screensaver/scrnsave.h b/kcontrol/screensaver/scrnsave.h
|
|
|
a59559 |
index 202e14e..ac2a539 100644
|
|
|
a59559 |
--- a/kcontrol/screensaver/scrnsave.h
|
|
|
a59559 |
+++ b/kcontrol/screensaver/scrnsave.h
|
|
|
a59559 |
@@ -80,9 +80,7 @@ protected Q_SLOTS:
|
|
|
a59559 |
// new preview
|
|
|
a59559 |
void slotPreviewExited();
|
|
|
a59559 |
void findSavers();
|
|
|
a59559 |
- void slotEnablePlasma(bool enable);
|
|
|
a59559 |
void slotEnableLegacyScreenSaver(bool enable);
|
|
|
a59559 |
- void slotPlasmaSetup();
|
|
|
a59559 |
|
|
|
a59559 |
protected:
|
|
|
a59559 |
void writeSettings();
|
|
|
a59559 |
diff --git a/ksmserver/screenlocker/ksldapp.cpp b/ksmserver/screenlocker/ksldapp.cpp
|
|
|
a59559 |
index 78c1ddf..82fb57e 100644
|
|
|
a59559 |
--- a/ksmserver/screenlocker/ksldapp.cpp
|
|
|
a59559 |
+++ b/ksmserver/screenlocker/ksldapp.cpp
|
|
|
a59559 |
@@ -161,7 +161,8 @@ void KSldApp::configure()
|
|
|
a59559 |
m_lockGrace = -1;
|
|
|
a59559 |
}
|
|
|
a59559 |
m_autoLogoutTimeout = KScreenSaverSettings::autoLogout() ? KScreenSaverSettings::autoLogoutTimeout() * 1000 : 0;
|
|
|
a59559 |
- m_plasmaEnabled = KScreenSaverSettings::plasmaEnabled();
|
|
|
a59559 |
+ // m_plasmaEnabled = KScreenSaverSettings::plasmaEnabled();
|
|
|
a59559 |
+ m_plasmaEnabled = false;
|
|
|
a59559 |
}
|
|
|
a59559 |
|
|
|
a59559 |
void KSldApp::lock()
|