[nautilus-actions] Fix appearance of UI (align labels, etc.)



commit 1f45112ad1d308e1455367405db9f2e6c8af81c4
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Jul 2 14:07:47 2009 +0200

    Fix appearance of UI (align labels, etc.)

 ChangeLog                                |   30 ++
 src/nact/nact-action-conditions-editor.c |   52 ++-
 src/nact/nact-imenu-item.c               |   54 ++-
 src/nact/nact-imenu-item.h               |    6 +-
 src/nact/nact-iprofile-conditions.c      |   50 ++-
 src/nact/nact-iprofile-conditions.h      |    4 +
 src/nact/nact-window.c                   |   17 +
 src/nact/nautilus-actions-config.ui      |  800 +++++++++++-------------------
 8 files changed, 478 insertions(+), 535 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 151fd10..062e4c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,33 @@
+2009-07-02 Pierre Wieser <pwieser trychlos org>
+
+	* src/nact/nact-action-conditions-editor.c (on_cancel_clicked):
+	New function to trigger dialog response.
+
+	* src/nact/nact-action-conditions-editor.c
+	(on_initial_load_dialog): Make labels and buttons the same size.
+
+	* src/nact/nact-imenu-item.c:
+	* src/nact/nact-imenu-item.h (nact_imenu_item_size_labels,
+	nact_imenu_item_size_buttons): New functions.
+
+	* src/nact/nact-imenu-item.c (on_icon_changed):
+	Forces the display of an empty frame where there is no icon.
+
+	* nact/nact-iprofile-conditions.c (hide_legend_dialog):
+	Fixes bug which recorded a (0,0) position when the dialog closed.
+
+	* nact/nact-iprofile-conditions.c:
+	* nact/nact-iprofile-conditions.h
+	(nact_iprofile_conditions_size_labels,
+	nact_iprofile_conditions_size_buttons): New functions.
+
+	* src/nact/nact-window.c (on_all_widgets_showed): Restore the
+	saved position of the window.
+
+	* src/nact/nautilus-actions-config.ui:
+	Add tooltips to AddAction and EditAction buttons.
+	Encapsulates the IconImage into a IconFrame.
+
 2009-07-01 Pierre Wieser <pwieser trychlos org>
 
 	* src/nact/base-application.c:
diff --git a/src/nact/nact-action-conditions-editor.c b/src/nact/nact-action-conditions-editor.c
index 0d1052c..10c3cc7 100644
--- a/src/nact/nact-action-conditions-editor.c
+++ b/src/nact/nact-action-conditions-editor.c
@@ -77,6 +77,7 @@ static void     on_all_widgets_showed( BaseWindow *dialog );
 static void     setup_dialog_title( NactActionConditionsEditor *dialog, gboolean is_modified );
 static void     setup_buttons( NactActionConditionsEditor *dialog, gboolean can_save );
 static void     on_modified_field( NactWindow *dialog );
+static void     on_cancel_clicked( GtkButton *button, gpointer user_data );
 static gboolean on_dialog_response( GtkDialog *dialog, gint code, BaseWindow *window );
 
 static GObject *get_edited_action( NactWindow *window );
@@ -307,7 +308,7 @@ static gchar *
 do_get_dialog_name( BaseWindow *dialog )
 {
 	/*g_debug( "nact_action_conditions_editor_do_get_dialog_name" );*/
-	return( g_strdup( "EditActionDialogExt"));
+	return( g_strdup( "EditActionDialogExt" ));
 }
 
 static void
@@ -328,6 +329,18 @@ on_initial_load_dialog( BaseWindow *dialog )
 
 	NAActionProfile *profile = NA_ACTION_PROFILE( na_action_get_profiles( window->private->edited )->data );
 	nact_iprofile_conditions_initial_load( NACT_WINDOW( window ), profile );
+
+	/* label alignements */
+	GtkSizeGroup *label_group = gtk_size_group_new( GTK_SIZE_GROUP_HORIZONTAL );
+	nact_imenu_item_size_labels( NACT_WINDOW( window ), G_OBJECT( label_group ));
+	nact_iprofile_conditions_size_labels( NACT_WINDOW( window ), G_OBJECT( label_group ));
+	g_object_unref( label_group );
+
+	/* buttons size */
+	GtkSizeGroup *button_group = gtk_size_group_new( GTK_SIZE_GROUP_HORIZONTAL );
+	nact_imenu_item_size_buttons( NACT_WINDOW( window ), G_OBJECT( button_group ));
+	nact_iprofile_conditions_size_buttons( NACT_WINDOW( window ), G_OBJECT( button_group ));
+	g_object_unref( button_group );
 }
 
 static void
