Fix popup menu item capitalization according to Gnome HIG.

Add separator menu item to VTE popup menu.
Move VTE Prefs item below Input Methods.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@2037 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

@@ -5,6 +5,10 @@
    enum for tree model columns.
    Ask the user whether to override an existing keybinding when setting
    a combination that is already in use.
+ * plugins/filebrowser.c, src/treeviews.c, src/vte.c:
+   Fix popup menu item capitalization according to Gnome HIG.
+   Add separator menu item to VTE popup menu.
+   Move VTE Prefs item below Input Methods.
 
 
 2007-11-08  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

plugins/filebrowser.c

@@ -293,7 +293,7 @@ static GtkWidget *create_popup_menu()
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	item = gtk_check_menu_item_new_with_mnemonic(_("Show _hidden files"));
+	item = gtk_check_menu_item_new_with_mnemonic(_("Show _Hidden Files"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect((gpointer) item, "activate",
@@ -303,7 +303,7 @@ static GtkWidget *create_popup_menu()
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide sidebar"));
+	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
 		gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU));
 	gtk_widget_show(item);

src/treeviews.c

@@ -356,14 +356,14 @@ static void create_taglist_popup_menu()
 
 	tv.popup_taglist = gtk_menu_new();
 
-	item = gtk_menu_item_new_with_mnemonic(_("Sort by _name"));
+	item = gtk_menu_item_new_with_mnemonic(_("Sort by _Name"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item);
 	g_signal_connect((gpointer) item, "activate",
 				G_CALLBACK(on_taglist_tree_popup_clicked),
 				GINT_TO_POINTER(SYMBOL_ACTION_SORT_BY_NAME));
 
-	item = gtk_menu_item_new_with_mnemonic(_("Sort by _appearance"));
+	item = gtk_menu_item_new_with_mnemonic(_("Sort by _Appearance"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(tv.popup_taglist), item);
 	g_signal_connect((gpointer) item, "activate",
@@ -386,7 +386,7 @@ static void create_taglist_popup_menu()
 	g_signal_connect((gpointer) mi.symbols_show_documents, "activate",
 			G_CALLBACK(on_list_document_activate), NULL);
 
-	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide sidebar"));
+	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
 		gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU));
 	gtk_widget_show(item);
@@ -451,7 +451,7 @@ static void create_openfiles_popup_menu()
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), item);
 
-	mi.documents_fullpath = gtk_check_menu_item_new_with_mnemonic(_("Show _full path name"));
+	mi.documents_fullpath = gtk_check_menu_item_new_with_mnemonic(_("Show _Full Path Name"));
 	gtk_widget_show(mi.documents_fullpath);
 	gtk_container_add(GTK_CONTAINER(tv.popup_openfiles), mi.documents_fullpath);
 	g_signal_connect((gpointer) mi.documents_fullpath, "activate",
@@ -473,7 +473,7 @@ static void create_openfiles_popup_menu()
 	g_signal_connect((gpointer) mi.documents_show_documents, "activate",
 			G_CALLBACK(on_list_document_activate), NULL);
 
-	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide sidebar"));
+	item = gtk_image_menu_item_new_with_mnemonic(_("H_ide Sidebar"));
 	gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item),
 		gtk_image_new_from_stock("gtk-close", GTK_ICON_SIZE_MENU));
 	gtk_widget_show(item);

src/vte.c

@@ -398,7 +398,6 @@ static void vte_popup_menu_clicked(GtkMenuItem *menuitem, gpointer user_data)
 		{
 			vte_restart(vc->vte);
 			break;
-			
 		}
 		case POPUP_PREFERENCES:
 		{
@@ -431,12 +430,16 @@ static GtkWidget *vte_create_popup_menu(void)
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PASTE));
 
-	item = gtk_image_menu_item_new_with_label(_("Set path from document"));
+	item = gtk_separator_menu_item_new();
+	gtk_widget_show(item);
+	gtk_container_add(GTK_CONTAINER(menu), item);
+
+	item = gtk_image_menu_item_new_with_label(_("Set Path From Document"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_CHANGEPATH));
 
-	item = gtk_image_menu_item_new_with_label(_("Restart terminal"));
+	item = gtk_image_menu_item_new_with_label(_("Restart Terminal"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 	g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_RESTARTTERMINAL));
@@ -445,25 +448,25 @@ static GtkWidget *vte_create_popup_menu(void)
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	item = gtk_image_menu_item_new_from_stock("gtk-preferences", NULL);
+	vc->im_submenu = gtk_menu_new();
+
+	item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods"));
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
-	g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PREFERENCES));
+
+	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu);
 
 	item = gtk_separator_menu_item_new();
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
 
-	vc->im_submenu = gtk_menu_new();
-
-	item = gtk_image_menu_item_new_with_mnemonic(_("_Input Methods"));
+	item = gtk_image_menu_item_new_from_stock("gtk-preferences", NULL);
 	gtk_widget_show(item);
 	gtk_container_add(GTK_CONTAINER(menu), item);
+	g_signal_connect((gpointer)item, "activate", G_CALLBACK(vte_popup_menu_clicked), GINT_TO_POINTER(POPUP_PREFERENCES));
 
 	msgwin_menu_add_common_items(GTK_MENU(menu));
 
-	gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), vc->im_submenu);
-
 	return menu;
 }