diff --git a/Makefile.am b/Makefile.am index 22f7501..e2a86ba 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,6 +58,7 @@ src_obconf_la_SOURCES = \ src/tree.h dist_glade_DATA = \ + src/obconf-gtk3.glade \ src/obconf.glade EXTRA_DIST = \ diff --git a/Makefile.in b/Makefile.in index c308cc7..dd0a378 100644 --- a/Makefile.in +++ b/Makefile.in @@ -480,6 +480,7 @@ src_obconf_la_SOURCES = \ src/tree.h dist_glade_DATA = \ + src/obconf-gtk3.glade \ src/obconf.glade EXTRA_DIST = \ diff --git a/src/main.c b/src/main.c index a39faf1..15c65d8 100644 --- a/src/main.c +++ b/src/main.c @@ -171,12 +171,22 @@ extern gboolean plugin_load(LXAppearance* app, GtkBuilder* lxappearance_builder) builder = gtk_builder_new(); gtk_builder_set_translation_domain(builder, GETTEXT_PACKAGE); +#if GTK_CHECK_VERSION(3, 0, 0) + // hide theme preview for GTKv3 (ticket #768) + g_debug(GLADEDIR"/obconf-gtk3.glade"); + if(!gtk_builder_add_from_file(builder, GLADEDIR"/obconf-gtk3.glade", NULL)) + { + obconf_error(_("Failed to load the obconf-gtk3.glade interface file. ObConf is probably not installed correctly."), TRUE); + exit_with_error = TRUE; + } +#elif // GTK_CHECK_VERSION(3, 0, 0) g_debug(GLADEDIR"/obconf.glade"); if(!gtk_builder_add_from_file(builder, GLADEDIR"/obconf.glade", NULL)) { obconf_error(_("Failed to load the obconf.glade interface file. ObConf is probably not installed correctly."), TRUE); exit_with_error = TRUE; } +#endif // GTK_CHECK_VERSION(3, 0, 0) gtk_builder_connect_signals(builder, NULL); gtk_box_pack_start( GTK_BOX(app->wm_page), get_widget("obconf_vbox"), TRUE, TRUE, 0); gtk_widget_show_all(app->wm_page); diff --git a/src/obconf-gtk3.glade b/src/obconf-gtk3.glade new file mode 100644 index 0000000..eb738e4 --- /dev/null +++ b/src/obconf-gtk3.glade @@ -0,0 +1,551 @@ + + + + + + True + False + 6 + + + True + False + 12 + + + True + True + True + + + True + False + 12 + 6 + + + True + False + 6 + + + True + False + 0 + <span weight="bold">Theme</span> + True + + + False + False + 0 + + + + + True + True + never + automatic + in + + + True + True + False + + + + + True + True + 1 + + + + + True + True + 0 + + + + + True + False + + + True + True + True + False + + + + True + False + 0 + 0 + 0 + + + True + False + 2 + + + True + False + gtk-open + + + False + False + 0 + + + + + True + False + _Install a new theme... + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + False + True + 1 + + + + + True + False + + + True + True + True + False + + + + True + False + 0 + 0 + 0 + + + True + False + 2 + + + True + False + gtk-save + + + False + False + 0 + + + + + True + False + Create a theme _archive (.obt)... + True + + + False + False + 1 + + + + + + + + + False + False + 0 + + + + + False + True + 2 + + + + + + + True + False + 0 + Theme + + + False + + + + + True + False + 12 + 18 + + + True + False + 6 + + + True + False + 0 + Font for active window title: + True + + + False + True + 0 + + + + + True + True + True + False + True + + + + False + True + 1 + + + + + True + False + 0 + Font for inactive window title: + True + + + False + True + 2 + + + + + True + True + True + False + True + + + + False + True + 3 + + + + + False + True + 0 + + + + + True + False + 6 + + + True + False + 6 + + + True + False + _Button order: + True + + + False + True + 0 + + + + + True + True + ● + False + False + True + True + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + 0 + 0 + N: Window icon +L: Window label (Title) +I: Iconify (Minimize) +M: Maximize +C: Close +S: Shade (Roll up) +D: Omnipresent (On all desktops) + + + False + True + 1 + + + + + False + True + 1 + + + + + 1 + + + + + True + False + 0 + Title Bar + + + 1 + False + + + + + True + False + 12 + + + True + False + 6 + + + True + False + 0 + Font for menu header: + True + + + False + True + 0 + + + + + True + True + True + False + True + + + + True + True + 1 + + + + + True + False + 0 + Font for menu Item: + True + + + False + True + 2 + + + + + True + True + True + False + True + + + + True + True + 3 + + + + + True + False + 0 + Font for on-screen display: + True + + + True + True + 4 + + + + + True + True + True + False + True + + + + True + True + 5 + + + + + True + False + 0 + Font for inactive on-screen display: + True + + + True + True + 6 + + + + + True + True + True + False + True + + + + True + True + 7 + + + + + False + True + 0 + + + + + 2 + + + + + True + False + 0 + Misc. + + + 2 + False + + + + + True + True + 0 + + + + + + + True + True + 0 + + + +