From 0fba3a1841410d87f1899acc90d0a8035402d9a1 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 19 Jul 2015 19:33:47 +0300 Subject: [PATCH] kcontrol: remove remains of plasma-netbook reference --- kcontrol/desktoptheme/kcmdesktoptheme.cpp | 18 ++-------------- kcontrol/desktoptheme/kcmdesktoptheme.h | 2 -- kcontrol/workspaceoptions/workspaceoptions.cpp | 30 +++----------------------- kcontrol/workspaceoptions/workspaceoptions.h | 1 - 4 files changed, 5 insertions(+), 46 deletions(-) diff --git a/kcontrol/desktoptheme/kcmdesktoptheme.cpp b/kcontrol/desktoptheme/kcmdesktoptheme.cpp index e752a8ec..6de7c234 100644 --- a/kcontrol/desktoptheme/kcmdesktoptheme.cpp +++ b/kcontrol/desktoptheme/kcmdesktoptheme.cpp @@ -57,9 +57,6 @@ KCMDesktopTheme::KCMDesktopTheme( QWidget* parent, const QVariantList& ) m_bDesktopThemeDirty = false; m_bDetailsDirty = false; - KAutostart plasmaNetbookAutoStart("plasma-netbook"); - m_isNetbook = plasmaNetbookAutoStart.autostarts(); - KGlobal::dirs()->addResourceType("themes", "data", "kstyle/themes"); KAboutData *about = @@ -112,12 +109,7 @@ void KCMDesktopTheme::save() if ( m_bDesktopThemeDirty ) { QString theme = m_themeModel->data(m_theme->currentIndex(), ThemeModel::PackageNameRole).toString(); - if (m_isNetbook) { - KConfigGroup cg(KSharedConfig::openConfig("plasmarc"), "Theme-plasma-netbook"); - cg.writeEntry("name", theme); - } else { - Plasma::Theme::defaultTheme()->setThemeName(theme); - } + Plasma::Theme::defaultTheme()->setThemeName(theme); } if (m_bDetailsDirty) @@ -146,13 +138,7 @@ void KCMDesktopTheme::loadDesktopTheme() { QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); m_themeModel->reload(); - QString themeName; - if (m_isNetbook) { - KConfigGroup cg(KSharedConfig::openConfig("plasmarc"), "Theme-plasma-netbook"); - themeName = cg.readEntry("name", "air-netbook"); - } else { - themeName = Plasma::Theme::defaultTheme()->themeName(); - } + QString themeName = Plasma::Theme::defaultTheme()->themeName(); m_theme->setCurrentIndex(m_themeModel->indexOf(themeName)); QApplication::restoreOverrideCursor(); } diff --git a/kcontrol/desktoptheme/kcmdesktoptheme.h b/kcontrol/desktoptheme/kcmdesktoptheme.h index d1e49d96..d84f8421 100644 --- a/kcontrol/desktoptheme/kcmdesktoptheme.h +++ b/kcontrol/desktoptheme/kcmdesktoptheme.h @@ -60,8 +60,6 @@ private: bool m_bDetailsDirty; ThemeModel* m_themeModel; - - bool m_isNetbook; }; #endif // KCMDESKTOPTHEME_H diff --git a/kcontrol/workspaceoptions/workspaceoptions.cpp b/kcontrol/workspaceoptions/workspaceoptions.cpp index cf3256f7..30bc4a92 100644 --- a/kcontrol/workspaceoptions/workspaceoptions.cpp +++ b/kcontrol/workspaceoptions/workspaceoptions.cpp @@ -41,7 +41,6 @@ WorkspaceOptionsModule::WorkspaceOptionsModule(QWidget *parent, const QVariantLi m_kwinConfig( KSharedConfig::openConfig("kwinrc")), m_ownConfig( KSharedConfig::openConfig("workspaceoptionsrc")), m_plasmaDesktopAutostart("plasma-desktop"), - m_plasmaNetbookAutostart("plasma-netbook"), m_krunnerAutostart("krunner"), m_ui(new Ui::MainPage) { @@ -63,8 +62,7 @@ WorkspaceOptionsModule::WorkspaceOptionsModule(QWidget *parent, const QVariantLi connect(m_ui->showToolTips, SIGNAL(toggled(bool)), this, SLOT(changed())); connect(m_ui->formFactor, SIGNAL(currentIndexChanged(int)), this, SLOT(formFactorChanged(int))); - //enable the combobox if both plasma-desktop and plasma-netbook are present - if (KStandardDirs::findExe("plasma-desktop").isNull() || KStandardDirs::findExe("plasma-netbook").isNull()) { + if (KStandardDirs::findExe("plasma-desktop").isNull()) { m_ui->formFactor->setEnabled(false); } } @@ -85,17 +83,12 @@ void WorkspaceOptionsModule::save() const bool isDesktop = m_ui->formFactor->currentIndex() == 0; - m_plasmaDesktopAutostart.setAutostarts(isDesktop); + m_plasmaDesktopAutostart.setAutostarts(true); m_plasmaDesktopAutostart.setStartPhase(KAutostart::BaseDesktop); m_plasmaDesktopAutostart.setCommand("plasma-desktop"); m_plasmaDesktopAutostart.setAllowedEnvironments(QStringList()<<"KDE"); - m_plasmaNetbookAutostart.setAutostarts(!isDesktop); - m_plasmaNetbookAutostart.setStartPhase(KAutostart::BaseDesktop); - m_plasmaNetbookAutostart.setCommand("plasma-netbook"); - m_plasmaNetbookAutostart.setAllowedEnvironments(QStringList()<<"KDE"); - - m_krunnerAutostart.setAutostarts(isDesktop); + m_krunnerAutostart.setAutostarts(true); m_krunnerAutostart.setStartPhase(KAutostart::BaseDesktop); m_krunnerAutostart.setCommand("krunner"); m_krunnerAutostart.setAllowedEnvironments(QStringList()<<"KDE"); @@ -282,21 +275,6 @@ void WorkspaceOptionsModule::save() QDBusMessage message = QDBusMessage::createSignal( "/KWin", "org.kde.KWin", "reloadConfig" ); QDBusConnection::sessionBus().send(message); - - if (isDesktop && !m_currentlyIsDesktop) { - if (KRun::run("plasma-desktop", KUrl::List(), 0)) { - QDBusInterface interface("org.kde.plasma-netbook", "/MainApplication"); - interface.call(QDBus::NoBlock, "quit"); - KRun::run("krunner", KUrl::List(), 0); - } - } else if (!isDesktop && m_currentlyIsDesktop) { - if (KRun::run("plasma-netbook", KUrl::List(), 0)) { - QDBusInterface interface("org.kde.plasma-desktop", "/MainApplication"); - interface.call(QDBus::NoBlock, "quit"); - QDBusInterface krunnerInterface("org.kde.krunner", "/MainApplication"); - krunnerInterface.call(QDBus::NoBlock, "quit"); - } - } m_currentlyIsDesktop = isDesktop; const bool fixedDashboard = m_ui->dashboardMode->currentIndex() == 1; @@ -327,8 +305,6 @@ void WorkspaceOptionsModule::load() m_ui->formFactor->setCurrentIndex(1); } - m_currentlyIsDesktop = m_plasmaDesktopAutostart.autostarts(); - QDBusInterface interface("org.kde.plasma-desktop", "/App"); m_currentlyFixedDashboard = false; diff --git a/kcontrol/workspaceoptions/workspaceoptions.h b/kcontrol/workspaceoptions/workspaceoptions.h index c5cd57bf..e2d2e58c 100644 --- a/kcontrol/workspaceoptions/workspaceoptions.h +++ b/kcontrol/workspaceoptions/workspaceoptions.h @@ -45,7 +45,6 @@ private: KSharedConfigPtr m_kwinConfig; KSharedConfigPtr m_ownConfig; KAutostart m_plasmaDesktopAutostart; - KAutostart m_plasmaNetbookAutostart; KAutostart m_krunnerAutostart; bool m_currentlyIsDesktop; bool m_currentlyFixedDashboard; -- 2.11.0