yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merging from old trunk:

Browse source 
r615451 | mlaurent | 2006-12-21 16:34:31 +0100 (Thu, 21 Dec 2006) | 2 lines

Use dbus interface


svn path=/trunk/KDE/kdebase/workspace/; revision=659495
This commit is contained in:
Luboš Luňák 2007-04-30 10:01:00 +00:00
parent 1afce20bbf
commit ff291be58f
12 changed files with 54 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
data/CMakeLists.txt
View file

@ -1,8 +1,14 @@
set(kwin_xml ${CMAKE_SOURCE_DIR}/workspace/kwin/org.kde.KWin.xml)
set(interface_file)
QT4_ADD_DBUS_INTERFACE( interface_file ${kwin_xml} kwin_interface )
########### next target ############### ########### next target ###############
set(kwin_update_window_settings_SRCS update_window_settings.cpp) set(kwin_update_window_settings_SRCS update_window_settings.cpp ${interface_file})
kde4_automoc(${kwin_update_window_settings_SRCS}) kde4_automoc(${kwin_update_window_settings_SRCS})
@ -14,7 +20,7 @@ install(TARGETS kwin_update_window_settings DESTINATION ${LIB_INSTALL_DIR}/kconf
########### next target ############### ########### next target ###############
set(kwin_update_default_rules_SRCS update_default_rules.cpp) set(kwin_update_default_rules_SRCS update_default_rules.cpp ${interface_file})
kde4_automoc(${kwin_update_default_rules}) kde4_automoc(${kwin_update_default_rules})

5
data/update_default_rules.cpp
View file

@ -15,6 +15,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <kcomponentdata.h> #include <kcomponentdata.h>
#include <kstandarddirs.h> #include <kstandarddirs.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <kwin_interface.h>
int main( int argc, char* argv[] ) int main( int argc, char* argv[] )
{ {
@ -54,6 +55,6 @@ int main( int argc, char* argv[] )
#warning D-BUS TODO #warning D-BUS TODO
// kwin* , and an attach to dbus is missing as well // kwin* , and an attach to dbus is missing as well
#endif #endif
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }

6
data/update_window_settings.cpp
View file

@ -17,7 +17,7 @@ License. See the file "COPYING" for the exact licensing terms.
#include <QByteArray> #include <QByteArray>
#include <QList> #include <QList>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <kwin_interface.h>
struct SessionInfo struct SessionInfo
{ {
QByteArray sessionId; QByteArray sessionId;
@ -171,6 +171,6 @@ int main()
#warning D-BUS TODO #warning D-BUS TODO
// kwin* , and an attach to dbus is missing as well // kwin* , and an attach to dbus is missing as well
#endif #endif
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }

5
kcmkwin/kwindecoration/CMakeLists.txt
View file

@ -5,6 +5,11 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp ) set(kcm_kwindecoration_PART_SRCS kwindecoration.cpp buttons.cpp preview.cpp )
set(kwin_xml ${CMAKE_SOURCE_DIR}/workspace/kwin/org.kde.KWin.xml)
QT4_ADD_DBUS_INTERFACE( kcm_kwindecoration_PART_SRCS ${kwin_xml} kwin_interface )
kde4_automoc(${kcm_kwindecoration_PART_SRCS}) kde4_automoc(${kcm_kwindecoration_PART_SRCS})

5
kcmkwin/kwindecoration/kwindecoration.cpp
View file

@ -62,6 +62,7 @@
#include <kdecoration_plugins_p.h> #include <kdecoration_plugins_p.h>
#include <kdecorationfactory.h> #include <kdecorationfactory.h>
#include <kvbox.h> #include <kvbox.h>
#include <kwin_interface.h>
// KCModule plugin interface // KCModule plugin interface
// ========================= // =========================
@ -531,8 +532,8 @@ void KWinDecorationModule::save()
emit pluginSave( kwinConfig ); emit pluginSave( kwinConfig );
kwinConfig.sync(); kwinConfig.sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }

4
kcmkwin/kwinoptions/CMakeLists.txt
View file

@ -5,6 +5,10 @@
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp ) set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
set(kwin_xml ${CMAKE_SOURCE_DIR}/workspace/kwin/org.kde.KWin.xml)
QT4_ADD_DBUS_INTERFACE( kcm_kwinoptions_PART_SRCS ${kwin_xml} kwin_interface )
kde4_automoc(${kcm_kwinoptions_PART_SRCS}) kde4_automoc(${kcm_kwinoptions_PART_SRCS})
kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS}) kde4_add_plugin(kcm_kwinoptions ${kcm_kwinoptions_PART_SRCS})

10
kcmkwin/kwinoptions/main.cpp
View file