@@ -351,6 +364,29 @@ on_runtime_init_dialog( BaseWindow *dialog )
 	/*na_object_dump( NA_OBJECT( window->private->edited ));*/
 	NAActionProfile *profile = NA_ACTION_PROFILE( na_action_get_profiles( window->private->edited )->data );
 	nact_iprofile_conditions_runtime_init( NACT_WINDOW( window ), profile );
+
+	GtkWidget *close_button = base_window_get_widget( dialog, "CancelButton" );
+	nact_window_signal_connect( NACT_WINDOW( window ), G_OBJECT( close_button ), "clicked", G_CALLBACK( on_cancel_clicked ));
+}
+
+static void
+on_all_widgets_showed( BaseWindow *dialog )
+{
+	static const gchar *thisfn = "nact_action_conditions_editor_on_all_widgets_showed";
+
+	/* call parent class at the very beginning */
+	if( BASE_WINDOW_CLASS( st_parent_class )->all_widgets_showed ){
+		BASE_WINDOW_CLASS( st_parent_class )->all_widgets_showed( dialog );
+	}
+
+	g_debug( "%s: dialog=%p", thisfn, dialog );
+
+	GtkNotebook *notebook = GTK_NOTEBOOK( base_window_get_widget( dialog, "notebook2" ));
+	gtk_notebook_set_current_page( notebook, 0 );
+
+	nact_imenu_item_all_widgets_showed( NACT_WINDOW( dialog ));
+
+	/*nact_iprefs_position_window( NACT_WINDOW( dialog ));*/
 }
 
 static void
@@ -416,17 +452,10 @@ on_modified_field( NactWindow *window )
 }
 
 static void
-on_all_widgets_showed( BaseWindow *dialog )
+on_cancel_clicked( GtkButton *button, gpointer user_data )
 {
-	static const gchar *thisfn = "nact_action_conditions_editor_on_all_widgets_showed";
-	g_debug( "%s: dialog=%p", thisfn, dialog );
-
-	GtkNotebook *notebook = GTK_NOTEBOOK( base_window_get_widget( dialog, "notebook2" ));
-	gtk_notebook_set_current_page( notebook, 0 );
-
-	nact_imenu_item_all_widgets_showed( NACT_WINDOW( dialog ));
-
-	nact_iprefs_position_window( NACT_WINDOW( dialog ));
+	GtkWindow *toplevel = base_window_get_toplevel_dialog( BASE_WINDOW( user_data ));
+	gtk_dialog_response( GTK_DIALOG( toplevel ), GTK_RESPONSE_CLOSE );
 }
 
 static gboolean
@@ -458,7 +487,6 @@ on_dialog_response( GtkDialog *dialog, gint code, BaseWindow *window )
 					g_object_unref( editor->private->original );
 					editor->private->original = na_action_duplicate( editor->private->edited );
 					editor->private->is_new = FALSE;
-					g_debug( "%s: after replication", thisfn );
 					on_modified_field( NACT_WINDOW( editor ));
 				}
 			}
diff --git a/src/nact/nact-imenu-item.c b/src/nact/nact-imenu-item.c
index c30fe3b..f9062e1 100644
--- a/src/nact/nact-imenu-item.c
+++ b/src/nact/nact-imenu-item.c
@@ -68,6 +68,7 @@ static void          icon_combo_list_fill( GtkComboBoxEntry* combo );
 static GtkTreeModel *create_stock_icon_model( void );
 static gint          sort_stock_ids( gconstpointer a, gconstpointer b );
 static gchar        *strip_underscore( const gchar *text );
+static void          display_icon( NactWindow *window, GtkWidget *image, gboolean display );
 
 GType
 nact_imenu_item_get_type( void )
@@ -153,6 +154,32 @@ nact_imenu_item_initial_load( NactWindow *dialog, NAAction *action )
 }
 
 void
