[nautilus-actions/file-manager-actions] Nautilus-Actions: restore a first toolbar



commit db6cf9937a980075f1bb1f8204fe177e6e1e4c18
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jun 4 23:25:47 2015 +0200

    Nautilus-Actions: restore a first toolbar
    
    + get rid of GtkAlignment in MainWindow (deprecated since 3.14)

 INSTALL                                            |    4 +-
 m4/na-log-domains.m4                               |   32 +-
 na_required_versions                               |   26 +
 src/nact/Makefile.am                               |    6 +-
 src/nact/base-gtk-utils.c                          |   15 +
 src/nact/base-gtk-utils.h                          |    2 +
 src/nact/base-window.c                             |    1 -
 src/nact/gtk-index.png                             |  Bin 0 -> 753 bytes
 src/nact/nact-iaction-tab.c                        |    2 +-
 src/nact/nact-main-toolbar.c                       |  221 --
 src/nact/nact-main-window.c                        |   26 +-
 src/nact/nact-main-window.h                        |    2 +
 src/nact/nact-main-window.ui                       | 3802 +++++++++-----------
 src/nact/nact-menu-file.c                          |    4 +-
 src/nact/nact-menu-file.h                          |    2 +-
 src/nact/nact-menu-view.c                          |  268 ++
 src/nact/{nact-main-toolbar.h => nact-menu-view.h} |   27 +-
 src/nact/nact-menu.c                               |  176 +-
 src/nact/nact-menu.h                               |   13 +
 src/nact/nact-toolbar.ui                           |   74 +
 src/nact/nact-tree-view.c                          |    5 +-
 src/nact/nautilus-actions-config-tool.actions      |    8 +-
 22 files changed, 2297 insertions(+), 2419 deletions(-)
---
diff --git a/INSTALL b/INSTALL
index 007e939..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/m4/na-log-domains.m4 b/m4/na-log-domains.m4
index 1ae35c2..90d8df0 100644
--- a/m4/na-log-domains.m4
+++ b/m4/na-log-domains.m4
@@ -32,30 +32,30 @@ dnl when not in development mode
 # serial 2 define NA-runtime log domain
 
 AC_DEFUN([NA_LOG_DOMAINS],[
-       AC_SUBST([NA_LOGDOMAIN_IO_DESKTOP],[NA-io-desktop])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_IO_DESKTOP],["NA-io-desktop"],[Log domain of desktop I/O Provider])
+       AC_SUBST([NA_LOGDOMAIN_IO_DESKTOP],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_IO_DESKTOP],["NA"],[Log domain of desktop I/O Provider])
 
-       AC_SUBST([NA_LOGDOMAIN_IO_GCONF],[NA-io-gconf])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_IO_GCONF],["NA-io-gconf"],[Log domain of GConf I/O Provider])
+       AC_SUBST([NA_LOGDOMAIN_IO_GCONF],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_IO_GCONF],["NA"],[Log domain of GConf I/O Provider])
 
-       AC_SUBST([NA_LOGDOMAIN_IO_XML],[NA-io-xml])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_IO_XML],["NA-io-xml"],[Log domain of XML I/O])
+       AC_SUBST([NA_LOGDOMAIN_IO_XML],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_IO_XML],["NA"],[Log domain of XML I/O])
 
        AC_SUBST([NA_LOGDOMAIN_CORE],[NA-core])
        AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_CORE],["NA-core"],[Log domain of core library])
 
-       AC_SUBST([NA_LOGDOMAIN_NACT],[NA-nact])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_NACT],["NA-nact"],[Log domain of NACT user interface])
+       AC_SUBST([NA_LOGDOMAIN_NACT],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_NACT],["NA"],[Log domain of NACT user interface])
 
-       AC_SUBST([NA_LOGDOMAIN_PLUGIN_MENU],[NA-plugin-menu])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PLUGIN_MENU],["NA-plugin-menu"],[Log domain of Nautilus Menu plugin])
+       AC_SUBST([NA_LOGDOMAIN_PLUGIN_MENU],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PLUGIN_MENU],["NA"],[Log domain of Nautilus Menu plugin])
 
-       AC_SUBST([NA_LOGDOMAIN_PLUGIN_TRACKER],[NA-plugin-tracker])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PLUGIN_TRACKER],["NA-plugin-tracker"],[Log domain of Nautilus 
Tracker plugin])
+       AC_SUBST([NA_LOGDOMAIN_PLUGIN_TRACKER],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_PLUGIN_TRACKER],["NA"],[Log domain of Nautilus Tracker plugin])
 
-       AC_SUBST([NA_LOGDOMAIN_TEST],[NA-test])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_TEST],["NA-test"],[Log domain of test programs])
+       AC_SUBST([NA_LOGDOMAIN_TEST],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_TEST],["NA"],[Log domain of test programs])
 
-       AC_SUBST([NA_LOGDOMAIN_UTILS],[NA-utils])
-       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_UTILS],["NA-utils"],[Log domain of utilities])
+       AC_SUBST([NA_LOGDOMAIN_UTILS],[NA])
+       AC_DEFINE_UNQUOTED([NA_LOGDOMAIN_UTILS],["NA"],[Log domain of utilities])
 ])
diff --git a/na_required_versions b/na_required_versions
new file mode 100644
index 0000000..0ce4922
--- /dev/null
+++ b/na_required_versions
@@ -0,0 +1,26 @@
+# This file is to be sourced as shell definitions from:
+# - maintainer/run-autogen.sh
+# - configure.ac
+#
+# Build tools
+intltool_required=0.50.2
+REQUIRED_INTLTOOL_VERSION=${intltool_required}
+
+# Libraries
+# Supported distribution as of Feb. 2015:
+# distribution                       release date  end of life  GLib     Gtk+
+# ---------------------------------  ------------  -----------  -------  ------
+# Debian 7.0 Wheezy                  2013-05-04    2016         2.33.12  3.4.2
+# Debian 8.0 Jessie                  2015-04-25    2018         2.42.1   3.14.5
+# Fedora 20 Heisenbug                2013-12-17    2015         2.38.2   3.10.9
+# Fedora 21                          2014-12-09    2016         2.42.1   3.14.9
+# Ubuntu 12.04 LTS Precise Pangolin  2012-04-26    2017-04-xx   2.32.1   3.4.2
+# Ubuntu 14.04 LTS Trusty Thar       2014-04-17    2019-04-xx   2.40.0   3.10.8
+
+glib_required=2.32.1
+gtop_required=2.23.1
+gtk_required=3.4.2
+xml_required=2.6
+
+# File-managers
+nautilus_required=3.4.1
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 639d53d..d9febbb 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -109,8 +109,6 @@ nautilus_actions_config_tool_SOURCES = \
        nact-ischemes-tab.h                                                                     \
        nact-main-tab.c                                                                         \
        nact-main-tab.h                                                                         \
-       nact-main-toolbar.c                                                                     \
-       nact-main-toolbar.h                                                                     \
        nact-main-window.c                                                                      \
        nact-main-window.h                                                                      \
        nact-main-window-def.h                                                          \
@@ -122,6 +120,8 @@ nautilus_actions_config_tool_SOURCES = \
        nact-menu-edit.h                                                                        \
        nact-menu-file.c                                                                        \
        nact-menu-file.h                                                                        \
+       nact-menu-view.c                                                                        \
+       nact-menu-view.h                                                                        \
        nact-preferences-editor.c                                                       \
        nact-preferences-editor.h                                                       \
        nact-providers-list.c                                                           \
@@ -164,11 +164,13 @@ ui_files = \
        nact-legend.ui                                                                          \
        nact-main-window.ui                                                                     \
        nact-preferences.ui                                                                     \
+       nact-toolbar.ui                                                                         \
        $(NULL)
 
 images_files = \
        locked.png                                                                                      \
        transparent.png                                                                         \
+       gtk-index.png                                                                           \
        $(NULL)
 
 ui_data_DATA = \
diff --git a/src/nact/base-gtk-utils.c b/src/nact/base-gtk-utils.c
index e7eaaa6..2536335 100644
--- a/src/nact/base-gtk-utils.c
+++ b/src/nact/base-gtk-utils.c
@@ -224,6 +224,21 @@ base_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button )
 }
 
 /**
+ * base_gtk_utils_widget_set_color:
+ * @widget:
+ * @color:
+ *
+ * Set a color to the widget.
+ *
+ * gtk_widget_override_color has been deprecated since version 3.16.
+ */
+void
+base_gtk_utils_widget_set_color( GtkWidget *widget, GdkRGBA *color )
+{
+       g_message( "base_gtk_utils_widget_set_color: to be written" );
+}
+
+/**
  * base_gtk_utils_get_pixbuf:
  * @name: either the name of a themed icon, or a filename.
  * @widget: the widget on which the image should be rendered.
diff --git a/src/nact/base-gtk-utils.h b/src/nact/base-gtk-utils.h
index fdbc9a4..28fddbd 100644
--- a/src/nact/base-gtk-utils.h
+++ b/src/nact/base-gtk-utils.h
@@ -62,6 +62,8 @@ void       base_gtk_utils_toggle_set_initial_state ( BaseWindow *window,
 
 void       base_gtk_utils_toggle_reset_initial_state( GtkToggleButton *button );
 
+void       base_gtk_utils_widget_set_color( GtkWidget *widget, GdkRGBA *color );
+
 /* image utilities
  */
 GdkPixbuf *base_gtk_utils_get_pixbuf( const gchar *name, GtkWidget *widget, GtkIconSize size );
diff --git a/src/nact/base-window.c b/src/nact/base-window.c
index 4d0b56b..b048c77 100644
--- a/src/nact/base-window.c
+++ b/src/nact/base-window.c
@@ -40,7 +40,6 @@
 #include "base-builder.h"
 #include "base-window.h"
 #include "base-gtk-utils.h"
-#include "base-marshal.h"
 #include "nact-application.h"
 
 /* private class data
diff --git a/src/nact/gtk-index.png b/src/nact/gtk-index.png
new file mode 100644
index 0000000..0967a61
Binary files /dev/null and b/src/nact/gtk-index.png differ
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index 1360b55..4547786 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -611,7 +611,7 @@ set_label_label( NactIActionTab *instance, const gchar *color_str )
        label = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( instance ), "ActionMenuLabelLabel" );
 
        gdk_rgba_parse( &color, color_str );
-       gtk_widget_override_color( label, GTK_STATE_FLAG_ACTIVE, &color );
+       base_gtk_utils_widget_set_color( label, &color );
 }
 
 static void
diff --git a/src/nact/nact-main-window.c b/src/nact/nact-main-window.c
index e232874..8dd162a 100644
--- a/src/nact/nact-main-window.c
+++ b/src/nact/nact-main-window.c
@@ -688,6 +688,7 @@ nact_main_window_new( NactApplication *application )
 
        setup_monitor_pivot( window );
        load_or_reload_items( window );
+       gtk_widget_show_all( GTK_WIDGET( window ));
 
        return( window );
 }
@@ -716,7 +717,12 @@ setup_main_ui( NactMainWindow *main_window )
        top_widget = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_window ), "top" );
        g_return_if_fail( top_widget && GTK_IS_CONTAINER( top_widget ));
 
-       gtk_widget_reparent( top_widget, GTK_WIDGET( main_window ));
+       /* reparent */
+       g_object_ref( top_widget );
+       gtk_container_remove( GTK_CONTAINER( top_window ), top_widget );
+       gtk_container_add( GTK_CONTAINER( main_window ), top_widget );
+       g_object_unref( top_widget );
+
        gtk_widget_destroy( GTK_WIDGET( top_window ));
        g_object_unref( builder );
 
