From 83edec3e9fcdcd843e99cdf0e5a40fb615e5a9e8 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Thu, 28 Jul 2016 20:28:32 +0200 Subject: Gtk+3 UI: add panel-properties-dialog-gtk3.ui which is cleaned from deprecated widgets for >= gtk+-3.14 --- configure.ac | 1 + mate-panel/Makefile.am | 1 + mate-panel/panel-properties-dialog-gtk3.ui | 834 +++++++++++++++++++++++++++++ mate-panel/panel-properties-dialog.c | 10 + po/POTFILES.in | 1 + 5 files changed, 847 insertions(+) create mode 100644 mate-panel/panel-properties-dialog-gtk3.ui diff --git a/configure.ac b/configure.ac index 70337748..f7542ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -99,6 +99,7 @@ case "$with_gtk" in esac AC_SUBST(GTK_API_VERSION) + dnl pkg-config dependency checks PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-$GTK_API_VERSION) diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index a7ea3944..61240e1b 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -225,6 +225,7 @@ BUILT_SOURCES = \ uidir = $(datadir)/mate-panel/ui ui_DATA = \ panel-properties-dialog.ui \ + panel-properties-dialog-gtk3.ui \ panel-run-dialog.ui \ panel-test-applets.ui diff --git a/mate-panel/panel-properties-dialog-gtk3.ui b/mate-panel/panel-properties-dialog-gtk3.ui new file mode 100644 index 00000000..886d29cd --- /dev/null +++ b/mate-panel/panel-properties-dialog-gtk3.ui @@ -0,0 +1,834 @@ + + + + + + + + + + + 100 + 33.75 + 5 + 10 + + + 12 + 120 + 12 + 1 + 12 + + + False + 5 + Panel Properties + False + center + dialog + + + True + False + vertical + 2 + + + True + False + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-close + True + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + + + + True + True + 5 + + + True + False + 12 + vertical + 6 + + + False + + + True + False + gtk-dialog-warning + + + True + True + 0 + + + + + True + False + Some of these properties are locked down + + + False + False + 1 + + + + + True + True + 0 + + + + + True + False + 6 + 12 + + + True + False + 0 + 0 + + + + + + 1 + 2 + + + + + True + False + start + _Icon: + True + True + + + 0 + 2 + + + + + True + False + 6 + + + True + True + adjustment2 + 1 + True + + + True + True + 0 + + + + + True + False + pixels + + + True + True + 1 + + + + + 1 + 1 + + + + + True + False + + + 1 + 0 + + + + + True + False + _Orientation: + True + orientation_combo + + + 0 + 0 + + + + + True + False + start + _Size: + True + size_spin + + + 0 + 1 + + + + + True + True + 1 + + + + + E_xpand + True + True + False + True + True + + + False + False + 2 + + + + + _Autohide + True + True + False + True + True + + + False + False + 3 + + + + + True + False + vertical + 6 + + + Show hide _buttons + True + True + False + True + True + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + Arro_ws on hide buttons + True + True + False + True + True + + + True + True + 1 + + + + + True + True + 1 + + + + + True + False + 4 + + + + + False + + + + + True + False + General + + + False + + + + + True + False + 12 + vertical + 6 + + + False + + + True + False + gtk-dialog-warning + + + True + True + 0 + + + + + True + False + Some of these properties are locked down + + + False + False + 1 + + + + + True + True + 0 + + + + + _None (use system theme) + True + True + False + True + True + + + False + False + 1 + + + + + True + False + 6 + + + Solid c_olor + True + True + False + True + True + default_radio + + + True + True + 0 + + + + + False + True + 2 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + 6 + 12 + + + True + True + False + Pick a color + + + 1 + 0 + 2 + + + + + True + True + True + adjustment1 + + + 1 + 1 + 2 + + + + + True + False + 6 + + + True + False + <small>Transparent</small> + True + + + False + False + 1 + + + + + + + + 1 + 2 + + + + + True + False + Co_lor: + True + color_button + + + 0 + 0 + + + + + True + False + S_tyle: + True + opacity_scale + + + 0 + 1 + + + + + True + False + end + <small>Opaque</small> + True + + + 2 + 2 + + + + + + + + True + True + 1 + + + + + True + True + 3 + + + + + True + False + vertical + 6 + + + Background _image: + True + True + False + True + True + default_radio + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + Select background + + + True + True + 1 + + + + + False + False + 1 + + + + + False + True + 4 + + + + + 1 + + + + + True + False + Background + + + 1 + False + + + + + False + True + 1 + + + + + + helpbutton1 + closebutton1 + + + + False + 5 + Image Background Details + False + dialog + + + True + False + vertical + + + True + False + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-close + True + True + True + False + True + + + False + False + 1 + + + + + False + False + end + 0 + + + + + True + False + 5 + vertical + 6 + + + + + + True + False + vertical + 6 + + + _Tile + True + True + False + True + True + + + False + False + 0 + + + + + _Scale + True + True + False + True + True + tile_radio + + + False + False + 1 + + + + + St_retch + True + True + False + True + True + tile_radio + + + False + False + 2 + + + + + True + True + 1 + + + + + Rotate image when panel is _vertical + True + True + False + True + True + + + False + False + 2 + + + + + False + False + 1 + + + + + + helpbutton2 + closebutton2 + + + diff --git a/mate-panel/panel-properties-dialog.c b/mate-panel/panel-properties-dialog.c index a75f4b58..e3790fd5 100644 --- a/mate-panel/panel-properties-dialog.c +++ b/mate-panel/panel-properties-dialog.c @@ -1012,15 +1012,25 @@ panel_properties_dialog_present (PanelToplevel *toplevel) gtk_builder_set_translation_domain (gui, GETTEXT_PACKAGE); error = NULL; +#if GTK_CHECK_VERSION (3, 0, 0) + gtk_builder_add_from_file (gui, + BUILDERDIR "/panel-properties-dialog-gtk3.ui", + &error); +#else gtk_builder_add_from_file (gui, BUILDERDIR "/panel-properties-dialog.ui", &error); +#endif if (error) { char *secondary; secondary = g_strdup_printf (_("Unable to load file '%s': %s."), +#if GTK_CHECK_VERSION (3, 0, 0) + BUILDERDIR"/panel-properties-dialog-gtk3.ui", +#else BUILDERDIR"/panel-properties-dialog.ui", +#endif error->message); panel_error_dialog (GTK_WINDOW (toplevel), gtk_window_get_screen (GTK_WINDOW (toplevel)), diff --git a/po/POTFILES.in b/po/POTFILES.in index dc79a790..22ae7622 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -59,6 +59,7 @@ mate-panel/panel-menu-items.c mate-panel/panel-profile.c mate-panel/panel-properties-dialog.c [type: gettext/glade]mate-panel/panel-properties-dialog.ui +[type: gettext/glade]mate-panel/panel-properties-dialog-gtk3.ui mate-panel/panel-recent.c mate-panel/panel-run-dialog.c [type: gettext/glade]mate-panel/panel-run-dialog.ui -- cgit v1.2.1