kwin is now free of KDE4Support

REVIEW: 115760
This commit is contained in:
Bhushan Shah 2014-02-16 00:27:22 +05:30
parent 727aa1e5ca
commit be8920d76c
4 changed files with 12 additions and 6 deletions

View file

@ -3,7 +3,7 @@
set(kcm_kwinoptions_PART_SRCS windows.cpp mouse.cpp main.cpp )
qt5_wrap_ui(kcm_kwinoptions_PART_SRCS actions.ui advanced.ui focus.ui mouse.ui moving.ui)
add_library(kcm_kwinoptions MODULE ${kcm_kwinoptions_PART_SRCS})
target_link_libraries(kcm_kwinoptions Qt5::DBus KF5::Completion KF5::I18n KF5::KCMUtils KF5::KDE4Support)
target_link_libraries(kcm_kwinoptions Qt5::DBus KF5::Completion KF5::I18n KF5::KCMUtils)
install(TARGETS kcm_kwinoptions DESTINATION ${PLUGIN_INSTALL_DIR} )

View file

@ -25,11 +25,9 @@
#include <QtDBus/QtDBus>
#include <kglobal.h>
#include <KDE/KLocalizedString>
#include <kconfig.h>
#include <kaboutdata.h>
#include <kdialog.h>
#include <KPluginFactory>
#include <KPluginLoader>

View file

@ -33,9 +33,8 @@
#include <QFormLayout>
#include <kconfig.h>
#include <kdialog.h>
#include <kconfiggroup.h>
#include <QDebug>
#include <kglobalsettings.h>
#include <kcolorscheme.h>
#include <kseparator.h>
#include <QtDBus/QtDBus>
@ -181,7 +180,6 @@ KTitleBarActionsConfig::KTitleBarActionsConfig(bool _standAlone, KConfig *_confi
connect(m_ui->leftClickMaximizeButton, SIGNAL(activated(int)), SLOT(changed()));
connect(m_ui->middleClickMaximizeButton, SIGNAL(activated(int)), SLOT(changed()));
connect(m_ui->rightClickMaximizeButton, SIGNAL(activated(int)), SLOT(changed()));
connect(KGlobalSettings::self(), SIGNAL(kdisplayPaletteChanged()), SLOT(paletteChanged()));
load();
}
@ -381,6 +379,15 @@ void KTitleBarActionsConfig::showEvent(QShowEvent *ev)
KCModule::showEvent(ev);
}
void KTitleBarActionsConfig::changeEvent(QEvent *ev)
{
if (ev->type() == QEvent::PaletteChange) {
paletteChanged();
}
ev->accept();
}
void KTitleBarActionsConfig::load()
{
KConfigGroup windowsConfig(config, "Windows");

View file

@ -62,6 +62,7 @@ public:
protected:
void showEvent(QShowEvent *ev);
void changeEvent(QEvent *ev);
public Q_SLOTS:
void changed() {