+nact_imenu_item_size_labels( NactWindow *window, GObject *size_group )
+{
+	g_assert( NACT_IS_WINDOW( window ));
+	g_assert( GTK_IS_SIZE_GROUP( size_group ));
+
+	GtkWidget *label = base_window_get_widget( BASE_WINDOW( window ), "MenuLabelLabel" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), label );
+
+	label = base_window_get_widget( BASE_WINDOW( window ), "MenuTooltipLabel" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), label );
+
+	label = base_window_get_widget( BASE_WINDOW( window ), "MenuIconLabel" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), label );
+}
+
+void
+nact_imenu_item_size_buttons( NactWindow *window, GObject *size_group )
+{
+	g_assert( NACT_IS_WINDOW( window ));
+	g_assert( GTK_IS_SIZE_GROUP( size_group ));
+
+	GtkWidget *button = base_window_get_widget( BASE_WINDOW( window ), "IconBrowseButton" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), button );
+}
+
+void
 nact_imenu_item_runtime_init( NactWindow *dialog, NAAction *action )
 {
 	static const gchar *thisfn = "nact_imenu_item_runtime_init";
@@ -267,9 +294,10 @@ on_icon_changed( GtkEntry *icon_entry, gpointer user_data )
 
 	GtkWidget *image = base_window_get_widget( BASE_WINDOW( dialog ), "IconImage" );
 	g_assert( GTK_IS_WIDGET( image ));
+	display_icon( dialog, image, FALSE );
+
 	const gchar *icon_name = gtk_entry_get_text( icon_entry );
 	/*g_debug( "%s: icon_name=%s", thisfn, icon_name );*/
-
 	GtkStockItem stock_item;
 	GdkPixbuf *icon = NULL;
 
@@ -279,7 +307,7 @@ on_icon_changed( GtkEntry *icon_entry, gpointer user_data )
 		if( gtk_stock_lookup( icon_name, &stock_item )){
 			g_debug( "%s: gtk_stock_lookup", thisfn );
 			gtk_image_set_from_stock( GTK_IMAGE( image ), icon_name, GTK_ICON_SIZE_MENU );
-			gtk_widget_show( image );
+			display_icon( dialog, image, TRUE );
 
 		} else if( g_file_test( icon_name, G_FILE_TEST_EXISTS ) &&
 					g_file_test( icon_name, G_FILE_TEST_IS_REGULAR )){
@@ -296,14 +324,9 @@ on_icon_changed( GtkEntry *icon_entry, gpointer user_data )
 				g_error_free( error );
 			}
 			gtk_image_set_from_pixbuf( GTK_IMAGE( image ), icon );
-			gtk_widget_show( image );
+			display_icon( dialog, image, TRUE );
 
-		} else {
-			g_debug( "%s: not stock, nor file", thisfn );
-			gtk_widget_hide( image );
 		}
-	} else {
-		gtk_widget_hide( image );
 	}
 
 	NAAction *edited = NA_ACTION( v_get_edited_action( dialog ));
@@ -448,3 +471,18 @@ strip_underscore( const gchar *text )
 
 	return( result );
 }
