Hello community, here is the log from the commit of package kdebase4-workspace checked in at Mon Sep 1 15:00:59 CEST 2008. -------- --- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-08-18 00:09:51.000000000 +0200 +++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-09-01 15:00:20.357857000 +0200 @@ -1,0 +2,17 @@ +Thu Aug 28 14:21:50 CEST 2008 - dmueller@suse.de + +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php + +------------------------------------------------------------------- +Wed Aug 20 22:17:10 CEST 2008 - dmueller@suse.de + +- update branch diff +- rediff patch of last change entry to apply properly + +------------------------------------------------------------------- +Wed Aug 20 16:01:35 CEST 2008 - llunak@suse.cz + +- move WM selection option to a better place in systemsettings + +------------------------------------------------------------------- kdebase4-workspace.changes: same change Old: ---- kdebase-workspace-4.1.0.tar.bz2 New: ---- kdebase-workspace-4.1.1.tar.bz2 wm-switch-systemsettings.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-wallpapers.spec ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:44.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-wallpapers (Version 4.1.0) +# spec file for package kdebase4-wallpapers (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,8 +28,8 @@ Group: System/GUI/KDE Summary: KDE 4 Wallpapers Url: http://www.kde.org/ -Version: 4.1.0 -Release: 19 +Version: 4.1.1 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -66,6 +66,14 @@ /usr/share/wallpapers %changelog +* Thu Aug 28 2008 dmueller@suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Thu Aug 21 2008 dmueller@suse.de +- update branch diff +- rediff patch of last change entry to apply properly +* Wed Aug 20 2008 llunak@suse.cz +- move WM selection option to a better place in systemsettings * Sat Aug 16 2008 stbinner@suse.de - branch diff update - fix debuginfo requires ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:45.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kdebase4-workspace (Version 4.1.0) +# spec file for package kdebase4-workspace (Version 4.1.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,8 +33,8 @@ Group: System/GUI/KDE Summary: The KDE Workspace Components Url: http://www.kde.org/ -Version: 4.1.0 -Release: 16 +Version: 4.1.1 +Release: 1 Source0: kdebase-workspace-%version.tar.bz2 Source2: titlebar_decor.png Source90: _upstream @@ -64,6 +64,7 @@ Patch87: klipperrc.diff Patch88: kde4-migrate.diff Patch89: no-kdefakes-link.diff +Patch90: wm-switch-systemsettings.diff %kde4_runtime_requires Conflicts: yast2-theme-NLD %if %suse_version > 1030 @@ -119,6 +120,7 @@ %patch87 %patch88 %patch89 +%patch90 %build %cmake_kde4 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DKDE4_KCHECKPASS_PAM_SERVICE=xdm @@ -529,7 +531,6 @@ %_kde_share_dir/apps/kfontinst %_kde_share_dir/apps/kfontview %_kde_share_dir/apps/kmenuedit -%_kde_share_dir/apps/ksmserver %_kde_share_dir/apps/ksplash %_kde_share_dir/apps/ksysguard %_kde_share_dir/apps/kthememanager @@ -725,6 +726,14 @@ /usr/share/kde4/apps/kconf_update/plasma-add-shortcut-to-menu.upd %changelog +* Thu Aug 28 2008 dmueller@suse.de +- update to 4.1.1 + * see http://kde.org/announcements/changelogs/changelog4_1to4_1_1.php +* Thu Aug 21 2008 dmueller@suse.de +- update branch diff +- rediff patch of last change entry to apply properly +* Wed Aug 20 2008 llunak@suse.cz +- move WM selection option to a better place in systemsettings * Sat Aug 16 2008 stbinner@suse.de - branch diff update - fix debuginfo requires ++++++ 4_1_BRANCH.diff ++++++ ++++ 7580 lines (skipped) ++++ between KDE/kdebase4-workspace/4_1_BRANCH.diff ++++ and /mounts/work_src_done/STABLE/kdebase4-workspace/4_1_BRANCH.diff ++++++ kdebase-workspace-4.1.0.tar.bz2 -> kdebase-workspace-4.1.1.tar.bz2 ++++++ KDE/kdebase4-workspace/kdebase-workspace-4.1.0.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase-workspace-4.1.1.tar.bz2 differ: byte 11, line 1 ++++++ plasma.diff ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:45.000000000 +0200 @@ -1,7 +1,5 @@ -Index: libs/plasma/theme.cpp -=================================================================== ---- libs/plasma/theme.cpp (revision 832721) -+++ libs/plasma/theme.cpp (working copy) +--- libs/plasma/theme.cpp ++++ libs/plasma/theme.cpp @@ -50,7 +50,6 @@ public: ThemePrivate(Theme *theme) @@ -44,10 +42,8 @@ return fullPath; } -Index: plasma/applets/lock_logout/lockout.cpp -=================================================================== ---- plasma/applets/lock_logout/lockout.cpp (revision 832782) -+++ plasma/applets/lock_logout/lockout.cpp (working copy) +--- plasma/applets/lock_logout/lockout.cpp ++++ plasma/applets/lock_logout/lockout.cpp @@ -47,12 +47,14 @@ m_layout->setSpacing(0); @@ -64,10 +60,8 @@ } LockOut::~LockOut() -Index: plasma/applets/kickoff/simpleapplet/simpleapplet.cpp -=================================================================== ---- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (revision 832721) -+++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp (working copy) +--- plasma/applets/kickoff/simpleapplet/simpleapplet.cpp ++++ plasma/applets/kickoff/simpleapplet/simpleapplet.cpp @@ -30,6 +30,7 @@ #include <QMetaEnum> #include <QPointer> @@ -97,10 +91,8 @@ d->addItem(d->formatComboBox, i18nc("@item:inlistbox Format:", "Description (Name)"), MenuLauncherApplet::DescriptionName); l->addWidget(d->formatComboBox, 1, 1); -Index: plasma/applets/kickoff/applet/applet.cpp -=================================================================== ---- plasma/applets/kickoff/applet/applet.cpp (revision 832721) -+++ plasma/applets/kickoff/applet/applet.cpp (working copy) +--- plasma/applets/kickoff/applet/applet.cpp ++++ plasma/applets/kickoff/applet/applet.cpp @@ -29,6 +29,7 @@ #include <QVBoxLayout> #include <QLabel> @@ -121,10 +113,8 @@ d->icon->setFlag(ItemIsMovable, false); connect(d->icon, SIGNAL(pressed(bool)), this, SLOT(toggleMenu(bool))); connect(this, SIGNAL(activate()), this, SLOT(toggleMenu())); -Index: plasma/applets/kickoff/core/systemmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/systemmodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/systemmodel.cpp (working copy) +--- plasma/applets/kickoff/core/systemmodel.cpp ++++ plasma/applets/kickoff/core/systemmodel.cpp @@ -87,7 +87,7 @@ connect(placesModel, SIGNAL(rowsRemoved(QModelIndex,int,int)), q, SLOT(sourceRowsRemoved(QModelIndex,int,int))); @@ -178,10 +168,8 @@ } } -Index: plasma/applets/kickoff/core/leavemodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/leavemodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/leavemodel.cpp (working copy) +--- plasma/applets/kickoff/core/leavemodel.cpp ++++ plasma/applets/kickoff/core/leavemodel.cpp @@ -27,6 +27,8 @@ #include <KLocalizedString> #include <KIcon> @@ -282,10 +270,8 @@ // Shutdown QStandardItem *shutDownOption = createStandardItem("leave:/shutdown"); systemOptions->appendRow(shutDownOption); -Index: plasma/applets/kickoff/core/itemhandlers.cpp -=================================================================== ---- plasma/applets/kickoff/core/itemhandlers.cpp (revision 832725) -+++ plasma/applets/kickoff/core/itemhandlers.cpp (working copy) +--- plasma/applets/kickoff/core/itemhandlers.cpp ++++ plasma/applets/kickoff/core/itemhandlers.cpp @@ -29,6 +29,8 @@ #include <KToolInvocation> #include <KUrl> @@ -380,10 +366,8 @@ + if (job != 0) + job->start(); +} -Index: plasma/applets/kickoff/core/leavemodel.h -=================================================================== ---- plasma/applets/kickoff/core/leavemodel.h (revision 832725) -+++ plasma/applets/kickoff/core/leavemodel.h (working copy) +--- plasma/applets/kickoff/core/leavemodel.h ++++ plasma/applets/kickoff/core/leavemodel.h @@ -36,6 +36,8 @@ static QStandardItem* createStandardItem(const QString& url); @@ -393,10 +377,8 @@ private: class Private; Private * const d; -Index: plasma/applets/kickoff/core/models.cpp -=================================================================== ---- plasma/applets/kickoff/core/models.cpp (revision 832725) -+++ plasma/applets/kickoff/core/models.cpp (working copy) +--- plasma/applets/kickoff/core/models.cpp ++++ plasma/applets/kickoff/core/models.cpp @@ -155,7 +155,19 @@ { KConfigGroup appsGroup = componentData().config()->group("SystemApplications"); @@ -418,10 +400,8 @@ apps = appsGroup.readEntry("DesktopFiles", apps); return apps; } -Index: plasma/applets/kickoff/core/favoritesmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/favoritesmodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/favoritesmodel.cpp (working copy) +--- plasma/applets/kickoff/core/favoritesmodel.cpp ++++ plasma/applets/kickoff/core/favoritesmodel.cpp @@ -85,12 +85,14 @@ static QList<QString> defaultFavorites() { @@ -439,10 +419,8 @@ if (service) { desktopFiles << service->entryPath(); } -Index: plasma/applets/kickoff/core/itemhandlers.h -=================================================================== ---- plasma/applets/kickoff/core/itemhandlers.h (revision 832725) -+++ plasma/applets/kickoff/core/itemhandlers.h (working copy) +--- plasma/applets/kickoff/core/itemhandlers.h ++++ plasma/applets/kickoff/core/itemhandlers.h @@ -42,6 +42,10 @@ void logout(); void lock(); @@ -454,10 +432,8 @@ private: QString m_logoutAction; -Index: plasma/applets/kickoff/core/applicationmodel.cpp -=================================================================== ---- plasma/applets/kickoff/core/applicationmodel.cpp (revision 832725) -+++ plasma/applets/kickoff/core/applicationmodel.cpp (working copy) +--- plasma/applets/kickoff/core/applicationmodel.cpp ++++ plasma/applets/kickoff/core/applicationmodel.cpp @@ -110,6 +110,8 @@ static bool AppNodeLessThan(AppNode *n1, AppNode *n2); @@ -827,10 +803,8 @@ /** * FIXME This is a temporary workaround to map the icon names found * in the desktop directory files (from /usr/share/desktop-directories) -Index: plasma/applets/kickoff/core/applicationmodel.h -=================================================================== ---- plasma/applets/kickoff/core/applicationmodel.h (revision 832725) -+++ plasma/applets/kickoff/core/applicationmodel.h (working copy) +--- plasma/applets/kickoff/core/applicationmodel.h ++++ plasma/applets/kickoff/core/applicationmodel.h @@ -86,10 +86,15 @@ void slotReloadMenu(); void checkSycocaChange(); @@ -847,10 +821,8 @@ Q_DISABLE_COPY(ApplicationModel) }; -Index: plasma/applets/kickoff/ui/launcher.cpp -=================================================================== ---- plasma/applets/kickoff/ui/launcher.cpp (revision 832721) -+++ plasma/applets/kickoff/ui/launcher.cpp (working copy) +--- plasma/applets/kickoff/ui/launcher.cpp ++++ plasma/applets/kickoff/ui/launcher.cpp @@ -80,6 +80,7 @@ , urlLauncher(new UrlItemLauncher(launcher)) , resizeHandle(0) @@ -901,39 +873,8 @@ } void Launcher::resultsAvailable() -Index: plasma/applets/kickoff/CMakeLists.txt -=================================================================== ---- plasma/applets/kickoff/CMakeLists.txt (revision 832721) -+++ plasma/applets/kickoff/CMakeLists.txt (working copy) -@@ -33,6 +33,8 @@ - QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${screensaver_xml} screensaver_interface) - set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/org.kde.krunner.Interface.xml) - QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${krunner_xml} krunner_interface) -+set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) -+QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${ksmserver_xml} ksmserver_interface) - - set ( Kickoff_LIBS - ${KDE4_KIO_LIBS} -@@ -60,13 +62,13 @@ - # Kickoff Plasma Applet - set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) - kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) --target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) -+target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) - install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) - - # Simple KMenu Plasma Applet - set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) - kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) --target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) -+target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) - install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) - install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -Index: plasma/plasma/desktopcorona.cpp -=================================================================== ---- plasma/plasma/desktopcorona.cpp (revision 832721) -+++ plasma/plasma/desktopcorona.cpp (working copy) +--- plasma/plasma/desktopcorona.cpp ++++ plasma/plasma/desktopcorona.cpp @@ -23,6 +23,7 @@ #include <QDesktopWidget> #include <QDir> @@ -975,3 +916,31 @@ foreach (Plasma::Applet* applet, panel->applets()) { applet->init(); applet->flushPendingConstraintsEvents(); +--- plasma/applets/kickoff/CMakeLists.txt ++++ plasma/applets/kickoff/CMakeLists.txt +@@ -33,6 +33,9 @@ set(screensaver_xml ${KDEBASE_WORKSPACE_ + QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${screensaver_xml} screensaver_interface) + set(krunner_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/krunner/org.kde.krunner.Interface.xml) + QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${krunner_xml} krunner_interface) ++set(ksmserver_xml ${KDEBASE_WORKSPACE_SOURCE_DIR}/ksmserver/org.kde.KSMServerInterface.xml) ++QT4_ADD_DBUS_INTERFACE(Kickoff_SRCS ${ksmserver_xml} ksmserver_interface) ++ + if(NOT WIN32) + set ( Kickoff_LIBS + ${KDE4_KIO_LIBS} +@@ -63,13 +66,13 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) + # Kickoff Plasma Applet + set ( Applet_SRCS ${Kickoff_SRCS} applet/applet.cpp ) + kde4_add_plugin(plasma_applet_launcher ${Applet_SRCS}) +-target_link_libraries(plasma_applet_launcher plasma ${Kickoff_LIBS}) ++target_link_libraries(plasma_applet_launcher plasma solidcontrol ${Kickoff_LIBS}) + install(TARGETS plasma_applet_launcher DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES applet/plasma-applet-launcher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + + # Simple KMenu Plasma Applet + set ( SimpleApplet_SRCS ${Kickoff_SRCS} simpleapplet/menuview.cpp simpleapplet/simpleapplet.cpp ) + kde4_add_plugin(plasma_applet_simplelauncher ${SimpleApplet_SRCS}) +-target_link_libraries(plasma_applet_simplelauncher plasma ${Kickoff_LIBS}) ++target_link_libraries(plasma_applet_simplelauncher plasma solidcontrol ${Kickoff_LIBS}) + install(TARGETS plasma_applet_simplelauncher DESTINATION ${PLUGIN_INSTALL_DIR}) + install(FILES simpleapplet/plasma-applet-simplelauncher.desktop DESTINATION ${SERVICES_INSTALL_DIR}) ++++++ systemsettings-desktop.diff ++++++ --- /var/tmp/diff_new_pack.P29492/_old 2008-09-01 15:00:45.000000000 +0200 +++ /var/tmp/diff_new_pack.P29492/_new 2008-09-01 15:00:45.000000000 +0200 @@ -1,6 +1,6 @@ ---- ./systemsettings/systemsettings.desktop 2008/02/18 09:32:23 1.2 -+++ ./systemsettings/systemsettings.desktop 2008/02/18 09:32:52 -@@ -5,7 +5,7 @@ +--- systemsettings/systemsettings.desktop ++++ systemsettings/systemsettings.desktop +@@ -5,7 +5,7 @@ Type=Application X-DocPath=systemsettings/index.html X-KDE-StartupNotify=true @@ -8,8 +8,8 @@ +GenericName=Configure Desktop GenericName[ar]=إعدادات النظام GenericName[bg]=Системни настройки - GenericName[ca]=Arranjament del sistema -@@ -54,7 +54,7 @@ + GenericName[bn_IN]=সিস্টেম সংক্রান্ত বৈশিষ্ট্য +@@ -65,7 +65,7 @@ GenericName[x-test]=xxSystem Settingsxx GenericName[zh_CN]=系统设置 GenericName[zh_TW]=系統設定 @@ -18,11 +18,9 @@ Name[ar]=إعدادات النظام Name[be]=Сістэмныя настаўленні Name[bg]=Системни настройки ---- systemsettings/systemsettings.desktop 2008/08/05 12:02:59 1.37 -+++ systemsettings/systemsettings.desktop 2008/08/05 12:05:21 -@@ -133,4 +133,3 @@ +@@ -132,4 +132,4 @@ Name[zh_CN]=系统设置 + Name[zh_TW]=系統設定 X-DBUS-StartupType=Unique -Categories=Qt;KDE;System; --NoDisplay=true +Categories=Qt;KDE;X-SuSE-core;Qt;Core; ++++++ wm-switch-systemsettings.diff ++++++ Subject: Move the window manager selection UI to 'default applications' control module From: Lubos Lunak Patch-upstream: r847440 Relates: kdebase4-workspace/wm-switch-systemsettings.diff Move the window manager selection UI option (i.e. mainly Compiz switch) to a more prominent and logical place, the 'default applications' control module. --- ksmserver/kcm/smserverconfigdlg.ui +++ ksmserver/kcm/smserverconfigdlg.ui @@ -6,7 +6,7 @@ <x>0</x> <y>0</y> <width>325</width> - <height>478</height> + <height>433</height> </rect> </property> <property name="windowTitle" > @@ -125,18 +125,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="windowManagerGroup" > - <property name="title" > - <string>Window Manager</string> - </property> - <layout class="QVBoxLayout" name="verticalLayout" > - <item> - <widget class="QComboBox" name="windowManagerCombo" /> - </item> - </layout> - </widget> - </item> - <item> <widget class="QGroupBox" name="advancedGroup" > <property name="title" > <string>Advanced</string> --- ksmserver/kcm/smserverconfigimpl.cpp +++ ksmserver/kcm/smserverconfigimpl.cpp @@ -28,7 +28,6 @@ connect(rebootRadio,SIGNAL(toggled(bool)), SLOT(configChanged())); connect(excludeLineedit,SIGNAL(textChanged(QString)),SLOT(configChanged())); connect(offerShutdownCheck,SIGNAL(toggled(bool)),SLOT(configChanged())); - connect(windowManagerCombo,SIGNAL(activated(int)),SLOT(configChanged())); } SMServerConfigImpl::~SMServerConfigImpl(){ } --- ksmserver/kcm/kcmsmserver.cpp +++ ksmserver/kcm/kcmsmserver.cpp @@ -63,8 +63,6 @@ connect(dialog, SIGNAL(changed()), SLOT(changed())); topLayout->addWidget(dialog); - - KGlobal::dirs()->addResourceType( "windowmanagers", "data", "ksmserver/windowmanagers" ); } void SMServerConfig::load() @@ -94,7 +92,6 @@ dialog->logoutRadio->setChecked(true); break; } - loadWMs(c.readEntry("windowManager", "kwin")); dialog->excludeLineedit->setText( c.readEntry("excludeApps")); emit changed(false); @@ -102,8 +99,8 @@ void SMServerConfig::save() { - KConfig *c = new KConfig("ksmserverrc", KConfig::NoGlobals); - KConfigGroup group = c->group("General"); + KConfig c("ksmserverrc", KConfig::NoGlobals); + KConfigGroup group = c.group("General"); group.writeEntry( "confirmLogout", dialog->confirmLogoutCheck->isChecked()); group.writeEntry( "offerShutdown", dialog->offerShutdownCheck->isChecked()); QString s = "restorePreviousLogout"; @@ -119,21 +116,13 @@ dialog->rebootRadio->isChecked() ? int(KWorkSpace::ShutdownTypeReboot) : int(KWorkSpace::ShutdownTypeNone)); - group.writeEntry("windowManager", currentWM()); group.writeEntry("excludeApps", dialog->excludeLineedit->text()); - c->sync(); - delete c; + c.sync(); # if 0 // update the k menu if necessary QDBusInterface kicker("org.kde.kicker", "/kicker", "org.kde.kicker"); kicker.call("configure"); #endif - if( oldwm != currentWM()) - { // TODO switch it already in the session instead and tell ksmserver - KMessageBox::information( this, - i18n( "The new window manager will be used when KDE is started the next time." ), - i18n( "Window manager change" ), "windowmanagerchange" ); - } } void SMServerConfig::defaults() @@ -143,55 +132,7 @@ dialog->offerShutdownCheck->setChecked(true); dialog->sdGroup->setEnabled(true); dialog->logoutRadio->setChecked(true); - dialog->windowManagerCombo->setCurrentIndex( 0 ); dialog->excludeLineedit->clear(); } -void SMServerConfig::loadWMs( const QString& current ) -{ - QString kwinname = i18n( "KWin (KDE default)" ); - dialog->windowManagerCombo->addItem( kwinname ); - dialog->windowManagerCombo->setCurrentIndex( 0 ); - wms[ kwinname ] = "kwin"; - oldwm = "kwin"; - QStringList list = KGlobal::dirs()->findAllResources( "windowmanagers", QString(), KStandardDirs::NoDuplicates ); - QRegExp reg( ".*/([^/\\.]*)\\.[^/\\.]*" ); - foreach( QString wmfile, list ) - { - KDesktopFile file( wmfile ); - if( file.noDisplay()) - continue; - if( !file.tryExec()) - continue; - QString testexec = file.desktopGroup().readEntry( "X-KDE-WindowManagerTestExec" ); - if( !testexec.isEmpty()) - { - KProcess proc; - proc.setShellCommand( testexec ); - if( proc.execute() != 0 ) - continue; - } - QString name = file.readName(); - if( name.isEmpty()) - continue; - if( !reg.exactMatch( wmfile )) - continue; - QString wm = reg.cap( 1 ); - if( wms.values().contains( wm )) - continue; - wms[ name ] = wm; - dialog->windowManagerCombo->addItem( name ); - if( wms[ name ] == current ) // make it selected - { - dialog->windowManagerCombo->setCurrentIndex( dialog->windowManagerCombo->count() - 1 ); - oldwm = wm; - } - } -} - -QString SMServerConfig::currentWM() const -{ - return wms[ dialog->windowManagerCombo->currentText() ]; -} - #include "kcmsmserver.moc" --- ksmserver/kcm/kcmsmserver.h +++ ksmserver/kcm/kcmsmserver.h @@ -40,10 +40,6 @@ void defaults(); private: - void loadWMs( const QString& current ); - QString currentWM() const; - QHash< QString, QString > wms; // i18n text -> internal name - QString oldwm; // the original value SMServerConfigImpl* dialog; }; --- ksmserver/CMakeLists.txt +++ ksmserver/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory( kcm ) -add_subdirectory( windowmanagers ) add_subdirectory( tests ) include_directories( ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org