@@ -741,7 +747,7 @@ setup_main_ui( NactMainWindow *main_window )
         */
        bar = nact_statusbar_new();
        alignment = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( top_widget ), "main-statusbar" );
-       g_return_if_fail( alignment && GTK_IS_ALIGNMENT( alignment ));
+       g_return_if_fail( alignment && GTK_IS_CONTAINER( alignment ));
        gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( bar ));
        main_window->private->statusbar = bar;
 }
@@ -1204,6 +1210,20 @@ load_or_reload_items( NactMainWindow *window )
 }
 
 /**
+ * nact_main_window_dispose_has_run:
+ * @window: the #NactMainWindow main window.
+ *
+ * Returns: %TRUE if the main window is terminating.
+ */
+gboolean
+nact_main_window_dispose_has_run( const NactMainWindow *window )
+{
+       g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), TRUE );
+
+       return( window->private->dispose_has_run );
+}
+
+/**
  * nact_main_window_quit:
  * @window: the #NactMainWindow main window.
  *
@@ -1218,7 +1238,7 @@ nact_main_window_quit( NactMainWindow *window )
        static const gchar *thisfn = "nact_main_window_quit";
        gboolean terminated;
 
-       g_return_val_if_fail( NACT_IS_MAIN_WINDOW( window ), FALSE );
+       g_return_val_if_fail( window && NACT_IS_MAIN_WINDOW( window ), FALSE );
 
        terminated = FALSE;
 
diff --git a/src/nact/nact-main-window.h b/src/nact/nact-main-window.h
index f68ab6f..0ed8314 100644
--- a/src/nact/nact-main-window.h
+++ b/src/nact/nact-main-window.h
@@ -85,6 +85,8 @@ void             nact_main_window_reload          ( NactMainWindow *window );
 
 void             nact_main_window_block_reload    ( NactMainWindow *window );
 
+gboolean         nact_main_window_dispose_has_run ( const NactMainWindow *window );
+
 gboolean         nact_main_window_quit            ( NactMainWindow *window );
 
 G_END_DECLS
diff --git a/src/nact/nact-main-window.ui b/src/nact/nact-main-window.ui
index 1d4e033..7c7f1f9 100644
--- a/src/nact/nact-main-window.ui
+++ b/src/nact/nact-main-window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.18.3 -->
 <interface>
   <requires lib="gtk+" version="3.4"/>
   <object class="GtkWindow" id="MainWindow">
@@ -17,114 +17,122 @@
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_left">4</property>
+                <property name="margin_right">2</property>
+                <property name="row_spacing">3</property>
                 <child>
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="column_spacing">4</property>
                     <child>
                       <object class="GtkLabel" id="ActionsListLabel">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="xalign">0</property>
-                        <property name="xpad">4</property>
-                        <property name="ypad">4</property>
+                        <property name="hexpand">True</property>
                         <property name="label" translatable="yes">Items _list :</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</property>
                       </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="GtkToggleButton" id="SortUpButton">
+                      <object class="GtkGrid" id="grid6">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort the list in ascending 
alphabetical order.</property>
+                        <property name="can_focus">False</property>
+                        <property name="halign">end</property>
+                        <property name="column_spacing">2</property>
                         <child>
-                          <object class="GtkImage" id="image1">
+                          <object class="GtkToggleButton" id="SortUpButton">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="stock">gtk-go-up</property>
-                            <property name="icon_size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Sort the list in ascending 
alphabetical order.</property>
+                            <child>
+                              <object class="GtkImage" id="image1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">go-up</property>
+                                <property name="icon_size">1</property>
+                              </object>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">0</property>
+                            <property name="top_attach">0</property>
+                          </packing>
                         </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>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToggleButton" id="SortManualButton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Do not sort the list, letting you 
manually reorder the items.</property>
                         <child>
-                          <object class="GtkImage" id="image2">
+                          <object class="GtkToggleButton" id="SortManualButton">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="stock">gtk-index</property>
-                            <property name="icon_size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Do not sort the list, letting 
you manually reorder the items.</property>
+                            <child>
+                              <object class="GtkImage" id="image2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="pixbuf">gtk-index.png</property>
+                                <property name="icon_size">1</property>
+                              </object>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                          </packing>
                         </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkToggleButton" id="SortDownButton">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="tooltip_text" translatable="yes">Sort the list in descending 
alphabetical order.</property>
                         <child>
-                          <object class="GtkImage" id="image3">
+                          <object class="GtkToggleButton" id="SortDownButton">
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="stock">gtk-go-down</property>
-                            <property name="icon_size">1</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="tooltip_text" translatable="yes">Sort the list in descending 
alphabetical order.</property>
+                            <child>
+                              <object class="GtkImage" id="image3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="icon_name">go-down</property>
+                                <property name="icon_size">1</property>
+                              </object>
+                            </child>
                           </object>
+                          <packing>
+                            <property name="left_attach">2</property>
+                            <property name="top_attach">0</property>
+                          </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="left_attach">3</property>
+                        <property name="left_attach">1</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>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="ActionsList">
+                  <object class="GtkFrame" id="ActionsList">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
                     <child>
                       <placeholder/>
                     </child>
+                    <child type="label_item">
+                      <placeholder/>
+                    </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>
                 </child>
               </object>
@@ -137,424 +145,276 @@
               <object class="GtkNotebook" id="main-notebook">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="margin_left">2</property>
                 <property name="scrollable">True</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment100">
+                  <object class="GtkGrid" id="grid100">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="yscale">0</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
-                      <object class="GtkGrid" id="grid110">
+                      <object class="GtkFrame" id="frame110">
                         <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="GtkFrame" id="frame110">
+                          <object class="GtkGrid" id="grid110">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment110">
+                              <object class="GtkCheckButton" id="ActionTargetSelectionButton">
+                                <property name="label" translatable="yes">Display item in _selection context 
menu</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When checked, the item will 
be candidate to be displayed in the file manager context menu, with a non-empty selection.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="ActionTargetLocationButton">
+                                <property name="label" translatable="yes">Display item in _location context 
menu</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When checked, the item will 
be candidate to be displayed in the file manager context menu when the selection is empty.
+In this case, the defined conditions will be applied to the current displayed folder.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ActionMenuLabelLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
+                                <property name="label" translatable="yes">_Context label :</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">ActionMenuLabelEntry</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="ActionMenuLabelEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The label of the item in 
the file manager context menus.</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="ActionTargetToolbarButton">
+                                <property name="label" translatable="yes">Display item in the 
_toolbar</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When checked, the item will 
be candidate to be displayed in the file manager toolbar.
+In this case, the defined conditions will be applied to the current folder, and do not depend of the 
possible current selection.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="ToolbarSameLabelButton">
+                                <property name="label" translatable="yes">Use s_ame label for icon in the 
toolbar</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When checked, the label 
displayed in the toolbar will be the same that the one displayed in the context menus.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">4</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ActionToolbarLabelLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">T_oolbar label :</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">ActionToolbarLabelEntry</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="ActionToolbarLabelEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The label displayed in the 
file manager toolbar.</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">5</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ActionTooltipLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Toolti_p :</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">ActionTooltipEntry</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="ActionTooltipEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The tooltip displayed in 
the file manager user interface.</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">6</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ActionIconLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Icon :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">7</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkGrid" id="grid7">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">4</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox115">
+                                  <object class="GtkAspectFrame" id="ActionIconFrame">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="spacing">10</property>
-                                    <child>
-                                      <object class="GtkTable" id="table115">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="n_rows">3</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <object class="GtkCheckButton" id="ActionTargetSelectionButton">
-                                            <property name="label" translatable="yes">Display item in 
_selection context menu</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="tooltip_text" translatable="yes">When checked, 
the item will be candidate to be displayed in the file manager context menu, with a non-empty 
selection.</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="ActionMenuLabelEntry">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">The label of 
the item in the file manager context menus.</property>
-                                            <property name="invisible_char">●</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="ActionMenuLabelLabel">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Context label 
:</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">ActionMenuLabelEntry</property>
-                                          </object>
-                                          <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkCheckButton" id="ActionTargetLocationButton">
-                                            <property name="label" translatable="yes">Display item in 
_location context menu</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="tooltip_text" translatable="yes">When checked, 
the item will be candidate to be displayed in the file manager context menu when the selection is empty.
-In this case, the defined conditions will be applied to the current displayed folder.</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                          </packing>
-                                        </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>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTable" id="table116">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="n_rows">3</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="column_spacing">6</property>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <object class="GtkCheckButton" id="ActionTargetToolbarButton">
-                                            <property name="label" translatable="yes">Display item in the 
_toolbar</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="tooltip_text" translatable="yes">When checked, 
the item will be candidate to be displayed in the file manager toolbar.
-In this case, the defined conditions will be applied to the current folder, and do not depend of the 
possible current selection.</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkCheckButton" id="ToolbarSameLabelButton">
-                                            <property name="label" translatable="yes">Use s_ame label for 
icon in the toolbar</property>
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="tooltip_text" translatable="yes">When checked, 
the label displayed in the toolbar will be the same that the one displayed in the context menus.</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="xalign">0</property>
-                                            <property name="draw_indicator">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="ActionToolbarLabelEntry">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">The label 
displayed in the file manager toolbar.</property>
-                                            <property name="invisible_char">●</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="ActionToolbarLabelLabel">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">T_oolbar label 
:</property>
-                                            <property name="use_underline">True</property>
-                                            <property 
name="mnemonic_widget">ActionToolbarLabelEntry</property>
-                                          </object>
-                                          <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
-                                        </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>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
+                                    <property name="label_xalign">0</property>
+                                    <property name="shadow_type">in</property>
+                                    <property name="obey_child">False</property>
                                     <child>
-                                      <object class="GtkTable" id="table117">
+                                      <object class="GtkImage" id="ActionIconImage">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="n_rows">2</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="column_spacing">6</property>
-                                        <property name="row_spacing">3</property>
-                                        <child>
-                                          <object class="GtkLabel" id="ActionTooltipLabel">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Toolti_p :</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">ActionTooltipEntry</property>
-                                          </object>
-                                          <packing>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel" id="ActionIconLabel">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Icon :</property>
-                                            <property name="use_underline">True</property>
-                                          </object>
-                                          <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                            <property name="x_options">GTK_FILL</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkEntry" id="ActionTooltipEntry">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">The tooltip 
displayed in the file manager user interface.</property>
-                                            <property name="invisible_char">●</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkHBox" id="hbox118">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="tooltip_text" translatable="yes">The icon 
displayed in the file manager user interface.</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkAspectFrame" id="ActionIconFrame">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="label_xalign">0</property>
-                                                <property name="shadow_type">in</property>
-                                                <property name="obey_child">False</property>
-                                                <child>
-                                                  <object class="GtkImage" id="ActionIconImage">
-                                                    <property name="visible">True</property>
-                                                    <property name="can_focus">False</property>
-                                                    <property name="xpad">2</property>
-                                                    <property name="ypad">2</property>
-                                                    <property name="stock">gtk-stock-blank</property>
-                                                    <property name="icon_size">2</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkEntry" id="ActionIconEntry">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="tooltip_text" translatable="yes">The name of 
a themed icon or the filename of an image.</property>
-                                                <property name="invisible_char">●</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">True</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkButton" id="ActionIconBrowseButton">
-                                                <property name="label" 
translatable="yes">_Browse...</property>
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">True</property>
-                                                <property name="use_underline">True</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="fill">True</property>
-                                                <property name="position">2</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
-                                          </packing>
-                                        </child>
+                                        <property name="pixbuf">transparent.png</property>
+                                        <property name="icon_size">2</property>
                                       </object>
-                                      <packing>
-                                        <property name="expand">True</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">3</property>
-                                      </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="ActionIconBrowseButton">
+                                    <property name="label" translatable="yes">_Browse...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">2</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkEntry" id="ActionIconEntry">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">The name of a themed 
icon or the filename of an image.</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="invisible_char">●</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">7</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label52">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Nautilus 
Item&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </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 type="label">
+                          <object class="GtkLabel" id="label110">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Nautilus item 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                 </child>
@@ -571,313 +431,261 @@ In this case, the defined conditions will be applied to the current folder, and
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment200">
+                  <object class="GtkGrid" id="grid200">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="yscale">0</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
-                      <object class="GtkGrid" id="grid200">
+                      <object class="GtkFrame" id="frame210">
                         <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="GtkFrame" id="frame210">
+                          <object class="GtkGrid" id="grid210">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">2</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment210">
+                              <object class="GtkLabel" id="ProfileLabelLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="grid210">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="ProfileLabelLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">_Label :</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">ProfileLabelEntry</property>
-                                      </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="GtkEntry" id="ProfileLabelEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="label" translatable="yes">_Label :</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">ProfileLabelEntry</property>
+                                <property name="xalign">1</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label210">
+                            <child>
+                              <object class="GtkEntry" id="ProfileLabelEntry">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" 
translatable="yes">&lt;b&gt;Profile&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </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 type="label">
+                          <object class="GtkLabel" id="label210">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Profile &lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame220">
+                        <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="GtkFrame" id="frame220">
+                          <object class="GtkGrid" id="grid220">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment220">
+                              <object class="GtkLabel" id="CommandPathLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
+                                <property name="label" translatable="yes">_Path :</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">CommandPathEntry</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="CommandParametersLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">P_arameters :</property>
+                                <property name="use_underline">True</property>
+                                <property name="mnemonic_widget">CommandParametersEntry</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="CommandWDLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Working directory :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="CommandPathEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The path of the command.
+If this is not an absolute path, then the PATH environment variable at execution time will be 
considered.</property>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="CommandParametersEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The parameters of the 
command.</property>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="CommandPathButton">
+                                <property name="label" translatable="yes">_Browse...</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkToggleButton" id="CommandLegendButton">
+                                <property name="label" translatable="yes">Le_gend</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="CommandWorkingDirectoryButton">
+                                <property name="label" translatable="yes">B_rowse...</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="WorkingDirectoryEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">The default working 
directory the command should be started in.</property>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkExpander" id="expander22">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="expanded">True</property>
                                 <child>
-                                  <object class="GtkGrid" id="grid220">
+                                  <object class="GtkFrame" id="frame1">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="CommandPathLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">_Path :</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">CommandPathEntry</property>
-                                      </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="CommandParametersLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">P_arameters :</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="mnemonic_widget">CommandParametersEntry</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>
-                                      <object class="GtkLabel" id="CommandWDLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">_Working directory 
:</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="CommandPathEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">The path of the 
command.
-If this is not an absolute path, then the PATH environment variable at execution time will be 
considered.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="CommandParametersEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">The parameters of 
the command.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="CommandPathButton">
-                                        <property name="label" translatable="yes">_Browse...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkToggleButton" id="CommandLegendButton">
-                                        <property name="label" translatable="yes">Le_gend</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="CommandWorkingDirectoryButton">
-                                        <property name="label" translatable="yes">B_rowse...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="WorkingDirectoryEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">The default working 
directory the command should be started in.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkExpander" id="expander22">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="expanded">True</property>
-                                        <child>
-                                          <object class="GtkAlignment" id="alignment22">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="yalign">0</property>
-                                            <property name="yscale">0</property>
-                                            <child>
-                                              <object class="GtkLabel" id="CommandExampleLabel">
-                                                <property name="visible">True</property>
-                                                <property name="can_focus">False</property>
-                                                <property name="xalign">0</property>
-                                                <property name="use_markup">True</property>
-                                                <property name="wrap">True</property>
-                                              </object>
-                                            </child>
-                                          </object>
-                                        </child>
-                                        <child type="label">
-                                          <object class="GtkLabel" id="label1">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">False</property>
-                                            <property name="label" translatable="yes">Example</property>
-                                            <attributes>
-                                              <attribute name="style" value="italic"/>
-                                              <attribute name="scale" value="0.80000000000000004"/>
-                                            </attributes>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
+                                    <property name="label_xalign">0</property>
+                                    <property name="shadow_type">none</property>
                                     <child>
                                       <placeholder/>
                                     </child>
-                                    <child>
+                                    <child type="label_item">
                                       <placeholder/>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="CommandExampleLabel">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">Example</property>
+                                    <attributes>
+                                      <attribute name="style" value="italic"/>
+                                      <attribute name="scale" value="0.80000000000000004"/>
+                                    </attributes>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label220">
-                                <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" 
translatable="yes">&lt;b&gt;Command&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
-                              </object>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </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>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label220">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Command &lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -899,332 +707,274 @@ Defining several profiles lets you have several commands, each applying with a d
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment300">
+                  <object class="GtkGrid" id="grid300">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="yscale">0</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
-                      <object class="GtkGrid" id="grid300">
+                      <object class="GtkFrame" id="frame310">
                         <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="GtkFrame" id="frame310">
+                          <object class="GtkGrid" id="grid310">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment310">
+                              <object class="GtkLabel" id="ExecutionModeLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="grid310">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="ExecutionModeLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                      </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="GtkRadioButton" id="ExecutionModeNormal">
-                                        <property name="label" translatable="yes">_Normal</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">The command will be 
started as a standard graphical user interface.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="ExecutionModeTerminal">
-                                        <property name="label" translatable="yes">In a _terminal</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">The command will be 
started in the preferred terminal of the graphical environment.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">ExecutionModeNormal</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="ExecutionModeEmbedded">
-                                        <property name="label" translatable="yes">_Embedded</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">This option makes 
use of a special feature of the file manager, which would allow a terminal to be ran inside of it.
-An acceptable fallback is running in the standard terminal.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">ExecutionModeNormal</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkRadioButton" id="ExecutionModeDisplayOutput">
-                                        <property name="label" translatable="yes">_Display output</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">The command will be 
run in a terminal.
-The terminal will be closed at the end of the execution; standard error and output streams will be displayed.
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="ExecutionModeNormal">
+                                <property name="label" translatable="yes">_Normal</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">The command will be started 
as a standard graphical user interface.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="ExecutionModeTerminal">
+                                <property name="label" translatable="yes">In a _terminal</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">The command will be started 
in the preferred terminal of the graphical environment.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">ExecutionModeNormal</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="ExecutionModeEmbedded">
+                                <property name="label" translatable="yes">_Embedded</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">This option makes use of a 
special feature of the file manager, which would allow a terminal to be ran inside of it.
 An acceptable fallback is running in the standard terminal.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">ExecutionModeNormal</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">ExecutionModeNormal</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label310">
+                            <child>
+                              <object class="GtkRadioButton" id="ExecutionModeDisplayOutput">
+                                <property name="label" translatable="yes">_Display output</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Execution 
mode&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">The command will be run in 
a terminal.
+The terminal will be closed at the end of the execution; standard error and output streams will be displayed.
+An acceptable fallback is running in the standard terminal.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">ExecutionModeNormal</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </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 type="label">
+                          <object class="GtkLabel" id="label310">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Execution mode 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="StartupModeFrame">
+                        <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="GtkFrame" id="StartupModeFrame">
+                          <object class="GtkGrid" id="grid320">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Note: this is not yet 
implemented in Nautilus-Actions.
-</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment320">
+                              <object class="GtkCheckButton" id="StartupNotifyButton">
+                                <property name="label" translatable="yes">_Startup notify</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="grid320">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="StartupNotifyButton">
-                                        <property name="label" translatable="yes">_Startup notify</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">When checked, it is 
known that the run command will send a "remove" message to the desktop environment.
-See the Startup Notification Protocol Specification for more details.
-Only relevant when chosen execution mode is Normal.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="ExecutionStartupLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Startup Window Manager 
_class :</property>
-                                        <property name="use_underline">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>
-                                    <child>
-                                      <object class="GtkEntry" id="StartupWMClassEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">When specified, 
this should be the name of a WM class of at least one window of the run command.
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">When checked, it is known 
that the run command will send a "remove" message to the desktop environment.
 See the Startup Notification Protocol Specification for more details.
 Only relevant when chosen execution mode is Normal.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label320">
+                            <child>
+                              <object class="GtkLabel" id="ExecutionStartupLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Startup 
mode&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Startup Window Manager _class 
:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="StartupWMClassEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">When specified, this should 
be the name of a WM class of at least one window of the run command.
+See the Startup Notification Protocol Specification for more details.
+Only relevant when chosen execution mode is Normal.</property>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </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>
                         </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label320">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Startup mode 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="UserFrame">
+                        <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="GtkFrame" id="UserFrame">
+                          <object class="GtkGrid" id="grid330">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="tooltip_text" translatable="yes">Note: this is not yet 
implemented in Nautilus-Actions.</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment330">
+                              <object class="GtkLabel" id="ExecuteAsLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="grid330">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="ExecuteAsLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Execute as _user 
:</property>
-                                        <property name="use_underline">True</property>
-                                      </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="GtkEntry" id="ExecuteAsEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">Enter here the user 
the command should be ran as.
-The user may be defined by his numeric UID or his login name.
-Leave the field empty to run the command as the current user.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="label" translatable="yes">Execute as _user :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label330">
+                            <child>
+                              <object class="GtkEntry" id="ExecuteAsEntry">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Execute as 
user&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">Enter here the user the 
command should be ran as.
+The user may be defined by his numeric UID or his login name.
+Leave the field empty to run the command as the current user.</property>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label330">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Execute as user 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1245,12 +995,12 @@ Leave the field empty to run the command as the current user.</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment400">
+                  <object class="GtkGrid" id="grid400">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
                       <object class="GtkFrame" id="frame410">
                         <property name="visible">True</property>
@@ -1258,151 +1008,131 @@ Leave the field empty to run the command as the current user.</property>
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment410">
+                          <object class="GtkGrid" id="grid410">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="yalign">0</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">6</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
                             <child>
-                              <object class="GtkGrid" id="grid410">
+                              <object class="GtkLabel" id="label411">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">The current item will appear if 
the basename of each element of the selection matches one filter of the 'Must match one of' column, while not 
matching any of the filters of the 'Must not match any of' column.</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="GtkGrid" id="grid411">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">4</property>
                                 <child>
-                                  <object class="GtkLabel" id="label68">
+                                  <object class="GtkScrolledWindow" id="scrolledwindow412">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">The current item will appear 
if the basename of each element of the selection matches one filter of the 'Must match one of' column, while 
not matching any of the filters of the 'Must not match any of' column.</property>
-                                    <property name="wrap">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">This list lets you 
determine for which basenames the currently selected item will be displayed in the Nautilus context menu.
+Basenames may use '*' and '?' wildcards.
+Basenames may be negated to specify for which basenames your item must not appear.</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="shadow_type">in</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="BasenamesTreeview">
+                                        <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>
+                                    </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="grid412">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
+                                    <property name="row_spacing">3</property>
                                     <child>
-                                      <object class="GtkScrolledWindow" id="scrolledwindow12">
+                                      <object class="GtkButton" id="AddBasenameButton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">This list lets you 
determine for which basenames the currently selected item will be displayed in the Nautilus context menu.
-Basenames may use '*' and '?' wildcards.
-Basenames may be negated to specify for which basenames your item must not appear.</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="shadow_type">in</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="tooltip_text" translatable="yes">Click to add a new 
basename filter.</property>
                                         <child>
-                                          <object class="GtkTreeView" id="BasenamesTreeview">
+                                          <object class="GtkImage" id="image4">
                                             <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-selection1"/>
-                                            </child>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">list-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="grid416">
+                                      <object class="GtkButton" id="RemoveBasenameButton">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="row_spacing">3</property>
-                                        <child>
-                                          <object class="GtkButton" id="AddBasenameButton">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="tooltip_text" translatable="yes">Click to add a 
new basename filter.</property>
-                                            <child>
-                                              <object class="GtkImage" id="image4">
-                                                <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>
+                                        <property name="tooltip_text" translatable="yes">Click to remove the 
current basename filter.</property>
                                         <child>
-                                          <object class="GtkButton" id="RemoveBasenameButton">
+                                          <object class="GtkImage" id="image20">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="tooltip_text" translatable="yes">Click to remove 
the current basename filter.</property>
-                                            <child>
-                                              <object class="GtkImage" id="image20">
-                                                <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="icon_name">list-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>
                                       </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">0</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="BasenamesMatchcaseButton">
-                                    <property name="label" translatable="yes">Match _case</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="tooltip_text" translatable="yes">Click to define the 
above basename filters as case sensitive.</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="BasenamesMatchcaseButton">
+                                <property name="label" translatable="yes">Match _case</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Click to define the above 
basename filters as case sensitive.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -1410,12 +1140,15 @@ Basenames may be negated to specify for which basenames your item must not appea
                           <object class="GtkLabel" id="label410">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Basenames 
conditions&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Basenames conditions 
&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1437,12 +1170,12 @@ Basenames may be negated to specify for which basenames your item must not appea
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment500">
+                  <object class="GtkGrid" id="grid500">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
                       <object class="GtkFrame" id="frame510">
                         <property name="visible">True</property>
@@ -1450,129 +1183,110 @@ Basenames may be negated to specify for which basenames your item must not appea
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment510">
+                          <object class="GtkGrid" id="grid510">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="yalign">0</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">6</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <child>
+                              <object class="GtkLabel" id="label511">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">The current item will appear if 
the mimetype of each element of the selection matches one filter of the 'Must match one of' column, while not 
matching any of the filters of the 'Must not match any of' column.</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="GtkGrid" id="grid510">
+                              <object class="GtkGrid" id="grid511">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="column_spacing">4</property>
                                 <child>
-                                  <object class="GtkLabel" id="label67">
+                                  <object class="GtkScrolledWindow" id="scrolledwindow512">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">The current item will appear 
if the mimetype of each element of the selection matches one filter of the 'Must match one of' column, while 
not matching any of the filters of the 'Must not match any of' column.</property>
-                                    <property name="wrap">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="tooltip_text" translatable="yes">This list lets you 
determine for which mimetypes the currently selected item will be displayed in the Nautilus context menu.
+Mimetypes may be specified as '*', '*/*', 'group/*' or 'group/subgroup'.
+Mimetypes may be negated to specify for which type of objects your item must not appear.</property>
+                                    <property name="shadow_type">in</property>
+                                    <child>
+                                      <object class="GtkTreeView" id="MimetypesTreeview">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="vexpand">True</property>
+                                        <child internal-child="selection">
+                                          <object class="GtkTreeSelection" id="treeview-selection1"/>
+                                        </child>
+                                      </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="grid515">
+                                  <object class="GtkGrid" id="grid512">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
+                                    <property name="row_spacing">3</property>
                                     <child>
-                                      <object class="GtkScrolledWindow" id="scrolledwindow8">
+                                      <object class="GtkButton" id="AddMimetypeButton">
                                         <property name="visible">True</property>
                                         <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">This list lets you 
determine for which mimetypes the currently selected item will be displayed in the Nautilus context menu.
-Mimetypes may be specified as '*', '*/*', 'group/*' or 'group/subgroup'.
-Mimetypes may be negated to specify for which type of objects your item must not appear.</property>
-                                        <property name="shadow_type">in</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="tooltip_text" translatable="yes">Click to add a new 
mimetype filter.</property>
                                         <child>
-                                          <object class="GtkTreeView" id="MimetypesTreeview">
+                                          <object class="GtkImage" id="image14">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                            <child internal-child="selection">
-                                              <object class="GtkTreeSelection" id="treeview-selection2"/>
-                                            </child>
+                                            <property name="can_focus">False</property>
+                                            <property name="icon_name">list-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="grid516">
+                                      <object class="GtkButton" id="RemoveMimetypeButton">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="row_spacing">3</property>
-                                        <child>
-                                          <object class="GtkButton" id="AddMimetypeButton">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="tooltip_text" translatable="yes">Click to add a 
new mimetype filter.</property>
-                                            <child>
-                                              <object class="GtkImage" id="image14">
-                                                <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>
+                                        <property name="tooltip_text" translatable="yes">Click to remove the 
current mimetype filter.</property>
                                         <child>
-                                          <object class="GtkButton" id="RemoveMimetypeButton">
+                                          <object class="GtkImage" id="image15">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">True</property>
-                                            <property name="tooltip_text" translatable="yes">Click to remove 
the current mimetype filter.</property>
-                                            <child>
-                                              <object class="GtkImage" id="image15">
-                                                <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="icon_name">list-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>
                                       </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">0</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -1580,12 +1294,15 @@ Mimetypes may be negated to specify for which type of objects your item must not
                           <object class="GtkLabel" id="label510">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Mimetypes 
conditions&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Mimetypes conditions 
&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1608,12 +1325,12 @@ Mimetypes may be negated to specify for which type of objects your item must not
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment600">
+                  <object class="GtkGrid" id="grid600">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
                       <object class="GtkFrame" id="frame610">
                         <property name="visible">True</property>
@@ -1621,133 +1338,115 @@ Mimetypes may be negated to specify for which type of objects your item must not
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment610">
+                          <object class="GtkGrid" id="grid610">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="yalign">0</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">6</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkGrid" id="grid610">
+                              <object class="GtkLabel" id="label611">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="column_spacing">3</property>
+                                <property name="label" translatable="yes">The current item will appear if 
the location of each element of the selection is one or inside one of the paths of the 'Must match one of' 
column, while not being one or inside one of the 'Must not match any of' column.</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>
+                                <property name="width">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow611">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This list lets you 
determine where (in which folders) the currently selected files must be found in order for the item to be 
displayed in the Nautilus context menu.
+Folders may use '*' or '?' wildcards.
+Folder filters may be negated to specify for which folders your item must not appear.</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkLabel" id="label72">
+                                  <object class="GtkTreeView" id="FoldersTreeview">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">The current item will appear 
if the location of each element of the selection is one or inside one of the paths of the 'Must match one of' 
column, while not being one or inside one of the 'Must not match any of' column.</property>
-                                    <property name="wrap">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection2"/>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">2</property>
-                                    <property name="height">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="grid611">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="row_spacing">3</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow2">
+                                  <object class="GtkButton" id="AddFolderButton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">This list lets you 
determine where (in which folders) the currently selected files must be found in order for the item to be 
displayed in the Nautilus context menu.
-Folders may use '*' or '?' wildcards.
-Folder filters may be negated to specify for which folders your item must not appear.</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to add a new 
folder filter.</property>
                                     <child>
-                                      <object class="GtkTreeView" id="FoldersTreeview">
+                                      <object class="GtkImage" id="image10">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="vexpand">True</property>
-                                        <child internal-child="selection">
-                                          <object class="GtkTreeSelection" id="treeview-selection3"/>
-                                        </child>
+                                        <property name="can_focus">False</property>
+                                        <property name="icon_name">list-add</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="FolderBrowseButton">
+                                    <property name="label" translatable="yes">_Browse...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to browse the 
filesystem in order to select a new folder filter.</property>
+                                    <property name="use_underline">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>
                                 <child>
-                                  <object class="GtkGrid" id="grid620">
+                                  <object class="GtkButton" id="RemoveFolderButton">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
-                                    <child>
-                                      <object class="GtkButton" id="AddFolderButton">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to add a new 
folder filter.</property>
-                                        <child>
-                                          <object class="GtkImage" id="image10">
-                                            <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>
-                                    <child>
-                                      <object class="GtkButton" id="FolderBrowseButton">
-                                        <property name="label" translatable="yes">_Browse...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to browse the 
filesystem in order to select a new folder filter.</property>
-                                        <property name="use_underline">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>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to remove the 
current folder filter.</property>
                                     <child>
-                                      <object class="GtkButton" id="RemoveFolderButton">
+                                      <object class="GtkImage" id="image11">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to remove the 
current folder filter.</property>
-                                        <child>
-                                          <object class="GtkImage" id="image11">
-                                            <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="icon_name">list-remove</property>
                                       </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">2</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -1755,12 +1454,15 @@ Folder filters may be negated to specify for which folders your item must not ap
                           <object class="GtkLabel" id="label610">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Folders 
conditions&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Folders conditions 
&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1782,12 +1484,12 @@ Folder filters may be negated to specify for which folders your item must not ap
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment700">
+                  <object class="GtkGrid" id="grid700">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
                       <object class="GtkFrame" id="frame710">
                         <property name="visible">True</property>
@@ -1795,135 +1497,116 @@ Folder filters may be negated to specify for which folders your item must not ap
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment710">
+                          <object class="GtkGrid" id="grid710">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="yalign">0</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">6</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkGrid" id="grid710">
+                              <object class="GtkLabel" id="label711">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="column_spacing">3</property>
+                                <property name="label" translatable="yes">The current item will appear if 
the scheme of each element of the selection matches one of the 'Must match one of' column, while not matching 
any of the 'Must not match any of' column.</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>
+                                <property name="width">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow711">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This list lets you 
determine which schemes the currently selected files must satisfy in order for the item to be displayed in 
the Nautilus context menu.
+Filters may be negated to specify for which schemes your item must not appear.</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkLabel" id="label74">
+                                  <object class="GtkTreeView" id="SchemesTreeView">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">The current item will appear 
if the scheme of each element of the selection matches one of the 'Must match one of' column, while not 
matching any of the 'Must not match any of' column.</property>
-                                    <property name="wrap">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="show_expanders">False</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection3"/>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">2</property>
-                                    <property name="height">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="grid711">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="row_spacing">3</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow4">
+                                  <object class="GtkButton" id="AddSchemeButton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">This list lets you 
determine which schemes the currently selected files must satisfy in order for the item to be displayed in 
the Nautilus context menu.
-Filters may be negated to specify for which schemes your item must not appear.</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to add a new 
scheme filter.</property>
                                     <child>
-                                      <object class="GtkTreeView" id="SchemesTreeView">
+                                      <object class="GtkImage" id="image16">
                                         <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-selection4"/>
-                                        </child>
+                                        <property name="can_focus">False</property>
+                                        <property name="icon_name">list-add</property>
                                       </object>
                                     </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="AddFromDefaultButton">
+                                    <property name="label" translatable="yes">De_faults...</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to select a new 
scheme filter among default schemes.</property>
+                                    <property name="use_underline">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>
                                 <child>
-                                  <object class="GtkGrid" id="grid720">
+                                  <object class="GtkButton" id="RemoveSchemeButton">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
-                                    <child>
-                                      <object class="GtkButton" id="AddSchemeButton">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to add a new 
scheme filter.</property>
-                                        <child>
-                                          <object class="GtkImage" id="image16">
-                                            <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>
-                                    <child>
-                                      <object class="GtkButton" id="AddFromDefaultButton">
-                                        <property name="label" translatable="yes">De_faults...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to select a 
new scheme filter among default schemes.</property>
-                                        <property name="use_underline">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>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to remove the 
current scheme filter.</property>
                                     <child>
-                                      <object class="GtkButton" id="RemoveSchemeButton">
+                                      <object class="GtkImage" id="image17">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to remove the 
current scheme filter.</property>
-                                        <child>
-                                          <object class="GtkImage" id="image17">
-                                            <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="icon_name">list-remove</property>
                                       </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
                                     </child>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                    <property name="width">1</property>
-                                    <property name="height">1</property>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">2</property>
                                   </packing>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -1931,12 +1614,15 @@ Filters may be negated to specify for which schemes your item must not appear.</
                           <object class="GtkLabel" id="label710">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Schemes 
conditions&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Schemes conditions 
&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -1958,12 +1644,12 @@ Filters may be negated to specify for which schemes your item must not appear.</
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment800">
+                  <object class="GtkGrid" id="grid800">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
                       <object class="GtkFrame" id="frame810">
                         <property name="visible">True</property>
@@ -1971,119 +1657,102 @@ Filters may be negated to specify for which schemes your item must not appear.</
                         <property name="label_xalign">0</property>
                         <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkAlignment" id="alignment810">
+                          <object class="GtkGrid" id="grid810">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="yalign">0</property>
-                            <property name="top_padding">6</property>
-                            <property name="bottom_padding">6</property>
-                            <property name="left_padding">12</property>
-                            <property name="right_padding">6</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkGrid" id="grid810">
+                              <object class="GtkLabel" id="label77">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="column_spacing">3</property>
+                                <property name="label" translatable="yes">The current item will appear if 
each element of the selection matches all capabilities of the 'Must match all of' column, while not matching 
any capability of the 'Must not match any of' column.</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>
+                                <property name="width">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow10">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This list lets you 
determine which capabilities the currently selected files must satisfy in order for the item to be displayed 
in the Nautilus context menu.
+Capabilities may be negated to specify for which capabilities your item must not appear.</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkLabel" id="label77">
+                                  <object class="GtkTreeView" id="CapabilitiesTreeView">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">The current item will appear 
if each element of the selection matches all capabilities of the 'Must match all of' column, while not 
matching any capability of the 'Must not match any of' column.</property>
-                                    <property name="wrap">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="show_expanders">False</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection4"/>
+                                    </child>
                                   </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                    <property name="width">2</property>
-                                    <property name="height">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="grid820">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="column_spacing">3</property>
                                 <child>
-                                  <object class="GtkScrolledWindow" id="scrolledwindow10">
+                                  <object class="GtkButton" id="AddCapabilityButton">
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
-                                    <property name="tooltip_text" translatable="yes">This list lets you 
determine which capabilities the currently selected files must satisfy in order for the item to be displayed 
in the Nautilus context menu.
-Capabilities may be negated to specify for which capabilities your item must not appear.</property>
-                                    <property name="shadow_type">in</property>
+                                    <property name="receives_default">True</property>
+                                    <property name="tooltip_text" translatable="yes">Click to add a new 
capability filter.</property>
                                     <child>
-                                      <object class="GtkTreeView" id="CapabilitiesTreeView">
+                                      <object class="GtkImage" id="image5">
                                         <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-selection5"/>
-                                        </child>
+                                        <property name="can_focus">False</property>
+                                        <property name="icon_name">list-add</property>
                                       </object>
                                     </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>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkGrid" id="grid820">
+                                  <object class="GtkButton" id="RemoveCapabilityButton">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkButton" id="AddCapabilityButton">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to add a new 
capability filter.</property>
-                                        <child>
-                                          <object class="GtkImage" id="image5">
-                                            <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>
+                                    <property name="tooltip_text" translatable="yes">Click to remove the 
current capability.</property>
                                     <child>
-                                      <object class="GtkButton" id="RemoveCapabilityButton">
+                                      <object class="GtkImage" id="image6">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Click to remove the 
current capability.</property>
-                                        <child>
-                                          <object class="GtkImage" id="image6">
-                                            <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="icon_name">list-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>
                                   </object>
                                   <packing>
-                                    <property name="left_attach">1</property>
+                                    <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="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
                             </child>
                           </object>
                         </child>
@@ -2091,12 +1760,15 @@ Capabilities may be negated to specify for which capabilities your item must not
                           <object class="GtkLabel" id="label810">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="xpad">5</property>
-                            <property name="label" translatable="yes">&lt;b&gt;Capabilities 
conditions&lt;/b&gt;</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Capabilities conditions 
&lt;/b&gt;</property>
                             <property name="use_markup">True</property>
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -2118,462 +1790,389 @@ Filters may be negated to specify for which capabilities your item must not appe
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignment900">
+                  <object class="GtkGrid" id="grid900">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="bottom_padding">4</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
-                      <object class="GtkGrid" id="grid900">
+                      <object class="GtkFrame" id="frame910">
                         <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="GtkFrame" id="frame910">
+                          <object class="GtkGrid" id="grid910">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment910">
+                              <object class="GtkLabel" id="label17">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="grid910">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label17">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">_Count :</property>
-                                        <property name="use_underline">True</property>
-                                      </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="GtkComboBox" id="SelectionCountSigneCombobox">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="SelectionCountNumberEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="invisible_char">●</property>
-                                        <property name="width_chars">5</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label87">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">3</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="label" translatable="yes">_Count :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label910">
+                            <child>
+                              <object class="GtkComboBox" id="SelectionCountSigneCombobox">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Appears if selection 
contains&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="SelectionCountNumberEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="invisible_char">●</property>
+                                <property name="width_chars">5</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label87">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">3</property>
+                                <property name="top_attach">0</property>
+                              </packing>
                             </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 type="label">
+                          <object class="GtkLabel" id="label910">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Appears if selection 
contains &lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame920">
+                        <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="GtkFrame" id="frame920">
+                          <object class="GtkGrid" id="grid920">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment920">
+                              <object class="GtkLabel" id="label48">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
+                                <property name="label" translatable="yes">Item may appear depending of the 
desktop environment.</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow5">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkGrid" id="grid920">
+                                  <object class="GtkTreeView" id="EnvironmentsDesktopTreeView">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label48">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Item may appear depending 
of the desktop environment.</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkScrolledWindow" id="scrolledwindow5">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="shadow_type">in</property>
-                                        <child>
-                                          <object class="GtkTreeView" id="EnvironmentsDesktopTreeView">
-                                            <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="enable_search">False</property>
-                                            <property name="show_expanders">False</property>
-                                            <child internal-child="selection">
-                                              <object class="GtkTreeSelection" id="treeview-selection6"/>
-                                            </child>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkGrid" id="grid5">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <child>
-                                          <object class="GtkRadioButton" id="ShowAlwaysButton">
-                                            <property name="label" translatable="yes">_Always 
appears</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="active">True</property>
-                                            <property name="draw_indicator">True</property>
-                                          </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="GtkRadioButton" id="OnlyShowButton">
-                                            <property name="label" translatable="yes">_Only appears in 
selected environments</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>
-                                            <property name="group">ShowAlwaysButton</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>
-                                          <object class="GtkRadioButton" id="DoNotShowButton">
-                                            <property name="label" translatable="yes">_Never appears in 
selected environments</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>
-                                            <property name="group">ShowAlwaysButton</property>
-                                          </object>
-                                          <packing>
-                                            <property name="left_attach">0</property>
-                                            <property name="top_attach">2</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">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
+                                    <property name="can_focus">True</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="headers_visible">False</property>
+                                    <property name="enable_search">False</property>
+                                    <property name="show_expanders">False</property>
+                                    <child internal-child="selection">
+                                      <object class="GtkTreeSelection" id="treeview-selection5"/>
                                     </child>
                                   </object>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label920">
+                            <child>
+                              <object class="GtkGrid" id="grid5">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Desktop 
environment&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="ShowAlwaysButton">
+                                    <property name="label" translatable="yes">_Always appears</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="OnlyShowButton">
+                                    <property name="label" translatable="yes">_Only appears in selected 
environments</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">ShowAlwaysButton</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">0</property>
+                                    <property name="top_attach">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="DoNotShowButton">
+                                    <property name="label" translatable="yes">_Never appears in selected 
environments</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="halign">start</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0.5</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">ShowAlwaysButton</property>
+                                  </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">1</property>
+                              </packing>
                             </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>
                         </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label920">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Desktop environment 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frame930">
+                        <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="GtkFrame" id="frame930">
+                          <object class="GtkGrid" id="grid930">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">4</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment930">
+                              <object class="GtkLabel" id="label55">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="grid930">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label55">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Appears if the file is 
e_xecutable :</property>
-                                        <property name="use_underline">True</property>
-                                      </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="label56">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Appears if the name is 
_registered on D-Bus :</property>
-                                        <property name="use_underline">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>
-                                    <child>
-                                      <object class="GtkLabel" id="label57">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Appears if the command 
outputs "_true" :</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label6">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Appears if the _binary is 
running :</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="TryExecEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of an executable file on the file system.
+                                <property name="label" translatable="yes">Appears if the file is e_xecutable 
:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label56">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Appears if the name is _registered 
on D-Bus :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label57">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Appears if the command outputs 
"_true" :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label6">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Appears if the _binary is running 
:</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="TryExecEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of an executable file on the file system.
 This may be used for example to test for a prerequisite package.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="ShowIfRegisteredEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a particular service on the D-Bus system.
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="ShowIfRegisteredEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a particular service on the D-Bus system.
 This may be used for example for testing that a prerequisite service is currently available.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="ShowIfTrueEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on a runtime result.
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="ShowIfTrueEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on a runtime result.
 Enter here a command which is able to display the exact "true" string on its standard output.
 This may be used for example for testing a complex condition.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="ShowIfRunningEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a running binary.
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkEntry" id="ShowIfRunningEntry">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">This is an advanced 
condition based on the presence of a running binary.
 Note that only the basename of the binary is checked, not its dirname nor its parameters.
 This may be used for example for testing the presence of a prerequisite daemon.</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="TryExecButton">
-                                        <property name="label" translatable="yes">Bro_wse...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="ShowIfRunningButton">
-                                        <property name="label" translatable="yes">Brow_se...</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="hexpand">True</property>
+                                <property name="invisible_char">●</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">3</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label930">
+                            <child>
+                              <object class="GtkButton" id="TryExecButton">
+                                <property name="label" translatable="yes">Bro_wse...</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Execution 
environment&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_underline">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="ShowIfRunningButton">
+                                <property name="label" translatable="yes">Brow_se...</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="use_underline">True</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">2</property>
+                                <property name="top_attach">3</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </child>
                           </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">1</property>
-                            <property name="height">1</property>
-                          </packing>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="label930">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Execution environment 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">2</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -2594,273 +2193,231 @@ This may be used for example for testing the presence of a prerequisite daemon.<
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkAlignment" id="alignmentA00">
+                  <object class="GtkGrid" id="gridA00">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="yalign">0</property>
-                    <property name="yscale">0</property>
-                    <property name="left_padding">4</property>
-                    <property name="right_padding">4</property>
+                    <property name="margin_left">4</property>
+                    <property name="margin_right">4</property>
+                    <property name="margin_bottom">4</property>
                     <child>
-                      <object class="GtkGrid" id="gridA00">
+                      <object class="GtkFrame" id="frameA10">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="vexpand">True</property>
+                        <property name="label_xalign">0</property>
+                        <property name="shadow_type">in</property>
                         <child>
-                          <object class="GtkFrame" id="frameA10">
+                          <object class="GtkGrid" id="gridA10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="vexpand">True</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignmentA10">
+                              <object class="GtkCheckButton" id="ActionEnabledButton">
+                                <property name="label" translatable="yes">E_nabled</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">Check the box to enable 
this item.
+If unchecked, then the item will never appear in the file manager context menus or toolbar.</property>
+                                <property name="halign">start</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0.5</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                                <property name="width">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="PropertiesDescriptionLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">_Description :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
                                 <property name="yalign">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkScrolledWindow" id="scrolledwindow3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="tooltip_text" translatable="yes">Enter here a free text 
which may be used (e.g. in a Web service or in a search tool) to describe your item.</property>
+                                <property name="vexpand">True</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkGrid" id="gridA10">
+                                  <object class="GtkTextView" id="ActionDescriptionText">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="ActionEnabledButton">
-                                        <property name="label" translatable="yes">E_nabled</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">Check the box to 
enable this item.
-If unchecked, then the item will never appear in the file manager context menus or toolbar.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="PropertiesDescriptionLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="yalign">0</property>
-                                        <property name="label" translatable="yes">_Description :</property>
-                                        <property name="use_underline">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>
-                                    <child>
-                                      <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">Enter here a free 
text which may be used (e.g. in a Web service or in a search tool) to describe your item.</property>
-                                        <property name="shadow_type">in</property>
-                                        <child>
-                                          <object class="GtkTextView" id="ActionDescriptionText">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="hexpand">True</property>
-                                            <property name="vexpand">True</property>
-                                          </object>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">2</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="PropertiesShortcutLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Suggested _shortcut 
:</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="SuggestedShortcutButton">
-                                        <property name="label" translatable="yes">None</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="tooltip_text" translatable="yes">Enter here the 
keyboard touch combination you suggest as a shortcut to your action.
-Note: this is not yet implemented in Nautilus-Actions.</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
+                                    <property name="can_focus">True</property>
+                                    <property name="hexpand">True</property>
+                                    <property name="vexpand">True</property>
                                   </object>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                                <property name="width">2</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="ActionPropertiesTitle">
+                            <child>
+                              <object class="GtkLabel" id="PropertiesShortcutLabel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Action editable 
properties&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="label" translatable="yes">Suggested _shortcut :</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="SuggestedShortcutButton">
+                                <property name="label" translatable="yes">None</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="tooltip_text" translatable="yes">Enter here the keyboard 
touch combination you suggest as a shortcut to your action.
+Note: this is not yet implemented in Nautilus-Actions.</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </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 type="label">
+                          <object class="GtkLabel" id="ActionPropertiesTitle">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Action editable properties 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkFrame" id="frameA20">
+                        <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="GtkFrame" id="frameA20">
+                          <object class="GtkGrid" id="gridA20">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="margin_left">8</property>
+                            <property name="margin_right">4</property>
+                            <property name="margin_bottom">4</property>
+                            <property name="row_spacing">3</property>
+                            <property name="column_spacing">4</property>
                             <child>
-                              <object class="GtkAlignment" id="alignmentA20">
+                              <object class="GtkCheckButton" id="ActionReadonlyButton">
+                                <property name="label" translatable="yes">Read-only item</property>
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="yalign">0</property>
-                                <property name="yscale">0</property>
-                                <property name="top_padding">6</property>
-                                <property name="bottom_padding">6</property>
-                                <property name="left_padding">12</property>
-                                <property name="right_padding">6</property>
-                                <child>
-                                  <object class="GtkGrid" id="gridA20">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">3</property>
-                                    <property name="column_spacing">3</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="ActionReadonlyButton">
-                                        <property name="label" translatable="yes">Read-only item</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">This box is checked 
if the item cannot be edited.
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="tooltip_text" translatable="yes">This box is checked if the 
item cannot be edited.
 There may be multiple reasons for why an item cannot be edited. See your User's Manual.</property>
-                                        <property name="focus_on_click">False</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="PropertiesIdLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Id. :</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>
-                                      <object class="GtkLabel" id="PropertiesProviderLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">I/O provider :</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="ActionItemID">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="ActionItemProvider">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="xalign">0</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">2</property>
-                                        <property name="width">1</property>
-                                        <property name="height">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                </child>
+                                <property name="focus_on_click">False</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="PropertiesIdLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">Id. :</property>
+                                <property name="xalign">1</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="labelA20">
+                            <child>
+                              <object class="GtkLabel" id="PropertiesProviderLabel">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="label" translatable="yes">I/O provider :</property>
+                                <property name="xalign">1</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ActionItemID">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
-                                <property name="xpad">5</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Read-only 
properties&lt;/b&gt;</property>
-                                <property name="use_markup">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="xalign">0</property>
                               </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="ActionItemProvider">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">1</property>
+                                <property name="top_attach">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
                             </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>
+                        </child>
+                        <child type="label">
+                          <object class="GtkLabel" id="labelA20">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">&lt;b&gt; Read-only properties 
&lt;/b&gt;</property>
+                            <property name="use_markup">True</property>
+                          </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">1</property>
+                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -2890,38 +2447,61 @@ There may be multiple reasons for why an item cannot be edited. See your User's
           <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>
-          <object class="GtkAlignment" id="main-toolbar">
+          <object class="GtkGrid" id="main-toolbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <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>
             <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="main-statusbar">
+          <object class="GtkFrame" id="main-statusbar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
               <placeholder/>
             </child>
+            <child type="label_item">
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
           </packing>
         </child>
       </object>
@@ -2949,6 +2529,18 @@ There may be multiple reasons for why an item cannot be edited. See your User's
       <widget name="CommandWDLabel"/>
     </widgets>
   </object>
+  <object class="GtkSizeGroup" id="EnvironmentLabelSizeGroup">
+    <widgets>
+      <widget name="label17"/>
+      <widget name="ShowAlwaysButton"/>
+      <widget name="OnlyShowButton"/>
+      <widget name="DoNotShowButton"/>
+      <widget name="label55"/>
+      <widget name="label56"/>
+      <widget name="label57"/>
+      <widget name="label6"/>
+    </widgets>
+  </object>
   <object class="GtkSizeGroup" id="ExecutionModeSizeGroup">
     <widgets>
       <widget name="ExecutionModeLabel"/>
diff --git a/src/nact/nact-menu-file.c b/src/nact/nact-menu-file.c
index e693882..63df0fc 100644
--- a/src/nact/nact-menu-file.c
+++ b/src/nact/nact-menu-file.c
@@ -64,11 +64,11 @@ static gboolean autosave_callback( NactMainWindow *main_window );
 static void     autosave_destroyed( NactMainWindow *main_window );
 
 /*
- * nact_menu_file_initialize:
+ * nact_menu_file_init:
  * @main_window: the #NactMainWindow main window.
  */
 void
