vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert r768755. There apparently is a need to have two calls. 

The wonders of dbus ...


svn path=/trunk/KDE/kdebase/workspace/; revision=768770
icc-effect-5.14.5
Luboš Luňák 2008-01-30 16:08:23 +00:00
parent 47bf19d978
commit a59f0a7f5e
12 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/update_default_rules.cpp
View File

@ -62,7 +62,7 @@ int main( int argc, char* argv[] )
dcg.sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

2
data/update_window_settings.cpp
View File

@ -178,6 +178,6 @@ int main()
dest_cfg.sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

2
kcmkwin/kwincompositing/main.cpp
View File

@ -323,7 +323,7 @@ void KWinCompositingConfig::configChanged()
// Send signal to kwin
mKWinConfig->sync();
// Send signal to all kwin instances
QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage message = QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

2
kcmkwin/kwindecoration/kwindecoration.cpp
View File

@ -538,7 +538,7 @@ void KWinDecorationModule::save()
kwinConfig.sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

4
kcmkwin/kwinoptions/main.cpp
View File

@ -152,7 +152,7 @@ void KWinOptions::save()
mConfig->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
@ -229,7 +229,7 @@ void KActionsOptions::save()
mConfig->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

4
kcmkwin/kwinoptions/mouse.cpp
View File

@ -585,7 +585,7 @@ void KTitleBarActionsConfig::save()
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
@ -882,7 +882,7 @@ void KWindowActionsConfig::save()
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
}

6
kcmkwin/kwinoptions/windows.cpp
View File

@ -526,7 +526,7 @@ void KFocusConfig::save( void )
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
emit KCModule::changed(false);
@ -745,7 +745,7 @@ void KAdvancedConfig::save( void )
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
@ -1143,7 +1143,7 @@ void KMovingConfig::save( void )
config->sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}
emit KCModule::changed(false);

2
kcmkwin/kwinrules/kcm.cpp
View File

@ -71,7 +71,7 @@ void KCMRules::save()
config.sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

2
kcmkwin/kwinrules/main.cpp
View File

@ -257,7 +257,7 @@ static int edit( Window wid, bool whole_app )
saveRules( rules );
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reconfigure");
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
return 0;
}

5
org.kde.KWin.xml
View File

@ -8,6 +8,9 @@
<method name="unclutterDesktop">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="reconfigure">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
<method name="killWindow">
<annotation name="org.freedesktop.DBus.Method.NoReply" value="true"/>
</method>
@ -30,7 +33,7 @@
<method name="nextDesktop"/>
<method name="previousDesktop"/>
<method name="circulateDesktopApplications"/>
<signal name="reconfigure"/>
<signal name="reloadConfig"/>
<signal name="reinitCompositing"/>
<method name="loadEffect">
<arg name="name" type="s" direction="in"/>

7
workspace.cpp
View File

@ -144,7 +144,7 @@ Workspace::Workspace( bool restore )
(void) new KWinAdaptor( this );
QDBusConnection dbus = QDBusConnection::sessionBus();
dbus.registerObject("/KWin", this);
dbus.connect(QString(), "/KWin", "org.kde.KWin", "reconfigure", this, SLOT(reconfigure()));
dbus.connect(QString(), "/KWin", "org.kde.KWin", "reloadConfig", this, SLOT(slotReloadConfig()));
dbus.connect(QString(), "/KWin", "org.kde.KWin", "reinitCompositing", this, SLOT(slotReinitCompositing()));
_self = this;
mgr = new PluginMgr;
@ -952,6 +952,11 @@ void Workspace::updateColormap()
}
}
void Workspace::slotReloadConfig()
{
reconfigure();
}
void Workspace::reconfigure()
{
reconfigureTimer.start( 200 );

3
workspace.h
View File

@ -138,6 +138,7 @@ class Workspace : public QObject, public KDecorationDefines
void raiseOrLowerClient( Client * );
void restoreSessionStackingOrder( Client* c );
void restackUnmanaged( Unmanaged* c, Window above );
void reconfigure();
void forceRestacking();
void clientHidden( Client* );
@ -472,7 +473,7 @@ class Workspace : public QObject, public KDecorationDefines
void cleanupTemporaryRules();
void writeWindowRules();
void slotBlockShortcuts(int data);
void reconfigure();
void slotReloadConfig();
void setPopupClientOpacity( QAction* action );
void setupCompositing();
void performCompositing();