[nautilus-actions] Fix Gtk+ 3 build and execution



commit dd06203b5df639ac20915b35fe1d14bdbb6afacf
Author: Pierre Wieser <pwieser trychlos org>
Date:   Mon Dec 20 23:31:27 2010 +0100

    Fix Gtk+ 3 build and execution

 ChangeLog                                |   30 +
 README                                   |   27 +-
 configure.ac                             |   26 +-
 m4/na-check-for-gtk.m4                   |  116 ++
 m4/na-check-module.m4                    |   45 +-
 m4/na-nautilus-extdir.m4                 |   16 +-
 run-autogen.sh                           |   40 +-
 src/nact/Makefile.am                     |    1 +
 src/nact/base-assistant.c                |    4 +-
 src/nact/base-keysyms.h                  |   81 +
 src/nact/nact-iaction-tab.c              |    2 +-
 src/nact/nact-iactions-list.c            |   11 +-
 src/nact/nact-icommand-tab.c             |    4 +-
 src/nact/nact-match-list.c               |    8 +-
 src/nact/nact-schemes-list.c             |    8 +-
 src/nact/nautilus-actions-config-tool.ui | 2637 +++++++++++++++---------------
 16 files changed, 1679 insertions(+), 1377 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 7019fa8..c5c3e2d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2010-12-20 Pierre Wieser <pwieser trychlos org>
+
+	* README: Add some words about importer/exporter plugins.
+
+	* m4/na-check-for-gtk.m4: New file.
+
+	* configure.ac: Add check for building against Gtk+ 3.0.
+
+	* m4/na-check-module.m4:
+	* m4/na-nautilus-extdir.m4:
+	* run-autogen.sh: Updated accordingly.
+
+	* src/nact/base-keysyms.h: New file which holds defines for Gdk keys.
+
+	* src/nact/Makefile.am:
+	* src/nact/base-assistant.c (on_key_pressed_event):
+	* src/nact/nact-iactions-list.c (on_key_pressed_event):
+	* src/nact/nact-match-list.c (on_key_pressed_event):
+	* src/nact/nact-schemes-list.c (on_key_pressed_event):
+	Updated accordingly.
+
+	* src/nact/nact-iaction-tab.c
+	(nact_iaction_tab_initial_load_toplevel):
+	Fix arguments when building against Gtk+ 2.0.
+
+	* src/nact/nact-icommand-tab.c (update_example_label):
+	Replace 'e.g.,' with 'Ex.:'.
+
+	* src/nact/nautilus-actions-config-tool.ui: Review the widget layout.
+
 2010-12-16 Pierre Wieser <pwieser trychlos org>
 
 	* m4/na-check-module.m4: Fix variable substitution.
diff --git a/README b/README
index ce6f59a..6cf8a4b 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ Nautilus-Actions components.
   Nautilus-Actions has three sort of components:
 
   - A user interface, nautilus-actions-config-tool (NACT), which let you
-    manage your actions. With NACT, you will able to create, modify and
+    manage your actions. With NACT, you are able to create, modify and
     delete actions, to define menus and submenus, to order and reorder
     items.
     Import/export functions are also managed via NACT.
@@ -17,17 +17,17 @@ Nautilus-Actions components.
   - Nautilus extensions as dynamically loadable plugins. These extensions
     are automatically loaded by Nautilus when it starts. For now, two
     extensions are provided:
-    . libnautilus-actions-menu is a plugin which takes care of displaying
-      actions in Nautilus context menu
-    . libnautilus-actions-tracker is a plugin which tracks the current Nautilus
-      selection, and send it in response to a DBus request. 
+    . libnautilus-actions-menu.so is a plugin which takes care of displaying
+      actions in Nautilus context menus;
+    . libnautilus-actions-tracker.so is a plugin which tracks the current
+      Nautilus selection, and sends it in response to a DBus request. 
 
   - Command-line utilities:
     . nautilus-actions-new lets you create new actions from the command-line.
     . nautilus-actions-schemas prints the full GConf schema on stdout.
     . nautilus-actions-run lets you execute a predefined action, taking
       into account the current Nautilus selection via a DBus call to the
-      tracker plugin.
+      libnautilus-actions-tracker plugin.
 
 Nautilus-Actions plugins.
 
@@ -41,13 +41,22 @@ Nautilus-Actions plugins.
     which means that newly created actions and menus will be stored on
     disk as .desktop files, in accordance with DES-EMA specification [1].
 
+  Importers/Exporters.
+
+    Nautilus-Actions also relies on plugins to import actions and menus,
+    and to export them, in several formats.
+    For now, Nautilus-Actions is able to import/export its items as:
+    . GConf schemas;
+    . GConf dump;
+    . XML. 
+
 Nautilus-Actions documentation.
 
   Documentation is provided in several formats:
   - developer documentation is provided as xml and html files, as generated
     by gtk-doc;
-  - user's manuals and general documentation is provided as xml, pdf and
-    html files, as generated by gnome-doc-utils, docbook-utils or dblatex
-    packages.
+  - NACT user's manuals and general documentation is provided as xml, pdf
+    and html files, as generated by gnome-doc-utils, docbook-utils or dblatex
+    tools.
 
 [1] http://www.nautilus-actions.org/?q=node/377
diff --git a/configure.ac b/configure.ac
index b5e96b1..89f7f33 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,24 +135,7 @@ if test "${PKG_CONFIG}" = "no"; then
 	AC_MSG_ERROR([You need to install pkg-config])
 fi
 
-gtk_required=2.12.0
-PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= ${gtk_required}],[have_gtk3=yes],[have_gtk3=no])
-if test "${have_gtk3}" = "yes"; then
-	unique_module="unique-3.0"
-	NAUTILUS_ACTIONS_CFLAGS="${GTK3_CFLAGS}"
-	NAUTILUS_ACTIONS_LIBS="${GTK3_LIBS}"
-	AC_MSG_CHECKING([for GTK2])
-	AC_MSG_RESULT([skipped as Gtk+-3 build has been detected])
-else
-	PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= ${gtk_required}],[have_gtk2=yes],[have_gtk2=no])
-	if test "${have_gtk2}" = "yes"; then
-		unique_module="unique-1.0"
-		NAUTILUS_ACTIONS_CFLAGS="${GTK2_CFLAGS}"
-		NAUTILUS_ACTIONS_LIBS="${GTK2_LIBS}"
-	else
-		AC_MSG_ERROR([unable to find any Gtk+ library])
-	fi
-fi
+NA_CHECK_FOR_GTK
 
 glib_required=2.16.0
 
@@ -164,7 +147,6 @@ NA_CHECK_MODULE([GLIB],              [glib-2.0 >= ${glib_required}])
 NA_CHECK_MODULE([GTOP],              [libgtop-2.0 >= 2.23.1])
 NA_CHECK_MODULE([LIBXML],            [libxml-2.0 >= 2.6])
 NA_CHECK_MODULE([SM],                [sm >= 1.0])
-NA_CHECK_MODULE([UNIQUE],            [${unique_module}])
 NA_CHECK_MODULE([UUID],              [uuid])
 NA_CHECK_MODULE([NAUTILUS_EXTENSION],[libnautilus-extension >= 2.8])
 
@@ -204,12 +186,16 @@ if test "x${enable_schemas_install}" = "xno"; then
 fi
 msg_gtk_html_doc=`if test "x${enable_gtk_doc_html}" = "xno"; then echo disabled; else echo "enabled with gtk-doc"; fi`
 msg_gtk_pdf_doc=`if test "x${enable_gtk_doc_pdf}" = "xno"; then echo disabled; else echo enabled; fi`
+msg_gtk_version=""
+if test "${have_gtk3}" = "yes"; then msg_gtk_version="Gtk+ 3.0"; 
+	elif  test "${have_gtk2}" = "yes"; then msg_gtk_version="Gtk+ 2.0"; fi
 $as_echo "
 	${PACKAGE_STRING} configuration summary:
 
 	Installation prefix             ${prefix}
 	Build system type               ${ac_cv_build}
-	Nautilus extensions directory   ${ac_with_nact_nautilus_extdir}
+	Nautilus extensions directory   ${with_nautilus_extdir}
+	Gtk+ version                    ${msg_gtk_version}
 	Default I/O provider            ${with_default_io_provider}
 	GConf schemas installation      ${msg_schemas_install}
 	Maintainer mode                 ${msg_maintainer_mode}