-nact_menu_file_initialize( NactMainWindow *main_window )
+nact_menu_file_init( NactMainWindow *main_window )
 {
        install_autosave( main_window );
 }
diff --git a/src/nact/nact-menu-file.h b/src/nact/nact-menu-file.h
index 2085aa8..a907544 100644
--- a/src/nact/nact-menu-file.h
+++ b/src/nact/nact-menu-file.h
@@ -34,7 +34,7 @@
 
 G_BEGIN_DECLS
 
-void nact_menu_file_initialize          ( NactMainWindow *main_window );
+void nact_menu_file_init                ( NactMainWindow *main_window );
 
 void nact_menu_file_update_sensitivities( NactMainWindow *main_window );
 
diff --git a/src/nact/nact-menu-view.c b/src/nact/nact-menu-view.c
new file mode 100644
index 0000000..8508074
--- /dev/null
+++ b/src/nact/nact-menu-view.c
@@ -0,0 +1,268 @@
+/*
+ * Nautilus-Actions
+ * A Nautilus extension which offers configurable context menu actions.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006-2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009-2014 Pierre Wieser and others (see AUTHORS)
+ *
+ * Nautilus-Actions is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * Nautilus-Actions is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Nautilus-Actions; see the file COPYING. If not, see
+ * <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ *   Frederic Ruaudel <grumz grumz net>
+ *   Rodrigo Moya <rodrigo gnome-db org>
+ *   Pierre Wieser <pwieser trychlos org>
+ *   ... and many others (see AUTHORS)
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include "core/na-gtk-utils.h"
+
+#include "nact-main-window.h"
+#include "nact-menu.h"
+#include "nact-menu-view.h"
+
+/* defines the toolbar properties
+ */
+typedef struct {
+       guint        id;
+       const gchar *prefs_key;
+       const gchar *action_name;
+       const gchar *toolbar_name;
+       GtkWidget   *toolbar;                           /* loaded at run time */
+}
+       sToolbarProps;
+
+static sToolbarProps st_toolbar_props[] = {
+       { TOOLBAR_FILE_ID,  NA_IPREFS_MAIN_TOOLBAR_FILE_DISPLAY,  "toolbar-file",  "file-toolbar",  NULL },
+       { TOOLBAR_EDIT_ID,  NA_IPREFS_MAIN_TOOLBAR_EDIT_DISPLAY,  "toolbar-edit",  "edit-toolbar",  NULL },
+       { TOOLBAR_TOOLS_ID, NA_IPREFS_MAIN_TOOLBAR_TOOLS_DISPLAY, "toolbar-tools", "tools-toolbar", NULL },
+       { TOOLBAR_HELP_ID,  NA_IPREFS_MAIN_TOOLBAR_HELP_DISPLAY,  "toolbar-help",  "help-toolbar",  NULL }
+};
+
+static const gchar *st_toolbar_ui       = PKGUIDIR "/nact-toolbar.ui";
+
+static void           setup_toolbars_submenu( NactMainWindow *window );
+static void           setup_toolbar( NactMainWindow *window, GtkBuilder *builder, guint toolbar_id );
+static sToolbarProps *get_toolbar_properties_by_id( guint toolbar_id );
+static sToolbarProps *get_toolbar_properties_by_name( const gchar *action_name );
+#if 0
+static void           reorder_toolbars( GtkWidget *hbox, sToolbarProps *props );
+#endif
+
+/**
+ * nact_menu_view_init:
+ * @window: the #NactMainWindow main window.
+ *
+ * Update sensitivity of items of the View menu.
+ */
+void
+nact_menu_view_init( NactMainWindow *window )
+{
+       setup_toolbars_submenu( window );
+}
+
+/**
+ * nact_menu_view_update_sensitivities:
+ * @window: the #NactMainWindow main window.
+ *
+ * Update sensitivity of items of the View menu.
+ */
+void
+nact_menu_view_update_sensitivities( NactMainWindow *window )
+{
+       sMenuData *sdata;
+       guint count_list;
+
+       sdata = nact_menu_get_data( window );
+
+       /* expand all/collapse all requires at least one item in the list */
+       count_list = sdata->count_menus + sdata->count_actions + sdata->count_profiles;
+       nact_menu_enable_item( window, "expand", count_list > 0 );
+       nact_menu_enable_item( window, "collapse", count_list > 0 );
+}
+
+/*
+ * Setup the initial display of the standard main toolbars.
+ *
+ * This actually only setup the initial state of the toggle options in
+ * View > Toolbars menu; when an option is activated, this will trigger
+ * the 'on_view_toolbar_activated()' which will actually display the
+ * toolbar.
+ */
+void
+setup_toolbars_submenu( NactMainWindow *window )
+{
+       GtkBuilder *builder;
+
+       builder = gtk_builder_new_from_file( st_toolbar_ui );
+
+       setup_toolbar( window, builder, TOOLBAR_FILE_ID );
+       setup_toolbar( window, builder, TOOLBAR_EDIT_ID );
+       setup_toolbar( window, builder, TOOLBAR_TOOLS_ID );
+       setup_toolbar( window, builder, TOOLBAR_HELP_ID );
+
+       g_object_unref( builder );
+}
+
+static void
+setup_toolbar( NactMainWindow *window, GtkBuilder *builder, guint toolbar_id )
+{
+       sToolbarProps *props;
+       gboolean is_active;
+       GAction *action;
+
+       props = get_toolbar_properties_by_id( toolbar_id );
+       g_return_if_fail( props && props->id == toolbar_id );
+
+       /* load and ref the toolbar from the UI file */
+       props->toolbar = ( GtkWidget * ) g_object_ref( gtk_builder_get_object( builder, props->toolbar_name 
));
+       g_return_if_fail( props->toolbar && GTK_IS_TOOLBAR( props->toolbar ));
+
+       /* display the toolbar depending it is active or not */
+       is_active = na_settings_get_boolean( props->prefs_key, NULL, NULL );
+       if( is_active ){
+               action = g_action_map_lookup_action( G_ACTION_MAP( window ), props->action_name );
+               g_action_change_state( action, g_variant_new_boolean( is_active ));
+       }
+}
+
+static sToolbarProps *
+get_toolbar_properties_by_id( guint toolbar_id )
+{
+       static const gchar *thisfn = "nact_menu_view_get_toolbar_properties_by_id";
+       guint i;
+
+       for( i=0 ; i < G_N_ELEMENTS( st_toolbar_props ) ; ++i ){
+               if( st_toolbar_props[i].id == toolbar_id ){
+                       return( &st_toolbar_props[i] );
+               }
+       }
+
+       g_warning( "%s: unable to find toolbar properties for id=%d", thisfn, toolbar_id );
+       return( NULL );
+}
+
+/**
+ * nact_menu_view_toolbar_display:
+ * @main_window: the #NactMainWindow main window.
+ * @action_name: the action name.
+ * @visible: whether the toolbar must be displayed or hidden.
+ */
+void
+nact_menu_view_toolbar_display( NactMainWindow *main_window, const gchar *action_name, gboolean visible )
+{
+       sToolbarProps *props;
+       GtkWidget *parent;
+
+       props = get_toolbar_properties_by_name( action_name );
+       g_return_if_fail( props );
+
+       parent = na_gtk_utils_find_widget_by_name( GTK_CONTAINER( main_window ), "main-toolbar" );
+       g_return_if_fail( parent && GTK_IS_CONTAINER( parent ));
+
+       if( visible ){
+               gtk_grid_attach( GTK_GRID( parent ), props->toolbar, props->id-1, 0, 1, 1 );
+
+       } else {
+               gtk_container_remove( GTK_CONTAINER( parent ), props->toolbar );
+       }
+
+       gtk_widget_show_all( parent );
+       na_settings_set_boolean( props->prefs_key, visible );
+}
+
+static sToolbarProps *
+get_toolbar_properties_by_name( const gchar *action_name )
+{
+       static const gchar *thisfn = "nact_menu_view_get_toolbar_properties_by_name";
+       guint i;
+
+       for( i=0 ; i < G_N_ELEMENTS( st_toolbar_props ) ; ++i ){
+               if( g_utf8_collate( st_toolbar_props[i].action_name, action_name ) == 0 ){
+                       return( &st_toolbar_props[i] );
+               }
+       }
+
+       g_warning( "%s: unable to find toolbar properties for action name=%s", thisfn, action_name );
+       return( NULL );
+}
+
+#if 0
+/*
+ * @hbox: the GtkHBox container
+ * @toolbar_id: toolbar identifier
+ * @handle: the #GtkToolbar widget
+ *
+ * reposition the newly activated toolbar in handle
+ * so that the relative positions of toolbars are respected in hbox
+ */
+static void
+reorder_toolbars( GtkWidget *hbox, sToolbarProps *props )
+{
+       int this_canonic_rel_pos;
+       int i;
+       GList *children, *ic;
+       int pos;
+       int canonic_pos;
+
+       this_canonic_rel_pos = 0;
+       for( i = 0 ; i < G_N_ELEMENTS( toolbar_pos ); ++ i ){
+               if( toolbar_pos[i] == toolbar_id ){
+                       this_canonic_rel_pos = i;
+                       break;
+               }
+       }
+       g_object_set_data( G_OBJECT( handle ), "toolbar-canonic-pos", GINT_TO_POINTER( this_canonic_rel_pos 
));
+
+       pos = 0;
+       children = gtk_container_get_children( GTK_CONTAINER( hbox ));
+       for( ic = children ; ic ; ic = ic->next ){
+               canonic_pos = GPOINTER_TO_INT( g_object_get_data( G_OBJECT( ic->data ), "toolbar-canonic-pos" 
));
+               if( canonic_pos >= this_canonic_rel_pos ){
+                       break;
+               }
+               pos += 1;
+       }
+
+       gtk_box_reorder_child( GTK_BOX( hbox ), handle, pos );
+}
+#endif
+
+/*
+ * When activating one of the GtkRadioAction which handles the position
+ * of the notebook tabs
+ * @action: the first GtkRadioAction of the group
+ * @current: the activated GtkRadioAction
+ *
+ * This function is triggered once each time we are activating an item of
+ * the menu, after having set the "current_value" to the new value. All
+ * GtkRadioButtons items share the same "current_value".
+ */
+#if 0
+void
+nact_menu_view_on_tabs_pos_changed( GtkRadioAction *action, GtkRadioAction *current, BaseWindow *window )
+{
+       GtkNotebook *notebook;
+       guint new_pos;
+
+       notebook = GTK_NOTEBOOK( base_window_get_widget( BASE_WINDOW( window ), "MainNotebook" ));
+       new_pos = gtk_radio_action_get_current_value( action );
+       gtk_notebook_set_tab_pos( notebook, new_pos );
+}
+#endif
diff --git a/src/nact/nact-main-toolbar.h b/src/nact/nact-menu-view.h
similarity index 71%
rename from src/nact/nact-main-toolbar.h
rename to src/nact/nact-menu-view.h
index 89d9619..b60ea73 100644
--- a/src/nact/nact-main-toolbar.h
+++ b/src/nact/nact-menu-view.h
@@ -27,16 +27,10 @@
  *   ... and many others (see AUTHORS)
  */
 
