Hello community, here is the log from the commit of package kdebase3 checked in at Fri Apr 6 00:21:45 CEST 2007. -------- --- KDE/kdebase3/kdebase3.changes 2007-04-03 18:29:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-04-05 15:22:56.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Apr 5 15:22:27 CEST 2007 - stbinner@suse.de + +- simplify resize and rotate settings dialog (#104926) + +------------------------------------------------------------------- New: ---- simplify-randr-settings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase3.spec ++++++ --- /var/tmp/diff_new_pack.f20060/_old 2007-04-06 00:21:09.000000000 +0200 +++ /var/tmp/diff_new_pack.f20060/_new 2007-04-06 00:21:09.000000000 +0200 @@ -55,7 +55,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.kde.org/ Version: 3.5.6 -Release: 24 +Release: 25 %define kde_version 3.5.6 Source0: kdebase-%{kde_version}.tar.bz2 Source3: startkde.suse.sh @@ -195,6 +195,7 @@ Patch203: show-konqueror-in-menu.diff Patch204: fix-desktop-icons.diff Patch205: kcmkdm-default-grub.diff +Patch206: simplify-randr-settings.diff %description This package contains kdebase, one of the basic packages of the K @@ -381,7 +382,7 @@ Summary: Set and list fileshares Group: System/Management Version: 2.0 -Release: 259 +Release: 260 %description -n fileshareset This package contains the the fileshareset utility to allow users to @@ -555,6 +556,7 @@ %patch203 %patch204 %patch205 +%patch206 cp %SOURCE17 l10n/tw/flag.png . /etc/opt/kde3/common_options cd ../fileshareset2 @@ -1567,6 +1569,8 @@ %endif %changelog +* Thu Apr 05 2007 - stbinner@suse.de +- simplify resize and rotate settings dialog (#104926) * Tue Apr 03 2007 - stbinner@suse.de - update 3_5_BRANCH.diff - update kickoff.diff from SVN: ++++++ simplify-randr-settings.diff ++++++ Index: kcontrol/randr/randr.cpp =================================================================== --- kcontrol/randr/randr.cpp (revision 650813) +++ kcontrol/randr/randr.cpp (working copy) @@ -661,7 +661,7 @@ bool RandRDisplay::applyOnStartup(KConfig& config) { config.setGroup("Display"); - return config.readBoolEntry("ApplyOnStartup", false); + return config.readBoolEntry("ApplyOnStartup", true); } bool RandRDisplay::syncTrayApp(KConfig& config) @@ -676,7 +676,6 @@ config.setGroup("Display"); config.writeEntry("ApplyOnStartup", applyOnStartup); - config.writeEntry("SyncTrayApp", syncTrayApp); for (RandRScreen* s = m_screens.first(); s; s = m_screens.next()) s->save(config); Index: kcontrol/randr/krandrmodule.cpp =================================================================== --- kcontrol/randr/krandrmodule.cpp (revision 650813) +++ kcontrol/randr/krandrmodule.cpp (working copy) @@ -125,23 +125,15 @@ m_rotationGroup->setRadioButtonExclusive(true); QWhatsThis::add(m_rotationGroup, i18n("The options in this section allow you to change the rotation of your screen.")); - m_applyOnStartup = new QCheckBox(i18n("Apply settings on KDE startup"), this); - topLayout->addWidget(m_applyOnStartup); - QWhatsThis::add(m_applyOnStartup, i18n("If this option is enabled the size and orientation settings will be used when KDE starts.")); - connect(m_applyOnStartup, SIGNAL(clicked()), SLOT(setChanged())); + m_applyOnlySession = new QCheckBox(i18n("Change settings only for current session"), this); + topLayout->addWidget(m_applyOnlySession); + QWhatsThis::add(m_applyOnlySession, i18n("If this option is enabled the size and orientation settings will be only changed for the current session.")); + connect(m_applyOnlySession, SIGNAL(clicked()), SLOT(setChanged())); - QHBox* syncBox = new QHBox(this); - syncBox->layout()->addItem(new QSpacerItem(20, 1, QSizePolicy::Maximum)); - m_syncTrayApp = new QCheckBox(i18n("Allow tray application to change startup settings"), syncBox); - topLayout->addWidget(syncBox); - QWhatsThis::add(m_syncTrayApp, i18n("If this option is enabled, options set by the system tray applet will be saved and loaded when KDE starts instead of being temporary.")); - connect(m_syncTrayApp, SIGNAL(clicked()), SLOT(setChanged())); - topLayout->addStretch(1); // just set the "apply settings on startup" box load(); - m_syncTrayApp->setEnabled(m_applyOnStartup->isChecked()); slotScreenChanged(QApplication::desktop()->primaryScreen()); @@ -278,8 +270,7 @@ m_oldApply = loadDisplay(config, false); m_oldSyncTrayApp = syncTrayApp(config); - m_applyOnStartup->setChecked(m_oldApply); - m_syncTrayApp->setChecked(m_oldSyncTrayApp); + m_applyOnlySession->setChecked(!m_oldApply); emit changed( useDefaults ); } @@ -291,8 +282,7 @@ apply(); - m_oldApply = m_applyOnStartup->isChecked(); - m_oldSyncTrayApp = m_syncTrayApp->isChecked(); + m_oldApply = !m_applyOnlySession->isChecked(); KConfig config("kcmrandrrc"); saveDisplay(config, m_oldApply, m_oldSyncTrayApp); @@ -301,8 +291,7 @@ void KRandRModule::setChanged() { - bool isChanged = (m_oldApply != m_applyOnStartup->isChecked()) || (m_oldSyncTrayApp != m_syncTrayApp->isChecked()); - m_syncTrayApp->setEnabled(m_applyOnStartup->isChecked()); + bool isChanged = (m_oldApply != !m_applyOnlySession->isChecked()); if (!isChanged) for (int screenIndex = 0; screenIndex < numScreens(); screenIndex++) { Index: kcontrol/randr/krandrmodule.h =================================================================== --- kcontrol/randr/krandrmodule.h (revision 650813) +++ kcontrol/randr/krandrmodule.h (working copy) @@ -57,8 +57,7 @@ KComboBox* m_sizeCombo; QButtonGroup* m_rotationGroup; KComboBox* m_refreshRates; - QCheckBox* m_applyOnStartup; - QCheckBox* m_syncTrayApp; + QCheckBox* m_applyOnlySession; bool m_oldApply; bool m_oldSyncTrayApp; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org