[Goodies-commits] r7103 - in gigolo/trunk: . src

[Enrico Troeger]

Author: enrico
Date: 2009-04-02 22:09:12 +0000 (Thu, 02 Apr 2009)
New Revision: 7103

Modified:
   gigolo/trunk/ChangeLog
   gigolo/trunk/src/preferencesdialog.c
   gigolo/trunk/src/window.c
Log:
Make the connection list view mode options in the preferences dialog and in the main window's View menu more unique.

Modified: gigolo/trunk/ChangeLog
===================================================================
--- gigolo/trunk/ChangeLog	2009-04-02 21:54:24 UTC (rev 7102)
+++ gigolo/trunk/ChangeLog	2009-04-02 22:09:12 UTC (rev 7103)
@@ -4,6 +4,9 @@
    Present the main window when the status icon is removed.
  * src/backendgvfs.c, src/backendgvfs.h, src/browsenetworkpanel.c:
    Fix build for GTK 2.12.
+ * src/preferencesdialog.c, src/window.c:
+   Make the connection list view mode options in the preferences dialog
+   and in the main window's View menu more unique.
 
 
 2009-04-02  Enrico Tröger  <enrico(at)xfce(dot)org>

Modified: gigolo/trunk/src/preferencesdialog.c
===================================================================
--- gigolo/trunk/src/preferencesdialog.c	2009-04-02 21:54:24 UTC (rev 7102)
+++ gigolo/trunk/src/preferencesdialog.c	2009-04-02 22:09:12 UTC (rev 7103)
@@ -192,7 +192,7 @@
 
 	widget = gtk_combo_box_new_text();
 	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Symbols"));
-	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Detailed"));
+	gtk_combo_box_append_text(GTK_COMBO_BOX(widget), _("Detailed List"));
 
 	gtk_combo_box_set_active(GTK_COMBO_BOX(widget), value);
 
@@ -426,7 +426,7 @@
 	hbox = gtk_hbox_new(FALSE, 6);
 	gtk_box_pack_start(GTK_BOX(frame_vbox), hbox, FALSE, FALSE, 0);
 
-	label4 = gtk_label_new_with_mnemonic(_("_View Mode"));
+	label4 = gtk_label_new_with_mnemonic(_("_Connection List Mode"));
 	gtk_misc_set_alignment(GTK_MISC(label4), 0.0f, 0.5f);
 	gtk_box_pack_start(GTK_BOX(hbox), label4, FALSE, FALSE, 0);
 

Modified: gigolo/trunk/src/window.c
===================================================================
--- gigolo/trunk/src/window.c	2009-04-02 21:54:24 UTC (rev 7102)
+++ gigolo/trunk/src/window.c	2009-04-02 22:09:12 UTC (rev 7103)
@@ -1127,8 +1127,10 @@
 				"<menuitem action='ShowPanel'/>"
 				"<menuitem action='ShowInSystray'/>"
 				"<separator/>"
-				"<menuitem action='ViewDetailed'/>"
-				"<menuitem action='ViewSymbols'/>"
+				"<menu action='ConnectionList'>"
+					"<menuitem action='ViewDetailed'/>"
+					"<menuitem action='ViewSymbols'/>"
+				"</menu>"
 			"</menu>"
 			"<menu action='Actions'>"
 				"<menuitem action='Connect'/>"
@@ -1181,6 +1183,7 @@
 		{ "Edit", NULL, N_("_Edit"), NULL, NULL, NULL },
 		{ "Actions", NULL, N_("_Actions"), NULL, NULL, NULL },
 		{ "View", NULL, N_("_View"), NULL, NULL, NULL },
+		{ "ConnectionList", NULL, N_("_Connection List Mode"), NULL, NULL, NULL },
 		{ "Help", NULL, N_("_Help"), NULL, NULL, NULL },
 		{ "Preferences", GTK_STOCK_PREFERENCES,
 			NULL, "<Ctrl>p", NULL, G_CALLBACK(action_preferences_cb) },
@@ -1214,8 +1217,8 @@
 	const guint toggle_entries_n = G_N_ELEMENTS(toggle_entries);
 
 	const GtkRadioActionEntry radio_entries[] = {
-		{ "ViewDetailed", NULL, N_("View as _Symbols"), NULL, NULL, 0 },
-		{ "ViewSymbols", NULL, N_("View as _Detailed List"), NULL, NULL, 1 },
+		{ "ViewDetailed", NULL, N_("_Symbols"), NULL, NULL, 0 },
+		{ "ViewSymbols", NULL, N_("_Detailed List"), NULL, NULL, 1 },
 	};
 	const guint radio_entries_n = G_N_ELEMENTS(radio_entries);
 
@@ -1355,7 +1358,7 @@
 			"icon-name", GIGOLO_WINDOW_COL_ICON_NAME);
 
 	renderer = gtk_cell_renderer_text_new();
-	g_object_set(renderer, "xalign", 0.5, "yalign", 1.0, NULL);
+	g_object_set(renderer, "xalign", 0.5, "yalign", 0.0, NULL);
 	gtk_cell_layout_pack_end(GTK_CELL_LAYOUT(priv->iconview), renderer, TRUE);
 	gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(priv->iconview), renderer,
 		"text", GIGOLO_WINDOW_COL_NAME, NULL);