-#ifndef __NACT_MAIN_TOOLBAR_H__
-#define __NACT_MAIN_TOOLBAR_H__
+#ifndef __NACT_MENU_VIEW_H__
+#define __NACT_MENU_VIEW_H__
 
-/**
- * SECTION: nact_main_toolbar
- * @short_description: Main toolbar management.
- * @include: nact/nact-main-toolbar.h
- */
-
-#include "nact-main-window.h"
+#include "nact-main-window-def.h"
 
 G_BEGIN_DECLS
 
@@ -47,13 +41,16 @@ enum {
        MAIN_TOOLBAR_HELP_ID,
 };
 
-void nact_main_toolbar_init_toggle_actions( NactMainWindow *window,
-                                                                                                       
GSimpleActionGroup *toolbar_group );
+void nact_menu_view_init                ( NactMainWindow *main_window );
+
+void nact_menu_view_update_sensitivities( NactMainWindow *main_window );
+
+void nact_menu_view_toolbar_display     ( NactMainWindow *main_window,
+                                                                                               const gchar 
*action_name,
+                                                                                               gboolean 
visible );
 
-void nact_main_toolbar_activate           ( NactMainWindow *window,
-                                                                                                       int 
toolbar_id,
-                                                                                                       
gboolean active );
+void nact_menu_view_set_notebook_label  ( NactMainWindow *main_window );
 
 G_END_DECLS
 
