[nautilus-actions] fma-config-tool: manage GtkBuilder on Ubuntu 12
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions] fma-config-tool: manage GtkBuilder on Ubuntu 12
- Date: Mon, 20 Feb 2017 11:13:25 +0000 (UTC)
commit 29a976d802789b4a3f169689b0a31d65e9f2ad6f
Author: Pierre Wieser <pwieser trychlos org>
Date: Fri Feb 17 20:01:28 2017 +0100
fma-config-tool: manage GtkBuilder on Ubuntu 12
src/core/fma-importer-ask.ui | 10 +++---
src/ui/fma-assistant-export.ui | 12 +++---
src/ui/fma-assistant-import.ui | 16 +++------
src/ui/fma-export-ask.ui | 8 ++--
src/ui/fma-legend.ui | 10 +++---
src/ui/fma-main-window.c | 9 ++++-
src/ui/fma-main-window.ui | 42 +++++++++++++++++-----
src/ui/fma-preferences.ui | 79 +++++++++++++++++++---------------------
8 files changed, 102 insertions(+), 84 deletions(-)
---
diff --git a/src/core/fma-importer-ask.ui b/src/core/fma-importer-ask.ui
index 4f4278a..d1a44da 100644
--- a/src/core/fma-importer-ask.ui
+++ b/src/core/fma-importer-ask.ui
@@ -57,7 +57,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -78,13 +78,13 @@
</packing>
</child>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -106,7 +106,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="label111">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">
@@ -135,7 +135,7 @@ What should I do with this ?</property>
</object>
</child>
<child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"> A duplicate is detected </property>
diff --git a/src/ui/fma-assistant-export.ui b/src/ui/fma-assistant-export.ui
index 58e4a6c..7df44fb 100644
--- a/src/ui/fma-assistant-export.ui
+++ b/src/ui/fma-assistant-export.ui
@@ -126,7 +126,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
<property name="row_spacing">2</property>
<property name="column_spacing">4</property>
<child>
- <object class="GtkLabel" id="p3-l4-label1">
+ <object class="GtkLabel" id="p3-label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Which format should I use when exporting these
items ?</property>
@@ -182,7 +182,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p4-label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">About to export selected items:</property>
@@ -210,7 +210,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p4-label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">8</property>
@@ -280,11 +280,11 @@ You may use Ctrl and Shift keys to extend the selection.</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkScrolledWindow">
+ <object class="GtkScrolledWindow" id="p5-scrolled1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkViewport">
+ <object class="GtkViewport" id="p5-viewport1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
@@ -310,7 +310,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p5-label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Selected items have been proceeded:</property>
diff --git a/src/ui/fma-assistant-import.ui b/src/ui/fma-assistant-import.ui
index d0769f9..46a269e 100644
--- a/src/ui/fma-assistant-import.ui
+++ b/src/ui/fma-assistant-import.ui
@@ -47,7 +47,7 @@
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p2-label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">What should I do when importing an item whose ID
already exists ?</property>
@@ -73,7 +73,7 @@
<property name="rules_hint">True</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
- <object class="GtkTreeSelection"/>
+ <object class="GtkTreeSelection" id="p2-selection1"/>
</child>
</object>
<packing>
@@ -81,12 +81,6 @@
<property name="top_attach">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="title" translatable="yes">Managing duplicates</property>
@@ -97,7 +91,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p3-label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">About to import selected files:</property>
@@ -125,7 +119,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p3-label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">8</property>
@@ -167,7 +161,7 @@
<property name="row_spacing">2</property>
<property name="column_spacing">4</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="p4-label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Selected files have been proceeded:</property>
diff --git a/src/ui/fma-export-ask.ui b/src/ui/fma-export-ask.ui
index be21811..f6dd252 100644
--- a/src/ui/fma-export-ask.ui
+++ b/src/ui/fma-export-ask.ui
@@ -51,18 +51,18 @@
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
<child>
- <object class="GtkFrame">
+ <object class="GtkFrame" id="frame11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkGrid" id="grid11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -114,7 +114,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel" id="label11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes"> About to export item(s) </property>
diff --git a/src/ui/fma-legend.ui b/src/ui/fma-legend.ui
index ab97e53..149cc7f 100644
--- a/src/ui/fma-legend.ui
+++ b/src/ui/fma-legend.ui
@@ -6,13 +6,13 @@
<property name="can_focus">False</property>
<property name="type_hint">dialog</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
<property name="column_spacing">4</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -48,7 +48,7 @@
</packing>
</child>
<child>
- <object class="GtkSeparator">
+ <object class="GtkSeparator" id="separator12">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -58,7 +58,7 @@
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid13">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">20</property>
@@ -487,7 +487,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="label12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">: space-separated list of the URIs of the selected
file(s)/folder(s).</property>
diff --git a/src/ui/fma-main-window.c b/src/ui/fma-main-window.c
index 45370ad..6939849 100644
--- a/src/ui/fma-main-window.c
+++ b/src/ui/fma-main-window.c
@@ -713,9 +713,14 @@ setup_main_ui( FMAMainWindow *main_window )
#if GTK_CHECK_VERSION( 3, 10, 0 )
builder = gtk_builder_new_from_file( st_xmlui_filename );
#else
+ GError *error = NULL;
builder = gtk_builder_new();
- guint ret = gtk_builder_add_from_file( builder, st_xmlui_filename, NULL );
- g_return_if_fail( ret > 0 );
+ guint ret = gtk_builder_add_from_file( builder, st_xmlui_filename, &error );
+ if( ret == 0 ){
+ g_warning( "setup_main_ui: %s", error->message );
+ g_error_free( error );
+ return;
+ }
#endif
top_window = gtk_builder_get_object( builder, st_toplevel_name );
g_return_if_fail( top_window && GTK_IS_WINDOW( top_window ));
diff --git a/src/ui/fma-main-window.ui b/src/ui/fma-main-window.ui
index ef51632..7086c03 100644
--- a/src/ui/fma-main-window.ui
+++ b/src/ui/fma-main-window.ui
@@ -553,7 +553,7 @@ In this case, the defined conditions will be applied to the current folder, and
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid221">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -592,7 +592,7 @@ If this is not an absolute path, then the PATH environment variable at execution
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid222">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -629,7 +629,7 @@ If this is not an absolute path, then the PATH environment variable at execution
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid223">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -673,7 +673,7 @@ If this is not an absolute path, then the PATH environment variable at execution
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid224">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -2025,7 +2025,7 @@ Filters may be negated to specify for which capabilities your item must not appe
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="label925">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
@@ -2124,7 +2124,7 @@ Filters may be negated to specify for which capabilities your item must not appe
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid931">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">2</property>
@@ -2162,7 +2162,7 @@ This may be used for example to test for a prerequisite package.</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid932">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">2</property>
@@ -2197,7 +2197,7 @@ This may be used for example for testing that a prerequisite service is currentl
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid933">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">2</property>
@@ -2233,7 +2233,7 @@ This may be used for example for testing a complex condition.</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid934">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">2</property>
@@ -2585,6 +2585,30 @@ There may be multiple reasons for why an item cannot be edited. See your User's
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
diff --git a/src/ui/fma-preferences.ui b/src/ui/fma-preferences.ui
index 3acf669..01466b0 100644
--- a/src/ui/fma-preferences.ui
+++ b/src/ui/fma-preferences.ui
@@ -2,6 +2,22 @@
<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.4"/>
+ <object class="GtkImage" id="image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="stock">gtk-go-up</property>
+ </object>
+ <object class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <object class="GtkImage" id="image3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-down</property>
+ </object>
<object class="GtkDialog" id="PreferencesDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -74,7 +90,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid11">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -154,7 +170,7 @@
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid12">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -240,7 +256,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid21">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -313,9 +329,13 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid22">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">8</property>
+ <property name="margin_right">2</property>
+ <property name="margin_top">2</property>
+ <property name="margin_bottom">2</property>
<property name="hexpand">True</property>
<property name="row_spacing">2</property>
<property name="column_spacing">4</property>
@@ -417,7 +437,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid31">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -429,7 +449,6 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<object class="GtkLabel" id="label45">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="ypad">6</property>
<property name="label" translatable="yes">What to do when pasting or duplicating
an item in the tree ?</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
@@ -440,7 +459,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid311">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -520,7 +539,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid32">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -582,7 +601,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid33">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -606,7 +625,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid331">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="column_spacing">4</property>
@@ -707,7 +726,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid41">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -720,7 +739,6 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<object class="GtkLabel" id="label8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="ypad">10</property>
<property name="label" translatable="yes">What to do when an item, action or
menu, selected to be imported, has the same identifier that a currently existing one ?</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
@@ -795,7 +813,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid51">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -808,7 +826,6 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="ypad">10</property>
<property name="label" translatable="yes">What is your preferred export format
?</property>
<property name="wrap">True</property>
<property name="xalign">0</property>
@@ -884,7 +901,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid61">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -895,7 +912,7 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="row_spacing">2</property>
<property name="column_spacing">2</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid611">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -941,9 +958,6 @@ Note that this item will be displayed only if a unique menu is defined in the Na
<property name="top_attach">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -968,7 +982,7 @@ You can add a new scheme by clicking on the '+' button.</property>
<property name="rules_hint">True</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
- <object class="GtkTreeSelection"/>
+ <object class="GtkTreeSelection" id="selection13"/>
</child>
</object>
</child>
@@ -1028,7 +1042,7 @@ You can add a new scheme by clicking on the '+' button.</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid71">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">8</property>
@@ -1054,7 +1068,7 @@ You can add a new scheme by clicking on the '+' button.</property>
<property name="rules_hint">True</property>
<property name="show_expanders">False</property>
<child internal-child="selection">
- <object class="GtkTreeSelection"/>
+ <object class="GtkTreeSelection" id="selection14"/>
</child>
</object>
</child>
@@ -1065,7 +1079,7 @@ You can add a new scheme by clicking on the '+' button.</property>
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkGrid" id="grid711">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">2</property>
@@ -1102,9 +1116,6 @@ You can add a new scheme by clicking on the '+' button.</property>
<property name="top_attach">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1166,20 +1177,4 @@ You can add a new scheme by clicking on the '+' button.</property>
<widget name="label721"/>
</widgets>
</object>
- <object class="GtkImage" id="image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="stock">gtk-go-up</property>
- </object>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <object class="GtkImage" id="image3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-down</property>
- </object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
