From b06a89bf26788cbcbcd12757cf9f59226f16b7dc Mon Sep 17 00:00:00 2001 From: monsta Date: Mon, 21 Nov 2016 21:17:55 +0300 Subject: rename .ui file of panel properties dialog to the original name no need to mention GTK+3 anymore --- mate-panel/Makefile.am | 2 +- mate-panel/panel-properties-dialog-gtk3.ui | 834 ----------------------------- mate-panel/panel-properties-dialog.c | 4 +- mate-panel/panel-properties-dialog.ui | 834 +++++++++++++++++++++++++++++ po/POTFILES.in | 2 +- 5 files changed, 838 insertions(+), 838 deletions(-) delete mode 100644 mate-panel/panel-properties-dialog-gtk3.ui create mode 100644 mate-panel/panel-properties-dialog.ui diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index ec94421f..a7ea3944 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -224,7 +224,7 @@ BUILT_SOURCES = \ uidir = $(datadir)/mate-panel/ui ui_DATA = \ - panel-properties-dialog-gtk3.ui \ + panel-properties-dialog.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 deleted file mode 100644 index 46cd00c3..00000000 --- a/mate-panel/panel-properties-dialog-gtk3.ui +++ /dev/null @@ -1,834 +0,0 @@ - - - - - - - - - - - 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 d2c5c8d0..ef538187 100644 --- a/mate-panel/panel-properties-dialog.c +++ b/mate-panel/panel-properties-dialog.c @@ -938,14 +938,14 @@ panel_properties_dialog_present (PanelToplevel *toplevel) error = NULL; gtk_builder_add_from_file (gui, - BUILDERDIR "/panel-properties-dialog-gtk3.ui", + BUILDERDIR "/panel-properties-dialog.ui", &error); if (error) { char *secondary; secondary = g_strdup_printf (_("Unable to load file '%s': %s."), - BUILDERDIR"/panel-properties-dialog-gtk3.ui", + BUILDERDIR"/panel-properties-dialog.ui", error->message); panel_error_dialog (GTK_WINDOW (toplevel), gtk_window_get_screen (GTK_WINDOW (toplevel)), diff --git a/mate-panel/panel-properties-dialog.ui b/mate-panel/panel-properties-dialog.ui new file mode 100644 index 00000000..46cd00c3 --- /dev/null +++ b/mate-panel/panel-properties-dialog.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/po/POTFILES.in b/po/POTFILES.in index 2461cf89..dc79a790 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -58,7 +58,7 @@ mate-panel/panel-menu-button.c 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-gtk3.ui +[type: gettext/glade]mate-panel/panel-properties-dialog.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