Make menus more consistent with ellipses

This commit is contained in:
Pan7 2017-05-10 23:26:29 +02:00
parent a3e015da0a
commit 31c24a875f
9 changed files with 17 additions and 17 deletions

View file

@ -55,7 +55,7 @@
#define CMD_SEP "-" #define CMD_SEP "-"
#define CMD_CONFIG "Configure..." #define CMD_CONFIG "Configure..."
#define CMD_ABOUT "About..." #define CMD_ABOUT "About"
// ============================================================================= // =============================================================================
// Globals // Globals

View file

@ -39,7 +39,7 @@ _QEREntityTable g_EntityTable;
const char* PLUGIN_NAME = "bobToolz"; const char* PLUGIN_NAME = "bobToolz";
// commands in the menu // commands in the menu
static const char* PLUGIN_COMMANDS = "About...,-,Reset Textures...,PitOMatic,-,Vis Viewer,Brush Cleanup,Polygon Builder,Caulk Selection,-,Tree Planter,Drop Entity,Plot Splines,-,Merge Patches,Split patches,Turn edge"; static const char* PLUGIN_COMMANDS = "About,-,Reset Textures...,PitOMatic,-,Vis Viewer,Brush Cleanup,Polygon Builder,Caulk Selection,-,Tree Planter,Drop Entity,Plot Splines,-,Merge Patches,Split patches,Turn edge";
// globals // globals
GtkWidget *g_pRadiantWnd = NULL; GtkWidget *g_pRadiantWnd = NULL;
@ -103,7 +103,7 @@ extern "C" void QERPlug_Dispatch( const char *p, vec3_t vMin, vec3_t vMax, bool
else if ( !stricmp( p, "vis viewer" ) ) { else if ( !stricmp( p, "vis viewer" ) ) {
DoVisAnalyse(); DoVisAnalyse();
} }
else if ( !stricmp( p, "about..." ) ) { else if ( !stricmp( p, "About" ) ) {
DoMessageBox( PLUGIN_ABOUT, "About", MB_OK ); DoMessageBox( PLUGIN_ABOUT, "About", MB_OK );
} }
} }

View file

@ -36,7 +36,7 @@ CListener *Listener = NULL;
static const char *PLUGIN_NAME = "Camera"; static const char *PLUGIN_NAME = "Camera";
// commands in the menu // 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 // globals
GtkWidget *g_pRadiantWnd = NULL; GtkWidget *g_pRadiantWnd = NULL;
@ -116,7 +116,7 @@ void QERPlug_Dispatch( const char* p, float* vMin, float* vMax, bool bSingleBrus
else if ( !strcmp( p, "Load Camera..." ) ) { else if ( !strcmp( p, "Load Camera..." ) ) {
DoLoadCamera(); DoLoadCamera();
} }
else if ( !strcmp( p, "About..." ) ) { else if ( !strcmp( p, "About" ) ) {
g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, PLUGIN_ABOUT, "About", MB_OK, NULL ); g_FuncTable.m_pfnMessageBox( (GtkWidget *)g_pRadiantWnd, PLUGIN_ABOUT, "About", MB_OK, NULL );
} }
} }

View file

@ -40,8 +40,8 @@ const char* QERPlug_GetName(){
} }
const char* QERPlug_GetCommandList(){ const char* QERPlug_GetCommandList(){
return "Wall facing 270...;Wall facing 180...;Wall facing 90...;Wall facing 0...;" return "About;-;Wall facing 270...;Wall facing 180...;Wall facing 90...;Wall facing 0...;"
"Ceiling...;Ground surface...;-;About..."; "Ceiling...;Ground surface...";
} }
// vMin/vMax provide the bounds of the selection, they are zero if there is no selection // vMin/vMax provide the bounds of the selection, they are zero if there is no selection
@ -129,7 +129,7 @@ void QERPlug_Dispatch( const char *p, vec3_t vMin, vec3_t vMax, bool bSingleBrus
} }
Generate = true; Generate = true;
} }
else if ( !strcmp( p,"About..." ) ) { else if ( !strcmp( p,"About" ) ) {
About( g_pRadiantWnd ); About( g_pRadiantWnd );
} }

View file

@ -334,7 +334,7 @@ void UpdateWadKeyPair( void ){
const char *PLUGIN_NAME = "HydraToolz"; const char *PLUGIN_NAME = "HydraToolz";
// commands in the menu // 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" const char *PLUGIN_ABOUT = "HydraToolz v1.0 for GTKRadiant\n\n"
"By Hydra!"; "By Hydra!";
@ -362,7 +362,7 @@ extern "C" void QERPlug_Dispatch( const char* p, vec3_t vMin, vec3_t vMax, bool
if ( !strcmp( p, "Create/Update WAD keypair" ) ) { if ( !strcmp( p, "Create/Update WAD keypair" ) ) {
UpdateWadKeyPair(); UpdateWadKeyPair();
} }
else if ( !strcmp( p, "About..." ) ) { else if ( !strcmp( p, "About" ) ) {
g_FuncTable.m_pfnMessageBox( g_pMainWidget, PLUGIN_ABOUT, "About", MB_OK, NULL ); g_FuncTable.m_pfnMessageBox( g_pMainWidget, PLUGIN_ABOUT, "About", MB_OK, NULL );
} }
} }