+
+static void
+display_icon( NactWindow *window, GtkWidget *image, gboolean show )
+{
+	GtkFrame *frame = GTK_FRAME( base_window_get_widget( BASE_WINDOW( window ), "IconFrame" ));
+
+	if( show ){
+		gtk_widget_show( image );
+		gtk_frame_set_shadow_type( frame, GTK_SHADOW_NONE );
+
+	} else {
+		gtk_widget_hide( image );
+		gtk_frame_set_shadow_type( frame, GTK_SHADOW_IN );
+	}
+}
diff --git a/src/nact/nact-imenu-item.h b/src/nact/nact-imenu-item.h
index 72be58d..34a3cf9 100644
--- a/src/nact/nact-imenu-item.h
+++ b/src/nact/nact-imenu-item.h
@@ -65,12 +65,16 @@ typedef struct {
 GType    nact_imenu_item_get_type( void );
 
 void     nact_imenu_item_initial_load( NactWindow *dialog, NAAction *action );
+void     nact_imenu_item_size_labels( NactWindow *window, GObject *size_group );
+void     nact_imenu_item_size_buttons( NactWindow *window, GObject *size_group );
+
 void     nact_imenu_item_runtime_init( NactWindow *dialog, NAAction *action );
 void     nact_imenu_item_all_widgets_showed( NactWindow *dialog );
-void     nact_imenu_item_dispose( NactWindow *dialog );
 
 gboolean nact_imenu_item_has_label( NactWindow *window );
 
+void     nact_imenu_item_dispose( NactWindow *dialog );
+
 G_END_DECLS
 
 #endif /* __NACT_IMENU_ITEM_H__ */
diff --git a/src/nact/nact-iprofile-conditions.c b/src/nact/nact-iprofile-conditions.c
index 4d74a8e..1336a27 100644
--- a/src/nact/nact-iprofile-conditions.c
+++ b/src/nact/nact-iprofile-conditions.c
@@ -61,6 +61,10 @@ enum {
 #define IPREFS_LEGEND_DIALOG		"iprofile-conditions-legend-dialog"
 #define IPREFS_COMMAND_CHOOSER		"iprofile-conditions-command-chooser"
 
+/* a data set in the LegendDialog GObject
+ */
+#define LEGEND_DIALOG_IS_VISIBLE	"iprofile-conditions-legend-dialog-visible"
+
 static GType         register_type( void );
 static void          interface_base_init( NactIProfileConditionsInterface *klass );
 static void          interface_base_finalize( NactIProfileConditionsInterface *klass );
@@ -189,6 +193,32 @@ nact_iprofile_conditions_initial_load( NactWindow *dialog, NAActionProfile *prof
 }
 
 void
+nact_iprofile_conditions_size_labels( NactWindow *window, GObject *size_group )
+{
+	g_assert( NACT_IS_WINDOW( window ));
+	g_assert( GTK_IS_SIZE_GROUP( size_group ));
+
+	GtkWidget *label = base_window_get_widget( BASE_WINDOW( window ), "ActionPathLabel" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), label );
+
+	label = base_window_get_widget( BASE_WINDOW( window ), "ActionParametersLabel" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), label );
+}
+
+void
+nact_iprofile_conditions_size_buttons( NactWindow *window, GObject *size_group )
+{
+	g_assert( NACT_IS_WINDOW( window ));
+	g_assert( GTK_IS_SIZE_GROUP( size_group ));
+
+	GtkWidget *button = base_window_get_widget( BASE_WINDOW( window ), "PathBrowseButton" );
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), button );
+
+	button = GTK_WIDGET( get_legend_button( window ));
+	gtk_size_group_add_widget( GTK_SIZE_GROUP( size_group ), button );
+}
+
+void
 nact_iprofile_conditions_runtime_init( NactWindow *dialog, NAActionProfile *profile )
 {
 	static const gchar *thisfn = "nact_iprofile_conditions_runtime_init";
@@ -594,23 +624,29 @@ show_legend_dialog( NactWindow *window )
 
 	nact_iprefs_position_named_window( window, legend_dialog, IPREFS_LEGEND_DIALOG );
 	gtk_widget_show( GTK_WIDGET( legend_dialog ));
+
+	g_object_set_data( G_OBJECT( legend_dialog ), LEGEND_DIALOG_IS_VISIBLE, ( gpointer ) TRUE );
 }
 
 static void
 hide_legend_dialog( NactWindow *window )
 {
 	GtkWindow *legend_dialog = get_legend_dialog( window );
+	gboolean is_visible = ( gboolean ) g_object_get_data( G_OBJECT( legend_dialog ), LEGEND_DIALOG_IS_VISIBLE );
 
-	if( GTK_IS_WINDOW( legend_dialog )){
+	if( is_visible ){
+		g_assert( GTK_IS_WINDOW( legend_dialog ));
 		nact_iprefs_save_named_window_position( window, legend_dialog, IPREFS_LEGEND_DIALOG );
 		gtk_widget_hide( GTK_WIDGET( legend_dialog ));
-	}
 
-	/* set the legend button state consistent for when the dialog is
-	 * hidden by another mean (eg. close the edit profile dialog)
-	 */
-	GtkButton *legend_button = get_legend_button( window );
-	gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( legend_button ), FALSE );
+		/* set the legend button state consistent for when the dialog is
+		 * hidden by another mean (eg. close the edit profile dialog)
+		 */
+		GtkButton *legend_button = get_legend_button( window );
+		gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON( legend_button ), FALSE );
+
+		g_object_set_data( G_OBJECT( legend_dialog ), LEGEND_DIALOG_IS_VISIBLE, ( gpointer ) FALSE );
+	}
 }
 
 static GtkButton *