@ -33,7 +33,7 @@
#include "mouse.h" #include "mouse.h"
#include "windows.h" #include "windows.h"
#include "kwin_interface.h"
#include "main.h" #include "main.h"
static KComponentData *_kcmkwm = 0; static KComponentData *_kcmkwm = 0;
@ -184,8 +184,8 @@ void KWinOptions::save()
#warning D-BUS TODO #warning D-BUS TODO
// All these calls in kcmkwin modules should be actually kwin*, because of multihead. // All these calls in kcmkwin modules should be actually kwin*, because of multihead.
#endif #endif
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
@ -260,8 +260,8 @@ void KActionsOptions::save()
emit KCModule::changed( false ); emit KCModule::changed( false );
// Send signal to kwin // Send signal to kwin
mConfig->sync(); mConfig->sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }

10
kcmkwin/kwinoptions/mouse.cpp
View file

@ -47,7 +47,7 @@
#include "mouse.h" #include "mouse.h"
#include "mouse.moc" #include "mouse.moc"
#include "kwin_interface.h"
namespace { namespace {
@ -571,8 +571,8 @@ void KTitleBarActionsConfig::save()
if (standAlone) if (standAlone)
{ {
config->sync(); config->sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
} }
@ -847,8 +847,8 @@ void KWindowActionsConfig::save()
if (standAlone) if (standAlone)
{ {
config->sync(); config->sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
} }

14
kcmkwin/kwinoptions/windows.cpp
View file

@ -55,7 +55,7 @@
#include <X11/Xutil.h> #include <X11/Xutil.h>
#include "windows.h" #include "windows.h"
#include "kwin_interface.h"
// kwin config keywords // kwin config keywords
#define KWIN_FOCUS "FocusPolicy" #define KWIN_FOCUS "FocusPolicy"
@ -492,8 +492,8 @@ void KFocusConfig::save( void )
if (standAlone) if (standAlone)
{ {
config->sync(); config->sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
emit KCModule::changed(false); emit KCModule::changed(false);
} }
@ -719,8 +719,8 @@ void KAdvancedConfig::save( void )
if (standAlone) if (standAlone)
{ {
config->sync(); config->sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
emit KCModule::changed(false); emit KCModule::changed(false);
} }
@ -1183,8 +1183,8 @@ void KMovingConfig::save( void )
if (standAlone) if (standAlone)
{ {
config->sync(); config->sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
emit KCModule::changed(false); emit KCModule::changed(false);
} }

5
kcmkwin/kwinrules/CMakeLists.txt
View file

@ -7,6 +7,11 @@ ADD_DEFINITIONS(-DKCMRULES)
########### next target ############### ########### next target ###############
set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp) set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp)
set(kwin_xml ${CMAKE_SOURCE_DIR}/workspace/kwin/org.kde.KWin.xml)
QT4_ADD_DBUS_INTERFACE( kwinrules_SRCS ${kwin_xml} kwin_interface )
kde4_add_ui_files(kwinrules_SRCS ruleslistbase.ui detectwidgetbase.ui) kde4_add_ui_files(kwinrules_SRCS ruleslistbase.ui detectwidgetbase.ui)
kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui editshortcutbase.ui ) kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui editshortcutbase.ui )

5
kcmkwin/kwinrules/kcm.cpp
View file

@ -29,6 +29,7 @@
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include "ruleslist.h" #include "ruleslist.h"
#include "kwin_interface.h"
typedef KGenericFactory<KWin::KCMRules> KCMRulesFactory; typedef KGenericFactory<KWin::KCMRules> KCMRulesFactory;
K_EXPORT_COMPONENT_FACTORY(kwinrules, KCMRulesFactory("kcmkwinrules")) K_EXPORT_COMPONENT_FACTORY(kwinrules, KCMRulesFactory("kcmkwinrules"))
@ -64,8 +65,8 @@ void KCMRules::save()
emit KCModule::changed( false ); emit KCModule::changed( false );
// Send signal to kwin // Send signal to kwin
config.sync(); config.sync();
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
} }
void KCMRules::defaults() void KCMRules::defaults()

6
kcmkwin/kwinrules/main.cpp
View file

@ -22,7 +22,7 @@
#include <klocale.h> #include <klocale.h>
#include <kwm.h> #include <kwm.h>
#include <QtDBus/QtDBus> #include <QtDBus/QtDBus>
#include <kwin_interface.h>
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>
@ -256,8 +256,8 @@ static int edit( Window wid, bool whole_app )
delete orig_rule; delete orig_rule;
} }
saveRules( rules ); saveRules( rules );
QDBusInterface kwin( "org.kde.kwin", "/KWin", "org.kde.KWin" ); org::kde::KWin kwin("org.kde.kwin", "/KWin", QDBusConnection::sessionBus());
kwin.call( "reconfigure" ); kwin.reconfigure();
return 0; return 0;
} }