diff --git a/kde-gtk-config.desktop b/kde-gtk-config.desktop --- a/kde-gtk-config.desktop +++ b/kde-gtk-config.desktop @@ -1,5 +1,16 @@ [Desktop Entry] -Categories=Qt;KDE;X-KDE-settings-looknfeel; +Exec=kcmshell5 kde-gtk-config +Icon=kde-gtk-config +Type=Service +X-KDE-ServiceTypes=KCModule + +X-KDE-Library=kcm_kdegtkconfig +# X-KDE-ParentApp=kcontrol + +X-KDE-System-Settings-Parent-Category=applicationstyle +X-KDE-Weight=20 + +Name=GNOME/GTK Application Style Comment=Configure GNOME/GTK application style and behavior Comment[ca]=Configuració de l'estil i comportament de les aplicacions GNOME/GTK Comment[ca@valencia]=Configuració de l'estil i comportament de les aplicacions GNOME/GTK @@ -20,9 +31,6 @@ Comment[x-test]=xxConfigure GNOME/GTK application style and behaviorxx Comment[zh_CN]=配置 GNOME/GTK 应用程序风格和行为 Comment[zh_TW]=設定 GNOME/GTK 應用程式的樣式與行為 -Exec=kcmshell5 kde-gtk-config -Icon=kde-gtk-config -Name=GNOME/GTK Application Style Name[ca]=Estil de les aplicacions GNOME/GTK Name[ca@valencia]=Estil de les aplicacions GNOME/GTK Name[de]=GNOME/GTK Anwendungs-Stil @@ -46,7 +54,8 @@ Name[x-test]=xxGNOME/GTK Application Stylexx Name[zh_CN]=GNOME/GTK 应用程序风格 Name[zh_TW]=GNOME / GTK 應用程式樣式 -X-KDE-Keywords=gnome,style,gtk + +X-KDE-Keywords=gnome,gtk,style,styles,look,widget,icons,toolbars,apps,theme,menu X-KDE-Keywords[ca]=gnome,estil,gtk X-KDE-Keywords[ca@valencia]=gnome,estil,gtk X-KDE-Keywords[da]=gnome,stil,gtk @@ -80,10 +89,5 @@ X-KDE-Keywords[x-test]=xxgnomexx,xxstylexx,xxgtkxx X-KDE-Keywords[zh_CN]=gnome,style,gtk,样式 X-KDE-Keywords[zh_TW]=gnome,style,gtk -Type=Service -X-KDE-Library=kcm_kdegtkconfig -# X-KDE-ParentApp=kcontrol -X-KDE-ServiceTypes=KCModule -X-KDE-System-Settings-Parent-Category=applicationstyle -X-KDE-Weight=80 +Categories=Qt;KDE;X-KDE-settings-looknfeel; diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp --- a/src/gtkconfigkcmodule.cpp +++ b/src/gtkconfigkcmodule.cpp @@ -47,8 +47,8 @@ QMap gtkToolbar; gtkToolbar["GTK_TOOLBAR_ICONS"] = 0; gtkToolbar["GTK_TOOLBAR_TEXT"] = 1; - gtkToolbar["GTK_TOOLBAR_BOTH"] = 2; - gtkToolbar["GTK_TOOLBAR_BOTH_HORIZ"] = 3; + gtkToolbar["GTK_TOOLBAR_BOTH_HORIZ"] = 2; + gtkToolbar["GTK_TOOLBAR_BOTH"] = 3; return gtkToolbar; } @@ -62,10 +62,8 @@ , 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")); + KAboutData *acercade = new KAboutData("cgc", i18n("GTK Application Style"), PROJECT_VERSION, + QString(), 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")); 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 @@ -174,7 +174,7 @@ - Add New Icons Theme + Add New Icon Theme @@ -251,7 +251,7 @@ false - Install Icons + Install Icon Theme @@ -294,7 +294,7 @@ KUrlRequester - QFrame + QWidget
kurlrequester.h
diff --git a/src/ui/gui.ui b/src/ui/gui.ui --- a/src/ui/gui.ui +++ b/src/ui/gui.ui @@ -6,40 +6,230 @@ 0 0 - 931 - 564 + 900 + 600 - - - - - <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 GNOME/GTK Application Styles... - - - - - - - - QToolButton::InstantPopup - - - Qt::ToolButtonTextBesideIcon - - + + + + + + + + 300 + 0 + + + + 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 + + + + + Text only + + + + + Beside icons + + + + + Below icons + + + + + + + + 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 + + + + + + + - - - - - 0 - 0 - - + + 16777215 @@ -49,90 +239,70 @@ 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::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 - 40 - 20 + 0 + 0 - - - 0 - 0 - - 48 @@ -146,12 +316,6 @@ - - - 0 - 0 - - 48 @@ -165,12 +329,6 @@ - - - 0 - 0 - - 48 @@ -184,12 +342,6 @@ - - - 0 - 0 - - 48 @@ -203,12 +355,6 @@ - - - 0 - 0 - - 48 @@ -222,12 +368,6 @@ - - - 0 - 0 - - 48 @@ -241,12 +381,6 @@ - - - 0 - 0 - - 48 @@ -260,12 +394,6 @@ - - - 0 - 0 - - 48 @@ -279,12 +407,6 @@ - - - 0 - 0 - - 48 @@ -297,14 +419,14 @@ - + Qt::Horizontal - 40 - 20 + 0 + 0 @@ -314,220 +436,48 @@ - - - - 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: - - - - - - - - - - - - - - - - - Prefer Dark GTK3 Theme - - - - - - - - + + - Qt::Horizontal + Qt::Vertical - 537 - 20 + 0 + 0 - - - - Behavior - - - - 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 - - - - - + + + + + + Qt::Horizontal + + + + 0 + 0 + + + + + + + + <html><head/><body><p>Here you can install new GTK themes. Even more are available at <a href="http://gnome-look.org"><span style=" text-decoration: underline;">gnome-look.org</span></a></p></body></html> + + + Get New GNOME/GTK Application Styles... + + + + + + +