[nautilus-actions/file-manager-actions] Update the UIs for Gtk 3.4
- From: Pierre Wieser <pwieser src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [nautilus-actions/file-manager-actions] Update the UIs for Gtk 3.4
- Date: Wed, 15 Feb 2017 15:40:29 +0000 (UTC)
commit 4d1d2e260d1de7b724ab71a6a848ae1876b8d2b2
Author: Pierre Wieser <pwieser trychlos org>
Date: Tue Feb 14 20:39:10 2017 +0100
Update the UIs for Gtk 3.4
+ fix FmaImporterAsk
+ fix FmaAssistantExport
+ fix FmaAssistantImport.
TODO | 2 +
src/core/fma-importer-ask.c | 12 +-
src/core/fma-importer-ask.ui | 109 +++++++++------
src/core/fma-ioptions-list.c | 10 +-
src/ui/fma-add-capability.ui | 48 +++----
src/ui/fma-add-scheme.ui | 118 +++++++---------
src/ui/fma-assistant-export.c | 2 +-
src/ui/fma-assistant-export.ui | 287 ++++++++++++++++++---------------------
src/ui/fma-assistant-import.c | 4 +-
src/ui/fma-assistant-import.ui | 292 ++++++++++++++++++----------------------
10 files changed, 417 insertions(+), 467 deletions(-)
---
diff --git a/TODO b/TODO
index 94af036..ba6303a 100644
--- a/TODO
+++ b/TODO
@@ -313,6 +313,8 @@ FileManager-Actions - TODO
- 2012-01-02 have a libexec binary which just print the tree of items
+ 86 2017- 2-14 import assistant: in selection item, double click should go to the next page
+
-----------------------------------------------------------------------
DONE
====
diff --git a/src/core/fma-importer-ask.c b/src/core/fma-importer-ask.c
index 7d4ab5d..2f6d58e 100644
--- a/src/core/fma-importer-ask.c
+++ b/src/core/fma-importer-ask.c
@@ -370,11 +370,13 @@ initialize_gtk( FMAImporterAsk *dialog, GtkWindow *toplevel )
static const gchar *thisfn = "fma_importer_ask_initialize_gtk";
GtkWidget *container;
+ g_debug( "%s: dialog=%p, toplevel=%p", thisfn, ( void * ) dialog, ( void * ) toplevel );
+
g_return_if_fail( FMA_IS_IMPORTER_ASK( dialog ));
- g_debug( "%s: dialog=%p, toplevel=%p", thisfn, ( void * ) dialog, ( void * ) toplevel );
+ container = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeBox" );
+ g_return_if_fail( container && GTK_IS_CONTAINER( container ));
- container = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
fma_ioptions_list_gtk_init( FMA_IOPTIONS_LIST( dialog ), container, FALSE );
}
@@ -412,7 +414,7 @@ initialize_window( FMAImporterAsk *editor, GtkWindow *toplevel )
gtk_label_set_text( GTK_LABEL( widget ), label );
g_free( label );
- widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeVBox" );
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( toplevel ), "AskModeBox" );
mode_id = fma_settings_get_string( IPREFS_IMPORT_ASK_USER_LAST_MODE, NULL, NULL );
fma_ioptions_list_set_default( FMA_IOPTIONS_LIST( editor ), widget, mode_id );
g_free( mode_id );
@@ -433,7 +435,9 @@ get_selected_mode( FMAImporterAsk *editor )
GtkWidget *button;
gboolean keep;
- widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ), "AskModeVBox"
);
+ widget = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( editor->private->toplevel ), "AskModeBox"
);
+ g_return_if_fail( widget && GTK_IS_CONTAINER( widget ));
+
mode = fma_ioptions_list_get_selected( FMA_IOPTIONS_LIST( editor ), widget );
mode_id = fma_ioption_get_id( mode );
diff --git a/src/core/fma-importer-ask.ui b/src/core/fma-importer-ask.ui
index 4885a28..4f4278a 100644
--- a/src/core/fma-importer-ask.ui
+++ b/src/core/fma-importer-ask.ui
@@ -63,35 +63,83 @@
<property name="row_spacing">2</property>
<property name="column_spacing">4</property>
<child>
- <object class="GtkGrid">
+ <object class="GtkCheckButton" id="AskKeepChoiceButton">
+ <property name="label" translatable="yes">Re_member my choice in future import
operations</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_left">8</property>
- <property name="row_spacing">2</property>
- <property name="column_spacing">4</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkLabel" id="ImporterAskLabel">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="wrap">True</property>
- <property name="xalign">0</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="row_spacing">2</property>
+ <property name="column_spacing">4</property>
+ <child>
+ <object class="GtkLabel" id="ImporterAskLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">
+What should I do with this ?</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="AskModeBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
</child>
- <child>
+ <child type="label">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">What should I do with this ?</property>
- <property name="xalign">0</property>
+ <property name="label" translatable="yes"> A duplicate is detected </property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
</child>
</object>
<packing>
@@ -99,31 +147,6 @@
<property name="top_attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkSeparator">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="AskKeepChoiceButton">
- <property name="label" translatable="yes">Re_member my choice in future import
operations</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/src/core/fma-ioptions-list.c b/src/core/fma-ioptions-list.c
index 197461a..340f620 100644
--- a/src/core/fma-ioptions-list.c
+++ b/src/core/fma-ioptions-list.c
@@ -280,7 +280,7 @@ options_list_free_ask_option( const FMAIOptionsList *instance, GtkWidget *contai
* pseudo properties are set:
* - against the instance: whether it has been initialized
* - against the parent container: editable, sensitive, default and current options
- * - against each option container when drawing inside of a VBox: the corresponding option
+ * - against each option container when drawing inside of a Box: the corresponding option
*/
/* whether the container has been initialized
*
@@ -489,16 +489,16 @@ fma_ioptions_list_gtk_init( const FMAIOptionsList *instance, GtkWidget *containe
{
static const gchar *thisfn = "fma_ioptions_list_gtk_init";
- g_return_if_fail( FMA_IS_IOPTIONS_LIST( instance ));
-
- check_for_initializations( instance, container_parent );
-
g_debug( "%s: instance=%p (%s), container_parent=%p (%s), with_ask=%s",
thisfn,
( void * ) instance, G_OBJECT_TYPE_NAME( instance ),
( void * ) container_parent, G_OBJECT_TYPE_NAME( container_parent ),
with_ask ? "True":"False" );
+ g_return_if_fail( FMA_IS_IOPTIONS_LIST( instance ));
+
+ check_for_initializations( instance, container_parent );
+
if( GTK_IS_BOX( container_parent )){
radio_button_create_group( instance, container_parent, with_ask );
diff --git a/src/ui/fma-add-capability.ui b/src/ui/fma-add-capability.ui
index e1a5993..8d648fb 100644
--- a/src/ui/fma-add-capability.ui
+++ b/src/ui/fma-add-capability.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.4"/>
<object class="GtkDialog" id="AddCapabilityDialog">
@@ -63,44 +63,36 @@
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">8</property>
- <property name="right_padding">4</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>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkTreeView" id="CapabilitiesTreeView">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="CapabilitiesTreeView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="enable_search">False</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection"/>
- </child>
- </object>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="enable_search">False</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
</child>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/src/ui/fma-add-scheme.ui b/src/ui/fma-add-scheme.ui
index 93be69f..577e2ba 100644
--- a/src/ui/fma-add-scheme.ui
+++ b/src/ui/fma-add-scheme.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.4"/>
<object class="GtkDialog" id="AddSchemeDialog">
@@ -63,101 +63,85 @@
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
- <object class="GtkAlignment" id="alignment1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">4</property>
- <property name="bottom_padding">4</property>
- <property name="left_padding">8</property>
- <property name="right_padding">4</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="row_spacing">2</property>
+ <property name="column_spacing">2</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="SchemesTreeView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="enable_search">False</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">3</property>
+ <property name="row_spacing">2</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkButton" id="AddSchemeButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="receives_default">True</property>
<child>
- <object class="GtkTreeView" id="SchemesTreeView">
+ <object class="GtkImage" id="image1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="enable_search">False</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection"/>
- </child>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-add</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkGrid" id="grid2">
+ <object class="GtkButton" id="RemoveSchemeButton">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkButton" id="AddSchemeButton">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<child>
- <object class="GtkButton" id="RemoveSchemeButton">
+ <object class="GtkImage" id="image2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <child>
- <object class="GtkImage" id="image2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-remove</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-remove</property>
</object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
</child>
diff --git a/src/ui/fma-assistant-export.c b/src/ui/fma-assistant-export.c
index b8cda5a..3457a57 100644
--- a/src/ui/fma-assistant-export.c
+++ b/src/ui/fma-assistant-export.c
@@ -816,7 +816,7 @@ assist_prepare_exportdone( FMAAssistantExport *window, GtkAssistant *assistant,
errors = 0;
width = 15;
- vbox = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p5-SummaryVBox" );
+ vbox = fma_gtk_utils_find_widget_by_name( GTK_CONTAINER( page ), "p5-SummaryParent" );
g_return_if_fail( GTK_IS_BOX( vbox ));
/* for each item:
diff --git a/src/ui/fma-assistant-export.ui b/src/ui/fma-assistant-export.ui
index 1a52a2d..58e4a6c 100644
--- a/src/ui/fma-assistant-export.ui
+++ b/src/ui/fma-assistant-export.ui
@@ -8,7 +8,7 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child>
- <object class="GtkLabel" id="p0-l1-label1">
+ <object class="GtkLabel" id="p0">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">This assistant will guide you through the process of
exporting actions.</property>
@@ -19,7 +19,7 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p1-l1-vbox1">
+ <object class="GtkGrid" id="p1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -30,6 +30,9 @@
<object class="GtkGrid" id="grid2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_right">2</property>
+ <property name="row_spacing">2</property>
+ <property name="column_spacing">4</property>
<child>
<object class="GtkLabel" id="ActionsListLabel">
<property name="visible">True</property>
@@ -67,6 +70,7 @@
<object class="GtkLabel" id="p1-l5-label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">2</property>
<property name="label" translatable="yes">Please select one or more actions to be exported.
You may use Ctrl and Shift keys to extend the selection.</property>
@@ -78,6 +82,10 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -85,7 +93,7 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p2-l1-vbox1">
+ <object class="GtkGrid" id="p2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -97,6 +105,10 @@ You may use Ctrl and Shift keys to extend the selection.</property>
<property name="preview_widget_active">False</property>
<property name="use_preview_label">False</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -104,13 +116,15 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p3-l1-vbox1">
+ <object class="GtkGrid" id="p3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<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="GtkLabel" id="p3-l4-label1">
<property name="visible">True</property>
@@ -153,6 +167,10 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -160,142 +178,96 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p4-l1-vbox1">
+ <object class="GtkGrid" id="p4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkScrolledWindow" id="p4-l3-scrolledwindow1">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkViewport" id="p4-l4-viewport1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkGrid" id="grid3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkGrid" id="grid4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="p4-l7-label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">About to export selected
items:</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="p4-ConfirmItemsList">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">15</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="p4-l6-label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Into the destination folder:</property>
- <property name="wrap">True</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="p4-ConfirmTargetFolder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">15</property>
- <property name="wrap">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="p4-ConfirmExportFormat">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="wrap">True</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="p4-ConfirmExportTooltip">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xpad">15</property>
- <property name="wrap">True</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">About to export selected items:</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p4-ConfirmItemsList">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">8</property>
+ <property name="label" translatable="yes">Into the destination folder:</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p4-ConfirmTargetFolder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="wrap">True</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p4-ConfirmExportFormat">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">8</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p4-ConfirmExportTooltip">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ </packing>
</child>
</object>
<packing>
@@ -304,44 +276,53 @@ You may use Ctrl and Shift keys to extend the selection.</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p5-l1-vbox1">
+ <object class="GtkGrid" id="p5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkScrolledWindow" id="p5-l3-scrolledwindow1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkViewport" id="p5-l4-viewport1">
+ <object class="GtkViewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkBox" id="p5-SummaryVBox">
+ <object class="GtkBox" id="p5-SummaryParent">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="p5-l6-label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Selected items have been
proceeded:</property>
- <property name="xalign">0</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
+ <placeholder/>
</child>
</object>
</child>
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selected items have been proceeded:</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/src/ui/fma-assistant-import.c b/src/ui/fma-assistant-import.c
index 44913d4..0663b2c 100644
--- a/src/ui/fma-assistant-import.c
+++ b/src/ui/fma-assistant-import.c
@@ -625,7 +625,7 @@ prepare_confirm( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidget
mode_label = fma_ioption_get_label( window->private->mode );
label2 = fma_core_utils_str_remove_char( mode_label, "_" );
mode_description = fma_ioption_get_description( window->private->mode );
- text = g_markup_printf_escaped( "%s\n\n<span style=\"italic\">%s</span>", label2, mode_description );
+ text = g_markup_printf_escaped( "%s\n<span style=\"italic\">%s</span>", label2, mode_description );
gtk_label_set_markup( GTK_LABEL( label ), text );
g_free( text );
g_free( mode_description );
@@ -761,7 +761,7 @@ prepare_importdone( FMAAssistantImport *window, GtkAssistant *assistant, GtkWidg
thisfn, ( void * ) window, ( void * ) assistant, ( void * ) page );
width = 15;
- vbox = find_widget_from_page( page, "p4-SummaryVBox" );
+ vbox = find_widget_from_page( page, "p4-SummaryParent" );
g_return_if_fail( GTK_IS_BOX( vbox ));
#if !GTK_CHECK_VERSION( 3,0,0 )
diff --git a/src/ui/fma-assistant-import.ui b/src/ui/fma-assistant-import.ui
index 35d3bdf..d0769f9 100644
--- a/src/ui/fma-assistant-import.ui
+++ b/src/ui/fma-assistant-import.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.20.0 -->
<interface>
<requires lib="gtk+" version="3.4"/>
<object class="GtkAssistant" id="ImportAssistant">
@@ -8,7 +8,7 @@
<property name="modal">True</property>
<property name="type_hint">dialog</property>
<child>
- <object class="GtkLabel" id="p0-l1-label1">
+ <object class="GtkLabel" id="p0">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">This assistant will guide you through the process of
importing items, actions or menus.</property>
@@ -19,7 +19,7 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p1-l1-vbox1">
+ <object class="GtkGrid" id="p1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -31,6 +31,10 @@
<property name="select_multiple">True</property>
<property name="use_preview_label">False</property>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
</child>
</object>
<packing>
@@ -38,54 +42,50 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p2-l1-vbox1">
+ <object class="GtkGrid" id="p2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="row_spacing">2</property>
<child>
- <object class="GtkGrid" id="grid1">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkLabel" id="p2-l4-label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">What should I do when importing an item whose ID
already exists ?</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkTreeView" id="p2-AskTreeView">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="headers_visible">False</property>
- <property name="rules_hint">True</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection"/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
+ <property name="label" translatable="yes">What should I do when importing an item whose ID
already exists ?</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTreeView" id="p2-AskTreeView">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="headers_visible">False</property>
+ <property name="rules_hint">True</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"/>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
<packing>
@@ -93,115 +93,66 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p3-l1-vbox1">
+ <object class="GtkGrid" id="p3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkScrolledWindow" id="p3-l3-scrolledwindow1">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <child>
- <object class="GtkViewport" id="p3-l4-viewport1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkBox" id="p3-ConfirmVBox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkGrid" id="grid2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="p3-l7-label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">About to import selected
files:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="p3-ConfirmFilesList">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">15</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkGrid" id="grid3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="p3-l7-label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">When importing an item whose ID
already exists:</property>
- <property name="wrap">True</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="p3-ConfirmImportMode">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">15</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">About to import selected files:</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p3-ConfirmFilesList">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="ellipsize">start</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">8</property>
+ <property name="label" translatable="yes">When importing an item whose ID already
exists:</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="p3-ConfirmImportMode">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="wrap">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
</child>
</object>
<packing>
@@ -210,9 +161,26 @@
</packing>
</child>
<child>
- <object class="GtkAlignment" id="p4-l1-vbox1">
+ <object class="GtkGrid" id="p4">
<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="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Selected files have been proceeded:</property>
+ <property name="xalign">0</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
<child>
<object class="GtkScrolledWindow" id="p4-l3-scrolledwindow1">
<property name="visible">True</property>
@@ -223,31 +191,25 @@
<property name="can_focus">False</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkBox" id="p4-SummaryVBox">
+ <object class="GtkBox" id="p4-SummaryParent">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="margin_left">100</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="p4-l6-label1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Selected files have been
proceeded:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
+ <placeholder/>
</child>
</object>
</child>
</object>
</child>
</object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -259,6 +221,8 @@
<object class="GtkBox" id="assistant-action_area1">
<property name="can_focus">False</property>
</object>
+ <packing>
+ </packing>
</child>
</object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
