diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 33e4790cf..a0b822bc7 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,37 +1,5 @@ - -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} ) - +if(KWIN_PLASMA_ACTIVE) + add_subdirectory(active) +else(KWIN_PLASMA_ACTIVE) + add_subdirectory(desktop) +endif(KWIN_PLASMA_ACTIVE) diff --git a/data/active/CMakeLists.txt b/data/active/CMakeLists.txt new file mode 100644 index 000000000..a05401f1d --- /dev/null +++ b/data/active/CMakeLists.txt @@ -0,0 +1,12 @@ +########### 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} ) diff --git a/data/active/kwin_update_tabbox_qml_settings_active.upd b/data/active/kwin_update_tabbox_qml_settings_active.upd new file mode 100644 index 000000000..9467efc10 --- /dev/null +++ b/data/active/kwin_update_tabbox_qml_settings_active.upd @@ -0,0 +1,2 @@ +Id=Kwin-4.8 +Script=kwin_update_tabbox_qml_settings_active diff --git a/data/update_tabbox_settings.cpp b/data/active/update_tabbox_qml_settings_active.cpp similarity index 63% copy from data/update_tabbox_settings.cpp copy to data/active/update_tabbox_qml_settings_active.cpp index 87a76a4c2..36c2ffde6 100644 --- a/data/update_tabbox_settings.cpp +++ b/data/active/update_tabbox_qml_settings_active.cpp @@ -1,54 +1,52 @@ /******************************************************************** KWin - the KDE window manager This file is part of the KDE project. -Copyright (C) 2005 Lubos Lunak -Copyright (C) 2009 Martin Gräßlin +Copyright (C) 2012 Lamarque V. Souza 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 . *********************************************************************/ -// read additional window rules and add them to kwinrulesrc - #include #include #include #include #include #include #include +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_settings", "kwin", KLocalizedString(), 0 ); + 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 windows(&config, "Windows"); - KConfigGroup tabbox(&config, "TabBox"); - const bool traverse = tabbox.readEntry("TraverseAll", false); - const QString style = windows.readEntry("AltTabStyle", "KDE"); - if( !tabbox.hasKey("ListMode") ) - tabbox.writeEntry("ListMode", traverse?1:0); - if( !tabbox.hasKey("ShowTabBox") ) - tabbox.writeEntry("ShowTabBox", (style.compare("KDE", Qt::CaseInsensitive) == 0)?true:false); - tabbox.sync(); + KConfig config("kwinrc"); + KConfigGroup tabbox = config.group("TabBox"); + const bool tabboxSwitchLayout = tabbox.readEntry("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); - + QDBusConnection::sessionBus().send(message); } diff --git a/data/CMakeLists.txt b/data/desktop/CMakeLists.txt similarity index 100% copy from data/CMakeLists.txt copy to data/desktop/CMakeLists.txt diff --git a/data/fsp_workarounds_1.kwinrules b/data/desktop/fsp_workarounds_1.kwinrules similarity index 100% rename from data/fsp_workarounds_1.kwinrules rename to data/desktop/fsp_workarounds_1.kwinrules diff --git a/data/kwin_fsp_workarounds_1.upd b/data/desktop/kwin_fsp_workarounds_1.upd similarity index 100% rename from data/kwin_fsp_workarounds_1.upd rename to data/desktop/kwin_fsp_workarounds_1.upd diff --git a/data/kwin_remove_delay_focus.sh b/data/desktop/kwin_remove_delay_focus.sh similarity index 100% rename from data/kwin_remove_delay_focus.sh rename to data/desktop/kwin_remove_delay_focus.sh diff --git a/data/kwin_remove_delay_focus.upd b/data/desktop/kwin_remove_delay_focus.upd similarity index 100% rename from data/kwin_remove_delay_focus.upd rename to data/desktop/kwin_remove_delay_focus.upd diff --git a/data/kwin_remove_effects.upd b/data/desktop/kwin_remove_effects.upd similarity index 100% rename from data/kwin_remove_effects.upd rename to data/desktop/kwin_remove_effects.upd diff --git a/data/kwin_update_tabbox_qml_settings.upd b/data/desktop/kwin_update_tabbox_qml_settings.upd similarity index 100% rename from data/kwin_update_tabbox_qml_settings.upd rename to data/desktop/kwin_update_tabbox_qml_settings.upd diff --git a/data/kwin_update_tabbox_settings.upd b/data/desktop/kwin_update_tabbox_settings.upd similarity index 100% rename from data/kwin_update_tabbox_settings.upd rename to data/desktop/kwin_update_tabbox_settings.upd diff --git a/data/pop.wav b/data/desktop/pop.wav similarity index 100% rename from data/pop.wav rename to data/desktop/pop.wav diff --git a/data/update_default_rules.cpp b/data/desktop/update_default_rules.cpp similarity index 100% rename from data/update_default_rules.cpp rename to data/desktop/update_default_rules.cpp diff --git a/data/update_tabbox_qml_settings.cpp b/data/desktop/update_tabbox_qml_settings.cpp similarity index 100% rename from data/update_tabbox_qml_settings.cpp rename to data/desktop/update_tabbox_qml_settings.cpp diff --git a/data/update_tabbox_settings.cpp b/data/desktop/update_tabbox_settings.cpp similarity index 100% rename from data/update_tabbox_settings.cpp rename to data/desktop/update_tabbox_settings.cpp