diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,8 +34,6 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kde-gtk-config\") set(kcm_SRCS - src/iconthemesmodel.cpp - src/cursorthemesmodel.cpp src/appearancegtk3.cpp src/appearancegtk2.cpp src/appearencegtk.cpp @@ -45,7 +43,6 @@ src/gtkconfigkcmodule.cpp src/dialog_installer.cpp src/dialog_uninstaller.cpp - src/fontshelpers.cpp ) ki18n_wrap_ui(kcm_SRCS diff --git a/src/abstractappearance.h b/src/abstractappearance.h --- a/src/abstractappearance.h +++ b/src/abstractappearance.h @@ -39,24 +39,10 @@ virtual QStringList installedThemes() const = 0; void setTheme(const QString& name); - void setCursor(const QString& name); - void setIcon(const QString& name); - void setIconFallback(const QString& name); - void setFont(const QString& font); - void setShowIconsInMenus(bool show); - void setShowIconsInButtons(bool show); void setPrimaryButtonWarpsSlider(bool enabled); - void setToolbarStyle(const QString& style); QString getTheme() const; - QString getCursor() const; - QString getIcon() const; - QString getIconFallback() const; - QString getFont() const; QString getThemeGtk3() const; - QString getToolbarStyle() const; - bool getShowIconsInButtons() const; - bool getShowIconsInMenus() const; bool getPrimaryButtonWarpsSlider() const; QStringList installedThemesNames() const; diff --git a/src/abstractappearance.cpp b/src/abstractappearance.cpp --- a/src/abstractappearance.cpp +++ b/src/abstractappearance.cpp @@ -31,25 +31,11 @@ //SETTERS void AbstractAppearance::setTheme(const QString& name) { m_settings["theme"] = name;} -void AbstractAppearance::setCursor(const QString& cur) { m_settings["cursor"] = cur;} -void AbstractAppearance::setIcon(const QString& ic) { m_settings["icon"] = ic;} -void AbstractAppearance::setIconFallback(const QString& fall) { m_settings["icon_fallback"] = fall; } -void AbstractAppearance::setFont(const QString& fo) { m_settings["font"] = fo;} -void AbstractAppearance::setShowIconsInButtons(bool show) { m_settings["show_icons_buttons"] = show ? "1" : "0"; } -void AbstractAppearance::setShowIconsInMenus(bool show) { m_settings["show_icons_menus"] = show ? "1" : "0"; } void AbstractAppearance::setPrimaryButtonWarpsSlider(bool enabled) { m_settings["primary_button_warps_slider"] = enabled ? "1" : "0"; } -void AbstractAppearance::setToolbarStyle(const QString& toolbar_style) { m_settings["toolbar_style"] = toolbar_style; } // GETTERS QString AbstractAppearance::getTheme() const { return m_settings["theme"];} -QString AbstractAppearance::getCursor() const { return m_settings["cursor"];} -QString AbstractAppearance::getIcon() const { return m_settings["icon"];} -QString AbstractAppearance::getIconFallback() const { return m_settings["icon_fallback"]; } -QString AbstractAppearance::getFont() const { return m_settings["font"]; } QString AbstractAppearance::getThemeGtk3() const { return m_settings["themegtk3"]; } -QString AbstractAppearance::getToolbarStyle() const { return m_settings["toolbar_style"]; } -bool AbstractAppearance::getShowIconsInButtons() const { return isTrue(m_settings["show_icons_buttons"]); } -bool AbstractAppearance::getShowIconsInMenus() const { return isTrue(m_settings["show_icons_menus"]); } bool AbstractAppearance::getPrimaryButtonWarpsSlider() const { return isTrue(m_settings["primary_button_warps_slider"]); } QRegExp valueRx(" *([a-zA-Z\\-_]+) *= *\"?([^\"\\n]+)\"?", Qt::CaseSensitive, QRegExp::RegExp2); diff --git a/src/appearancegtk2.cpp b/src/appearancegtk2.cpp --- a/src/appearancegtk2.cpp +++ b/src/appearancegtk2.cpp @@ -43,24 +43,8 @@ for(auto it = foundSettings.constBegin(), itEnd = foundSettings.constEnd(); it!=itEnd; ++it) { if (it.key() == "gtk-theme-name") m_settings["theme"] = *it; - else if (it.key() == "gtk-icon-theme-name") - m_settings["icon"] = *it; - else if (it.key() == "gtk-fallback-icon-theme") - m_settings["icon_fallback"] = *it; - else if (it.key() == "gtk-cursor-theme-name") - m_settings["cursor"] = *it; - else if (it.key() == "gtk-font-name") - m_settings["font"] = *it; - else if (it.key() == "gtk-toolbar-style") - m_settings["toolbar_style"] = *it; - else if (it.key() == "gtk-button-images") - m_settings["show_icons_buttons"] = *it; - else if(it.key() == "gtk-menu-images") - m_settings["show_icons_menus"] = *it; else if (it.key() == "gtk-primary-button-warps-slider") m_settings["primary_button_warps_slider"] = *it; - else - qWarning() << "unknown field" << it.key(); } return true; } @@ -109,14 +93,7 @@ void AppearanceGTK2::modifyGtkrcContents(QString& fileContents) const { - modifyGtkrcProperty("gtk-font-name", m_settings["font"], fileContents); modifyGtkrcProperty("gtk-theme-name", m_settings["theme"], fileContents); - modifyGtkrcProperty("gtk-icon-theme-name", m_settings["icon"], fileContents); - modifyGtkrcProperty("gtk-fallback-icon-theme", m_settings["icon_fallback"], fileContents); - modifyGtkrcProperty("gtk-cursor-theme-name", m_settings["cursor"], fileContents); - modifyGtkrcProperty("gtk-toolbar-style", m_settings["toolbar_style"], fileContents); - modifyGtkrcProperty("gtk-menu-images", m_settings["show_icons_menus"], fileContents); - modifyGtkrcProperty("gtk-button-images", m_settings["show_icons_buttons"], fileContents); modifyGtkrcProperty("gtk-primary-button-warps-slider", m_settings["primary_button_warps_slider"], fileContents); removeGtkrcLegacyContents(fileContents); } diff --git a/src/appearancegtk3.cpp b/src/appearancegtk3.cpp --- a/src/appearancegtk3.cpp +++ b/src/appearancegtk3.cpp @@ -63,14 +63,7 @@ { KConfigGroup group(file, "Settings"); - group.writeEntry("gtk-font-name", m_settings["font"]); group.writeEntry("gtk-theme-name", m_settings["theme"]); - group.writeEntry("gtk-icon-theme-name", m_settings["icon"]); - group.writeEntry("gtk-fallback-icon-theme", m_settings["icon_fallback"]); - group.writeEntry("gtk-cursor-theme-name", m_settings["cursor"]); - group.writeEntry("gtk-toolbar-style", m_settings["toolbar_style"]); - group.writeEntry("gtk-menu-images", m_settings["show_icons_menus"]); - group.writeEntry("gtk-button-images", m_settings["show_icons_buttons"]); group.writeEntry("gtk-primary-button-warps-slider", m_settings["primary_button_warps_slider"]); group.writeEntry("gtk-application-prefer-dark-theme", m_settings["application_prefer_dark_theme"]); @@ -89,21 +82,11 @@ } m_settings = QMap { - {"toolbar_style", "GTK_TOOLBAR_ICONS"}, - {"show_icons_buttons", "0"}, - {"show_icons_menus", "0"}, {"primary_button_warps_slider", "false"}, {"application_prefer_dark_theme", "false"} }; m_settings["theme"] = group.readEntry("gtk-theme-name"); - m_settings["icon"] = group.readEntry("gtk-icon-theme-name"); - m_settings["icon_fallback"] = group.readEntry("gtk-fallback-icon-theme"); - m_settings["cursor"] = group.readEntry("gtk-cursor-theme-name"); - m_settings["font"] = group.readEntry("gtk-font-name"); - m_settings["toolbar_style"] = group.readEntry("gtk-toolbar-style"); - m_settings["show_icons_buttons"] = group.readEntry("gtk-button-images"); - m_settings["show_icons_menus"] = group.readEntry("gtk-menu-images"); m_settings["primary_button_warps_slider"] = group.readEntry("gtk-primary-button-warps-slider"); m_settings["application_prefer_dark_theme"] = group.readEntry("gtk-application-prefer-dark-theme"); for(auto it = m_settings.begin(); it != m_settings.end(); ) { @@ -167,22 +150,6 @@ g_autoptr(GSettings) gsettings = g_settings_new("org.gnome.desktop.interface"); g_settings_set_string(gsettings, "gtk-theme", m_settings["theme"].toUtf8().constData()); - g_settings_set_string(gsettings, "icon-theme", m_settings["icon"].toUtf8().constData()); - g_settings_set_string(gsettings, "cursor-theme", m_settings["cursor"].toUtf8().constData()); - g_settings_set_string(gsettings, "font-name", m_settings["font"].toUtf8().constData()); - - QString toolbarStyle; - if (m_settings["toolbar_style"] == QStringLiteral("GTK_TOOLBAR_ICONS")) { - toolbarStyle = QStringLiteral("icons"); - } else if (m_settings["toolbar_style"] == QStringLiteral("GTK_TOOLBAR_TEXT")) { - toolbarStyle = QStringLiteral("text"); - } else if (m_settings["toolbar_style"] == QStringLiteral("GTK_TOOLBAR_BOTH")) { - toolbarStyle = QStringLiteral("both"); - } else if (m_settings["toolbar_style"] == QStringLiteral("GTK_TOOLBAR_BOTH_HORIZ")) { - toolbarStyle = QStringLiteral("both-horiz"); - } - - g_settings_set_string(gsettings, "toolbar-style", toolbarStyle.toUtf8().constData()); g_object_set(gtk_settings_get_default(), "gtk-application-prefer-dark-theme", getApplicationPreferDarkTheme(), nullptr); diff --git a/src/appearencegtk.cpp b/src/appearencegtk.cpp --- a/src/appearencegtk.cpp +++ b/src/appearencegtk.cpp @@ -41,13 +41,6 @@ void AppearenceGTK::set##name(const type& a) { foreach(AbstractAppearance* app, m_app) app->set##name(a); }\ type AppearenceGTK::get##name() const { foreach(AbstractAppearance* app, m_app) { if(app->hasProperty(propname)) return app->get##name(); } /*Q_ASSERT(false);*/ return type (); } -PROPERTY_IMPLEMENTATION(QString, Cursor, "cursor") -PROPERTY_IMPLEMENTATION(QString, Icon, "icon") -PROPERTY_IMPLEMENTATION(QString, IconFallback, "icon_fallback") -PROPERTY_IMPLEMENTATION(QString, Font, "font") -PROPERTY_IMPLEMENTATION(QString, ToolbarStyle, "toolbar_style") -PROPERTY_IMPLEMENTATION(bool, ShowIconsInButtons, "show_icons_buttons") -PROPERTY_IMPLEMENTATION(bool, ShowIconsInMenus, "show_icons_menus") PROPERTY_IMPLEMENTATION(bool, PrimaryButtonWarpsSlider, "primary_button_warps_slider") QString AppearenceGTK::getTheme() const { return gtk2Appearance()->getTheme(); } diff --git a/src/cursorthemesmodel.h b/src/cursorthemesmodel.h deleted file mode 100644 --- a/src/cursorthemesmodel.h +++ /dev/null @@ -1,41 +0,0 @@ -/* KDE GTK Configuration Module - * - * Copyright 2016 Andrey Bondrov - * Copyright 2011 Aleix Pol Gonzalez - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef CURSORTHEMESMODEL_H -#define CURSORTHEMESMODEL_H - -#include "iconthemesmodel.h" - -class QDir; -class CursorThemesModel : public IconThemesModel -{ - public: - explicit CursorThemesModel(QObject* parent = 0); - - void reload() override; - - private: - static void fillItem(const QDir& dir, QStandardItem* item); - QList installedThemesPaths(); -}; - -#endif // CURSORTHEMESMODEL_H diff --git a/src/cursorthemesmodel.cpp b/src/cursorthemesmodel.cpp deleted file mode 100644 --- a/src/cursorthemesmodel.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* KDE GTK Configuration Module - * - * Copyright 2016 Jason A. Donenfeld - * Copyright 2016 Andrey Bondrov - * Copyright 2011 Aleix Pol Gonzalez - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#include "cursorthemesmodel.h" -#include -#include -#include -#include -#include -#include - -#include - -CursorThemesModel::CursorThemesModel(QObject* parent) - : IconThemesModel(parent) -{ - reload(); -} - -QList CursorThemesModel::installedThemesPaths() -{ - QList availableIcons; - QStringList dirs(QString(XcursorLibraryPath()).split(':', QString::SkipEmptyParts)); - - std::transform(dirs.begin(), dirs.end(), dirs.begin(), KShell::tildeExpand); - dirs.removeDuplicates(); - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); - QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); - - if(dir.exists() && dir.exists("cursors")) - availableIcons << dir; - } - } - return availableIcons; -} - -void CursorThemesModel::fillItem(const QDir& dir, QStandardItem* item) -{ - KIconTheme theme(dir.dirName()); - if(!theme.name().isEmpty()) - item->setText(theme.name()); - else - item->setText(dir.dirName()); - item->setToolTip(theme.description()); - item->setData(theme.inherits(), CursorThemesModel::InheritsRole); -} - - - -void CursorThemesModel::reload() -{ - clear(); - - QList paths = installedThemesPaths(); - Q_FOREACH(const QDir& dir, paths) { - QStandardItem* themeit = new QStandardItem(dir.dirName()); - themeit->setData(dir.path(), PathRole); - themeit->setData(dir.dirName(), DirNameRole); - fillItem(dir, themeit); - appendRow(themeit); - } -} diff --git a/src/dialog_installer.h b/src/dialog_installer.h --- a/src/dialog_installer.h +++ b/src/dialog_installer.h @@ -47,11 +47,6 @@ void themeInstalled(); private slots: - /** - Instala el tema de icono a traves del objeto Installer - Para ello lanza un hilo para que no se bloqué la GUI - */ - void installThemeIcon(); /** Instala el tema de icono a traves del objeto Installer Para ello lanza un hilo para que no se bloqué la GUI @@ -65,22 +60,13 @@ ///executed after analyzing theme void checkThemeAnalisys(); - - void enableGUIThemeIconInstaller(); - void disableGUIThemeIconInstaller(); - void refreshGUIIconTheme(); - void themeIconAnalisys(); - void checkThemeIconAnalisys(); - private: Ui::dialog_installer *ui; //PROPIEDADES PARA EL AREA DE INSTALADOR Thread *threadForTheme; //Hilo que instala el tema gtk - Thread *threadForIcon; //Hilo que instala el tema de iconos ThreadAnalisysTheme *threadAnalisysTheme; //hilo para analizar los temas a instalar - ThreadAnalisysThemeIcon *threadAnalisysThemeIcon; //hilo para analizar los temas a instalar }; diff --git a/src/dialog_installer.cpp b/src/dialog_installer.cpp --- a/src/dialog_installer.cpp +++ b/src/dialog_installer.cpp @@ -46,44 +46,30 @@ //TODO: make sure it's a good idea to have the threads always instanciated threadForTheme = new Thread("theme"); - threadForIcon = new Thread("icon"); threadAnalisysTheme = new ThreadAnalisysTheme; - threadAnalisysThemeIcon = new ThreadAnalisysThemeIcon; //installation ui connect(ui->theme_file, &KUrlRequester::textChanged, this, &DialogInstaller::themeAnalisys); - connect(ui->icon_file, &KUrlRequester::textChanged, this, &DialogInstaller::themeIconAnalisys); - connect(ui->but_icon_install, &QAbstractButton::clicked, this, &DialogInstaller::installThemeIcon); connect(ui->but_theme_install, &QAbstractButton::clicked, this, &DialogInstaller::installTheme); connect(threadAnalisysTheme, &KJob::finished, this, &DialogInstaller::checkThemeAnalisys); - connect(threadAnalisysThemeIcon, &KJob::finished, this, &DialogInstaller::checkThemeIconAnalisys); connect(threadForTheme, &Thread::started, this, &DialogInstaller::disableGUIThemeInstaller); - connect(threadForIcon, &Thread::started, this, &DialogInstaller::disableGUIThemeIconInstaller); connect(threadForTheme, &KJob::finished, this, &DialogInstaller::enableGUIThemeInstaller); - connect(threadForIcon, &KJob::finished, this, &DialogInstaller::enableGUIThemeIconInstaller); //ui refresh connect(threadForTheme, &KJob::finished, this, &DialogInstaller::refreshGUITheme); - connect(threadForIcon, &KJob::finished, this, &DialogInstaller::refreshGUIIconTheme); - } DialogInstaller::~DialogInstaller() { disconnect(threadAnalisysTheme, nullptr, this, nullptr); - disconnect(threadAnalisysThemeIcon, nullptr, this, nullptr); disconnect(threadForTheme, nullptr, this, nullptr); - disconnect(threadForIcon, nullptr, this, nullptr); disconnect(threadForTheme, nullptr, this, nullptr); - disconnect(threadForIcon, nullptr, this, nullptr); delete threadAnalisysTheme; - delete threadAnalisysThemeIcon; - delete threadForIcon; delete threadForTheme; delete ui; } @@ -102,26 +88,11 @@ threadForTheme->start(); } -void DialogInstaller::installThemeIcon() -{ - QString file = ui->icon_file->text(); - -// qDebug()<< "File to install" << file; - if(!fileIsTar(file)) { - KMessageBox::error(this, i18n("Could not install the %1 theme.", file), i18n("Cannot install theme")); - return; - } - - threadForIcon->setUrlPackage(file); - threadForIcon->start(); -} - void DialogInstaller::themeAnalisys() { ui->lb_theme_notice->setText(i18n("Parsing theme...")); ui->theme_file->setEnabled(false); - ui->but_icon_install->setEnabled(false); QString archivo = ui->theme_file->text(); threadAnalisysTheme->setPackageTheme(archivo); @@ -142,69 +113,19 @@ } -void DialogInstaller::themeIconAnalisys() -{ - ui->lb_icon_notice->setText(i18n("Parsing theme...")); - - ui->icon_file->setEnabled(false); - ui->but_icon_install->setEnabled(false); - - QString archivo = ui->icon_file->text(); - threadAnalisysThemeIcon->setPackageTheme(archivo); - threadAnalisysThemeIcon->start(); -} - -void DialogInstaller::checkThemeIconAnalisys() -{ - ui->icon_file->setEnabled(true); - - if(threadAnalisysThemeIcon->isSuccess()) { - ui->lb_icon_notice->setText(i18n("This icons theme can be installed")); - ui->but_icon_install->setEnabled(true); - } else { - ui->lb_icon_notice->setText(i18n("This icons theme cannot be installed")); - ui->but_icon_install->setEnabled(false); - } -} - void DialogInstaller::enableGUIThemeInstaller() { ui->but_theme_install->setEnabled(true); ui->theme_file->setEnabled(true); } -void DialogInstaller::enableGUIThemeIconInstaller() -{ - ui->but_icon_install->setEnabled(true); - ui->icon_file->setEnabled(true); - ui->buttonBox->button(QDialogButtonBox::Close)->setEnabled(true); -} - void DialogInstaller::disableGUIThemeInstaller() { ui->lb_theme_notice->setText(i18n("Installing GTK theme...")); ui->but_theme_install->setEnabled(false); ui->theme_file->setEnabled(false); } -void DialogInstaller::disableGUIThemeIconInstaller() -{ - ui->lb_icon_notice->setText(i18n("Installing icons...")); - ui->but_icon_install->setEnabled(false); - ui->icon_file->setEnabled(false); - ui->buttonBox->button(QDialogButtonBox::Close)->setEnabled(false); -} -void DialogInstaller::refreshGUIIconTheme() -{ - if(threadForIcon->isSuccess()) { - ui->lb_icon_notice->setText(i18n("Icons Successfully Installed")); - ui->icon_file->clear(); - emit themeInstalled(); - } else { - ui->lb_icon_notice->setText(i18n("The icons theme cannot be installed")); - ui->icon_file->clear(); - } -} // Esto se ejecuta cuando un tema es tratado a instalar void DialogInstaller::refreshGUITheme() diff --git a/src/dialog_uninstaller.h b/src/dialog_uninstaller.h --- a/src/dialog_uninstaller.h +++ b/src/dialog_uninstaller.h @@ -47,9 +47,7 @@ public slots: void refreshListsForUninstall(); void uninstallTheme(); - void uninstallIcon(); void threadUninstalledThemeFinished(KJob* job); - void threadUninstalledThemeIconFinished(KJob* job); private: Ui::dialog_uninstaller *ui; diff --git a/src/dialog_uninstaller.cpp b/src/dialog_uninstaller.cpp --- a/src/dialog_uninstaller.cpp +++ b/src/dialog_uninstaller.cpp @@ -22,7 +22,6 @@ #include "dialog_uninstaller.h" #include "abstractappearance.h" -#include "iconthemesmodel.h" #include "ui_dialog_uninstaller.h" #include "thread.h" #include "appearencegtk.h" @@ -40,7 +39,6 @@ refreshListsForUninstall(); connect(ui->but_uninstall_theme, &QAbstractButton::clicked, this, &DialogUninstaller::uninstallTheme); - connect(ui->but_uninstall_icon, &QAbstractButton::clicked, this, &DialogUninstaller::uninstallIcon); } DialogUninstaller::~DialogUninstaller() @@ -50,7 +48,6 @@ void DialogUninstaller::refreshListsForUninstall() { - ui->lb_notice_uninstall_icon->clear(); ui->lb_notice_uninstall_theme->clear(); QStringList themes = appareance->gtk2Appearance()->installedThemes(); @@ -62,8 +59,6 @@ ui->cb_uninstall_theme->clear(); ui->cb_uninstall_theme->addItems(themes); - - ui->cb_uninstall_icon->setModel(new IconThemesModel(true)); } void DialogUninstaller::uninstallTheme() @@ -89,26 +84,6 @@ threadEraseTheme->start(); } -void DialogUninstaller::uninstallIcon() -{ - int themeIndex = ui->cb_uninstall_icon->currentIndex(); - if(themeIndex<0) - return; - - QAbstractItemModel* model = ui->cb_uninstall_icon->model(); - QString theme = model->data(model->index(themeIndex, 0), IconThemesModel::PathRole).toString(); - - ui->cb_uninstall_icon->setEnabled(false); - ui->but_uninstall_icon->setEnabled(false); - - ui->lb_notice_uninstall_icon->setText(i18n("Uninstalling icons...")); - - ThreadErase* threadEraseIcon = new ThreadErase; - threadEraseIcon->setThemeForErase(theme); - connect(threadEraseIcon, &KJob::finished, this, &DialogUninstaller::threadUninstalledThemeIconFinished); - threadEraseIcon->start(); -} - void DialogUninstaller::threadUninstalledThemeFinished(KJob* job) { if(job->error()==0) { @@ -123,18 +98,3 @@ refreshListsForUninstall(); } - -void DialogUninstaller::threadUninstalledThemeIconFinished(KJob* job) -{ - if(job->error()==0) { - ui->lb_notice_uninstall_icon->setText(i18n("Icons successfully uninstalled.")); - emit(themeUninstalled()); - } else { - ui->lb_notice_uninstall_icon->setText(i18n("Could not uninstall the icon theme.")); - } - - ui->cb_uninstall_icon->setEnabled(true); - ui->but_uninstall_icon->setEnabled(true); - - refreshListsForUninstall(); -} diff --git a/src/fontshelpers.h b/src/fontshelpers.h deleted file mode 100644 --- a/src/fontshelpers.h +++ /dev/null @@ -1,30 +0,0 @@ -/* KDE GTK Configuration Module - * - * Copyright 2011 Aleix Pol Gonzalez - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef FONTSHELPERS_H -#define FONTSHELPERS_H - -#include - -QString fontToString(const QFont& f); -QFont stringToFont(const QString& font); - -#endif diff --git a/src/fontshelpers.cpp b/src/fontshelpers.cpp deleted file mode 100644 --- a/src/fontshelpers.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* KDE GTK Configuration Module - * - * Copyright 2011 Aleix Pol Gonzalez - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#include "fontshelpers.h" -#include -#include -#include -#include - -QString fontToString(const QFont& f) -{ - return f.family() + ' ' + f.styleName() + ' ' + QString::number(f.pointSize()); -} - -QFont stringToFont(const QString& font) -{ - QFontDatabase fdb; - QString fontFamily; - int familyIdx=-1; - QStringList allFamilies = fdb.families(); - for(int idx=font.indexOf(' '); idx=0; idx=font.indexOf(' ', idx+1)) { - QString testFont = font.left(idx); - if(allFamilies.contains(testFont)) { - fontFamily = testFont; - familyIdx = idx; - } - } - - QFont f; - f.setFamily(fontFamily); - QRegularExpression fontRx(QStringLiteral(" (.*) +([0-9]+)$")); - QRegularExpressionMatch match = fontRx.match(font, familyIdx); - if (match.isValid()) { - QString fontStyle = match.captured(1).trimmed(); - int fontSize = match.captured(2).toInt(); - f.setStyleName(fontStyle); - f.setPointSize(fontSize); - } else { - qWarning() << "Couldn't figure out style and size" << font; - } - return f; -} diff --git a/src/gtkconfigkcmodule.h b/src/gtkconfigkcmodule.h --- a/src/gtkconfigkcmodule.h +++ b/src/gtkconfigkcmodule.h @@ -29,8 +29,6 @@ #include "dialog_installer.h" #include "dialog_uninstaller.h" #include -#include "iconthemesmodel.h" -#include "cursorthemesmodel.h" class KProcess; namespace Ui { class Modulo; class GUI; } @@ -50,7 +48,6 @@ public slots: void refreshLists(); - void makePreviewIconTheme(); ///it is called whenever something in the UI has changed void appChanged(); @@ -66,9 +63,6 @@ void runGtk3IfNecessary(bool); void untogglePreview(); -signals: - void selectedIconTheme(); - private: void syncUI(); bool m_loading = false; @@ -83,8 +77,6 @@ QString m_tempGtk2Preview; QString m_tempGtk3Preview; bool m_saveEnabled; - CursorThemesModel* m_cursorsModel; - IconThemesModel* m_iconsModel; }; #endif // MODULO_H diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp --- a/src/gtkconfigkcmodule.cpp +++ b/src/gtkconfigkcmodule.cpp @@ -35,27 +35,13 @@ #include #include "ui_gui.h" #include "abstractappearance.h" -#include "iconthemesmodel.h" -#include "fontshelpers.h" #include #include #include #include K_PLUGIN_FACTORY_WITH_JSON(GTKConfigKCModuleFactory, "kde-gtk-config.json", registerPlugin();) -QMap gtkToolbarInit() -{ - QMap gtkToolbar; - gtkToolbar["GTK_TOOLBAR_ICONS"] = 0; - gtkToolbar["GTK_TOOLBAR_TEXT"] = 1; - gtkToolbar["GTK_TOOLBAR_BOTH_HORIZ"] = 2; - gtkToolbar["GTK_TOOLBAR_BOTH"] = 3; - return gtkToolbar; -} - -static QMap gtkToolbar = gtkToolbarInit(); - GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args ) : KCModule(parent) , ui(new Ui::GUI) @@ -75,23 +61,6 @@ ui->setupUi(this); appareance = new AppearenceGTK; - m_cursorsModel = new CursorThemesModel(this); - QSortFilterProxyModel *cursorsProxyModel = new QSortFilterProxyModel(this); - cursorsProxyModel->setSourceModel(m_cursorsModel); - cursorsProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); - cursorsProxyModel->setSortRole(Qt::DisplayRole); - cursorsProxyModel->sort(0); - ui->cb_cursor->setModel(cursorsProxyModel); - - m_iconsModel = new IconThemesModel(false, this); - QSortFilterProxyModel *iconsProxyModel = new QSortFilterProxyModel(this); - iconsProxyModel->setSourceModel(m_iconsModel); - iconsProxyModel->setSortCaseSensitivity(Qt::CaseInsensitive); - iconsProxyModel->setSortRole(Qt::DisplayRole); - iconsProxyModel->sort(0); - ui->cb_icon->setModel(iconsProxyModel); - ui->cb_icon_fallback->setModel(iconsProxyModel); - m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0"; m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini"; @@ -123,18 +92,9 @@ connect(ui->cb_theme, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); connect(ui->cb_theme_gtk3, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); connect(ui->checkBox_theme_gtk3_prefer_dark, &QAbstractButton::clicked, this, >KConfigKCModule::appChanged); - connect(ui->cb_cursor, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); - connect(ui->cb_icon, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); - connect(ui->cb_icon_fallback ,SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); - connect(ui->font, &KFontRequester::fontSelected, this, >KConfigKCModule::appChanged); - connect(ui->cb_toolbar_icons, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); - connect(ui->checkBox_icon_gtk_menus, &QAbstractButton::clicked, this, >KConfigKCModule::appChanged); - connect(ui->checkBox_icon_gtk_buttons, &QAbstractButton::clicked, this, >KConfigKCModule::appChanged); connect(ui->buttonGroup_primary_button_warps_slider, SIGNAL(buttonToggled(QAbstractButton*, bool)), this, SLOT(appChanged())); //preview updates - connect(ui->cb_icon_fallback, SIGNAL(activated(QString)), this, SLOT(makePreviewIconTheme())); - connect(ui->cb_icon, SIGNAL(activated(QString)), this, SLOT(makePreviewIconTheme())); connect(ui->gtk2Preview, &QAbstractButton::clicked, this, >KConfigKCModule::runGtk2IfNecessary); connect(ui->gtk3Preview, &QAbstractButton::clicked, this, >KConfigKCModule::runGtk3IfNecessary); @@ -166,14 +126,7 @@ appareance->setThemeGtk3(ui->cb_theme_gtk3->currentText()); appareance->setTheme(ui->cb_theme->currentText()); appareance->setApplicationPreferDarkTheme(ui->checkBox_theme_gtk3_prefer_dark->isChecked()); - appareance->setCursor(ui->cb_cursor->itemData(ui->cb_cursor->currentIndex(), CursorThemesModel::DirNameRole).toString()); - appareance->setIcon(ui->cb_icon->itemData(ui->cb_icon->currentIndex(), IconThemesModel::DirNameRole).toString()); - appareance->setIconFallback(ui->cb_icon_fallback->itemData(ui->cb_icon_fallback->currentIndex(), IconThemesModel::DirNameRole).toString()); - appareance->setFont(fontToString(ui->font->font())); - - appareance->setToolbarStyle(gtkToolbar.key(ui->cb_toolbar_icons->currentIndex())); - appareance->setShowIconsInButtons(ui->checkBox_icon_gtk_buttons->isChecked()); - appareance->setShowIconsInMenus(ui->checkBox_icon_gtk_menus->isChecked()); + appareance->setPrimaryButtonWarpsSlider(ui->buttonGroup_primary_button_warps_slider->checkedButton() == ui->radioButton_warp); } @@ -197,79 +150,9 @@ { refreshThemesUi(true); - const auto newFont = stringToFont(appareance->getFont()); - if (newFont != ui->font->font()) - ui->font->setFont(newFont); - - ui->cb_toolbar_icons->setCurrentIndex(gtkToolbar[appareance->getToolbarStyle()]); - - ui->checkBox_icon_gtk_buttons->setChecked(appareance->getShowIconsInButtons()); - ui->checkBox_icon_gtk_menus->setChecked(appareance->getShowIconsInMenus()); const bool warps = appareance->getPrimaryButtonWarpsSlider(); ui->radioButton_warp->setChecked(warps); ui->radioButton_dont_warp->setChecked(!warps); - - makePreviewIconTheme(); -} - -void tryIcon(QLabel* label, const QString& fallback, const QString& theme, const QString& iconName) -{ - label->setToolTip(iconName); - - auto findIconAt = [label, theme, iconName](const QDir &where) -> bool { - const QString path = IconThemesModel::findIconRecursivelyByName(iconName, where); - - if(!path.isEmpty()) { - QPixmap p; - QSize s(label->width(), label->height()); - if (path.endsWith(".svg") || path.endsWith(".svgz")) { - QImage image(s, QImage::Format_ARGB32_Premultiplied); - image.fill(Qt::transparent); - QPainter painter(&image); - QSvgRenderer r(path); - r.render(&painter); - painter.end(); - - p = QPixmap::fromImage(image); - } else { - p = {path}; - Q_ASSERT(!p.isNull()); - p = p.scaled(s); - } - label->setPixmap(p); - return true; - } - return false; - }; - if (!theme.isEmpty() && findIconAt(QDir(theme))) - return; - if (findIconAt(fallback)) - return; - - QIcon notFoundIcon = QIcon::fromTheme("application-x-zerosize"); - QPixmap noIcon(notFoundIcon.pixmap(48,48)); - label->setPixmap(noIcon); - - qWarning() << "could not find icon" << iconName; -} - -void GTKConfigKCModule::makePreviewIconTheme() -{ - int icon_fallback = ui->cb_icon_fallback->currentIndex(); - QString path_fallback = ui->cb_icon->itemData(icon_fallback, IconThemesModel::PathRole).toString(); - - int icon = ui->cb_icon->currentIndex(); - QString path_icon = ui->cb_icon->itemData(icon, IconThemesModel::PathRole).toString(); - - tryIcon(ui->lb_prev_1, path_fallback, path_icon, "user-home"); - tryIcon(ui->lb_prev_2, path_fallback, path_icon, "folder"); - tryIcon(ui->lb_prev_3, path_fallback, path_icon, "user-trash"); - tryIcon(ui->lb_prev_4, path_fallback, path_icon, "document-print"); - tryIcon(ui->lb_prev_5, path_fallback, path_icon, "user-desktop"); - tryIcon(ui->lb_prev_6, path_fallback, path_icon, "network-server"); - tryIcon(ui->lb_prev_7, path_fallback, path_icon, "system-help"); - tryIcon(ui->lb_prev_8, path_fallback, path_icon, "start-here"); - tryIcon(ui->lb_prev_9, path_fallback, path_icon, "go-up"); } void GTKConfigKCModule::appChanged() @@ -346,13 +229,6 @@ /* qDebug() << "******************************************* INSTALLATION :\n" << "theme : " << appareance->getTheme() << "\n" << "themeGTK3 : " << appareance->getThemeGtk3() << "\n" - << "icons : " << appareance->getIcon() << "\n" - << "fallback icons : " << appareance->getIconFallback() << "\n" - << "cursors : " << appareance->getCursor() << "\n" - << "font family : " << appareance->getFont() << "\n" - << "toolbar style : " << appareance->getToolbarStyle() << "\n" - << "icons in buttons : " << appareance->getShowIconsInButtons() << "\n" - << "icons in menus : " << appareance->getShowIconsInMenus() << "\n" << "********************************************************"; */ syncUI(); @@ -377,28 +253,15 @@ // qDebug() << "loading defaults..."; m_saveEnabled = false; - ui->font->setFont(font()); - bool showIcons = !QCoreApplication::testAttribute(Qt::AA_DontShowIconsInMenus); - ui->checkBox_icon_gtk_buttons->setChecked(showIcons); - ui->checkBox_icon_gtk_menus->setChecked(showIcons); // this makes it consistent with Qt apps and restores the old Gtk behavior ui->radioButton_dont_warp->setChecked(true); setComboItem(ui->cb_theme, QStringList("oxygen-gtk") << "Clearlooks"); setComboItem(ui->cb_theme_gtk3, QStringList("oxygen-gtk") << "Adwaita"); - QStringList icons; - icons << KIconLoader::global()->theme()->name() << "GNOME"; - setComboItem(ui->cb_icon, icons); - - int idx = ui->cb_icon->currentIndex(); - if(idx>=0) { - setComboItem(ui->cb_icon_fallback, icons.mid(icons.indexOf(ui->cb_icon->currentText())+1)); - } m_saveEnabled = true; - makePreviewIconTheme(); appChanged(); } @@ -494,22 +357,9 @@ // dark theme for gtk3 ui->checkBox_theme_gtk3_prefer_dark->setChecked(appareance->getApplicationPreferDarkTheme()); - //cursors - QString currentCursor = useConfig ? appareance->getCursor() : ui->cb_cursor->currentText(); - int currentCursorIdx = ui->cb_cursor->findData(currentCursor, CursorThemesModel::DirNameRole); - ui->cb_cursor->setCurrentIndex(qMax(currentCursorIdx, 0)); - - //icons - QString currentIcon = useConfig ? appareance->getIcon() : ui->cb_icon->currentText(), - currentFallback = useConfig ? appareance->getIconFallback() : ui->cb_icon_fallback->currentText(); - int currentIconIdx = ui->cb_icon->findData(currentIcon, IconThemesModel::DirNameRole); - int currentFallbackIdx = ui->cb_icon_fallback->findData(currentFallback, IconThemesModel::DirNameRole); - ui->cb_icon->setCurrentIndex(qMax(currentIconIdx, 0)); - ui->cb_icon_fallback->setCurrentIndex(qMax(currentFallbackIdx, 0)); m_saveEnabled = wasenabled; - if(currentCursorIdx<0 || currentIconIdx<0 || currentFallbackIdx<0) - emit changed(true); + emit changed(true); } void GTKConfigKCModule::showDialogForInstall() diff --git a/src/iconthemesmodel.h b/src/iconthemesmodel.h deleted file mode 100644 --- a/src/iconthemesmodel.h +++ /dev/null @@ -1,45 +0,0 @@ -/* KDE GTK Configuration Module - * - * Copyright 2011 José Antonio Sanchez Reynaga - * Copyright 2011 Aleix Pol Gonzalez - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#ifndef ICONTHEMESMODEL_H -#define ICONTHEMESMODEL_H - -#include - -class QDir; -class IconThemesModel : public QStandardItemModel -{ - public: - enum ThemesRoles { PathRole=Qt::UserRole+1, InheritsRole, DirNameRole }; - - explicit IconThemesModel(bool onlyHome=false, QObject* parent = 0); - - virtual void reload(); - static QString findIconRecursivelyByName(const QString& name, const QDir& directory); - - private: - static QString findFilesRecursively(const QStringList& wildcard, const QDir& directory); - QList installedThemesPaths(); - bool m_onlyHome; -}; - -#endif // ICONTHEMESMODEL_H diff --git a/src/iconthemesmodel.cpp b/src/iconthemesmodel.cpp deleted file mode 100644 --- a/src/iconthemesmodel.cpp +++ /dev/null @@ -1,131 +0,0 @@ -/* KDE GTK Configuration Module - * - * Copyright 2011 José Antonio Sanchez Reynaga - * Copyright 2011 Aleix Pol Gonzalez - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) version 3, or any - * later version accepted by the membership of KDE e.V. (or its - * successor approved by the membership of KDE e.V.), which shall - * act as a proxy defined in Section 6 of version 3 of the license. - * - * This library 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 - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see . - */ - -#include "iconthemesmodel.h" -#include -#include -#include -#include -#include -#include - -IconThemesModel::IconThemesModel(bool onlyHome, QObject* parent) - : QStandardItemModel(parent) - , m_onlyHome(onlyHome) -{ - reload(); -} - -QList IconThemesModel::installedThemesPaths() -{ - QList availableIcons; - - QSet dirs; - dirs += QDir::home().filePath(".icons"); - if(!m_onlyHome) { - dirs += QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "icons", QStandardPaths::LocateDirectory).toSet(); - } - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); - QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); - - if(dir.exists() && dir.exists("index.theme")) { - availableIcons << dir; - } - } - } - - return availableIcons; -} - -bool greatSizeIs48(const QString& a, const QString& b) -{ - bool a48=a.contains("48"), b48=b.contains("48"); - if((a48 && b48) || (!a48 && !b48)) - return a done; - QList paths = installedThemesPaths(); - Q_FOREACH(const QDir& dir, paths) { - KIconTheme theme(dir.dirName()); - if (!theme.isValid()) { //most likely a cursor theme -// qWarning() << "invalid theme" << dir.dirName(); - continue; - } - - if (done.contains(dir.dirName())) - continue; - - done << dir.dirName(); - - QStandardItem* item = new QStandardItem(dir.dirName()); - item->setData(dir.path(), PathRole); - item->setData(dir.dirName(), DirNameRole); - - item->setText(theme.name()); - item->setToolTip(theme.description()); - item->setData(theme.inherits(), IconThemesModel::InheritsRole); - QString iconName = theme.example(); - if (iconName.isEmpty()) - iconName = QStringLiteral("folder"); - - QString path = theme.iconPathByName(iconName, 16, KIconLoader::MatchBest); - item->setIcon(QIcon(path)); - - appendRow(item); - } -} diff --git a/src/installer.h b/src/installer.h --- a/src/installer.h +++ b/src/installer.h @@ -33,13 +33,6 @@ it has to be installed */ static bool installTheme(const QString& urlPackage); - - /** - This function will unpack the @p urlPackage icons theme packages wherever - it has to be installed - */ - static bool installIconTheme(const QString& urlPackage); - }; #endif // INSTALLER_H diff --git a/src/installer.cpp b/src/installer.cpp --- a/src/installer.cpp +++ b/src/installer.cpp @@ -36,15 +36,3 @@ package.directory()->copyTo(dest); return true; } - -bool Installer::installIconTheme(const QString &urlPackage) -{ - QString dest(QDir::homePath()+"/.icons"); - QDir::home().mkpath(dest); - - KTar package(urlPackage); - if(!package.open(QIODevice::ReadOnly)) - return false; - package.directory()->copyTo(dest); - return true; -} diff --git a/src/thread.cpp b/src/thread.cpp --- a/src/thread.cpp +++ b/src/thread.cpp @@ -41,9 +41,6 @@ bool success = false; if(urlPackage.isEmpty()) { qWarning() << "*** ERROR: There's nothing to do"; - } else if(action == "icon") { -// qDebug() << "Installing icons theme"; - success = Installer::installIconTheme(urlPackage); } else if(action == "theme") { // qDebug() << "Installing GTK theme"; success = Installer::installTheme(urlPackage); diff --git a/src/ui/dialog_installer.ui b/src/ui/dialog_installer.ui --- a/src/ui/dialog_installer.ui +++ b/src/ui/dialog_installer.ui @@ -21,274 +21,128 @@ - - - - 450 - 0 - - - - - 16777215 - 600 - - - - QTabWidget::North - - - QTabWidget::Rounded - - - 0 - - - Qt::ElideMiddle - - - false - - - - Add GTK Theme - - - - - - - - - - 0 - 0 - - - - <b>Step 2</b> - - - - - - - - 0 - 0 - - - - Select the theme file you want to install: - - - - - - - - 0 - 0 - - - - - 16777215 - 16777215 - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - true - - - - - - - - 0 - 0 - - - - Click the next button in order to install the theme in your system. - - - - - - - - 0 - 0 - - - - <b>Step 1</b> - - - - - - - false - - - Install GTK Theme - - - false - - - - - - - *.tar.gz *.tar|Compressed file - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Add New Icon Theme - - - - - - - 0 - 0 - - - - - - - - 0 - 0 - - - - Select the theme file you want to install: - - - - - - - - 0 - 0 - - - - <b>Step 1</b> - - - - - - - - 0 - 0 - - - - <b>Step 2</b> - - - - - - - - - - - - - - - 0 - 0 - - - - Click the next button in order to install the theme in your system. - - - - - - - false - - - Install Icon Theme - - - - - - - *.tar.gz *.tar|Compressed file - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + + + + + + 0 + 0 + + + + <b>Step 2</b> + + + + + + + + 0 + 0 + + + + Select the theme file you want to install: + + + + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + true + + + + + + + + 0 + 0 + + + + Click the next button in order to install the theme in your system. + + + + + + + + 0 + 0 + + + + <b>Step 1</b> + + + + + + + false + + + Install GTK Theme + + + false + + + + + + + *.tar.gz *.tar|Compressed file + + + + - + QDialogButtonBox::Close + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/ui/dialog_uninstaller.ui b/src/ui/dialog_uninstaller.ui --- a/src/ui/dialog_uninstaller.ui +++ b/src/ui/dialog_uninstaller.ui @@ -82,59 +82,6 @@ - - - - - - - Uninstall - - - - - - - Select an icon theme to uninstall - - - - - - - - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 75 - true - - - - Remove Icon Theme - - - - - - - - 150 - 0 - - - - - - - diff --git a/src/ui/gui.ui b/src/ui/gui.ui --- a/src/ui/gui.ui +++ b/src/ui/gui.ui @@ -12,430 +12,138 @@ - + - - + + + Qt::Horizontal + + - 300 - 0 + 40 + 20 - - GTK Themes - - - - Qt::AlignHCenter|Qt::AlignTop - - - - - GTK2 theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - QComboBox::AdjustToContents - - - - - - - Preview Theme - - - true - - - - - - - - - GTK3 theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - QComboBox::AdjustToContents - - - - - - - Preview Theme - - - true - - - - - - - - - Prefer dark theme - - - - - - - Font: - - - - - - - - 0 - 0 - - - - - - + - - - - 400 - 0 - - - - Behavior - - - - Qt::AlignHCenter|Qt::AlignTop - - - - - Toolbar label: - - - - - - - 2 - - - - None + + + + + GTK2 theme: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + QComboBox::AdjustToContents - - - - Text only + + + + + + Preview Theme - - - - Beside icons + + true - - - - Below icons + + + + + + + + GTK3 theme: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + QComboBox::AdjustToContents - - - - - - - Show icons: - - - - - - - On scrollbar left-click: - - - - - - - On buttons - - - true - - - - - - - In menus - - - true - - - - - - - Scro&ll one page up/down - - - true - - - buttonGroup_primary_button_warps_slider - - - - - - - &Jump to mouse cursor position - - - buttonGroup_primary_button_warps_slider - - - - - + + + + + + Preview Theme + + + true + + + + + + + + + Prefer dark theme + + + + + + + On scrollbar left-click: + + + + + + + Scro&ll one page up/down + + + true + + + buttonGroup_primary_button_warps_slider + + + + + + + &Jump to mouse cursor position + + + buttonGroup_primary_button_warps_slider + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + - - - - - 16777215 - 400 - - - - Icon Themes - - - - - - Qt::AlignHCenter|Qt::AlignTop - - - - - - - - Icon theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - Fallback theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - Cursor theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - - 48 - 48 - - - - - - - - - - - Qt::Horizontal - - - - 0 - 0 - - - - - - - - - @@ -473,21 +181,15 @@ Get New GNOME/GTK Application Styles... - + + .. - - - KFontRequester - QWidget -
kfontrequester.h
- - diff --git a/tests/configsavetest.cpp b/tests/configsavetest.cpp --- a/tests/configsavetest.cpp +++ b/tests/configsavetest.cpp @@ -16,14 +16,7 @@ static void fillValues(QScopedPointer& a) { - a->setFont("a"); - a->setIcon("a"); a->setTheme("a"); - a->setToolbarStyle("a"); - a->setIconFallback("a"); - a->setCursor("a"); - a->setShowIconsInButtons(true); - a->setShowIconsInMenus(true); a->setPrimaryButtonWarpsSlider(true); auto a3 = dynamic_cast(a.data()); @@ -34,14 +27,7 @@ void compareAppearances(QScopedPointer& reloaded, QScopedPointer& instance) { - QCOMPARE(reloaded->getFont(), instance->getFont()); - QCOMPARE(reloaded->getIcon(), instance->getIcon()); QCOMPARE(reloaded->getTheme(), instance->getTheme()); - QCOMPARE(reloaded->getCursor(), instance->getCursor()); - QCOMPARE(reloaded->getToolbarStyle(), instance->getToolbarStyle()); - QCOMPARE(reloaded->getIconFallback(), instance->getIconFallback()); - QCOMPARE(reloaded->getShowIconsInButtons(), instance->getShowIconsInButtons()); - QCOMPARE(reloaded->getShowIconsInMenus(), instance->getShowIconsInMenus()); QCOMPARE(reloaded->getPrimaryButtonWarpsSlider(), instance->getPrimaryButtonWarpsSlider()); }