diff --git a/m4/na-check-for-gtk.m4 b/m4/na-check-for-gtk.m4
new file mode 100644
index 0000000..ebca05a
--- /dev/null
+++ b/m4/na-check-for-gtk.m4
@@ -0,0 +1,116 @@
+# Nautilus Actions
+# A Nautilus extension which offers configurable context menu actions.
+#
+# Copyright (C) 2005 The GNOME Foundation
+# Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+# Copyright (C) 2009, 2010 Pierre Wieser and others (see AUTHORS)
+#
+# This Program 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.
+#
+# This Program 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 this Library; see the file COPYING.  If not,
+# write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307, USA.
+#
+# Authors:
+#   Frederic Ruaudel <grumz grumz net>
+#   Rodrigo Moya <rodrigo gnome-db org>
+#   Pierre Wieser <pwieser trychlos org>
+#   ... and many others (see AUTHORS)
+
+# serial 1 creation
+
+dnl let the user choose the Gtk+ version he wants build against
+dnl --with-gtk+=[2|3]
+dnl
+dnl if the --with-gtk+ option is specified, an argument is required
+dnl else, Gtk+-3.0 is first tested, then Gtk+-2.0
+
+AC_DEFUN([NA_CHECK_FOR_GTK],[
+	AC_REQUIRE([_AC_NA_ARG_GTK])dnl
+	AC_REQUIRE([_AC_NA_CHECK_GTK])dnl
+])
+
+AC_DEFUN([_AC_NA_ARG_GTK],[
+	AC_ARG_WITH(
+		[gtk],
+		AC_HELP_STRING(
+			[--with-gtk=@<:@2|3@:>@],
+			[the Gtk+ version to build against @<:@auto@:>@]
+		),
+	[with_gtk=$withval],
+	[with_gtk="auto"]
+	)
+])
+
+AC_DEFUN([_AC_NA_CHECK_GTK],[
+	gtk_required=2.12.0
+
+	if test "${with_gtk}" = "auto"; then
+		_AC_NA_CHECK_FOR_GTK3
+		if test "${have_gtk3}" != "yes"; then
+			_AC_NA_CHECK_FOR_GTK2
+			if test "${have_gtk2}" != "yes"; then
+				AC_MSG_ERROR([unable to find any suitable Gtk+ library])
+			fi
+		fi
+	else
+		if test "${with_gtk}" = "2"; then
+			_AC_NA_CHECK_FOR_GTK2
+			if test "${have_gtk2}" != "yes"; then
+				AC_MSG_ERROR([unable to build against Gtk+-2.0 library])
+			fi
+		else
+			if test "${with_gtk}" = "3"; then
+				_AC_NA_CHECK_FOR_GTK3
+				if test "${have_gtk3}" != "yes"; then
+					AC_MSG_ERROR([unable to build against Gtk+-3.0 library])
+				fi
+			else
+				AC_MSG_ERROR([--with-gtk=${with_gtk}: invalid argument])
+			fi
+		fi
+	fi
+])
+
+dnl test for Gtk+-3.0 and its dependancies
+dnl set have_gtk3=yes if all is ok
+
+AC_DEFUN([_AC_NA_CHECK_FOR_GTK3],[
+	PKG_CHECK_MODULES([GTK3],[gtk+-3.0 >= ${gtk_required}],[have_gtk3=yes],[have_gtk3=no])
+
+	if test "${have_gtk3}" = "yes"; then
+		NA_CHECK_MODULE([UNIQUE],[unique-3.0],[no])
+		if test "${have_UNIQUE}" != "yes"; then
+			have_gtk3="no"
+		else 
+			NAUTILUS_ACTIONS_CFLAGS="${NAUTILUS_ACTIONS_CFLAGS} ${GTK3_CFLAGS}"
+			NAUTILUS_ACTIONS_LIBS="${NAUTILUS_ACTIONS_LIBS} ${GTK3_LIBS}"
+		fi
+	fi
+])
+
+dnl test for Gtk+-2.0 and its dependancies
+dnl set have_gtk2=yes if all is ok
+
+AC_DEFUN([_AC_NA_CHECK_FOR_GTK2],[
+	PKG_CHECK_MODULES([GTK2],[gtk+-2.0 >= ${gtk_required}],[have_gtk2=yes],[have_gtk2=no])
+
+	if test "${have_gtk2}" = "yes"; then
+		NA_CHECK_MODULE([UNIQUE],[unique-1.0],[no])
+		if test "${have_UNIQUE}" != "yes"; then
+			have_gtk2="no"
+		else 
+			NAUTILUS_ACTIONS_CFLAGS="${NAUTILUS_ACTIONS_CFLAGS} ${GTK2_CFLAGS}"
+			NAUTILUS_ACTIONS_LIBS="${NAUTILUS_ACTIONS_LIBS} ${GTK2_LIBS}"
+		fi
+	fi
+])
diff --git a/m4/na-check-module.m4 b/m4/na-check-module.m4
index ed0f626..db7d90d 100644
--- a/m4/na-check-module.m4
+++ b/m4/na-check-module.m4
@@ -28,28 +28,49 @@
 
 # serial 1 creation
 
-dnl usage:  NA_CHECK_MODULE([var],[condition])
+dnl usage:  NA_CHECK_MODULE(var,condition[,error])
 dnl
 dnl this macro checks that gtk+-2.0 and gtk+-3.0 libraries are not mixed
+dnl
+dnl if 'error' != 'no', then displays an error message if condition is
+dnl not met.
+# translit($1, 'a-z', 'A-Z'),
 
 AC_DEFUN([NA_CHECK_MODULE],[
-	PKG_CHECK_MODULES([$1],[$2])
-	#echo "cflags='${$1_CFLAGS}'"
-	#echo "libs='${$1_LIBS}'"
-	if ! test -z "${$1_LIBS}"; then
+	PKG_CHECK_MODULES([$1],[$2],[have_$1="yes"],[have_$1="no"])
+
+	#echo "have_gtk2=$have_gtk2 have_gtk3=$have_gtk3"
+	#echo "$1_CFLAGS='${$1_CFLAGS}'"
+	#echo "$1_LIBS='${$1_LIBS}'"
+	#echo "against Gtk2: $(echo ${$1_LIBS} | grep -E 'gtk-@<:@^-@:>@+-2\.0')"
+	#echo "against Gtk3: $(echo ${$1_LIBS} | grep -E 'gtk-@<:@^-@:>@+-3\.0')"
+
+	if test "${have_$1}" = "yes"; then
 		if test "${have_gtk3}" = "yes"; then
-			if test "$(echo ${$1_LIBS} | grep gtk-x11-2.0)" != ""; then
-				AC_MSG_ERROR([$1: compiling with Gtk+-3 but adresses Gtk+-2 libraries])
+			if echo ${$1_LIBS} | grep -qE 'gtk-@<:@^-@:>@+-2\.0'; then
+				_NA_CHECK_MODULE_MSG([$3],[$1: compiling with Gtk+-3 but adresses Gtk+-2 libraries])
+				have_$1="no"
 			fi
-		else
-			if test "$(echo ${$1_LIBS} | grep gtk-x11-3.0)" != ""; then
-				AC_MSG_ERROR([$1: compiling with Gtk+-2 but adresses Gtk+-3 libraries])
+		elif test "${have_gtk2}" = "yes"; then
+			if echo ${$1_LIBS} | grep -qE 'gtk-@<:@^-@:>@+-3.0'; then
+				_NA_CHECK_MODULE_MSG([$3],[$1: compiling with Gtk+-2 but adresses Gtk+-3 libraries])
+				have_$1="no"
 			fi
 		fi
-				
+	else
+		_NA_CHECK_MODULE_MSG([$3],[$1: condition $2 not satisfied])
+	fi
+
+	if test "${have_$1}" = "yes"; then
 		NAUTILUS_ACTIONS_CFLAGS="${NAUTILUS_ACTIONS_CFLAGS} ${$1_CFLAGS}"
 		NAUTILUS_ACTIONS_LIBS="${NAUTILUS_ACTIONS_LIBS} ${$1_LIBS}"
+	fi
+])
+
+AC_DEFUN([_NA_CHECK_MODULE_MSG],[
+	if test "$1" = "no"; then
+		AC_MSG_RESULT([warning: $2])
 	else
-		AC_MSG_ERROR([condition $2 not satisfied])
+		AC_MSG_ERROR([$2])
 	fi
 ])
diff --git a/m4/na-nautilus-extdir.m4 b/m4/na-nautilus-extdir.m4
index b220fa0..ad9290b 100644
--- a/m4/na-nautilus-extdir.m4
+++ b/m4/na-nautilus-extdir.m4
@@ -34,12 +34,12 @@
 AC_DEFUN([NA_NAUTILUS_EXTDIR],[
 	AC_REQUIRE([_AC_ARG_NA_NAUTILUS_EXTDIR])dnl
 	AC_REQUIRE([_AC_NA_CHECK_NAUTILUS_EXTDIR])dnl
-	if test "${ac_with_nact_nautilus_extdir}" = ""; then
+	if test "${with_nautilus_extdir}" = ""; then
 		AC_MSG_ERROR([Unable to determine nautilus extension folder, please use --with-nautilus-extdir option])
 	else
-		AC_MSG_NOTICE([installing plugin in ${ac_with_nact_nautilus_extdir}])
-		AC_SUBST([NAUTILUS_EXTENSIONS_DIR],[${ac_with_nact_nautilus_extdir}])
-		AC_DEFINE_UNQUOTED([NA_NAUTILUS_EXTENSIONS_DIR],[${ac_with_nact_nautilus_extdir}],[Nautilus extensions directory])
+		AC_MSG_NOTICE([installing plugin in ${with_nautilus_extdir}])
+		AC_SUBST([NAUTILUS_EXTENSIONS_DIR],[${with_nautilus_extdir}])
+		AC_DEFINE_UNQUOTED([NA_NAUTILUS_EXTENSIONS_DIR],[${with_nautilus_extdir}],[Nautilus extensions directory])
 	fi
 ])
 
@@ -50,15 +50,15 @@ AC_DEFUN([_AC_ARG_NA_NAUTILUS_EXTDIR],[
 			[--with-nautilus-extdir=DIR],
 			[nautilus plugins extension directory @<:@auto@:>@]
 		),
-	[ac_with_nact_nautilus_extdir=$withval],
-	[ac_with_nact_nautilus_extdir=""]
+	[with_nautilus_extdir=$withval],
+	[with_nautilus_extdir=""]
 	)
 ])
 
 AC_DEFUN([_AC_NA_CHECK_NAUTILUS_EXTDIR],[
-	if test "${ac_with_nact_nautilus_extdir}" = ""; then
+	if test "${with_nautilus_extdir}" = ""; then
 		if test "{PKG_CONFIG}" != ""; then
-			ac_with_nact_nautilus_extdir=`${PKG_CONFIG} --variable=extensiondir libnautilus-extension`
+			with_nautilus_extdir=`${PKG_CONFIG} --variable=extensiondir libnautilus-extension`
 		fi
 	fi
 ])