diff --git a/src/nact/nact-iprofile-conditions.h b/src/nact/nact-iprofile-conditions.h
index 456acda..edd8845 100644
--- a/src/nact/nact-iprofile-conditions.h
+++ b/src/nact/nact-iprofile-conditions.h
@@ -66,8 +66,12 @@ typedef struct {
 GType    nact_iprofile_conditions_get_type( void );
 
 void     nact_iprofile_conditions_initial_load( NactWindow *dialog, NAActionProfile *profile );
+void     nact_iprofile_conditions_size_labels( NactWindow *window, GObject *size_group );
+void     nact_iprofile_conditions_size_buttons( NactWindow *window, GObject *size_group );
+
 void     nact_iprofile_conditions_runtime_init( NactWindow *dialog, NAActionProfile *profile );
 void     nact_iprofile_conditions_all_widgets_showed( NactWindow *dialog );
+
 void     nact_iprofile_conditions_dispose( NactWindow *dialog );
 
 G_END_DECLS
diff --git a/src/nact/nact-window.c b/src/nact/nact-window.c
index 45282fe..e3f9ec1 100644
--- a/src/nact/nact-window.c
+++ b/src/nact/nact-window.c
@@ -74,6 +74,7 @@ static void   instance_finalize( GObject *application );
 static gchar *v_get_iprefs_window_id( NactWindow *window );
 
 static void   on_runtime_init_toplevel( BaseWindow *window );
+static void   on_all_widgets_showed( BaseWindow *dialog );
 
 GType
 nact_window_get_type( void )
@@ -140,6 +141,7 @@ class_init( NactWindowClass *klass )
 
 	BaseWindowClass *base_class = BASE_WINDOW_CLASS( klass );
 	base_class->runtime_init_toplevel = on_runtime_init_toplevel;
+	base_class->all_widgets_showed = on_all_widgets_showed;
 }
 
 static void
@@ -240,6 +242,21 @@ on_runtime_init_toplevel( BaseWindow *window )
 	nact_iprefs_position_window( NACT_WINDOW( window ));
 }
 
+static void
+on_all_widgets_showed( BaseWindow *dialog )
+{
+	static const gchar *thisfn = "nact_window_on_all_widgets_showed";
+
+	/* call parent class at the very beginning */
+	if( BASE_WINDOW_CLASS( st_parent_class )->all_widgets_showed ){
+		BASE_WINDOW_CLASS( st_parent_class )->all_widgets_showed( dialog );
+	}
+
+	g_debug( "%s: dialog=%p", thisfn, dialog );
+
+	nact_iprefs_position_window( NACT_WINDOW( dialog ));
+}
+
 /**
  * Returns a pointer to the list of actions.
  */
diff --git a/src/nact/nautilus-actions-config.ui b/src/nact/nautilus-actions-config.ui
index f76a395..ebff366 100644
--- a/src/nact/nautilus-actions-config.ui
+++ b/src/nact/nautilus-actions-config.ui
@@ -49,6 +49,7 @@
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Create a new action.</property>
                     <property name="use_stock">True</property>
                   </object>
                   <packing>
@@ -65,6 +66,7 @@
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
+                    <property name="tooltip_text" translatable="yes">Edit the currently selected action.</property>
                     <property name="use_stock">True</property>
                   </object>
                   <packing>
@@ -133,7 +135,7 @@
                     <property name="can_focus">True</property>
                     <property name="can_default">True</property>
                     <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes">Delete the action without any confirmation nor the possibility to restore it.</property>
+                    <property name="tooltip_text" translatable="yes">Delete the currently selected action.</property>
                     <property name="use_stock">True</property>
                   </object>
                   <packing>
@@ -262,8 +264,6 @@
     <property name="type_hint">dialog</property>
     <child internal-child="vbox">
       <object class="GtkVBox" id="dialog-vbox4">
-        <property name="width_request">500</property>
-        <property name="height_request">430</property>
         <property name="visible">True</property>
         <child>
           <object class="GtkNotebook" id="notebook2">
@@ -274,15 +274,17 @@
               <object class="GtkVBox" id="vbox399">
                 <property name="visible">True</property>
                 <property name="border_width">10</property>
-                <property name="spacing">12</property>
                 <child>
                   <object class="GtkVBox" id="vbox1">
                     <property name="visible">True</property>
+                    <property name="border_width">6</property>
                     <property name="orientation">vertical</property>
