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

Revert "Merge branch 'kwin/active-kconf_update'"

Browse source 
This reverts commit 3676b8dcc9d33155881085ebff6073c372dcd0c9, reversing
changes made to 125533b36bd009b23f659a54d486d73d29081b4f.
This commit is contained in:
Lamarque V. Souza 2012-04-24 14:57:57 -03:00
parent 1d2e3aa327
commit 44b2b1e493
16 changed files with 37 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
data/CMakeLists.txt
View file

@ -1,5 +1,37 @@
if(KWIN_PLASMA_ACTIVE)
add_subdirectory(active)
else(KWIN_PLASMA_ACTIVE)
add_subdirectory(desktop)
endif(KWIN_PLASMA_ACTIVE)
set(kwin_xml ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.KWin.xml)
########### next target ###############
set(kwin_update_default_rules_SRCS update_default_rules.cpp)
kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} )
install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### next target ###############
set( kwin_update_tabbox_settings_SRCS update_tabbox_settings.cpp )
kde4_add_executable( kwin_update_tabbox_settings ${kwin_update_tabbox_settings_SRCS} )
target_link_libraries( kwin_update_tabbox_settings ${KDE4_KDECORE_LIBS} )
install( TARGETS kwin_update_tabbox_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### next target ###############
set( kwin_update_tabbox_qml_settings_SRCS update_tabbox_qml_settings.cpp )
kde4_add_executable( kwin_update_tabbox_qml_settings ${kwin_update_tabbox_qml_settings_SRCS} )
target_link_libraries( kwin_update_tabbox_qml_settings ${KDE4_KDECORE_LIBS} )
install( TARGETS kwin_update_tabbox_qml_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### install files ###############
install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules )
install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} )
install( FILES kwin_fsp_workarounds_1.upd kwin_update_tabbox_settings.upd kwin_remove_effects.upd kwin_update_tabbox_qml_settings.upd kwin_remove_delay_focus.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS kwin_remove_delay_focus.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

12
data/active/CMakeLists.txt
View file

@ -1,12 +0,0 @@
########### next target ###############
set( kwin_update_tabbox_qml_settings_active_SRCS update_tabbox_qml_settings_active.cpp )
kde4_add_executable( kwin_update_tabbox_qml_settings_active ${kwin_update_tabbox_qml_settings_active_SRCS} )
target_link_libraries( kwin_update_tabbox_qml_settings_active ${KDE4_KDECORE_LIBS} )
install( TARGETS kwin_update_tabbox_qml_settings_active DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### install files ###############
install( FILES kwin_update_tabbox_qml_settings_active.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

2
data/active/kwin_update_tabbox_qml_settings_active.upd
View file

@ -1,2 +0,0 @@
Id=Kwin-4.8
Script=kwin_update_tabbox_qml_settings_active

52
data/active/update_tabbox_qml_settings_active.cpp
View file

@ -1,52 +0,0 @@
/********************************************************************
KWin - the KDE window manager
This file is part of the KDE project.
Copyright (C) 2012 Lamarque V. Souza <Lamarque.Souza.ext@basyskom.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include <kconfig.h>
#include <kconfiggroup.h>
#include <kcomponentdata.h>
#include <kaboutdata.h>
#include <kcmdlineargs.h>
#include <kglobal.h>
#include <QtDBus/QtDBus>
void updateTabBoxConfig(KConfigGroup &tabbox, bool migrate)
{
if (migrate) {
tabbox.writeEntry("LayoutName", "window_strip");
}
tabbox.sync();
}
int main( int argc, char* argv[] )
{
KAboutData about( "kwin_update_tabbox_qml_settings_active", "kwin", KLocalizedString(), 0 );
KCmdLineArgs::init( argc, argv, &about );
KComponentData inst( &about );
Q_UNUSED( KGlobal::locale() ); // jump-start locales to get to translated descriptions
KConfig config("kwinrc");
KConfigGroup tabbox = config.group("TabBox");
const bool tabboxSwitchLayout = tabbox.readEntry<QString>("LayoutName", "") != QLatin1String("window_strip");
updateTabBoxConfig(tabbox, tabboxSwitchLayout);
config.sync();
// Send signal to all kwin instances
QDBusMessage message =
QDBusMessage::createSignal("/KWin", "org.kde.KWin", "reloadConfig");
QDBusConnection::sessionBus().send(message);
}

37
data/desktop/CMakeLists.txt
View file

@ -1,37 +0,0 @@
set(kwin_xml ${CMAKE_CURRENT_SOURCE_DIR}/../org.kde.KWin.xml)
########### next target ###############
set(kwin_update_default_rules_SRCS update_default_rules.cpp)
kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} )
install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### next target ###############
set( kwin_update_tabbox_settings_SRCS update_tabbox_settings.cpp )
kde4_add_executable( kwin_update_tabbox_settings ${kwin_update_tabbox_settings_SRCS} )
target_link_libraries( kwin_update_tabbox_settings ${KDE4_KDECORE_LIBS} )
install( TARGETS kwin_update_tabbox_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### next target ###############
set( kwin_update_tabbox_qml_settings_SRCS update_tabbox_qml_settings.cpp )
kde4_add_executable( kwin_update_tabbox_qml_settings ${kwin_update_tabbox_qml_settings_SRCS} )
target_link_libraries( kwin_update_tabbox_qml_settings ${KDE4_KDECORE_LIBS} )
install( TARGETS kwin_update_tabbox_qml_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
########### install files ###############
install( FILES fsp_workarounds_1.kwinrules DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules )
install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} )
install( FILES kwin_fsp_workarounds_1.upd kwin_update_tabbox_settings.upd kwin_remove_effects.upd kwin_update_tabbox_qml_settings.upd kwin_remove_delay_focus.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )
install( PROGRAMS kwin_remove_delay_focus.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} )

0
data/desktop/fsp_workarounds_1.kwinrules → data/fsp_workarounds_1.kwinrules
View file

0
data/desktop/kwin_fsp_workarounds_1.upd → data/kwin_fsp_workarounds_1.upd
View file

0
data/desktop/kwin_remove_delay_focus.sh → data/kwin_remove_delay_focus.sh
View file

0
data/desktop/kwin_remove_delay_focus.upd → data/kwin_remove_delay_focus.upd
View file

0
data/desktop/kwin_remove_effects.upd → data/kwin_remove_effects.upd
View file

0
data/desktop/kwin_update_tabbox_qml_settings.upd → data/kwin_update_tabbox_qml_settings.upd
View file

0
data/desktop/kwin_update_tabbox_settings.upd → data/kwin_update_tabbox_settings.upd
View file

0
data/desktop/pop.wav → data/pop.wav
View file

0
data/desktop/update_default_rules.cpp → data/update_default_rules.cpp
View file

0
data/desktop/update_tabbox_qml_settings.cpp → data/update_tabbox_qml_settings.cpp
View file

0
data/desktop/update_tabbox_settings.cpp → data/update_tabbox_settings.cpp
View file