Mailinglist Archive: opensuse-commit (1828 mails)

< Previous

Hello community,

here is the log from the commit of package kdebase4-runtime
checked in at Mon Sep 1 15:00:16 CEST 2008.

--------
--- KDE/kdebase4-runtime/kdebase4-runtime.changes 2008-08-16
16:43:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes
2008-08-20 17:52:58.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Aug 20 16:01:07 CEST 2008 - llunak@xxxxxxx
+
+- move WM selection option to a better place in systemsettings
+
+-------------------------------------------------------------------
oxygen-icon-theme.changes: same change

Old:
----
kdebase-runtime-4.1.0.tar.bz2

New:
----
kdebase-runtime-4.1.1.tar.bz2
wm-switch-systemsettings.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.T23131/_old 2008-09-01 14:59:58.000000000 +0200
+++ /var/tmp/diff_new_pack.T23131/_new 2008-09-01 14:59:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-runtime (Version 4.1.0)
+# spec file for package kdebase4-runtime (Version 4.1.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -29,8 +29,8 @@
Group: System/GUI/KDE
Summary: The KDE Runtime Components
Url: http://www.kde.org/
-Version: 4.1.0
-Release: 17
+Version: 4.1.1
+Release: 1
Source0: kdebase-runtime-%version.tar.bz2
Source1: kde4-essential.menu
Source2: kde-settings.menu
@@ -39,6 +39,7 @@
Patch3: hotplug-kde3.diff
Patch4: kde4-wrapper.diff
Patch5: kdesu-remember-keep-password.diff
+Patch6: wm-switch-systemsettings.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: oxygen-icon-theme >= %version
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}'
libqt4-x11`)
@@ -83,6 +84,7 @@
%patch3
%patch4
%patch5
+%patch6

%build
%cmake_kde4 -d build
@@ -228,6 +230,7 @@
%_kde_share_dir/apps/kio_man
%_kde_share_dir/apps/kio_thumbnail
%_kde_share_dir/apps/konqueror/dirtree/remote/smb-network.desktop
+%_kde_share_dir/apps/ksmserver
%_kde_share_dir/apps/kstyle/themes/*.themerc
%_kde_share_dir/apps/libphonon
%_kde_share_dir/apps/phonon
@@ -364,6 +367,8 @@
%_kde4_modules/kcm_phononxine.so

%changelog
+* Wed Aug 20 2008 llunak@xxxxxxx
+- move WM selection option to a better place in systemsettings
* Sat Aug 16 2008 stbinner@xxxxxxx
- branch diff update
* Wed Aug 13 2008 coolo@xxxxxxx

++++++ oxygen-icon-theme.spec ++++++
--- /var/tmp/diff_new_pack.T23131/_old 2008-09-01 14:59:58.000000000 +0200
+++ /var/tmp/diff_new_pack.T23131/_new 2008-09-01 14:59:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package oxygen-icon-theme (Version 4.1.0)
+# spec file for package oxygen-icon-theme (Version 4.1.1)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -26,8 +26,8 @@
Group: System/GUI/KDE
Summary: Oxygen Icon Theme
Url: http://www.kde.org
-Version: 4.1.0
-Release: 17
+Version: 4.1.1
+Release: 1
Requires: hicolor-icon-theme
Recommends: oxygen-icon-theme-scalable
Source0: kdebase-runtime-%version.tar.bz2
@@ -126,6 +126,8 @@
/usr/share/icons/oxygen

%changelog
+* Wed Aug 20 2008 llunak@xxxxxxx
+- move WM selection option to a better place in systemsettings
* Sat Aug 16 2008 stbinner@xxxxxxx
- branch diff update
* Wed Aug 13 2008 coolo@xxxxxxx

++++++ 4_1_BRANCH.diff ++++++
++++ 3642 lines (skipped)
++++ between KDE/kdebase4-runtime/4_1_BRANCH.diff
++++ and /mounts/work_src_done/STABLE/kdebase4-runtime/4_1_BRANCH.diff

++++++ kdebase-runtime-4.1.0.tar.bz2 -> kdebase-runtime-4.1.1.tar.bz2 ++++++
KDE/kdebase4-runtime/kdebase-runtime-4.1.0.tar.bz2
/mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-4.1.1.tar.bz2
differ: byte 11, line 1

++++++ 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.

Index: kcontrol/componentchooser/componentchooserwm.h
===================================================================
--- kcontrol/componentchooser/componentchooserwm.h (revision 0)
+++ kcontrol/componentchooser/componentchooserwm.h (revision 847440)
@@ -0,0 +1,54 @@
+/***************************************************************************
+ componentchooserwm.h - description
+ -------------------
+ copyright : (C) 2002 by Joseph Wenninger
+ email : jowenn@xxxxxxx
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License version 2 as *
+ * published by the Free Software Foundationi *
+ * *
+ ***************************************************************************/
+
+#ifndef _COMPONENTCHOOSERWM_H_
+#define _COMPONENTCHOOSERWM_H_
+
+#include "ui_wmconfig_ui.h"
+#include "componentchooser.h"
+class KConfig;
+class CfgPlugin;
+
+class WmConfig_UI : public QWidget, public Ui::WmConfig_UI
+{
+public:
+ WmConfig_UI( QWidget *parent ) : QWidget( parent ) {
+ setupUi( this );
+ }
+};
+
+class CfgWm: public WmConfig_UI,public CfgPlugin
+{
+Q_OBJECT
+public:
+ CfgWm(QWidget *parent);
+ virtual ~CfgWm();
+ virtual void load(KConfig *cfg);
+ virtual void save(KConfig *cfg);
+ virtual void defaults();
+
+protected Q_SLOTS:
+ void configChanged();
+
+Q_SIGNALS:
+ void changed(bool);
+private:
+ void loadWMs( const QString& current );
+ QString currentWM() const;
+ QHash< QString, QString > wms; // i18n text -> internal name
+ QString oldwm; // the original value
+};
+
+#endif
Index: kcontrol/componentchooser/wmconfig_ui.ui
===================================================================
--- kcontrol/componentchooser/wmconfig_ui.ui (revision 0)
+++ kcontrol/componentchooser/wmconfig_ui.ui (revision 847440)
@@ -0,0 +1,120 @@
+<ui version="4.0" >
+ <class>WmConfig_UI</class>
+ <widget class="QWidget" name="WmConfig_UI" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>447</width>
+ <height>188</height>
+ </rect>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <layout class="QGridLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <item row="3" column="1" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>0</width>
+ <height>87</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0" colspan="2" >
+ <widget class="QRadioButton" name="differentRB" >
+ <property name="text" >
+ <string>Use a different &window manager:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0" >
+ <spacer>
+ <property name="orientation" >
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType" >
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0" >
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="0" colspan="2" >
+ <widget class="QRadioButton" name="kwinRB" >
+ <property name="text" >
+ <string>&Use the default KDE window manager (KWin)</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1" >
+ <layout class="QHBoxLayout" >
+ <property name="margin" >
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QComboBox" name="wmCombo" >
+ <property name="enabled" >
+ <bool>false</bool>
+ </property>
+ <property name="sizePolicy" >
+ <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="3" margin="6" />
+ <layoutfunction spacing="KDialog::spacingHint" margin="KDialog::marginHint" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+ <tabstop>kwinRB</tabstop>
+ <tabstop>differentRB</tabstop>
+ <tabstop>wmCombo</tabstop>
+ </tabstops>
+ <includes>
+ <include location="local" >kdialog.h</include>
+ </includes>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>differentRB</sender>
+ <signal>toggled(bool)</signal>
+ <receiver>wmCombo</receiver>
+ <slot>setEnabled(bool)</slot>
+ <hints>
+ <hint type="sourcelabel" >
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ <hint type="destinationlabel" >
+ <x>20</x>
+ <y>20</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
Index: kcontrol/componentchooser/windowmanagers/compiz-custom.desktop
===================================================================
--- kcontrol/componentchooser/windowmanagers/compiz-custom.desktop
(revision 0)
+++ kcontrol/componentchooser/windowmanagers/compiz-custom.desktop
(revision 847440)
@@ -0,0 +1,41 @@
+[Desktop Entry]
+Name=Compiz custom (create wrapper script 'compiz-kde-launcher' to launch it)
+Name[ca]=Compiz personalitzat (crea un script embolcall 'compiz-kde-launcher'
per a engegar-lo)
+Name[da]=Brugerdefineret Compiz (opret wrapper-scriptet 'compiz-kde-launcher'
for at starte den)
+Name[de]=Compiz benutzerdefiniert (erstellen Sie ein Mantel-Skript namens
‚compiz-kde-launcher‘, um es zu starten)
+Name[el]=Προσαρμοσμένο Compiz (δημιουργία σεναρίου 'compiz-kde-launcher' για
την εκκίνησή του)
+Name[eo]=Compiz propra (kreu interfacan skripton 'compiz-kde-launcher' por
lanĉi ĝin)
+Name[es]=Compiz personalizado (crea un script 'compiz-kde-launcher' para
ejecutarlo)
+Name[et]=Kohandatud Compiz (käivitamiseks loo kohandav skript
'compiz-kde-launcher')
+Name[fr]=Compiz personnalisé (utilisez un script d'enrobage
« compiz-kde-launcher » pour le lancer)
+Name[fy]=Compiz oanpast (wrapper script 'compiz-kde-launcher' oanmeitsje om it
út te fieren)
+Name[gl]=Compiz personalizado (crea un script "compiz-kde-launcher" para
executalo)
+Name[gu]=પોતાનું કોમ્પિઝ (તેને શરૂ કરવા માટે 'compiz-kde-launcher' સ્ક્રિપ્ટ
બનાવો)
+Name[hu]=Egyedi Compiz (indításához egy "compiz-kde-launcher" nevű szkript
szükséges)
+Name[it]=Compiz personalizzato (per lanciarlo crea uno script
«compiz-kde-launcher» che prepara l'ambiente)
+Name[km]=Compiz ផ្ទាល់ខ្លួន (បង្កើតស្គ្រីបរុំ 'compiz-kde-launcher'
ដើម្បីចាប់ផ្ដើមវា)
+Name[ko]=사용자 정의 컴피즈 ('compiz-kde-launcher' 래퍼 스크립트로 실행함)
+Name[lv]=Pielāgots Compiz (lai to palaistu, izveidojiet palaišanas skriptu
'compiz-kde-launcher')
+Name[ml]=ക്രമീകൃതകോമ്പിസ്(create wrapper script 'compiz-kde-launcher' to
launch it)
+Name[mr]=इच्छिक Compiz (दाखल करण्याकरीता 'compiz-kde-launcher' स्क्रिप्ट
निर्माण करा)
+Name[nds]=Egen Compiz (För't Opropen deit en Skript "compiz-kde-launcher" noot)
+Name[nl]=Compiz custom (maak het script 'compiz-kde-launcher' aan om het te
starten)
+Name[nn]=Compiz sjølvvald (lag skriptet «compiz-kde-launcher» for å starta det)
+Name[pl]=Compiz custom (utwórz skrypt "comiz-kde-launcher", aby go uruchomić)
+Name[pt]=Personalizado do Compiz (criar um programa de interface
'compiz-kde-launcher' para o invocar)
+Name[pt_BR]=Compiz personalizado (criar um script 'compiz-kde-launcher' para
iniciá-lo)
+Name[ro]=Compiz particularizat (creare script „compiz-kde-launcher” pentru a-l
lansa)
+Name[sl]=Prilagojen Compiz (za zagon ustvarite skript »compiz-kde-launcher«)
+Name[sr]=Посебни Компиз (направите омотачку скрипту ‘compiz-kde-launcher’ за
покретање)
+Name[sr@latin]=Posebni Compiz (napravite omotačku skriptu
‘compiz-kde-launcher’ za pokretanje)
+Name[sv]=Egen Compiz (skapa omgivande skript 'compiz-kde-launcher' för att
starta den)
+Name[te]=Compiz custom (దానిని దించుటకు వ్రాపర్ స్క్రిప్‍ట్‌
'compiz-kde-launcher' ను సృష్టించుము)
+Name[th]=Compiz custom (สร้างสคริปต์ครอบ 'compiz-kde-launcher'
เพื่อเรียกใช้มัน)
+Name[tr]=Compiz özel (çalıştırmak için sarıcı betik 'compiz-kde-launcher'
oluştur)
+Name[uk]=Нетиповий Compiz (створити скрипт-обгортку "compiz-kde-launcher" для
його запуску)
+Name[x-test]=xxCompiz custom (create wrapper script 'compiz-kde-launcher' to
launch it)xx
+Name[zh_CN]=Compiz 定制(创建执行用包装脚本“compiz-kde-launcher”)
+Name[zh_TW]=Compiz 自訂（建立外包文稿 compiz-kde-launcher 來啟動）
+Exec=compiz-kde-launcher
+TryExec=compiz
+X-KDE-WindowManagerId=compiz
Index: kcontrol/componentchooser/windowmanagers/openbox.desktop
===================================================================
--- kcontrol/componentchooser/windowmanagers/openbox.desktop (revision 0)
+++ kcontrol/componentchooser/windowmanagers/openbox.desktop (revision
847440)
@@ -0,0 +1,18 @@
+[Desktop Entry]
+Name=Openbox
+Name[bn]=ওপেনবক্স
+Name[cy]=Blwchagored (Openbox)
+Name[gu]=ઓપનબોક્સ
+Name[hi]=ओपनबाक्स
+Name[km]=បើកប្រអប់
+Name[ml]=ഓപ്പണ്‍ബോക്സ്
+Name[mr]=ओपनबाक्स
+Name[ne]=खुला बाकस
+Name[pa]=ਓਪਨ-ਬਾਕਸੇ
+Name[sr]=Опенбокс
+Name[ta]=திறப்பு பெட்டி
+Name[te]=ఒపెన్ బాక్స్
+Name[x-test]=xxOpenboxxx
+Exec=openbox
+TryExec=openbox
+
Index: kcontrol/componentchooser/windowmanagers/metacity.desktop
===================================================================
--- kcontrol/componentchooser/windowmanagers/metacity.desktop (revision 0)
+++ kcontrol/componentchooser/windowmanagers/metacity.desktop (revision
847440)
@@ -0,0 +1,16 @@
+[Desktop Entry]
+Name=Metacity (GNOME)
+Name[cs]=Metacity (Gnome)
+Name[gu]=મેટાસિટી (GNOME)
+Name[ko]=Metacity (그놈)
+Name[ml]=മെറ്റാസിറ്റി (ഗ്നോം)
+Name[mr]=मेटासिटी (GNOME)
+Name[pa]=ਮੈਟਾਸਿਟੀ (ਗਨੋਮ)
+Name[sr]=Метасити (Гном)
+Name[sr@latin]=Metacity (Gnome)
+Name[te]=మెటాసిటి (GNOME)
+Name[x-test]=xxMetacity (GNOME)xx
+Name[zh_CN]=Metacity(GNOME)
+Name[zh_TW]=Metacity（GNOME）
+Exec=metacity
+TryExec=metacity
Index: kcontrol/componentchooser/windowmanagers/compiz.desktop
===================================================================
--- kcontrol/componentchooser/windowmanagers/compiz.desktop (revision 0)
+++ kcontrol/componentchooser/windowmanagers/compiz.desktop (revision
847440)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Compiz
+Name[gu]=કોમ્પિઝ
+Name[ko]=컴피즈
+Name[ml]=കോമ്പിസ്
+Name[mr]=कॉम्पीज
+Name[pa]=ਕੰਪਿਜ਼
+Name[sr]=Компиз
+Name[x-test]=xxCompizxx
+Exec=compiz ccp
+TryExec=compiz
Index: kcontrol/componentchooser/windowmanagers/CMakeLists.txt
===================================================================
--- kcontrol/componentchooser/windowmanagers/CMakeLists.txt (revision 0)
+++ kcontrol/componentchooser/windowmanagers/CMakeLists.txt (revision
847440)
@@ -0,0 +1,8 @@
+########### install files ###############
+
+install( FILES
+ openbox.desktop
+ metacity.desktop
+ compiz.desktop
+ compiz-custom.desktop
+ DESTINATION ${DATA_INSTALL_DIR}/ksmserver/windowmanagers )
Index: kcontrol/componentchooser/windowmanagers/README
===================================================================
--- kcontrol/componentchooser/windowmanagers/README (revision 0)
+++ kcontrol/componentchooser/windowmanagers/README (revision 847440)
@@ -0,0 +1,20 @@
+The list of window managers that the config module offers for using.
+The format is normal .desktop files:
+
+Name - required, name to display in the configuration dialog.
+
+Exec - required, the command to execute to launch the window manager.
+ If launching fails for any reason, it must quit with non-zero exit
+ value and not do anything else (show an error dialog, try to run
+ a fallback, etc.).
+
+TryExec - optional.
+
+X-KDE-WindowManagerTestExec - optional, a command that will be run and if
+ the exit code is not 0, the window manager won't be used (can be used
+ e.g. to detect that a window manager which requires compositing support
+ cannot be run on systems without such support).
+
+X-KDE-WindowManagerId - optional, the name under which the window manager
+ registers with the session manager (if different from the name
+ of the .desktop file)

Property changes on: kcontrol/componentchooser/windowmanagers
___________________________________________________________________
Added: svn:mergeinfo

Index: kcontrol/componentchooser/componentservices/kcm_wm.desktop
===================================================================
--- kcontrol/componentchooser/componentservices/kcm_wm.desktop (revision 0)
+++ kcontrol/componentchooser/componentservices/kcm_wm.desktop (revision
847440)
@@ -0,0 +1,3 @@
+Name=Window Manager
+Comment=Here you can select the window manager to be run in your KDE session.
Note that KDE settings are often not followed when not using the default KDE
window manager.
+configurationType=internal_wm
Index: kcontrol/componentchooser/componentservices/CMakeLists.txt
===================================================================
--- kcontrol/componentchooser/componentservices/CMakeLists.txt (revision
847439)
+++ kcontrol/componentchooser/componentservices/CMakeLists.txt (revision
847440)
@@ -1,4 +1,4 @@
install( FILES kcm_kemail.desktop kcm_browser.desktop DESTINATION
${DATA_INSTALL_DIR}/kcm_componentchooser )
if(NOT WIN32)
- install( FILES kcm_terminal.desktop DESTINATION
${DATA_INSTALL_DIR}/kcm_componentchooser)
+ install( FILES kcm_terminal.desktop kcm_wm.desktop DESTINATION
${DATA_INSTALL_DIR}/kcm_componentchooser)
endif(NOT WIN32)
Index: kcontrol/componentchooser/componentchooser.cpp
===================================================================
--- kcontrol/componentchooser/componentchooser.cpp (revision 847439)
+++ kcontrol/componentchooser/componentchooser.cpp (revision 847440)
@@ -20,6 +20,7 @@
#include "componentchooser.moc"
#ifdef Q_OS_UNIX
#include "componentchooserterminal.h"
+#include "componentchooserwm.h"
#endif

#include <QCheckBox>
@@ -385,6 +386,14 @@
}

}
+ else if (cfgType=="internal_wm")
+ {
+ if (!(configWidget && qobject_cast<CfgWm*>(configWidget)))
+ {
+ newConfigWidget = new CfgWm(configContainer);
+ }
+
+ }
#endif
else if (cfgType=="internal_browser")
{
Index: kcontrol/componentchooser/componentchooserwm.cpp
===================================================================
--- kcontrol/componentchooser/componentchooserwm.cpp (revision 0)
+++ kcontrol/componentchooser/componentchooserwm.cpp (revision 847440)
@@ -0,0 +1,116 @@
+/***************************************************************************
+ componentchooserwm.cpp - description
+ -------------------
+ copyright : (C) 2002 by Joseph Wenninger
+ email : jowenn@xxxxxxx
+ ***************************************************************************/
+
+/***************************************************************************
+ * *
+ * This program is free software; you can redistribute it and/or modify *
+ * it under the terms of the GNU General Public License verstion 2 as *
+ * published by the Free Software Foundation *
+ * *
+ ***************************************************************************/
+
+#include "componentchooserwm.h"
+#include "componentchooserwm.moc"
+
+#include <kdesktopfile.h>
+#include <kmessagebox.h>
+#include <kprocess.h>
+#include <kstandarddirs.h>
+
+CfgWm::CfgWm(QWidget *parent):WmConfig_UI(parent),CfgPlugin()
+{
+ connect(wmCombo,SIGNAL(activated(int)), this, SLOT(configChanged()));
+ connect(kwinRB,SIGNAL(toggled(bool)),this,SLOT(configChanged()));
+ connect(differentRB,SIGNAL(toggled(bool)),this,SLOT(configChanged()));
+
+ KGlobal::dirs()->addResourceType( "windowmanagers", "data",
"ksmserver/windowmanagers" );
+}
+
+CfgWm::~CfgWm()
+{
+}
+
+void CfgWm::configChanged()
+{
+ emit changed(true);
+}
+
+void CfgWm::defaults()
+{
+ wmCombo->setCurrentIndex( 0 );
+}
+
+
+void CfgWm::load(KConfig *)
+{
+ KConfig cfg("ksmserverrc", KConfig::NoGlobals);
+ KConfigGroup c( &cfg, "General");
+ loadWMs(c.readEntry("windowManager", "kwin"));
+ emit changed(false);
+}
+
+void CfgWm::save(KConfig *)
+{
+ KConfig cfg("ksmserverrc", KConfig::NoGlobals);
+ KConfigGroup c( &cfg, "General");
+ c.writeEntry("windowManager", currentWM());
+ emit changed(false);
+ 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 CfgWm::loadWMs( const QString& current )
+{
+ wms[ "KWin" ] = "kwin";
+ oldwm = "kwin";
+ kwinRB->setChecked( true );
+ wmCombo->setEnabled( false );
+ QStringList list = KGlobal::dirs()->findAllResources( "windowmanagers",
QString(), KStandardDirs::NoDuplicates );
+ QRegExp reg( ".*/([^/\\.]*)\\.[^/\\.]*" );
+ foreach( const 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;
+ wmCombo->addItem( name );
+ if( wms[ name ] == current ) // make it selected
+ {
+ wmCombo->setCurrentIndex( wmCombo->count() - 1 );
+ oldwm = wm;
+ differentRB->setChecked( true );
+ wmCombo->setEnabled( true );
+ }
+ }
+}
+
+QString CfgWm::currentWM() const
+{
+ return kwinRB->isChecked() ? "kwin" : wms[ wmCombo->currentText() ];
+}
Index: kcontrol/componentchooser/CMakeLists.txt
===================================================================
--- kcontrol/componentchooser/CMakeLists.txt (revision 847439)
+++ kcontrol/componentchooser/CMakeLists.txt (revision 847440)
@@ -1,5 +1,6 @@

add_subdirectory( componentservices )
+add_subdirectory( windowmanagers )

@@ -8,14 +9,15 @@
set(kcm_componentchooser_PART_SRCS componentchooser.cpp
kcm_componentchooser.cpp )

if(NOT WIN32)
- set(kcm_componentchooser_PART_SRCS ${kcm_componentchooser_PART_SRCS}
componentchooserterminal.cpp)
+ set(kcm_componentchooser_PART_SRCS ${kcm_componentchooser_PART_SRCS}
+ componentchooserterminal.cpp componentchooserwm.cpp)
endif(NOT WIN32)

kde4_add_ui_files(kcm_componentchooser_PART_SRCS browserconfig_ui.ui
emailclientconfig_ui.ui componentchooser_ui.ui componentconfig_ui.ui)

if(NOT WIN32)
- kde4_add_ui_files(kcm_componentchooser_PART_SRCS
terminalemulatorconfig_ui.ui)
+ kde4_add_ui_files(kcm_componentchooser_PART_SRCS
terminalemulatorconfig_ui.ui wmconfig_ui.ui)
endif(NOT WIN32)

kde4_add_plugin(kcm_componentchooser ${kcm_componentchooser_PART_SRCS})

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1828 mails)

commit kdebase4-runtime

Search this list

List Navigation

This Thread