From 2d79ee5764c0b7efb40d097539d27e62a0d41fdb Mon Sep 17 00:00:00 2001 From: Pan7 Date: Wed, 10 May 2017 02:30:05 +0200 Subject: [PATCH] Make menus more consistent --- contrib/camera/camera.cpp | 2 +- contrib/gtkgensurf/plugin.cpp | 4 ++-- contrib/hydratoolz/plugin.cpp | 2 +- plugins/model/plugin.cpp | 2 +- plugins/surface_idtech2/surfaceflags.cpp | 1 - plugins/textool/TexTool.cpp | 2 +- radiant/mainframe.cpp | 2 +- 7 files changed, 7 insertions(+), 8 deletions(-) diff --git a/contrib/camera/camera.cpp b/contrib/camera/camera.cpp index 9c133941..426e0a02 100644 --- a/contrib/camera/camera.cpp +++ b/contrib/camera/camera.cpp @@ -36,7 +36,7 @@ CListener *Listener = NULL; static const char *PLUGIN_NAME = "Camera"; // commands in the menu -static const char *PLUGIN_COMMANDS = "About...,-,Load Camera...,-,Preview Camera,-,Camera Inspector...,-,New Spline Camera,New Interpolated Camera,New Fixed Camera"; +static const char *PLUGIN_COMMANDS = "About...,-,Load Camera...,-,Preview Camera,-,Camera Inspector...,-,New Spline Camera...,New Interpolated Camera...,New Fixed Camera..."; // globals GtkWidget *g_pRadiantWnd = NULL; diff --git a/contrib/gtkgensurf/plugin.cpp b/contrib/gtkgensurf/plugin.cpp index 2ec3d469..3f9d5750 100644 --- a/contrib/gtkgensurf/plugin.cpp +++ b/contrib/gtkgensurf/plugin.cpp @@ -40,8 +40,8 @@ const char* QERPlug_GetName(){ } const char* QERPlug_GetCommandList(){ - return "Wall facing 270...;Wall facing 180...;Wall facing 90...;Wall facing 0...;" - "Ceiling...;Ground surface...;-;About..."; + return "About...;-;Wall facing 270...;Wall facing 180...;Wall facing 90...;Wall facing 0...;" + "Ceiling...;Ground surface..."; } // vMin/vMax provide the bounds of the selection, they are zero if there is no selection diff --git a/contrib/hydratoolz/plugin.cpp b/contrib/hydratoolz/plugin.cpp index b04e4022..3ca3f0cc 100644 --- a/contrib/hydratoolz/plugin.cpp +++ b/contrib/hydratoolz/plugin.cpp @@ -334,7 +334,7 @@ void UpdateWadKeyPair( void ){ const char *PLUGIN_NAME = "HydraToolz"; // commands in the menu -const char *PLUGIN_COMMANDS = "About...;Create/Update WAD keypair"; +const char *PLUGIN_COMMANDS = "About...;-;Create/Update WAD keypair"; const char *PLUGIN_ABOUT = "HydraToolz v1.0 for GTKRadiant\n\n" "By Hydra!"; diff --git a/plugins/model/plugin.cpp b/plugins/model/plugin.cpp index 47bc4345..269e1cfc 100644 --- a/plugins/model/plugin.cpp +++ b/plugins/model/plugin.cpp @@ -152,7 +152,7 @@ void init_filetypes(){ // plugin implementation static const char *PLUGIN_NAME = "Model loading module"; -static const char *PLUGIN_COMMANDS = "About;-;Flush & Reload Models;Flush & Reload Selected"; +static const char *PLUGIN_COMMANDS = "About...;-;Flush & Reload Models;Flush & Reload Selected"; static const char *PLUGIN_ABOUT = "Model Module v1.0 for GtkRadiant\nby Arnout van Meer (rr2do2@splashdamage.com)\n\nBased on the MD3Model Module by SPoG\nPicoModel Library Copyright (c) 2002, Randy Reddig & seaw0lf\n\nSupported models:\n"; void *g_pMainWidget = NULL; diff --git a/plugins/surface_idtech2/surfaceflags.cpp b/plugins/surface_idtech2/surfaceflags.cpp index fe6fac0e..80400c98 100644 --- a/plugins/surface_idtech2/surfaceflags.cpp +++ b/plugins/surface_idtech2/surfaceflags.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include "surfdlg_plugin.h" #include "surfacedialog.h" diff --git a/plugins/textool/TexTool.cpp b/plugins/textool/TexTool.cpp index 32b2b26d..adfbc371 100644 --- a/plugins/textool/TexTool.cpp +++ b/plugins/textool/TexTool.cpp @@ -37,7 +37,7 @@ _QERFuncTable_1 g_FuncTable; const char *PLUGIN_NAME = "Q3 Texture Tools"; // commands in the menu -const char *PLUGIN_COMMANDS = "About...;Go..."; +const char *PLUGIN_COMMANDS = "About...;-;Go..."; // cast to GtkWidget* void *g_pMainWnd; diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp index 4a1da7be..c8fa722e 100644 --- a/radiant/mainframe.cpp +++ b/radiant/mainframe.cpp @@ -1541,7 +1541,7 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){ item = create_menu_item_with_mnemonic( menu, _( "Simple Patch Mesh..." ), G_CALLBACK( HandleCommand ), ID_CURVE_SIMPLEPATCHMESH ); g_object_set_data( G_OBJECT( window ), "menu_simplepatchmesh", item ); - create_menu_item_with_mnemonic( menu, _( "Patch Inspector" ), G_CALLBACK( HandleCommand ), ID_PATCH_INSPECTOR ); + create_menu_item_with_mnemonic( menu, _( "Patch Inspector..." ), G_CALLBACK( HandleCommand ), ID_PATCH_INSPECTOR ); menu_separator( menu ); menu_in_menu = create_menu_in_menu_with_mnemonic( menu, _( "Insert" ) ); create_menu_item_with_mnemonic( menu_in_menu, _( "Insert (2) Columns" ),