-#endif /* __NACT_MAIN_TOOLBAR_H__ */
+#endif /* __NACT_MENU_VIEW_H__ */
diff --git a/src/nact/nact-menu.c b/src/nact/nact-menu.c
index 37e8f76..3d729a2 100644
--- a/src/nact/nact-menu.c
+++ b/src/nact/nact-menu.c
@@ -33,16 +33,18 @@
 
 #include <glib/gi18n.h>
 
+#include "core/na-about.h"
 #include "core/na-io-provider.h"
 
 #include "nact-main-window.h"
 #include "nact-menu.h"
 #include "nact-menu-edit.h"
 #include "nact-menu-file.h"
-/* #include "nact-menu-help.h"
+#include "nact-menu-view.h"
+/*
 #include "nact-menu-maintainer.h"
 #include "nact-menu-tools.h"
-#include "nact-menu-view.h" */
+*/
 #include "nact-preferences-editor.h"
 #include "nact-tree-view.h"
 
@@ -74,6 +76,8 @@ static void on_win_paste_into( GSimpleAction *action, GVariant *parameter, gpoin
 static void on_win_reload( GSimpleAction *action, GVariant *parameter, gpointer user_data );
 static void on_win_save( GSimpleAction *action, GVariant *parameter, gpointer user_data );
 static void on_win_test_function( GSimpleAction *action, GVariant *parameter, gpointer user_data );
+static void on_win_toolbar_activate( GSimpleAction *action, GVariant *parameter, gpointer user_data );
+static void on_win_toolbar_changed_state( GSimpleAction *action, GVariant *parameter, gpointer user_data );
 
 /* since the deprecation of GtkAction, I no more know how to display
  * menu item tooltips - but they have been translated and I don't want
@@ -140,6 +144,18 @@ static sActionEntry st_menubar_entries[] = {
                {{ "collapse", on_win_collapse_all, NULL, NULL, NULL },
                                /* i18n: status bar tooltip displayed on 'Collapse all' item navigation */
                                N_( "Entirely collapse the items hierarchy" )},
