diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp index d36c6a3..bb2d994 100644 --- a/src/gtkconfigkcmodule.cpp +++ b/src/gtkconfigkcmodule.cpp @@ -1,461 +1,463 @@ /* 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 "gtkconfigkcmodule.h" #include #include #include #include #include #include #include #include #include #include #include #include "ui_gui.h" #include "abstractappearance.h" #include "iconthemesmodel.h" #include "fontshelpers.h" 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"] = 2; gtkToolbar["GTK_TOOLBAR_BOTH_HORIZ"] = 3; return gtkToolbar; } static QMap gtkToolbar = gtkToolbarInit(); GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args ) : KCModule(parent) , ui(new Ui::GUI) , installer(0) , uninstaller(0) , m_saveEnabled(true) { Q_UNUSED(args); KAboutData *acercade = new KAboutData("cgc", i18n("KDE GTK Config"), PROJECT_VERSION, i18n("Configure your GTK Applications"), KAboutLicense::LGPL_V3, i18n("Copyright 2011 José Antonio Sánchez Reynaga")); acercade->addAuthor(i18n("José Antonio Sánchez Reynaga (antonioJASR)"),i18n("Main Developer"), "joanzare@gmail.com"); acercade->addAuthor(i18n("Aleix Pol i Gonzalez"), i18n("Feature development. Previews, code refactoring."), "aleixpol@blue-systems.com"); acercade->addCredit(i18n("Manuel Tortosa (manutortosa)"), i18n("Ideas, tester, internationalization")); acercade->addCredit(i18n("Adrián Chaves Fernández (Gallaecio)"), i18n("Internationalization")); setAboutData(acercade); setButtons(KCModule::Default | KCModule::Apply); ui->setupUi(this); appareance = new AppearenceGTK; m_cursorsModel = new CursorThemesModel(this); ui->cb_cursor->setModel(m_cursorsModel); m_iconsModel = new IconThemesModel(false, this); ui->cb_icon->setModel(m_iconsModel); ui->cb_icon_fallback->setModel(m_iconsModel); m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0"; m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ ".config/gtk-3.0/settings.ini"; const QIcon previewIcon = QIcon::fromTheme("document-preview"); ui->gtk2Preview->setIcon(previewIcon); ui->gtk3Preview->setIcon(previewIcon); QString gtk2Preview = QStandardPaths::findExecutable("gtk_preview"); QString gtk3Preview = QStandardPaths::findExecutable("gtk3_preview"); m_p2 = new KProcess(this); m_p2->setEnv("GTK2_RC_FILES", m_tempGtk2Preview, true); if(!gtk2Preview.isEmpty()) { *m_p2 << gtk2Preview; connect(m_p2, SIGNAL(finished(int)), this, SLOT(untogglePreview())); } m_p3 = new KProcess(this); m_p3->setEnv("XDG_CONFIG_HOME", QStandardPaths::writableLocation(QStandardPaths::TempLocation)+"/.config"); if(!gtk3Preview.isEmpty()) { *m_p3 << gtk3Preview; connect(m_p3, SIGNAL(finished(int)), this, SLOT(untogglePreview())); } ui->gtk2Preview->setVisible(!gtk2Preview.isEmpty()); ui->gtk3Preview->setVisible(!gtk3Preview.isEmpty()); //UI changes connect(ui->cb_theme, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); connect(ui->cb_theme_gtk3, SIGNAL(currentIndexChanged(int)), this, SLOT(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, SIGNAL(fontSelected(QFont)), this, SLOT(appChanged())); connect(ui->cb_toolbar_icons, SIGNAL(currentIndexChanged(int)), this, SLOT(appChanged())); connect(ui->checkBox_icon_gtk_menus, SIGNAL(clicked(bool)), this, SLOT(appChanged())); connect(ui->checkBox_icon_gtk_buttons, SIGNAL(clicked(bool)), this, SLOT(appChanged())); - connect(ui->checkBox_primary_button_warps_slider, SIGNAL(clicked(bool)), this, SLOT(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, SIGNAL(clicked(bool)), this, SLOT(runGtk2IfNecessary(bool))); connect(ui->gtk3Preview, SIGNAL(clicked(bool)), this, SLOT(runGtk3IfNecessary(bool))); QMenu* m = new QMenu(this); m->addAction(QIcon::fromTheme("get-hot-new-stuff"), i18n("Download GTK2 themes..."), this, SLOT(showThemeGHNS())); m->addAction(QIcon::fromTheme("get-hot-new-stuff"), i18n("Download GTK3 themes..."), this, SLOT(installThemeGTK3GHNS())); m->addAction(QIcon::fromTheme("archive-insert"), i18n("Install a local theme..."), this, SLOT(showDialogForInstall())); m->addAction(QIcon::fromTheme("archive-remove"), i18n("Uninstall a local theme..."), this, SLOT(showDialogForUninstall())); ui->newThemes->setMenu(m); ui->newThemes->setIcon(QIcon::fromTheme("get-hot-new-stuff")); } GTKConfigKCModule::~GTKConfigKCModule() { m_p2->kill(); m_p3->kill(); QFile::remove(m_tempGtk2Preview); QFile::remove(m_tempGtk3Preview); delete appareance; m_p2->waitForFinished(); m_p3->waitForFinished(); delete ui; } void GTKConfigKCModule::syncUI() { appareance->setThemeGtk3(ui->cb_theme_gtk3->currentText()); appareance->setTheme(ui->cb_theme->currentText()); 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->checkBox_primary_button_warps_slider->isChecked()); + appareance->setPrimaryButtonWarpsSlider(ui->buttonGroup_primary_button_warps_slider->checkedButton() == ui->radioButton_warp); } void GTKConfigKCModule::showThemeGHNS() { KNS3::DownloadDialog d("cgctheme.knsrc", this); if(d.exec()) { refreshLists(); } } void GTKConfigKCModule::installThemeGTK3GHNS() { KNS3::DownloadDialog d("cgcgtk3.knsrc", this); if(d.exec()) { refreshLists(); } } void GTKConfigKCModule::refreshLists() { refreshThemesUi(true); QString font = appareance->getFont(); // Q_ASSERT(!font.isEmpty()); ui->font->setFont(stringToFont(font)); ui->cb_toolbar_icons->setCurrentIndex(gtkToolbar[appareance->getToolbarStyle()]); ui->checkBox_icon_gtk_buttons->setChecked(appareance->getShowIconsInButtons()); ui->checkBox_icon_gtk_menus->setChecked(appareance->getShowIconsInMenus()); - ui->checkBox_primary_button_warps_slider->setChecked(appareance->getPrimaryButtonWarpsSlider()); - + 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); QString ret; if(!theme.isEmpty()) ret = IconThemesModel::findIconRecursivelyByName(iconName, QDir(theme)); if(!ret.isEmpty()) { QPixmap p(ret); Q_ASSERT(!p.isNull()); label->setPixmap(p); return; } if(!fallback.isEmpty()) ret = IconThemesModel::findIconRecursivelyByName(iconName, fallback); if(!ret.isEmpty()) { QPixmap p(ret); Q_ASSERT(!p.isNull()); label->setPixmap(p); 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() { savePreviewConfig(); emit changed(true); } void GTKConfigKCModule::savePreviewConfig() { if(!m_saveEnabled || !(ui->gtk2Preview->isChecked() || ui->gtk3Preview->isChecked())) return; // qDebug() << "saving UI..."; syncUI(); if(ui->gtk3Preview->isChecked()) { //we don't want to recursively loop between savePreviewConfig and runIfNecessary m_saveEnabled = false; m_p3->kill(); appareance->gtk3Appearance()->saveSettings(m_tempGtk3Preview); //need to make sure runIfNecessary() to know that it's not running m_p3->waitForFinished(); m_p3->start(); ui->gtk3Preview->setChecked(true); m_saveEnabled = true; } else if(ui->gtk2Preview->isChecked()) { appareance->gtk2Appearance()->saveSettings(m_tempGtk2Preview); } } void GTKConfigKCModule::runGtk2IfNecessary(bool checked) { KProcess* p = m_p2; KProcess* np = m_p3; if(checked) { np->kill(); np->waitForFinished(); savePreviewConfig(); if(p->state() == QProcess::NotRunning) p->start(); } else { p->kill(); p->waitForFinished(); } } void GTKConfigKCModule::runGtk3IfNecessary(bool checked) { KProcess* p = m_p3; KProcess* np = m_p2; if(checked) { np->kill(); np->waitForFinished(); savePreviewConfig(); if(p->state() == QProcess::NotRunning) p->start(); } else { p->kill(); p->waitForFinished(); } } void GTKConfigKCModule::save() { /* 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(); if(!appareance->saveFileConfig()) KMessageBox::error(this, i18n("It was not possible to save the config")); } void setComboItem(QComboBox* combo, const QStringList& texts) { foreach(const QString& text, texts) { int pos = combo->findText(text); if(pos>=0) { combo->setCurrentIndex(pos); return; } } } void GTKConfigKCModule::defaults() { refreshThemesUi(false); // 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->checkBox_primary_button_warps_slider->setChecked(false); + 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(); } void GTKConfigKCModule::load() { m_saveEnabled = false; bool someCorrect = appareance->loadFileConfig(); if(someCorrect) { refreshLists(); } else { defaults(); } m_saveEnabled = true; } void refreshComboSameCurrentValue(QComboBox* combo, const QString& temp, const QStringList& texts) { combo->clear(); combo->addItems(texts); int idx = combo->findText(temp); if(idx>=0) combo->setCurrentIndex(idx); } void GTKConfigKCModule::refreshThemesUi(bool useConfig) { //theme gtk2 bool wasenabled = m_saveEnabled; m_saveEnabled = false; refreshComboSameCurrentValue(ui->cb_theme, useConfig ? appareance->getTheme() : ui->cb_theme->currentText(), appareance->gtk2Appearance()->installedThemesNames()); //theme gtk3 refreshComboSameCurrentValue(ui->cb_theme_gtk3, useConfig ? appareance->getThemeGtk3() : ui->cb_theme_gtk3->currentText(), appareance->gtk3Appearance()->installedThemesNames()); //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); } void GTKConfigKCModule::showDialogForInstall() { if(!installer) { installer = new DialogInstaller(this); connect(installer, SIGNAL(themeInstalled()), SLOT(refreshLists())); } installer->exec(); refreshThemesUi(); } void GTKConfigKCModule::showDialogForUninstall() { if(!uninstaller) { uninstaller = new DialogUninstaller(this, appareance); connect(uninstaller, SIGNAL(themeUninstalled()), SLOT(refreshLists())); } uninstaller->refreshListsForUninstall(); uninstaller->exec(); refreshThemesUi(); } void GTKConfigKCModule::untogglePreview() { if(sender()==m_p2) ui->gtk2Preview->setChecked(false); else ui->gtk3Preview->setChecked(false); } #include "gtkconfigkcmodule.moc" diff --git a/src/ui/gui.ui b/src/ui/gui.ui index 326ee99..667ebbd 100644 --- a/src/ui/gui.ui +++ b/src/ui/gui.ui @@ -1,514 +1,533 @@ GUI 0 0 - 858 + 931 564 - - - - GTK Themes + + + + <html><head/><body><p>Here you can find more GTK themes to try. You can either download them from the following websites.</p><p>Also you can download it from the opendesktop facilities as suggested below</p><p align="center"><a href="http://gnome-look.org"><span style=" text-decoration: underline; color:#0000ff;">gnome-look.org</span></a><br/><a href="art.gnome.org"><span style=" text-decoration: underline; color:#0000ff;">art.gnome.org</span></a></p></body></html> - - - - - Select a GTK2 Theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - 0 - 0 - - - - - - - - Preview theme - - - true - - - - - - - - - Select a GTK3 Theme: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - - - 0 - 0 - - - - - - - - Preview theme - - - true - - - - - - - - - Font: - - - - - - - - - - - - - Behaviour + + Get New Themes + + + QToolButton::InstantPopup + + + Qt::ToolButtonTextBesideIcon - - - QFormLayout::ExpandingFieldsGrow - - - - - GTK style toolbar: - - - - - - - - Icons Only - - - - - Text Only - - - - - Text Under Icons - - - - - Text After Icons - - - - - - - - Show icons in GTK buttons: - - - - - - - - - - - - - - Show icons in GTK menus: - - - - - - - - - - - - - - Left mouse button warps scroll bar: - - - - - - - - - - - 0 0 0 100 16777215 400 Icon Themes Cursor theme: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter 0 0 Icon theme: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter 0 0 Fallback theme: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter 0 0 Qt::Horizontal 40 20 0 0 48 48 0 0 48 48 0 0 48 48 0 0 48 48 0 0 48 48 0 0 48 48 0 0 48 48 0 0 48 48 0 0 48 48 Qt::Horizontal 40 20 + + + + GTK Themes + + + + + + Select a GTK2 Theme: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + 0 + 0 + + + + + + + + Preview theme + + + true + + + + + + + + + Select a GTK3 Theme: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + + + + + + + + 0 + 0 + + + + + + + + Preview theme + + + true + + + + + + + + + Font: + + + + + + + + + Qt::Horizontal 537 20 - - - - <html><head/><body><p>Here you can find more GTK themes to try. You can either download them from the following websites.</p><p>Also you can download it from the opendesktop facilities as suggested below</p><p align="center"><a href="http://gnome-look.org"><span style=" text-decoration: underline; color:#0000ff;">gnome-look.org</span></a><br/><a href="art.gnome.org"><span style=" text-decoration: underline; color:#0000ff;">art.gnome.org</span></a></p></body></html> - - - Get New Themes - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextBesideIcon + + + + Behaviour + + + QFormLayout::ExpandingFieldsGrow + + + + + GTK style toolbar: + + + + + + + + Icons Only + + + + + Text Only + + + + + Text Under Icons + + + + + Text After Icons + + + + + + + + Show icons in GTK buttons: + + + + + + + + + + + + + + Show icons in GTK menus: + + + + + + + + + + + + + + On left-clicking the scroll bar: + + + + + + + Scro&ll one page up/down + + + true + + + buttonGroup_primary_button_warps_slider + + + + + + + &Jump to the mouse cursor position + + + buttonGroup_primary_button_warps_slider + + + + KFontRequester QWidget
kfontrequester.h
 + + +