+                    <property name="spacing">4</property>
                     <child>
                       <object class="GtkLabel" id="label159">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
+                        <property name="ypad">4</property>
                         <property name="label" translatable="yes">&lt;b&gt;Nautilus Menu Item&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -295,7 +297,6 @@
                     <child>
                       <object class="GtkTable" id="table3">
                         <property name="visible">True</property>
-                        <property name="border_width">10</property>
                         <property name="n_rows">3</property>
                         <property name="n_columns">2</property>
                         <property name="column_spacing">6</property>
@@ -315,12 +316,72 @@
                           </packing>
                         </child>
                         <child>
+                          <object class="GtkLabel" id="MenuIconLabel">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Icon :</property>
+                          </object>
+                          <packing>
+                            <property name="top_attach">2</property>
+                            <property name="bottom_attach">3</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="MenuTooltipLabel">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Tooltip :</property>
+                          </object>
+                          <packing>
+                            <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="MenuLabelLabel">
+                            <property name="visible">True</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Label :</property>
+                          </object>
+                          <packing>
+                            <property name="x_options"></property>
+                            <property name="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="MenuLabelEntry">
+                            <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="y_options"></property>
+                          </packing>
+                        </child>
+                        <child>
                           <object class="GtkHBox" id="hbox63">
                             <property name="visible">True</property>
                             <property name="spacing">6</property>
                             <child>
-                              <object class="GtkImage" id="IconImage">
-                                <property name="icon-size">1</property>
+                              <object class="GtkAspectFrame" id="IconFrame">
+                                <property name="width_request">20</property>
+                                <property name="height_request">20</property>
+                                <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="IconImage">
+                                    <property name="stock">gnome-stock-blank</property>
+                                    <property name="icon-size">4</property>
+                                  </object>
+                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -344,7 +405,7 @@
                             </child>
                             <child>
                               <object class="GtkButton" id="IconBrowseButton">
-                                <property name="label" translatable="yes">_Browse</property>
+                                <property name="label" translatable="yes">_Browse...</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="receives_default">True</property>
@@ -366,76 +427,29 @@
                             <property name="y_options">GTK_FILL</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkLabel" id="LabelAlign3">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Icon:</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">2</property>
-                            <property name="bottom_attach">3</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="LabelAlign2">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Tooltip:</property>
-                          </object>
-                          <packing>
-                            <property name="top_attach">1</property>
-                            <property name="bottom_attach">2</property>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="LabelAlign1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Label:</property>
-                          </object>
-                          <packing>
-                            <property name="x_options">GTK_FILL</property>
-                            <property name="y_options">GTK_FILL</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="MenuLabelEntry">
-                            <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="y_options"></property>
-                          </packing>
-                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkVBox" id="vbox396">
                     <property name="visible">True</property>
-                    <property name="border_width">10</property>
-                    <property name="spacing">6</property>
+                    <property name="border_width">6</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">4</property>
                     <child>
                       <object class="GtkLabel" id="label40">
                         <property name="visible">True</property>
                         <property name="xalign">0</property>
+                        <property name="ypad">4</property>
                         <property name="label" translatable="yes">&lt;b&gt;Action&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                       </object>
@@ -446,149 +460,93 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox32">
+                      <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
-                        <property name="spacing">6</property>
+                        <property name="n_rows">3</property>
+                        <property name="n_columns">3</property>
+                        <property name="column_spacing">6</property>
+                        <property name="row_spacing">4</property>
                         <child>
-                          <object class="GtkLabel" id="LabelAlign4">
+                          <object class="GtkLabel" id="ActionPathLabel">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Path:</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Path :</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
+                            <property name="x_options"></property>
+                            <property name="y_options"></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>
                             <property name="width_chars">10</property>
                           </object>
                           <packing>
-                            <property name="position">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="right_attach">2</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkButton" id="PathBrowseButton">
-                            <property name="label" translatable="yes">_Browse</property>
+                            <property name="label" translatable="yes">_Browse...</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Click to choose a command from the file chooser dialog.</property>
+                            <property name="receives_default">True</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</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>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkHBox" id="hbox33">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
                         <child>
-                          <object class="GtkLabel" id="LabelAlign5">
+                          <object class="GtkLabel" id="ActionParametersLabel">
                             <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Parameters:</property>