diff --git a/run-autogen.sh b/run-autogen.sh
index 0fa6631..95df1de 100755
--- a/run-autogen.sh
+++ b/run-autogen.sh
@@ -1,20 +1,23 @@
 #!/bin/sh
 
+autogen_target=${autogen_target:-normal}
+
 # a nautilus-actions-x.y may remain after an aborted make distcheck
 # such a directory breaks gnome-autogen.sh generation
 # so clean it here
 find . -maxdepth 1 -type d -name 'nautilus-actions-*' | xargs rm -fr
 
-#exec ./autogen.sh \
-#	--prefix=$(pwd)/install \
-#	--with-nautilus-extdir=$(pwd)/install/lib/nautilus \
-#	--enable-silent-rules \
-#	--disable-schemas-install \
-#	--enable-gtk-doc \
-#	--enable-gtk-doc-pdf \
-#	--disable-scrollkeeper \
-#	--enable-html-manuals \
-#	--enable-pdf-manuals
+[ "${autogen_target}" = "normal" ] &&
+	exec ./autogen.sh \
+		--prefix=$(pwd)/install \
+		--with-nautilus-extdir=$(pwd)/install/lib/nautilus \
+		--enable-silent-rules \
+		--disable-schemas-install \
+		--enable-gtk-doc \
+		--enable-gtk-doc-pdf \
+		--disable-scrollkeeper \
+		--enable-html-manuals \
+		--enable-pdf-manuals $*
 
 # Build with Gtk+ 3 (actually a 2.97.x unstable version)
 # installed in ~/.local/jhbuild
@@ -25,10 +28,13 @@ find . -maxdepth 1 -type d -name 'nautilus-actions-*' | xargs rm -fr
 # $ grep gtk+-2.0 /usr/lib/pkgconfig/*
 #   libnautilus-extension.pc:Requires: glib-2.0 gio-2.0 gtk+-2.0
 #   unique-1.0.pc:Requires: gtk+-2.0
-PKG_CONFIG_PATH=/home/pierre/.local/jhbuild/lib/pkgconfig \
-LD_LIBRARY_PATH=/home/pierre/.local/jhbuild/lib \
-	exec ./autogen.sh \
-		--prefix=/home/pierre/.local/jhbuild \
-		--with-nautilus-extdir=/home/pierre/.local/jhbuild/lib/nautilus \
-		--enable-silent-rules \
-		--disable-schemas-install
+
+[ "${autogen_target}" = "jhbuild" ] &&
+	export autogen_prefix=${HOME}/.local/jhbuild &&
+	PKG_CONFIG_PATH=${autogen_prefix}/lib/pkgconfig \
+	LD_LIBRARY_PATH=${autogen_prefix}/lib \
+		exec ./autogen.sh \
+			--prefix=${autogen_prefix} \
+			--with-nautilus-extdir=${autogen_prefix}/lib/nautilus \
+			--enable-silent-rules \
+			--disable-schemas-install $*
diff --git a/src/nact/Makefile.am b/src/nact/Makefile.am
index 48f875e..95bc60a 100644
--- a/src/nact/Makefile.am
+++ b/src/nact/Makefile.am
@@ -59,6 +59,7 @@ nautilus_actions_config_tool_SOURCES = \
 	base-dialog.h										\
 	base-iprefs.c										\
 	base-iprefs.h										\
+	base-keysyms.h										\
 	base-window.c										\
 	base-window.h										\
 	base-window-class.h									\
diff --git a/src/nact/base-assistant.c b/src/nact/base-assistant.c
index 70d6019..9648069 100644
--- a/src/nact/base-assistant.c
+++ b/src/nact/base-assistant.c
@@ -32,12 +32,12 @@
 #include <config.h>
 #endif
 
-#include <gdk/gdkkeysyms.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
 #include "base-application.h"
 #include "base-assistant.h"
+#include "base-keysyms.h"
 
 /* private class data
  */