+               {{ "toolbar-file", on_win_toolbar_activate, NULL, "false", on_win_toolbar_changed_state },
+                               /* i18n: status bar tooltip displayed on 'Toolbars/File' item navigation */
+                               N_( "Display the File toolbar" )},
+               {{ "toolbar-edit", on_win_toolbar_activate, NULL, "false", on_win_toolbar_changed_state },
+                               /* i18n: status bar tooltip displayed on 'Toolbars/Edit' item navigation */
+                               N_( "Display the Edit toolbar" )},
+               {{ "toolbar-tools", on_win_toolbar_activate, NULL, "false", on_win_toolbar_changed_state },
+                               /* i18n: status bar tooltip displayed on 'Toolbars/Tools' item navigation */
+                               N_( "Display the Tools toolbar" )},
+               {{ "toolbar-help", on_win_toolbar_activate, NULL, "false", on_win_toolbar_changed_state },
+                               /* i18n: status bar tooltip displayed on 'Toolbars/Help' item navigation */
+                               N_( "Display the Help toolbar" )},
                {{ "import", on_win_import, NULL, NULL, NULL },
                                /* i18n: status bar tooltip displayed on 'Import' item navigation */
                                N_( "Import one or more actions from external files into your configuration" 
)},
@@ -220,6 +236,61 @@ nact_menu_app( NactApplication *application )
        }
 }
 