+                            <property name="xalign">1</property>
+                            <property name="label" translatable="yes">Parameters :</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</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="GtkEntry" id="CommandParamsEntry">
                             <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>
                             <property name="width_chars">10</property>
                           </object>
                           <packing>
-                            <property name="position">1</property>
+                            <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="GtkToggleButton" id="LegendButton">
+                            <property name="label" translatable="yes">_Legend</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">Click to toggle the display of the list of special tokens you can use in the parameter field.</property>
-                            <child>
-                              <object class="GtkAlignment" id="alignment16">
-                                <property name="visible">True</property>
-                                <property name="xscale">0</property>
-                                <property name="yscale">0</property>
-                                <child>
-                                  <object class="GtkHBox" id="hbox62">
-                                    <property name="visible">True</property>
-                                    <property name="spacing">2</property>
-                                    <child>
-                                      <object class="GtkImage" id="image25">
-                                        <property name="visible">True</property>
-                                        <property name="stock">gtk-help</property>
-                                        <property name="icon-size">4</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel" id="label158">
-                                        <property name="visible">True</property>
-                                        <property name="label" translatable="yes">_Legend</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">False</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
-                          </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>
-                    <child>
-                      <object class="GtkHBox" id="hbox46">
-                        <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="LabelAlign6">
-                            <property name="visible">True</property>
-                            <property name="label">  </property>
+                            <property name="receives_default">True</property>
+                            <property name="image">HelpImageButton</property>
+                            <property name="use_underline">True</property>
                           </object>
                           <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</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>
@@ -599,19 +557,27 @@
                             <property name="wrap">True</property>
                           </object>
                           <packing>
-                            <property name="position">1</property>
+                            <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>
+                        <child>
+                          <placeholder/>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
-                        <property name="position">3</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -645,115 +611,85 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVBox" id="vbox398">
+                  <object class="GtkTable" id="table2">
                     <property name="visible">True</property>
-                    <property name="border_width">10</property>
-                    <property name="spacing">6</property>
+                    <property name="n_rows">3</property>
+                    <property name="n_columns">2</property>
+                    <property name="column_spacing">4</property>
+                    <property name="row_spacing">6</property>
                     <child>
-                      <object class="GtkHBox" id="hbox52">
+                      <object class="GtkLabel" id="CLabelAlign1">
                         <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="CLabelAlign1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Filenames:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="PatternEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">A string with wildcards (? or *) that will be used to match the filenames. You can set several filename patterns by separating them with a semi-colon (;).</property>
-                            <property name="text">*</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Filenames :</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="position">0</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox54">
+                      <object class="GtkLabel" id="CLabelAlign2">
                         <property name="visible">True</property>
-                        <child>
-                          <object class="GtkLabel" id="label146">
-                            <property name="visible">True</property>
-                            <property name="label">    </property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="MatchCaseButton">
-                            <property name="label" translatable="yes">Match case</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">If selected, the filename patterns will be matched case sensitive (eg, *.jpg will not match photo.JPG)</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <property name="xalign">1</property>
+                        <property name="label" translatable="yes">Mimetypes :</property>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
+                        <property name="top_attach">2</property>
+                        <property name="bottom_attach">3</property>
+                        <property name="x_options"></property>
+                        <property name="y_options"></property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkHBox" id="hbox53">
+                      <object class="GtkCheckButton" id="MatchCaseButton">
+                        <property name="label" translatable="yes">Match case</property>
                         <property name="visible">True</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="CLabelAlign2">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">Mimetypes:</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkEntry" id="MimeTypeEntry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="tooltip_text" translatable="yes">A string with wildcards (? or *) that will be used to match the mimetypes of files. You can set several mimetype patterns by separating them with a semi-colon (;).</property>
-                            <property name="text">*/*</property>
-                          </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
+                        <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="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
+                        <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="PatternEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="text">*</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="right_attach">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkEntry" id="MimeTypeEntry">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="invisible_char">&#x25CF;</property>
+                        <property name="text">*/*</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>
+                      <placeholder/>
+                    </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -1389,146 +1325,147 @@ file(s)/folder(s)</property>
               </packing>
             </child>
             <child>
-              <placeholder/>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label156">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">&lt;b&gt;Profiles&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>
-            <child>
-              <object class="GtkHBox" id="hbox60">
+              <object class="GtkVBox" id="vbox2">
                 <property name="visible">True</property>