@@ -538,7 +538,7 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, BaseAssistant *assi
 
 	if( !assistant->private->dispose_has_run ){
 
-		if( event->keyval == GDK_KEY_Escape &&
+		if( event->keyval == NACT_KEY_Escape &&
 			assistant->private->cancel_on_escape ){
 
 				assistant->private->escape_key_pressed = TRUE;
diff --git a/src/nact/base-keysyms.h b/src/nact/base-keysyms.h
new file mode 100644
index 0000000..1d33ede
--- /dev/null
+++ b/src/nact/base-keysyms.h
@@ -0,0 +1,81 @@
+/*
+ * Nautilus Actions
+ * A Nautilus extension which offers configurable context menu actions.
+ *
+ * Copyright (C) 2005 The GNOME Foundation
+ * Copyright (C) 2006, 2007, 2008 Frederic Ruaudel and others (see AUTHORS)
+ * Copyright (C) 2009, 2010 Pierre Wieser and others (see AUTHORS)
+ *
+ * This Program 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.
+ *
+ * This Program 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 this Library; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place,
+ * Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors:
+ *   Frederic Ruaudel <grumz grumz net>
+ *   Rodrigo Moya <rodrigo gnome-db org>
+ *   Pierre Wieser <pwieser trychlos org>
+ *   ... and many others (see AUTHORS)
+ */
+
+#ifndef __BASE_KEYSYMS_H__
+#define __BASE_KEYSYMS_H__
+
+/**
+ * SECTION: base_window
+ * @short_description: #BaseWindow public function declaration.
+ * @include: nact/base-window.h
+ *
+ * This is a base class which encapsulates a Gtk+ windows.
+ * It works together with the BaseApplication class to run a Gtk+
+ * application.
+ */
+
+#include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
+
+G_BEGIN_DECLS
+
+/* GDK_KEY_ defines have been defined since Gtk+ 2.21.8
+ */
+#if(( GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION >= 22 ) || GTK_MAJOR_VERSION >= 3 )
+
+#define NACT_KEY_Escape    (GDK_KEY_Escape)
+#define NACT_KEY_Insert    (GDK_KEY_Insert)
+#define NACT_KEY_Delete    (GDK_KEY_Delete)
+#define NACT_KEY_Return    (GDK_KEY_Return)
+#define NACT_KEY_KP_Delete (GDK_KEY_KP_Delete)
+#define NACT_KEY_KP_Enter  (GDK_KEY_KP_Enter)
+#define NACT_KEY_KP_Insert (GDK_KEY_KP_Insert)
+#define NACT_KEY_Left      (GDK_KEY_Left)
+#define NACT_KEY_Right     (GDK_KEY_Right)
+#define NACT_KEY_F2        (GDK_KEY_F2)
+
+#else
+
+#define NACT_KEY_Escape    (GDK_Escape)
+#define NACT_KEY_Insert    (GDK_Insert)
+#define NACT_KEY_Delete    (GDK_Delete)
+#define NACT_KEY_Return    (GDK_Return)
+#define NACT_KEY_KP_Delete (GDK_KP_Delete)
+#define NACT_KEY_KP_Enter  (GDK_KP_Enter)
+#define NACT_KEY_KP_Insert (GDK_KP_Insert)
+#define NACT_KEY_Left      (GDK_Left)
+#define NACT_KEY_Right     (GDK_Right)
+#define NACT_KEY_F2        (GDK_F2)
+
+#endif
+
+G_END_DECLS
+
+#endif /* __BASE_KEYSYMS_H__ */
diff --git a/src/nact/nact-iaction-tab.c b/src/nact/nact-iaction-tab.c
index d9b06dd..8bd8c0b 100644
--- a/src/nact/nact-iaction-tab.c
+++ b/src/nact/nact-iaction-tab.c
@@ -234,7 +234,7 @@ nact_iaction_tab_initial_load_toplevel( NactIActionTab *instance )
 #if(( GTK_MAJOR_VERSION >= 2 && GTK_MINOR_VERSION >= 24 ) || GTK_MAJOR_VERSION >= 3 )
 		icon_combo = gtk_combo_box_new_with_model_and_entry( model );
 #else
-		icon_combo = gtk_combo_box_entry_new_with_model( model );
+		icon_combo = gtk_combo_box_entry_new_with_model( model, ICON_LABEL_COLUMN );
 #endif
 		g_object_unref( model );
 		container = base_window_get_widget( BASE_WINDOW( instance ), "ActionIconHBox" );
diff --git a/src/nact/nact-iactions-list.c b/src/nact/nact-iactions-list.c
index 13a5a4c..9b1db70 100644
--- a/src/nact/nact-iactions-list.c
+++ b/src/nact/nact-iactions-list.c
@@ -32,11 +32,10 @@
 #include <config.h>
 #endif
 
-#include <gdk/gdkkeysyms.h>
-
 #include <api/na-object-api.h>
 
 #include "base-window.h"
+#include "base-keysyms.h"
 #include "nact-main-menubar.h"
 #include "nact-main-tab.h"
 #include "nact-marshal.h"
@@ -1195,22 +1194,22 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, NactIActionsList *i
 	g_debug( "%s: widget=%p, event=%p, user_data=%p", thisfn, widget, event, user_data );*/
 	gboolean stop = FALSE;
 
-	if( event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_KP_Enter ){
+	if( event->keyval == NACT_KEY_Return || event->keyval == NACT_KEY_KP_Enter ){
 		nact_iactions_list_bis_toggle_collapse( instance );
 		stop = TRUE;
 	}
 
-	if( event->keyval == GDK_KEY_F2 ){
+	if( event->keyval == NACT_KEY_F2 ){
 		inline_edition( instance );
 		stop = TRUE;
 	}
 
-	if( event->keyval == GDK_KEY_Right ){
+	if( event->keyval == NACT_KEY_Right ){
 		nact_iactions_list_bis_expand_to_first_child( instance );
 		stop = TRUE;
 	}
 
-	if( event->keyval == GDK_KEY_Left ){
+	if( event->keyval == NACT_KEY_Left ){
 		nact_iactions_list_bis_collapse_to_parent( instance );
 		stop = TRUE;
 	}
diff --git a/src/nact/nact-icommand-tab.c b/src/nact/nact-icommand-tab.c
index 254cd18..b0268fb 100644
--- a/src/nact/nact-icommand-tab.c
+++ b/src/nact/nact-icommand-tab.c
@@ -672,9 +672,9 @@ update_example_label( NactICommandTab *instance, NAObjectProfile *profile )
 		/* convert special xml chars (&, <, >,...) to avoid warnings
 		 * generated by Pango parser
 		 */
-		/* i18n: command-line example: e.g., /bin/ls file1.txt file2.txt */
+		/* i18n: command-line example: Ex.: /bin/ls file1.txt file2.txt */
 		newlabel = g_markup_printf_escaped(
-				"<i><b><span size=\"small\">%s %s</span></b></i>", _( "e.g.," ), parameters );
+				"<i><b><span size=\"small\">%s %s</span></b></i>", _( "Ex.:" ), parameters );
 
 		g_free( parameters );
 
diff --git a/src/nact/nact-match-list.c b/src/nact/nact-match-list.c
index ffa32c1..14d646a 100644
--- a/src/nact/nact-match-list.c
+++ b/src/nact/nact-match-list.c
@@ -32,12 +32,12 @@
 #include <config.h>
 #endif
 
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
 #include <api/na-object-api.h>
 #include <api/na-core-utils.h>
 
+#include "base-keysyms.h"
 #include "nact-gtk-utils.h"
 #include "nact-main-tab.h"
 #include "nact-match-list.h"
@@ -537,21 +537,21 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, MatchListStr *data
 
 	stop = FALSE;
 
-	if( event->keyval == GDK_KEY_F2 ){
+	if( event->keyval == NACT_KEY_F2 ){
 		if( data->editable_filter ){
 			edit_inline( data );
 			stop = TRUE;
 		}
 	}
 
-	if( event->keyval == GDK_KEY_Insert || event->keyval == GDK_KEY_KP_Insert ){
+	if( event->keyval == NACT_KEY_Insert || event->keyval == NACT_KEY_KP_Insert ){
 		if( data->editable_item ){
 			insert_new_row( data );
 			stop = TRUE;
 		}
 	}
 
-	if( event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_KP_Delete ){
+	if( event->keyval == NACT_KEY_Delete || event->keyval == NACT_KEY_KP_Delete ){
 		if( data->editable_item ){
 			delete_current_row( data );
 			stop = TRUE;
diff --git a/src/nact/nact-schemes-list.c b/src/nact/nact-schemes-list.c
index 0016f4c..69b8a86 100644
--- a/src/nact/nact-schemes-list.c
+++ b/src/nact/nact-schemes-list.c
@@ -33,7 +33,6 @@
 #endif
 
 #include <gconf/gconf-client.h>
-#include <gdk/gdkkeysyms.h>
 #include <glib/gi18n.h>
 
 #include <api/na-core-utils.h>
@@ -41,6 +40,7 @@
 
 #include <core/na-iprefs.h>
 
+#include "base-keysyms.h"
 #include "nact-application.h"
 #include "nact-gtk-utils.h"
 #include "nact-main-tab.h"
@@ -539,17 +539,17 @@ on_key_pressed_event( GtkWidget *widget, GdkEventKey *event, BaseWindow *window
 
 	stop = FALSE;
 
-	if( event->keyval == GDK_KEY_F2 ){
+	if( event->keyval == NACT_KEY_F2 ){
 		edit_inline( window );
 		stop = TRUE;
 	}
 
-	if( event->keyval == GDK_KEY_Insert || event->keyval == GDK_KEY_KP_Insert ){
+	if( event->keyval == NACT_KEY_Insert || event->keyval == NACT_KEY_KP_Insert ){
 		insert_new_row( window );
 		stop = TRUE;
 	}
 
-	if( event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_KP_Delete ){
+	if( event->keyval == NACT_KEY_Delete || event->keyval == NACT_KEY_KP_Delete ){
 		delete_row( window );
 		stop = TRUE;
 	}
diff --git a/src/nact/nautilus-actions-config-tool.ui b/src/nact/nautilus-actions-config-tool.ui
index fdfa83c..f489551 100644
--- a/src/nact/nautilus-actions-config-tool.ui
+++ b/src/nact/nautilus-actions-config-tool.ui
@@ -158,592 +158,617 @@
                     <property name="can_focus">True</property>
                     <property name="scrollable">True</property>
                     <child>
-                      <object class="GtkVBox" id="vbox3">
+                      <object class="GtkAlignment" id="alignment7">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determine the main characteristics of the currently selected item.</property>
-                        <property name="border_width">6</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <child>
-                          <object class="GtkFrame" id="frame7">
+                          <object class="GtkVBox" id="vbox3">
                             <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment7">
+                              <object class="GtkFrame" id="frame7">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox7">
+                                  <object class="GtkAlignment" id="alignment20">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">10</property>
-                                    <child>
-                                      <object class="GtkTable" id="table7">
+                                    <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="GtkVBox" id="vbox7">
                                         <property name="visible">True</property>
-                                        <property name="n_rows">3</property>
-                                        <property name="n_columns">2</property>
-                                        <property name="column_spacing">6</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">10</property>
                                         <child>
-                                          <object class="GtkCheckButton" id="ActionTargetSelectionButton">
-                                            <property name="label" translatable="yes">Display item in _selection context menu</property>
+                                          <object class="GtkTable" id="table7">
                                             <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 action will be candidate to be displayed in Nautilus context menus when there is a selection. It thus applies to selected objects. The item will also appear in Nautilus Edit menu.
-Menus are always candidate if they contain at least one action.</property>
-                                            <property name="use_underline">True</property>
-                                            <property name="draw_indicator">True</property>
+                                            <property name="n_rows">3</property>
+                                            <property name="n_columns">2</property>
+                                            <property name="column_spacing">6</property>
+                                            <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="use_underline">True</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="invisible_char">&#x25CF;</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="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="use_underline">True</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>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkEntry" id="ActionMenuLabelEntry">
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <object class="GtkTable" id="table6">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">Label of the menu item in the Nautilus popup menu.</property>
-                                            <property name="invisible_char">&#x25CF;</property>
+                                            <property name="n_rows">3</property>
+                                            <property name="n_columns">2</property>
+                                            <property name="column_spacing">6</property>
+                                            <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="use_underline">True</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="use_underline">True</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="invisible_char">&#x25CF;</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="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>
                                           </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>
+                                            <property name="position">2</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="ActionMenuLabelLabel">
+                                          <object class="GtkTable" id="table1">
                                             <property name="visible">True</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>
+                                            <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="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="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="invisible_char">&#x25CF;</property>
+                                              </object>
+                                              <packing>
+                                                <property name="left_attach">1</property>
+                                                <property name="right_attach">2</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkHBox" id="hbox2">
+                                                <property name="visible">True</property>
+                                                <property name="spacing">6</property>
+                                                <child>
+                                                  <object class="GtkAspectFrame" id="ActionIconFrame">
+                                                    <property name="visible">True</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="xpad">2</property>
+                                                        <property name="ypad">2</property>
+                                                        <property name="stock">gtk-stock-blank</property>
+                                                        <property name="icon-size">1</property>
+                                                      </object>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkHBox" id="ActionIconHBox">
+                                                    <property name="visible">True</property>
+                                                    <child>
+                                                      <placeholder/>
+                                                    </child>
+                                                  </object>
+                                                  <packing>
+                                                    <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="image">ImageIconBrowse</property>
+                                                    <property name="use_underline">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</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>
                                           </object>
                                           <packing>
-                                            <property name="top_attach">2</property>
-                                            <property name="bottom_attach">3</property>
-                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="position">3</property>
                                           </packing>
                                         </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label52">
+                                    <property name="visible">True</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>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <placeholder/>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="tab">
+                      <object class="GtkLabel" id="label1">
+                        <property name="visible">True</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determine the main characteristics of the currently selected item.</property>
+                        <property name="label" translatable="yes">_Action</property>
+                        <property name="use_underline">True</property>
+                      </object>
+                      <packing>
+                        <property name="tab_fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="alignment9">
+                        <property name="visible">True</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
+                        <child>
+                          <object class="GtkVBox" id="vbox5">
+                            <property name="visible">True</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
+                            <child>
+                              <object class="GtkFrame" id="frame9">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">in</property>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment10">
+                                    <property name="visible">True</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="GtkHBox" id="hbox3">
+                                        <property name="visible">True</property>
+                                        <property name="spacing">6</property>
                                         <child>
-                                          <object class="GtkCheckButton" id="ActionTargetLocationButton">
-                                            <property name="label" translatable="yes">Display item in _location context menu</property>
+                                          <object class="GtkLabel" id="ProfileLabelLabel">
                                             <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 action will be candidate to be displayed in Nautilus context menus when there is no selection. It thus applies to current location. The item will also appear in Nautilus File menu.
-Menus are always candidate if they contain at least one action.</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">_Label :</property>
                                             <property name="use_underline">True</property>
-                                            <property name="draw_indicator">True</property>
+                                            <property name="mnemonic_widget">ProfileLabelEntry</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>
+                                            <property name="expand">False</property>
+                                            <property name="position">0</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
+                                          <object class="GtkEntry" id="ProfileLabelEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                          </object>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
                                         </child>
                                       </object>
-                                      <packing>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
                                     </child>
-                                    <child>
-                                      <object class="GtkTable" id="table6">
+                                  </object>
+                                </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label53">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="frame10">
+                                <property name="visible">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">in</property>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment21">
+                                    <property name="visible">True</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="GtkTable" id="table2">
                                         <property name="visible">True</property>
-                                        <property name="n_rows">3</property>
-                                        <property name="n_columns">2</property>
+                                        <property name="n_rows">5</property>
+                                        <property name="n_columns">3</property>
                                         <property name="column_spacing">6</property>
+                                        <property name="row_spacing">3</property>
                                         <child>
-                                          <object class="GtkCheckButton" id="ActionTargetToolbarButton">
-                                            <property name="label" translatable="yes">Display item in the _toolbar</property>
+                                          <object class="GtkLabel" id="CommandPathLabel">
                                             <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 action will be displayed in Nautilus toolbar. It applies to current folder when there is no selection.
-Menus are never displayed in the toolbar.</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">_Path :</property>
                                             <property name="use_underline">True</property>
-                                            <property name="draw_indicator">True</property>
+                                            <property name="mnemonic_widget">CommandPathEntry</property>
                                           </object>
                                           <packing>
-                                            <property name="left_attach">1</property>
-                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkCheckButton" id="ToolbarSameLabelButton">
-                                            <property name="label" translatable="yes">Use s_ame label for icon in the toolbar</property>
+                                          <object class="GtkLabel" id="CommandParametersLabel">
                                             <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="receives_default">False</property>
-                                            <property name="tooltip_text" translatable="yes">Does the icon use the same label that the menu ?</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">P_arameters :</property>
                                             <property name="use_underline">True</property>
-                                            <property name="draw_indicator">True</property>
+                                            <property name="mnemonic_widget">CommandParametersEntry</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>
+                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkEntry" id="ActionToolbarLabelEntry">
+                                          <object class="GtkEntry" id="CommandPathEntry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">Label of the icon item in the Nautilus toolbar.</property>
                                             <property name="invisible_char">&#x25CF;</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>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="ActionToolbarLabelLabel">
+                                          <object class="GtkButton" id="CommandPathButton">
+                                            <property name="label" translatable="yes">_Browse...</property>
                                             <property name="visible">True</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">T_oolbar label :</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="image">ImagePathBrowse</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>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <placeholder/>
-                                        </child>
-                                        <child>
-                                          <placeholder/>
+                                          <object class="GtkEntry" id="CommandParametersEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</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>
+                                            <property name="x_options">GTK_SHRINK | GTK_FILL</property>
+                                            <property name="y_options"></property>
+                                          </packing>
                                         </child>
-                                      </object>
-                                      <packing>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkTable" id="table1">
-                                        <property name="visible">True</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">
+                                          <object class="GtkToggleButton" id="CommandLegendButton">
+                                            <property name="label" translatable="yes">Le_gend</property>
                                             <property name="visible">True</property>
-                                            <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">Toolti_p :</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="image">ImageParametersLegend</property>
                                             <property name="use_underline">True</property>
-                                            <property name="mnemonic_widget">ActionTooltipEntry</property>
                                           </object>
                                           <packing>
-                                            <property name="x_options">GTK_FILL</property>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkLabel" id="ActionIconLabel">
+                                          <object class="GtkLabel" id="label4">
                                             <property name="visible">True</property>
                                             <property name="xalign">1</property>
-                                            <property name="label" translatable="yes">_Icon :</property>
+                                            <property name="label" translatable="yes">_Working directory :</property>
                                             <property name="use_underline">True</property>
                                           </object>
                                           <packing>
-                                            <property name="top_attach">1</property>
-                                            <property name="bottom_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
                                             <property name="x_options">GTK_FILL</property>
+                                            <property name="y_options">GTK_FILL</property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkEntry" id="ActionTooltipEntry">
+                                          <object class="GtkEntry" id="WorkingDirectoryEntry">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">Tooltip of the menu item that will appear in the Nautilus statusbar.</property>
                                             <property name="invisible_char">&#x25CF;</property>
                                           </object>
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="y_options"></property>
                                           </packing>
                                         </child>
                                         <child>
-                                          <object class="GtkHBox" id="hbox2">
+                                          <object class="GtkButton" id="CommandWorkingDirectoryButton">
+                                            <property name="label" translatable="yes">B_rowse...</property>
                                             <property name="visible">True</property>
-                                            <property name="spacing">6</property>
-                                            <child>
-                                              <object class="GtkAspectFrame" id="ActionIconFrame">
-                                                <property name="visible">True</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="xpad">2</property>
-                                                    <property name="ypad">2</property>
-                                                    <property name="stock">gtk-stock-blank</property>
-                                                    <property name="icon-size">1</property>
-                                                  </object>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="position">0</property>
-                                              </packing>
-                                            </child>
-                                            <child>
-                                              <object class="GtkHBox" id="ActionIconHBox">
-                                                <property name="visible">True</property>
-                                                <child>
-                                                  <placeholder/>
-                                                </child>
-                                              </object>
-                                              <packing>
-                                                <property name="position">1</property>
-                                              </packing>
-                                            </child>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">True</property>
+                                            <property name="image">ImageWorkingDirectoryBrowse</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment22">
+                                            <property name="visible">True</property>
+                                            <property name="yalign">0</property>
+                                            <property name="yscale">0</property>
                                             <child>
-                                              <object class="GtkButton" id="ActionIconBrowseButton">
-                                                <property name="label" translatable="yes">_Browse...</property>
+                                              <object class="GtkLabel" id="CommandExampleLabel">
                                                 <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 choose a custom icon from a file instead of a predefined icon from the drop-down list.</property>
-                                                <property name="image">ImageIconBrowse</property>
-                                                <property name="use_underline">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="use_markup">True</property>
+                                                <property name="wrap">True</property>
                                               </object>
-                                              <packing>
-                                                <property name="expand">False</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>
+                                            <property name="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                            <property name="x_options">GTK_EXPAND | GTK_SHRINK | GTK_FILL</property>
+                                            <property name="y_options">GTK_SHRINK</property>
                                           </packing>
                                         </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
                                       </object>
-                                      <packing>
-                                        <property name="position">3</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label52">
-                                <property name="visible">True</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>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label1">
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determine the main characteristics of the currently selected item.</property>
-                        <property name="label" translatable="yes">_Action</property>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkVBox" id="vbox5">
-                        <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you choose the command to be executed, along with its parameters.
-Defining several profiles lets you have several commands, each applying with a different set of conditions.</property>
-                        <property name="border_width">6</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
-                        <child>
-                          <object class="GtkFrame" id="frame9">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment9">
-                                <property name="visible">True</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="GtkHBox" id="hbox3">
+                                <child type="label">
+                                  <object class="GtkLabel" id="label54">
                                     <property name="visible">True</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="ProfileLabelLabel">
-                                        <property name="visible">True</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="expand">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="ProfileLabelEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">The name of the profile. It is only used in Nautilus Actions Configuration Tool user interface.</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                      </object>
-                                      <packing>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
+                                    <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>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label53">
-                                <property name="visible">True</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>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame10">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment10">
-                                <property name="visible">True</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="GtkTable" id="table2">
-                                    <property name="visible">True</property>
-                                    <property name="n_rows">4</property>
-                                    <property name="n_columns">3</property>
-                                    <property name="column_spacing">6</property>
-                                    <property name="row_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="CommandPathLabel">
-                                        <property name="visible">True</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="x_options">GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="CommandParametersLabel">
-                                        <property name="visible">True</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="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</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 command that will be launched by selecting the action in Nautilus popup menu.</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</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="tooltip_text" translatable="yes">Click to choose a command from the file chooser dialog.</property>
-                                        <property name="image">ImagePathBrowse</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="x_options"></property>
-                                        <property name="y_options"></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">Parameters that will be sent to the program. Click on the 'Legend' button to see the different replacement tokens.</property>
-                                        <property name="invisible_char">&#x25CF;</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>
-                                        <property name="x_options">GTK_SHRINK | GTK_FILL</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="tooltip_text" translatable="yes">Click to toggle the display of the list of special tokens you can use in the parameter field.</property>
-                                        <property name="image">ImageParametersLegend</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options"></property>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="CommandExampleLabel">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="use_markup">True</property>
-                                        <property name="wrap">True</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>
-                                        <property name="x_options">GTK_SHRINK | GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label4">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">_Working directory :</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_options">GTK_FILL</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 working directory the program should be started in.
-Parameters may appear in Path value, and will be substituted at runtime.
-Defaults to base directory of the current selection, which happens to be the value of "%d" parameter. 
-</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</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="tooltip_text" translatable="yes">Click to choose a working directory from the folder chooser dialog.</property>
-                                        <property name="image">ImageWorkingDirectoryBrowse</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_options"></property>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label54">
-                                <property name="visible">True</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>
+                              <placeholder/>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -764,279 +789,285 @@ Defining several profiles lets you have several commands, each applying with a d
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox15">
+                      <object class="GtkAlignment" id="alignment1">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This advanced tab lets you precisely define how your command will be executed.</property>
-                        <property name="border_width">6</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <child>
-                          <object class="GtkFrame" id="frame1">
+                          <object class="GtkVBox" id="vbox15">
                             <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment1">
+                              <object class="GtkFrame" id="frame1">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkTable" id="table9">
+                                  <object class="GtkAlignment" id="alignment2">
                                     <property name="visible">True</property>
-                                    <property name="n_rows">4</property>
-                                    <property name="n_columns">2</property>
-                                    <property name="column_spacing">6</property>
-                                    <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">Starts the command as a standard graphical user interface.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="active">True</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="x_options">GTK_FILL</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">Starts the preferred terminal of the graphical environment, and runs the command in it.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">ExecutionModeNormal</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>
-                                        <property name="x_options">GTK_FILL</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">Makes use of a special feature of the file manager which allows a terminal to be ran inside of it; an acceptable fallback is to run in a terminal.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">ExecutionModeNormal</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>
-                                        <property name="x_options">GTK_FILL</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 ran terminal may be closed at end of the command, but standard streams (stdout, stderr) should be collected and displayed; an acceptable fallback is to run in a terminal.</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="draw_indicator">True</property>
-                                        <property name="group">ExecutionModeNormal</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label45">
+                                    <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="GtkTable" id="table9">
                                         <property name="visible">True</property>
+                                        <property name="n_rows">4</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">6</property>
+                                        <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="use_underline">True</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="x_options">GTK_FILL</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="use_underline">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">ExecutionModeNormal</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>
+                                            <property name="x_options">GTK_FILL</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="use_underline">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">ExecutionModeNormal</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>
+                                            <property name="x_options">GTK_FILL</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="use_underline">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">ExecutionModeNormal</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label45">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
                                       </object>
-                                      <packing>
-                                        <property name="x_options">GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label40">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label40">
-                                <property name="visible">True</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>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame3">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment3">
+                              <object class="GtkFrame" id="frame3">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkTable" id="table8">
+                                  <object class="GtkAlignment" id="alignment3">
                                     <property name="visible">True</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="GtkCheckButton" id="StartupNotifyButton">
-                                        <property name="label" translatable="yes">_Startup notify</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="GtkTable" id="table8">
                                         <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="tooltip_text" translatable="yes">When clicked, it is known that the ran application will send a "remove" message when started with the DESKTOP_STARTUP_ID environment variable set.</property>
-                                        <property name="use_underline">True</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="GtkLabel" id="label43">
-                                        <property name="visible">True</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="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</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">if specified, it is known that the ran application will map at least one window with the given string as its WM class or WM name hint.
-This is only relevant when execution mode is normal.</property>
-                                        <property name="invisible_char">&#x25CF;</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="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="use_underline">True</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="GtkLabel" id="label43">
+                                            <property name="visible">True</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="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="StartupWMClassEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</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>
                                       </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>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label42">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label42">
-                                <property name="visible">True</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>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame2">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment2">
+                              <object class="GtkFrame" id="frame2">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox13">
+                                  <object class="GtkAlignment" id="alignment19">
                                     <property name="visible">True</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label44">
+                                    <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="GtkHBox" id="hbox13">
                                         <property name="visible">True</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="expand">False</property>
-                                        <property name="position">0</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">The user the command must be ran as.
-This may be a username or a UID.</property>
-                                        <property name="invisible_char">&#x25CF;</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label44">
+                                            <property name="visible">True</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="expand">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="ExecuteAsEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                          </object>
+                                          <packing>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
                                       </object>
-                                      <packing>
-                                        <property name="position">1</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label41">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
-                            </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label41">
-                                <property name="visible">True</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>
-                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">2</property>
+                              </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -1044,14 +1075,15 @@ This may be a username or a UID.</property>
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label15">
+                      <object class="GtkLabel" id="label65">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This advanced tab lets you precisely define how your command will be executed.</property>
-                        <property name="label" translatable="yes">E_xecution</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determines for which basenames the currently selected item will be displayed in the Nautilus context menu.
+Basenames may be negated to specify for which basenames your item must not appear.</property>
+                        <property name="label" translatable="yes">_Basenames</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="position">5</property>
+                        <property name="position">2</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -1069,6 +1101,7 @@ This may be a username or a UID.</property>
                             <child>
                               <object class="GtkAlignment" id="alignment11">
                                 <property name="visible">True</property>
+                                <property name="yalign">0</property>
                                 <property name="top_padding">6</property>
                                 <property name="bottom_padding">6</property>
                                 <property name="left_padding">12</property>
@@ -1213,15 +1246,15 @@ Basenames may be negated to specify for which basenames your item must not appea
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label65">
+                      <object class="GtkLabel" id="label75">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determines for which basenames the currently selected item will be displayed in the Nautilus context menu.
-Basenames may be negated to specify for which basenames your item must not appear.</property>
-                        <property name="label" translatable="yes">_Basenames</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determines for which type of objects the currently selected item will be displayed in the Nautilus context menu.
+Mimetypes may be negated to specify for which type of objects your item must not appear.</property>
+                        <property name="label" translatable="yes">_Mimetypes</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
+                        <property name="position">3</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -1239,6 +1272,7 @@ Basenames may be negated to specify for which basenames your item must not appea
                             <child>
                               <object class="GtkAlignment" id="alignment13">
                                 <property name="visible">True</property>
+                                <property name="yalign">0</property>
                                 <property name="top_padding">6</property>
                                 <property name="bottom_padding">6</property>
                                 <property name="left_padding">12</property>
@@ -1363,15 +1397,15 @@ Mimetypes may be negated to specify for which basenames your item must not appea
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label75">
+                      <object class="GtkLabel" id="label16">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determines for which type of objects the currently selected item will be displayed in the Nautilus context menu.
-Mimetypes may be negated to specify for which type of objects your item must not appear.</property>
-                        <property name="label" translatable="yes">_Mimetypes</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determines where (in which folders) the currently selected files must be found in order the item be displayed in the Nautilus context menu.
+Folder filters may be negated to specify for which folders your item must not appear.</property>
+                        <property name="label" translatable="yes">_Folders</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="position">3</property>
+                        <property name="position">4</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -1389,6 +1423,7 @@ Mimetypes may be negated to specify for which type of objects your item must not
                             <child>
                               <object class="GtkAlignment" id="alignment14">
                                 <property name="visible">True</property>
+                                <property name="yalign">0</property>
                                 <property name="top_padding">6</property>
                                 <property name="bottom_padding">6</property>
                                 <property name="left_padding">12</property>
@@ -1540,15 +1575,14 @@ Folder filters may be negated to specify for which folders your item must not ap
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label16">
+                      <object class="GtkLabel" id="label15">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determines where (in which folders) the currently selected files must be found in order the item be displayed in the Nautilus context menu.
-Folder filters may be negated to specify for which folders your item must not appear.</property>
-                        <property name="label" translatable="yes">_Folders</property>
+                        <property name="tooltip_text" translatable="yes">This advanced tab lets you precisely define how your command will be executed.</property>
+                        <property name="label" translatable="yes">E_xecution</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="position">4</property>
+                        <property name="position">5</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
@@ -1566,6 +1600,7 @@ Folder filters may be negated to specify for which folders your item must not ap
                             <child>
                               <object class="GtkAlignment" id="alignment15">
                                 <property name="visible">True</property>
+                                <property name="yalign">0</property>
                                 <property name="top_padding">6</property>
                                 <property name="bottom_padding">6</property>
                                 <property name="left_padding">12</property>
@@ -1719,10 +1754,10 @@ Filters may be negated to specify for which schemes your item must not appear.</
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label8">
+                      <object class="GtkLabel" id="label50">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determine which schemes the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.
-Filters may be negated to specify for which schemes your item must not appear.</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determine which capabilities the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.
+Filters may be negated to specify for which capabilities your item must not appear.</property>
                         <property name="label" translatable="yes">_Schemes</property>
                         <property name="use_underline">True</property>
                       </object>
@@ -1745,6 +1780,7 @@ Filters may be negated to specify for which schemes your item must not appear.</
                             <child>
                               <object class="GtkAlignment" id="alignment16">
                                 <property name="visible">True</property>
+                                <property name="yalign">0</property>
                                 <property name="top_padding">6</property>
                                 <property name="bottom_padding">6</property>
                                 <property name="left_padding">12</property>
@@ -1868,422 +1904,419 @@ Capabilities may be negated to specify for which capabilities your item must not
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label50">
+                      <object class="GtkLabel" id="label58">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determine which capabilities the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.
-Filters may be negated to specify for which capabilities your item must not appear.</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determine some advanced conditions the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.</property>
                         <property name="label" translatable="yes">Ca_pabilities</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="position">5</property>
+                        <property name="position">7</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox25">
+                      <object class="GtkAlignment" id="alignment4">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determine some advanced conditions the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.</property>
-                        <property name="border_width">6</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
                         <child>
-                          <object class="GtkFrame" id="frame12">
+                          <object class="GtkVBox" id="vbox25">
                             <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment12">
+                              <object class="GtkFrame" id="frame12">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkHBox" id="hbox10">
+                                  <object class="GtkAlignment" id="alignment12">
                                     <property name="visible">True</property>
-                                    <property name="spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label17">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">_Count :</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <object class="GtkComboBox" id="SelectionCountSigneCombobox">
-                                        <property name="visible">True</property>
-                                        <property name="tooltip_text" translatable="yes">Select the operator which will be used when comparing your count with those of the current selection.</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="SelectionCountNumberEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">Your count limit as a positive integer.</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                        <property name="width_chars">5</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="position">3</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label87">
+                                    <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="GtkHBox" id="hbox10">
                                         <property name="visible">True</property>
+                                        <property name="spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label17">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">_Count :</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <object class="GtkComboBox" id="SelectionCountSigneCombobox">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="SelectionCountNumberEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                            <property name="width_chars">5</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label87">
+                                            <property name="visible">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="position">4</property>
+                                          </packing>
+                                        </child>
                                       </object>
-                                      <packing>
-                                        <property name="position">4</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label12">
+                                    <property name="visible">True</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>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label12">
-                                <property name="visible">True</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>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame4">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment4">
+                              <object class="GtkFrame" id="frame4">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkVBox" id="vbox26">
+                                  <object class="GtkAlignment" id="alignment5">
                                     <property name="visible">True</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">3</property>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
+                                    <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="GtkLabel" id="label48">
+                                      <object class="GtkVBox" id="vbox26">
                                         <property name="visible">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="label" translatable="yes">Item may appear depending of the desktop environment.</property>
-                                      </object>
-                                      <packing>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkHBox" id="hbox14">
-                                        <property name="visible">True</property>
-                                        <property name="spacing">6</property>
+                                        <property name="orientation">vertical</property>
+                                        <property name="spacing">3</property>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
                                         <child>
-                                          <object class="GtkVBox" id="vbox27">
+                                          <object class="GtkLabel" id="label48">
                                             <property name="visible">True</property>
-                                            <property name="orientation">vertical</property>
+                                            <property name="xalign">0</property>
+                                            <property name="label" translatable="yes">Item may appear depending of the desktop environment.</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkHBox" id="hbox14">
+                                            <property name="visible">True</property>
+                                            <property name="spacing">6</property>
                                             <child>
-                                              <object class="GtkRadioButton" id="ShowAlwaysButton">
-                                                <property name="label" translatable="yes">_Always appears</property>
+                                              <object class="GtkVBox" id="vbox27">
                                                 <property name="visible">True</property>
-                                                <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="tooltip_text" translatable="yes">When selected, the item will appear regarding of the current desktop environment.</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="active">True</property>
-                                                <property name="draw_indicator">True</property>
+                                                <property name="orientation">vertical</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="active">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="position">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="use_underline">True</property>
+                                                    <property name="draw_indicator">True</property>
+                                                    <property name="group">ShowAlwaysButton</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="position">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="draw_indicator">True</property>
+                                                    <property name="group">ShowAlwaysButton</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">False</property>
+                                                    <property name="position">2</property>
+                                                  </packing>
+                                                </child>
                                               </object>
                                               <packing>
                                                 <property name="expand">False</property>
+                                                <property name="fill">False</property>
                                                 <property name="position">0</property>
                                               </packing>
                                             </child>
                                             <child>
-                                              <object class="GtkRadioButton" id="OnlyShowButton">
-                                                <property name="label" translatable="yes">_Only appears in selected environments</property>
+                                              <object class="GtkScrolledWindow" id="scrolledwindow5">
                                                 <property name="visible">True</property>
                                                 <property name="can_focus">True</property>
-                                                <property name="receives_default">False</property>
-                                                <property name="tooltip_text" translatable="yes">When selected, your item will only appear in selected desktop environments.</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="draw_indicator">True</property>
-                                                <property name="group">ShowAlwaysButton</property>
+                                                <property name="hscrollbar_policy">automatic</property>
+                                                <property name="vscrollbar_policy">automatic</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="headers_visible">False</property>
+                                                    <property name="rules_hint">True</property>
+                                                    <property name="enable_search">False</property>
+                                                    <property name="show_expanders">False</property>
+                                                  </object>
+                                                </child>
                                               </object>
                                               <packing>
-                                                <property name="expand">False</property>
                                                 <property name="position">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="tooltip_text" translatable="yes">When selected, your item will never appear in selected desktop environments.</property>
-                                                <property name="use_underline">True</property>
-                                                <property name="draw_indicator">True</property>
-                                                <property name="group">ShowAlwaysButton</property>
-                                              </object>
-                                              <packing>
-                                                <property name="expand">False</property>
-                                                <property name="position">2</property>
-                                              </packing>
-                                            </child>
-                                          </object>
-                                          <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
-                                          </packing>
-                                        </child>
-                                        <child>
-                                          <object class="GtkScrolledWindow" id="scrolledwindow5">
-                                            <property name="visible">True</property>
-                                            <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">Select the desktop environments in which you want your item only appear (or not).</property>
-                                            <property name="hscrollbar_policy">automatic</property>
-                                            <property name="vscrollbar_policy">automatic</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="headers_visible">False</property>
-                                                <property name="rules_hint">True</property>
-                                                <property name="show_expanders">False</property>
-                                              </object>
-                                            </child>
                                           </object>
                                           <packing>
-                                            <property name="position">1</property>
+                                            <property name="position">2</property>
                                           </packing>
                                         </child>
                                       </object>
-                                      <packing>
-                                        <property name="position">2</property>
-                                      </packing>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label47">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label47">
-                                <property name="visible">True</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>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame5">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment5">
+                              <object class="GtkFrame" id="frame5">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkTable" id="table10">
+                                  <object class="GtkAlignment" id="alignment18">
                                     <property name="visible">True</property>
-                                    <property name="n_rows">4</property>
-                                    <property name="n_columns">3</property>
-                                    <property name="column_spacing">6</property>
-                                    <property name="row_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label55">
-                                        <property name="visible">True</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>
-                                    </child>
-                                    <child>
-                                      <object class="GtkEntry" id="TryExecEntry">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="tooltip_text" translatable="yes">If set, your item will only appear if the file is executable.
-If the file is not present or if it is not executable, then your item will not appear in Nautilus context menu.</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</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="tooltip_text" translatable="yes">Click to browse for a file in the filesystem.</property>
-                                        <property name="image">ImageTryExecBrowse</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="x_options"></property>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label56">
-                                        <property name="visible">True</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="top_attach">1</property>
-                                        <property name="bottom_attach">2</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">If set, your item will only appear if the specifiied name is currently registered on D-Bus.
-</property>
-                                        <property name="invisible_char">&#x25CF;</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="GtkLabel" id="label57">
-                                        <property name="visible">True</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="top_attach">2</property>
-                                        <property name="bottom_attach">3</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">If set, this must correspond to a command which, when ran, should display "true" on stdout.
-If the command is not found, or does not display the correct result, your item will not appear in Nautilus context menu.
-</property>
-                                        <property name="invisible_char">&#x25CF;</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="label6">
+                                    <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="GtkTable" id="table10">
                                         <property name="visible">True</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="top_attach">3</property>
-                                        <property name="bottom_attach">4</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">If set, then the name should correspond to a running process.</property>
-                                        <property name="invisible_char">&#x25CF;</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</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="tooltip_text" translatable="yes">Click to search for a file in the filesystem.</property>
-                                        <property name="image">ImageRunningBrowse</property>
-                                        <property name="use_underline">True</property>
+                                        <property name="n_rows">4</property>
+                                        <property name="n_columns">3</property>
+                                        <property name="column_spacing">6</property>
+                                        <property name="row_spacing">3</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label55">
+                                            <property name="visible">True</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>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="TryExecEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</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="image">ImageTryExecBrowse</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label56">
+                                            <property name="visible">True</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="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="ShowIfRegisteredEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</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="GtkLabel" id="label57">
+                                            <property name="visible">True</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="top_attach">2</property>
+                                            <property name="bottom_attach">3</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="ShowIfTrueEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</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="label6">
+                                            <property name="visible">True</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="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkEntry" id="ShowIfRunningEntry">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="invisible_char">&#x25CF;</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</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="image">ImageRunningBrowse</property>
+                                            <property name="use_underline">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">2</property>
+                                            <property name="right_attach">3</property>
+                                            <property name="top_attach">3</property>
+                                            <property name="bottom_attach">4</property>
+                                            <property name="x_options"></property>
+                                            <property name="y_options"></property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
                                       </object>
-                                      <packing>
-                                        <property name="left_attach">2</property>
-                                        <property name="right_attach">3</property>
-                                        <property name="top_attach">3</property>
-                                        <property name="bottom_attach">4</property>
-                                        <property name="x_options"></property>
-                                        <property name="y_options"></property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label51">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="position">2</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label51">
-                                <property name="visible">True</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>
-                              </object>
+                            <child>
+                              <placeholder/>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">2</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -2291,259 +2324,270 @@ If the command is not found, or does not display the correct result, your item w
                       </packing>
                     </child>
                     <child type="tab">
-                      <object class="GtkLabel" id="label58">
+                      <object class="GtkLabel" id="label8">
                         <property name="visible">True</property>
-                        <property name="tooltip_text" translatable="yes">This tab lets you determine some advanced conditions the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.</property>
+                        <property name="tooltip_text" translatable="yes">This tab lets you determine which schemes the currently selected files must satisfy in order the item be displayed in the Nautilus context menu.
+Filters may be negated to specify for which schemes your item must not appear.</property>
                         <property name="label" translatable="yes">_Environment</property>
                         <property name="use_underline">True</property>
                       </object>
                       <packing>
-                        <property name="position">7</property>
+                        <property name="position">5</property>
                         <property name="tab_fill">False</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="vbox17">
+                      <object class="GtkAlignment" id="alignment6">
                         <property name="visible">True</property>
-                        <property name="border_width">6</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">10</property>
+                        <property name="yalign">0</property>
+                        <property name="yscale">0</property>
                         <child>
-                          <object class="GtkFrame" id="frame8">
+                          <object class="GtkVBox" id="vbox17">
                             <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
+                            <property name="border_width">6</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">10</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment8">
+                              <object class="GtkFrame" id="frame8">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkTable" id="table4">
+                                  <object class="GtkAlignment" id="alignment8">
                                     <property name="visible">True</property>
-                                    <property name="n_rows">3</property>
-                                    <property name="n_columns">2</property>
-                                    <property name="column_spacing">6</property>
-                                    <property name="row_spacing">3</property>
-                                    <child>
-                                      <object class="GtkLabel" id="label18">
+                                    <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="GtkTable" id="table4">
                                         <property name="visible">True</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="top_attach">1</property>
-                                        <property name="bottom_attach">2</property>
-                                        <property name="x_options">GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkScrolledWindow" id="scrolledwindow3">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="hscrollbar_policy">automatic</property>
-                                        <property name="vscrollbar_policy">automatic</property>
-                                        <property name="shadow_type">in</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">6</property>
+                                        <property name="row_spacing">3</property>
+                                        <child>
+                                          <object class="GtkLabel" id="label18">
+                                            <property name="visible">True</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="top_attach">1</property>
+                                            <property name="bottom_attach">2</property>
+                                            <property name="x_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
                                         <child>
-                                          <object class="GtkTextView" id="ActionDescriptionText">
+                                          <object class="GtkScrolledWindow" id="scrolledwindow3">
                                             <property name="visible">True</property>
                                             <property name="can_focus">True</property>
-                                            <property name="tooltip_text" translatable="yes">A free description of your action or your menu.</property>
+                                            <property name="hscrollbar_policy">automatic</property>
+                                            <property name="vscrollbar_policy">automatic</property>
+                                            <property name="shadow_type">in</property>
+                                            <child>
+                                              <object class="GtkTextView" id="ActionDescriptionText">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                              </object>
+                                            </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>
-                                      </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="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">When enabled, your item will be candidate to be displayed in the Nautilus context menu.</property>
-                                        <property name="use_underline">True</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="GtkLabel" id="label39">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Suggested _shortcut :</property>
-                                        <property name="use_underline">True</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="GtkHBox" id="hbox15">
-                                        <property name="visible">True</property>
                                         <child>
-                                          <object class="GtkButton" id="SuggestedShortcutButton">
-                                            <property name="label" translatable="yes">None</property>
+                                          <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">True</property>
-                                            <property name="tooltip_text" translatable="yes">A shortcut suggested for the action or the menu.</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="draw_indicator">True</property>
                                           </object>
                                           <packing>
-                                            <property name="expand">False</property>
-                                            <property name="position">0</property>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label39">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Suggested _shortcut :</property>
+                                            <property name="use_underline">True</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="GtkHBox" id="hbox15">
+                                            <property name="visible">True</property>
+                                            <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>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <placeholder/>
+                                            </child>
+                                          </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>
                                           <placeholder/>
                                         </child>
                                       </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>
-                                      <placeholder/>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="ActionPropertiesTitle">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="ActionPropertiesTitle">
-                                <property name="visible">True</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>
-                              </object>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkFrame" id="frame6">
-                            <property name="visible">True</property>
-                            <property name="label_xalign">0</property>
-                            <property name="shadow_type">in</property>
                             <child>
-                              <object class="GtkAlignment" id="alignment6">
+                              <object class="GtkFrame" id="frame6">
                                 <property name="visible">True</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_xalign">0</property>
+                                <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkTable" id="table3">
+                                  <object class="GtkAlignment" id="alignment17">
                                     <property name="visible">True</property>
-                                    <property name="n_rows">3</property>
-                                    <property name="n_columns">2</property>
-                                    <property name="column_spacing">6</property>
-                                    <property name="row_spacing">6</property>
-                                    <child>
-                                      <object class="GtkLabel" id="ActionItemID">
-                                        <property name="visible">True</property>
-                                        <property name="tooltip_text" translatable="yes">Internal identifiant of the item.</property>
-                                        <property name="xalign">0</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>
-                                        <property name="y_options">GTK_FILL</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label49">
+                                    <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="GtkTable" id="table3">
                                         <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">Id. :</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="GtkLabel" id="label19">
-                                        <property name="visible">True</property>
-                                        <property name="xalign">1</property>
-                                        <property name="label" translatable="yes">I/O provider :</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="GtkLabel" id="ActionItemProvider">
-                                        <property name="visible">True</property>
-                                        <property name="tooltip_text" translatable="yes">Storage provider of the item.</property>
-                                        <property name="xalign">0</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="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">When checked, this means that the item is read-only and cannot be updated.</property>
-                                        <property name="focus_on_click">False</property>
-                                        <property name="draw_indicator">True</property>
+                                        <property name="n_rows">3</property>
+                                        <property name="n_columns">2</property>
+                                        <property name="column_spacing">6</property>
+                                        <property name="row_spacing">6</property>
+                                        <child>
+                                          <object class="GtkLabel" id="ActionItemID">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</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>
+                                            <property name="y_options">GTK_FILL</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkLabel" id="label49">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">Id. :</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="GtkLabel" id="label19">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">1</property>
+                                            <property name="label" translatable="yes">I/O provider :</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="GtkLabel" id="ActionItemProvider">
+                                            <property name="visible">True</property>
+                                            <property name="xalign">0</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="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="focus_on_click">False</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="left_attach">1</property>
+                                            <property name="right_attach">2</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <placeholder/>
+                                        </child>
                                       </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="right_attach">2</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <placeholder/>
                                     </child>
                                   </object>
                                 </child>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label10">
+                                    <property name="visible">True</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>
+                                  </object>
+                                </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">1</property>
+                              </packing>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label10">
-                                <property name="visible">True</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>
-                              </object>
+                            <child>
+                              <placeholder/>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
@@ -2784,6 +2828,15 @@ If the command is not found, or does not display the correct result, your item w
       <placeholder/>
     </child>
     <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
+      <placeholder/>
+    </child>
+    <child>
       <object class="GtkLabel" id="label3">
         <property name="visible">True</property>
         <property name="label" translatable="yes">This assistant will guide you through the process of importing items, actions or menus.</property>
@@ -3765,14 +3818,6 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
       </object>
     </child>
   </object>
-  <object class="GtkImage" id="ImagePathBrowse">
-    <property name="visible">True</property>
-    <property name="stock">gtk-find-and-replace</property>
-  </object>
-  <object class="GtkImage" id="ImageParametersLegend">
-    <property name="visible">True</property>
-    <property name="stock">gtk-help</property>
-  </object>
   <object class="GtkMessageDialog" id="ConfirmLogoutDialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">End of session</property>
@@ -3862,11 +3907,11 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
     <property name="visible">True</property>
     <property name="stock">gtk-save</property>
   </object>
-  <object class="GtkImage" id="ImageWorkingDirectoryBrowse">
+  <object class="GtkImage" id="FolderBrowseImage">
     <property name="visible">True</property>
     <property name="stock">gtk-find-and-replace</property>
   </object>
-  <object class="GtkImage" id="ImageRunningBrowse">
+  <object class="GtkImage" id="SchemeBrowseImage">
     <property name="visible">True</property>
     <property name="stock">gtk-find-and-replace</property>
   </object>
@@ -3874,53 +3919,61 @@ Be warned: this mode may be dangerous. You will not be prompted another time.</p
     <property name="visible">True</property>
     <property name="stock">gtk-find-and-replace</property>
   </object>
+  <object class="GtkImage" id="ImageRunningBrowse">
+    <property name="visible">True</property>
+    <property name="stock">gtk-find-and-replace</property>
+  </object>
   <object class="GtkImage" id="ImageIconBrowse">
     <property name="visible">True</property>
     <property name="stock">gtk-find-and-replace</property>
   </object>
-  <object class="GtkImage" id="FolderBrowseImage">
+  <object class="GtkImage" id="ImagePathBrowse">
     <property name="visible">True</property>
     <property name="stock">gtk-find-and-replace</property>
   </object>
-  <object class="GtkImage" id="SchemeBrowseImage">
+  <object class="GtkImage" id="ImageParametersLegend">
+    <property name="visible">True</property>
+    <property name="stock">gtk-help</property>
+  </object>
+  <object class="GtkImage" id="ImageWorkingDirectoryBrowse">
     <property name="visible">True</property>
     <property name="stock">gtk-find-and-replace</property>
   </object>
   <object class="GtkSizeGroup" id="CommandLabelSizeGroup">
     <widgets>
-      <widget name="ProfileLabelLabel"/>
-      <widget name="CommandPathLabel"/>
-      <widget name="CommandParametersLabel"/>
       <widget name="label4"/>
+      <widget name="CommandParametersLabel"/>
+      <widget name="CommandPathLabel"/>
+      <widget name="ProfileLabelLabel"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="CommandButtonSizeGroup">
     <widgets>
-      <widget name="CommandPathButton"/>
       <widget name="CommandLegendButton"/>
+      <widget name="CommandPathButton"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="ActionLabelSizeGroup">
     <widgets>
-      <widget name="ActionIconLabel"/>
-      <widget name="ActionTooltipLabel"/>
-      <widget name="ActionToolbarLabelLabel"/>
       <widget name="ActionMenuLabelLabel"/>
+      <widget name="ActionToolbarLabelLabel"/>
+      <widget name="ActionTooltipLabel"/>
+      <widget name="ActionIconLabel"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="ExecutionModeSizeGroup">
     <widgets>
-      <widget name="label45"/>
-      <widget name="label44"/>
       <widget name="label43"/>
+      <widget name="label44"/>
+      <widget name="label45"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="PropertiesLabelSizeGroup">
     <widgets>
-      <widget name="label19"/>
-      <widget name="label49"/>
-      <widget name="label39"/>
       <widget name="label18"/>
+      <widget name="label39"/>
+      <widget name="label49"/>
+      <widget name="label19"/>
     </widgets>
   </object>
 </interface>



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