+static void
+on_app_about( GSimpleAction *action, GVariant *parameter, gpointer user_data )
+{
+       GtkWindow *window;
+
+       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
+
+       window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
+       g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+
+       na_about_display( window );
+}
+
+static void
+on_app_help( GSimpleAction *action, GVariant *parameter, gpointer user_data )
+{
+       static const gchar *thisfn = "nact_menu_on_app_help";
+       GError *error;
+
+       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
+
+       error = NULL;
+       gtk_show_uri( NULL, "ghelp:nautilus-actions-config-tool", GDK_CURRENT_TIME, &error );
+       if( error ){
+               g_warning( "%s: %s", thisfn, error->message );
+               g_error_free( error );
+       }
+}
+
+static void
+on_app_preferences( GSimpleAction *action, GVariant *parameter, gpointer user_data )
+{
+       GtkWindow *window;
+
+       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
+
+       window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
+       g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+
+       nact_preferences_editor_run( NACT_MAIN_WINDOW( window ));
+}
+
+static void
+on_app_quit( GSimpleAction *action, GVariant *parameter, gpointer user_data )
+{
+       GtkWindow *window;
+
+       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
+
+       window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
+       g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
+
+       nact_main_window_quit( NACT_MAIN_WINDOW( window ));
+}
+
 /**
  * nact_menu_win:
  * @main_window: the #NactMainWindow.
@@ -290,43 +361,8 @@ nact_menu_win( NactMainWindow *main_window )
                                        main_window, MAIN_SIGNAL_UPDATE_SENSITIVITIES,
                                        G_CALLBACK( on_update_sensitivities ), NULL );
 
-       nact_menu_file_initialize( main_window );
-}
-
-static void
-on_app_about( GSimpleAction *action, GVariant *parameter, gpointer user_data )
-{
-       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
-}
-
-static void
-on_app_help( GSimpleAction *action, GVariant *parameter, gpointer user_data )
-{
-       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
-}
-
-static void
-on_app_preferences( GSimpleAction *action, GVariant *parameter, gpointer user_data )
-{
-       GtkWindow *window;
-
-       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
-
-       window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
-       g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
-
-       nact_preferences_editor_run( NACT_MAIN_WINDOW( window ));
-}
-
-static void
-on_app_quit( GSimpleAction *action, GVariant *parameter, gpointer user_data )
-{
-       GtkWindow *window;
-
-       g_return_if_fail( user_data && NACT_IS_APPLICATION( user_data ));
-       window = gtk_application_get_active_window( GTK_APPLICATION( user_data ));
-       g_return_if_fail( window && NACT_IS_MAIN_WINDOW( window ));
-       nact_main_window_quit( NACT_MAIN_WINDOW( window ));
+       nact_menu_file_init( main_window );
+       nact_menu_view_init( main_window );
 }
 
 /**
@@ -612,12 +648,15 @@ on_update_sensitivities( NactMainWindow *window, void *empty )
 
        g_debug( "%s: window=%p, empty=%p", thisfn, ( void * ) window, empty );
 
-       nact_menu_file_update_sensitivities( window );
-       nact_menu_edit_update_sensitivities( window );
-       /*nact_menu_view_update_sensitivities( window );
-       nact_menu_tools_update_sensitivities( window );
-       nact_menu_maintainer_update_sensitivities( window );
-       nact_menu_help_update_sensitivities( window );*/
+       if( !nact_main_window_dispose_has_run( window )){
+
+               nact_menu_file_update_sensitivities( window );
+               nact_menu_edit_update_sensitivities( window );
+               nact_menu_view_update_sensitivities( window );
+               /*nact_menu_tools_update_sensitivities( window );
+               nact_menu_maintainer_update_sensitivities( window );
+               nact_menu_help_update_sensitivities( window );*/
+       }
 }
 
 static void