-                <property name="border_width">6</property>
-                <property name="spacing">6</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="scrolledwindow6">
+                  <object class="GtkLabel" id="label156">
                     <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>
-                    <child>
-                      <object class="GtkTreeView" id="ProfilesList">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="headers_visible">False</property>
-                        <property name="rules_hint">True</property>
-                      </object>
-                    </child>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">&lt;b&gt;Profiles&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">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkVButtonBox" id="vbuttonbox2">
+                  <object class="GtkHBox" id="hbox60">
                     <property name="visible">True</property>
-                    <property name="spacing">3</property>
-                    <property name="layout_style">start</property>
+                    <property name="border_width">6</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkButton" id="AddProfileButton">
-                        <property name="label">gtk-add</property>
+                      <object class="GtkScrolledWindow" id="scrolledwindow6">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Create a new profile.</property>
-                        <property name="use_stock">True</property>
+                        <property name="hscrollbar_policy">automatic</property>
+                        <property name="vscrollbar_policy">automatic</property>
+                        <property name="shadow_type">in</property>
+                        <child>
+                          <object class="GtkTreeView" id="ProfilesList">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="headers_visible">False</property>
+                            <property name="rules_hint">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="GtkButton" id="EditProfileButton">
-                        <property name="label">gtk-edit</property>
+                      <object class="GtkVButtonBox" id="vbuttonbox2">
                         <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Edit the currently selected profile.</property>
-                        <property name="use_stock">True</property>
+                        <property name="spacing">3</property>
+                        <property name="layout_style">start</property>
+                        <child>
+                          <object class="GtkButton" id="AddProfileButton">
+                            <property name="label">gtk-add</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="EditProfileButton">
+                            <property name="label">gtk-edit</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="CopyProfileButton">
+                            <property name="label">gtk-copy</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="PasteProfileButton">
+                            <property name="label">gtk-paste</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="DeleteProfileButton">
+                            <property name="label">gtk-delete</property>
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="receives_default">True</property>
+                            <property name="use_stock">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">4</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="pack_type">end</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkButton" id="CopyProfileButton">
-                        <property name="label">gtk-copy</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Take a copy of the selected profile.</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="PasteProfileButton">
-                        <property name="label">gtk-paste</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Paste the clipboard content as a new profile.</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="DeleteProfileButton">
-                        <property name="label">gtk-delete</property>
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="can_focus">True</property>
-                        <property name="can_default">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes">Delete the currently selected profile.</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">4</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="pack_type">end</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">3</property>
+                <property name="position">1</property>
               </packing>
             </child>
           </object>
@@ -1584,160 +1521,9 @@ file(s)/folder(s)</property>
       <action-widget response="-5">okbutton4</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkFrame" id="MenuItemFrame">
+  <object class="GtkImage" id="HelpImageButton">
     <property name="visible">True</property>
-    <property name="label_xalign">0</property>
-    <property name="shadow_type">none</property>
-    <child>
-      <object class="GtkVBox" id="vbox1">
-        <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkLabel" id="label159">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">&lt;b&gt;Nautilus Menu Item&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">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkTable" id="table3">
-            <property name="visible">True</property>
-            <property name="border_width">10</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="GtkEntry" id="MenuTooltipEntry">
-                <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="y_options"></property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkHBox" id="hbox63">
-                <property name="visible">True</property>
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkImage" id="IconImage">
-                    <property name="icon-size">1</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxEntry" id="MenuIconComboBoxEntry">
-                    <property name="visible">True</property>
-                    <child>
-                      <object class="GtkCellRendererText" id="cellrenderertext1"/>
-                      <attributes>
-                        <attribute name="text">0</attribute>
-                      </attributes>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="IconBrowseButton">
-                    <property name="label" translatable="yes">_Browse</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="use_underline">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">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">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LabelAlign3">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Icon:</property>
-              </object>
-              <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LabelAlign2">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Tooltip:</property>
-              </object>
-              <packing>
-                <property name="top_attach">1</property>
-                <property name="bottom_attach">2</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="LabelAlign1">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Label:</property>
-              </object>
-              <packing>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_FILL</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkEntry" id="MenuLabelEntry">
-                <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="y_options"></property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-    <child type="label_item">
-      <placeholder/>
-    </child>
+    <property name="stock">gtk-help</property>
+    <property name="icon-size">4</property>
   </object>
 </interface>



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