View file

@ -25,7 +25,7 @@
#include <stdlib.h> #include <stdlib.h>
#define Q3R_CMD_SPLITTER "-" #define Q3R_CMD_SPLITTER "-"
#define Q3R_CMD_ABOUT "About Portal Viewer..." #define Q3R_CMD_ABOUT "About"
#define Q3R_CMD_LOAD "Load .prt file" #define Q3R_CMD_LOAD "Load .prt file"
#define Q3R_CMD_RELEASE "Unload .prt file" #define Q3R_CMD_RELEASE "Unload .prt file"
#define Q3R_CMD_SHOW_3D "Toggle portals (3D)" #define Q3R_CMD_SHOW_3D "Toggle portals (3D)"

View file

@ -148,7 +148,7 @@ _QERShadersTable g_ShadersTable;
static const char *PLUGIN_NAME = "Sprite Model loading module"; static const char *PLUGIN_NAME = "Sprite Model loading module";
static const char *PLUGIN_COMMANDS = "About..."; static const char *PLUGIN_COMMANDS = "About";
static const char *PLUGIN_ABOUT = "Sprite Model loading module v0.2 for GTKRadiant\n\n" static const char *PLUGIN_ABOUT = "Sprite Model loading module v0.2 for GTKRadiant\n\n"
"By Hydra!"; "By Hydra!";
@ -200,7 +200,7 @@ extern "C" const char* QERPlug_GetCommandList(){
extern "C" void QERPlug_Dispatch( const char *p, vec3_t vMin, vec3_t vMax, bool bSingleBrush ){ extern "C" void QERPlug_Dispatch( const char *p, vec3_t vMin, vec3_t vMax, bool bSingleBrush ){
// NOTE: this never happens in a module // NOTE: this never happens in a module
if ( !strcmp( p, "About..." ) ) { if ( !strcmp( p, "About" ) ) {
g_FuncTable.m_pfnMessageBox( g_pMainWidget, PLUGIN_ABOUT, "About", MB_OK, NULL ); g_FuncTable.m_pfnMessageBox( g_pMainWidget, PLUGIN_ABOUT, "About", MB_OK, NULL );
} }
} }

View file

@ -37,7 +37,7 @@ _QERFuncTable_1 g_FuncTable;
const char *PLUGIN_NAME = "Q3 Texture Tools"; const char *PLUGIN_NAME = "Q3 Texture Tools";
// commands in the menu // commands in the menu
const char *PLUGIN_COMMANDS = "About...;Go..."; const char *PLUGIN_COMMANDS = "About;-;Go...";
// cast to GtkWidget* // cast to GtkWidget*
void *g_pMainWnd; void *g_pMainWnd;
@ -775,8 +775,8 @@ extern "C" void QERPlug_Dispatch( const char* p, vec3_t vMin, vec3_t vMax, bool
} }
#endif #endif
if ( !strcmp( p, "About..." ) ) { if ( !strcmp( p, "About" ) ) {
DoMessageBox( PLUGIN_ABOUT, "About ...", MB_OK ); DoMessageBox( PLUGIN_ABOUT, "About", MB_OK );
} }
else if ( !strcmp( p, "Go..." ) ) { else if ( !strcmp( p, "Go..." ) ) {
if ( !g_pToolWnd ) { if ( !g_pToolWnd ) {

View file

@ -1541,7 +1541,7 @@ void MainFrame::create_main_menu( GtkWidget *window, GtkWidget *vbox ){
item = create_menu_item_with_mnemonic( menu, _( "Simple Patch Mesh..." ), item = create_menu_item_with_mnemonic( menu, _( "Simple Patch Mesh..." ),
G_CALLBACK( HandleCommand ), ID_CURVE_SIMPLEPATCHMESH ); G_CALLBACK( HandleCommand ), ID_CURVE_SIMPLEPATCHMESH );
g_object_set_data( G_OBJECT( window ), "menu_simplepatchmesh", item ); 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_separator( menu );
menu_in_menu = create_menu_in_menu_with_mnemonic( menu, _( "Insert" ) ); menu_in_menu = create_menu_in_menu_with_mnemonic( menu, _( "Insert" ) );
create_menu_item_with_mnemonic( menu_in_menu, _( "Insert (2) Columns" ), create_menu_item_with_mnemonic( menu_in_menu, _( "Insert (2) Columns" ),