@@ -629,7 +668,12 @@ on_win_brief_tree_store_dump( GSimpleAction *action, GVariant *parameter, gpoint
 static void
 on_win_collapse_all( GSimpleAction *action, GVariant *parameter, gpointer user_data )
 {
+       NactTreeView *items_view;
+
        g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+
+       items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( user_data ));
+       nact_tree_view_collapse_all( items_view );
 }
 
 static void
@@ -675,7 +719,12 @@ on_win_duplicate( GSimpleAction *action, GVariant *parameter, gpointer user_data
 static void
 on_win_expand_all( GSimpleAction *action, GVariant *parameter, gpointer user_data )
 {
+       NactTreeView *items_view;
+
        g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+
+       items_view = nact_main_window_get_items_view( NACT_MAIN_WINDOW( user_data ));
+       nact_tree_view_expand_all( items_view );
 }
 
 static void
@@ -700,18 +749,21 @@ static void
 on_win_new_action( GSimpleAction *action, GVariant *parameter, gpointer user_data )
 {
        g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+       nact_menu_file_new_action( NACT_MAIN_WINDOW( user_data ));
 }
 
 static void
 on_win_new_menu( GSimpleAction *action, GVariant *parameter, gpointer user_data )
 {
        g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+       nact_menu_file_new_menu( NACT_MAIN_WINDOW( user_data ));
 }
 
 static void
 on_win_new_profile( GSimpleAction *action, GVariant *parameter, gpointer user_data )
 {
        g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+       nact_menu_file_new_profile( NACT_MAIN_WINDOW( user_data ));
 }
 
 static void
@@ -748,6 +800,40 @@ on_win_test_function( GSimpleAction *action, GVariant *parameter, gpointer user_
        g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
 }
 
+/*
+ * the menu item is activated
+ * just toggle the state of the corresponding action
+ */
+static void
+on_win_toolbar_activate( GSimpleAction *action, GVariant *parameter, gpointer user_data )
+{
+       GVariant *state;
+
+       g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+
+       state = g_action_get_state( G_ACTION( action ));
+       g_action_change_state( G_ACTION( action ),
+                       g_variant_new_boolean( !g_variant_get_boolean( state )));
+       g_variant_unref( state );
+}
+
+/*
+ * the state of the action has been toggled, either directly or by
+ * activating the menu item
+ */
+static void
+on_win_toolbar_changed_state( GSimpleAction *action, GVariant *state, gpointer user_data )
+{
+       g_return_if_fail( user_data && NACT_IS_MAIN_WINDOW( user_data ));
+
+       nact_menu_view_toolbar_display(
+                       NACT_MAIN_WINDOW( user_data ),
+                       g_action_get_name( G_ACTION( action )),
+                       g_variant_get_boolean( state ));
+
+       g_simple_action_set_state( action, state );
+}
+
 /**
  * nact_menu_enable_item:
  * @main_window: this #NactMainWindow main window.
diff --git a/src/nact/nact-menu.h b/src/nact/nact-menu.h
index fafa3f9..f5cc23c 100644
--- a/src/nact/nact-menu.h
+++ b/src/nact/nact-menu.h
@@ -44,6 +44,9 @@
 
 G_BEGIN_DECLS
 
+/* This is private data, set against the main window
+ * for exclusive use of menu functions
+ */
 typedef struct {
 
        /* set at initialization time
@@ -93,6 +96,16 @@ typedef struct {
 }
        sMenuData;
 
+/* Toolbars identifiers
+ * they are listed here in the order they should be displayed
+ */
+enum {
+       TOOLBAR_FILE_ID = 1,
+       TOOLBAR_EDIT_ID,
+       TOOLBAR_TOOLS_ID,
+       TOOLBAR_HELP_ID,
+};
+
 void       nact_menu_app        ( NactApplication *application );
 
 void       nact_menu_win        ( NactMainWindow *main_window );
diff --git a/src/nact/nact-toolbar.ui b/src/nact/nact-toolbar.ui
new file mode 100644
index 0000000..0eaad0f
--- /dev/null
+++ b/src/nact/nact-toolbar.ui
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
+<interface>
+  <requires lib="gtk+" version="3.4"/>
+  <object class="GtkToolbar" id="edit-toolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <property name="icon_size">2</property>
+  </object>
+  <object class="GtkToolbar" id="file-toolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <property name="icon_size">2</property>
+    <child>
+      <object class="GtkToolButton" id="new-action-btn">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Define a new action</property>
+        <property name="is_important">True</property>
+        <property name="action_name">new-action</property>
+        <property name="label" translatable="yes">New _action</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="save-btn">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Save the items tree</property>
+        <property name="is_important">True</property>
+        <property name="action_name">save</property>
+        <property name="label" translatable="yes">_Save</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkToolButton" id="quit-btn">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="tooltip_text" translatable="yes">Quit the application</property>
+        <property name="is_important">True</property>
+        <property name="action_name">quit</property>
+        <property name="label" translatable="yes">_Quit</property>
+        <property name="use_underline">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="homogeneous">True</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkToolbar" id="help-toolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <property name="icon_size">2</property>
+  </object>
+  <object class="GtkToolbar" id="tools-toolbar">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="toolbar_style">both-horiz</property>
+    <property name="icon_size">2</property>
+  </object>
+</interface>
diff --git a/src/nact/nact-tree-view.c b/src/nact/nact-tree-view.c
index 2447d6b..906e6aa 100644
--- a/src/nact/nact-tree-view.c
+++ b/src/nact/nact-tree-view.c
@@ -40,7 +40,6 @@
 #include "base-keysyms.h"
 #include "nact-application.h"
 #include "nact-main-window.h"
-#include "nact-marshal.h"
 #include "nact-tree-view.h"
 #include "nact-tree-model.h"
 #include "nact-tree-ieditable.h"
@@ -487,10 +486,14 @@ initialize_gtk( NactTreeView *view )
 
        scrolled = gtk_scrolled_window_new( NULL, NULL );
        gtk_container_add( GTK_CONTAINER( view ), scrolled );
+       gtk_scrolled_window_set_shadow_type( GTK_SCROLLED_WINDOW( scrolled ), GTK_SHADOW_IN );
 
        tview = gtk_tree_view_new();
+       gtk_widget_set_hexpand( tview, TRUE );
+       gtk_widget_set_vexpand( tview, TRUE );
        gtk_container_add( GTK_CONTAINER( scrolled ), tview );
        priv->tree_view = GTK_TREE_VIEW( tview );
+       gtk_tree_view_set_headers_visible( priv->tree_view, FALSE );
 
        model = nact_tree_model_new( GTK_TREE_VIEW( tview ));
        nact_tree_model_set_main_window( model, priv->window );
diff --git a/src/nact/nautilus-actions-config-tool.actions b/src/nact/nautilus-actions-config-tool.actions
index 69a96cb..dde9bf0 100644
--- a/src/nact/nautilus-actions-config-tool.actions
+++ b/src/nact/nautilus-actions-config-tool.actions
@@ -113,19 +113,19 @@
           <section>
             <item>
               <attribute name="label" translatable="yes">_File</attribute>
-              <attribute name="action">win.view-toolbar-file</attribute>
+              <attribute name="action">win.toolbar-file</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Edit</attribute>
-              <attribute name="action">win.view-toolbar-edit</attribute>
+              <attribute name="action">win.toolbar-edit</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Tools</attribute>
-              <attribute name="action">win.view-toolbar-tools</attribute>
+              <attribute name="action">win.toolbar-tools</attribute>
             </item>
             <item>
               <attribute name="label" translatable="yes">_Help</attribute>
-              <attribute name="action">win.view-toolbar-help</attribute>
+              <attribute name="action">win.toolbar-help</attribute>
             </item>
           </section>
         </submenu>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]