Merge commit '6e687efe8899278a955efd1e3ba4de5300f7949a' into garux-merge

[xonotic/netradiant.git] / radiant / mainframe.cpp

diff --git a/radiant/mainframe.cpp b/radiant/mainframe.cpp
index 5a9f9be6d93a6f82ec2633b0b2d814d96270b3c4..30ca62864f0013d5ae3870103a64f9134bd6ecfa 100644 (file)
--- a/radiant/mainframe.cpp
+++ b/radiant/mainframe.cpp
@@ -1965,15 +1965,16 @@ ui::MenuItem create_file_menu(){
        create_menu_item_with_mnemonic( menu, "_Export selected...", "ExportSelected" );
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "Save re_gion...", "SaveRegion" );
-       menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "_Refresh models", "RefreshReferences" );
-       menu_separator( menu );
+//     menu_separator( menu );
+//     create_menu_item_with_mnemonic( menu, "_Refresh models", "RefreshReferences" );
+//     menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "Pro_ject settings...", "ProjectSettings" );
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "_Pointfile...", "TogglePointfile" );
        menu_separator( menu );
        MRU_constructMenu( menu );
        menu_separator( menu );
+//     create_menu_item_with_mnemonic( menu, "Check for NetRadiant update (web)", "CheckForUpdate" ); // FIXME
        create_menu_item_with_mnemonic( menu, "E_xit", "Exit" );
 
        return file_menu_item;
@@ -1997,18 +1998,22 @@ ui::MenuItem create_edit_menu(){
        create_menu_item_with_mnemonic( menu, "Duplicate, make uni_que", "CloneSelectionAndMakeUnique" );
        create_menu_item_with_mnemonic( menu, "D_elete", "DeleteSelection" );
        menu_separator( menu );
-       create_menu_item_with_mnemonic( menu, "Pa_rent", "ParentSelection" );
+       create_menu_item_with_mnemonic( menu, "Snap To Grid", "SnapToGrid" );
+       //create_menu_item_with_mnemonic( menu, "Pa_rent", "ParentSelection" );
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "C_lear Selection", "UnSelectSelection" );
        create_menu_item_with_mnemonic( menu, "_Invert Selection", "InvertSelection" );
        create_menu_item_with_mnemonic( menu, "Select i_nside", "SelectInside" );
        create_menu_item_with_mnemonic( menu, "Select _touching", "SelectTouching" );
 
-       auto convert_menu = create_sub_menu_with_mnemonic( menu, "E_xpand Selection" );
-       if ( g_Layout_enableDetachableMenus.m_value ) {
-               menu_tearoff( convert_menu );
-       }
-       create_menu_item_with_mnemonic( convert_menu, "To Whole _Entities", "ExpandSelectionToEntities" );
+       menu_separator( menu );
+
+//     auto convert_menu = create_sub_menu_with_mnemonic( menu, "E_xpand Selection" );
+//     if ( g_Layout_enableDetachableMenus.m_value ) {
+//             menu_tearoff( convert_menu );
+//     }
+       create_menu_item_with_mnemonic( menu, "Select All Of Type", "SelectAllOfType" );
+       create_menu_item_with_mnemonic( menu, "_Expand Selection To Entities", "ExpandSelectionToEntities" );
 
        menu_separator( menu );
        create_menu_item_with_mnemonic( menu, "Pre_ferences...", "Preferences" );
@@ -2060,6 +2065,7 @@ ui::MenuItem create_view_menu( MainFrame::EViewStyle style ){
                create_menu_item_with_mnemonic( menu, "Entity Inspector", "ViewEntityInfo" );
        }
        create_menu_item_with_mnemonic( menu, "_Surface Inspector", "SurfaceInspector" );
+       create_menu_item_with_mnemonic( menu, "_Patch Inspector", "PatchInspector" );
        create_menu_item_with_mnemonic( menu, "Entity List", "EntityList" );
 
        menu_separator( menu );
@@ -2095,6 +2101,8 @@ ui::MenuItem create_view_menu( MainFrame::EViewStyle style ){
                        menu_separator( orthographic_menu );
                }
 
+               create_menu_item_with_mnemonic( orthographic_menu, "Center on Selected", "CenterXYView" );
+               menu_separator( orthographic_menu );
                create_menu_item_with_mnemonic( orthographic_menu, "_XY 100%", "Zoom100" );
                create_menu_item_with_mnemonic( orthographic_menu, "XY Zoom _In", "ZoomIn" );
                create_menu_item_with_mnemonic( orthographic_menu, "XY Zoom _Out", "ZoomOut" );
@@ -2107,6 +2115,12 @@ ui::MenuItem create_view_menu( MainFrame::EViewStyle style ){
                if ( g_Layout_enableDetachableMenus.m_value ) {
                        menu_tearoff( menu_in_menu );
                }
+               create_menu_item_with_mnemonic( menu_in_menu, "Show Size Info", "ToggleSizePaint" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Show Crosshair", "ToggleCrosshairs" );
+               create_menu_item_with_mnemonic( menu_in_menu, "Show Grid", "ToggleGrid" );
+
+               menu_separator( menu_in_menu );
+
                create_check_menu_item_with_mnemonic( menu_in_menu, "Show _Angles", "ShowAngles" );
                create_check_menu_item_with_mnemonic( menu_in_menu, "Show _Names", "ShowNames" );
                create_check_menu_item_with_mnemonic( menu_in_menu, "Show Blocks", "ShowBlocks" );
@@ -2126,12 +2140,14 @@ ui::MenuItem create_view_menu( MainFrame::EViewStyle style ){
        }
        menu_separator( menu );
        {
-               auto menu_in_menu = create_sub_menu_with_mnemonic( menu, "Hide/Show" );
-               if ( g_Layout_enableDetachableMenus.m_value ) {
-                       menu_tearoff( menu_in_menu );
-               }
-               create_menu_item_with_mnemonic( menu_in_menu, "Hide Selected", "HideSelected" );
-               create_menu_item_with_mnemonic( menu_in_menu, "Show Hidden", "ShowHidden" );
+//             GtkMenu* menu_in_menu = create_sub_menu_with_mnemonic( menu, "Hide/Show" );
+//             if ( g_Layout_enableDetachableMenus.m_value ) {
+//                     menu_tearoff( menu_in_menu );
+//             }
+//             create_menu_item_with_mnemonic( menu_in_menu, "Hide Selected", "HideSelected" );
+//             create_menu_item_with_mnemonic( menu_in_menu, "Show Hidden", "ShowHidden" );
+               create_menu_item_with_mnemonic( menu, "Hide Selected", "HideSelected" );
+               create_menu_item_with_mnemonic( menu, "Show Hidden", "ShowHidden" );
        }
        menu_separator( menu );
        {
@@ -2306,7 +2322,7 @@ ui::MenuItem create_help_menu(){
                menu_tearoff( menu );
        }
 
-       create_menu_item_with_mnemonic( menu, "Manual", "OpenManual" );
+//     create_menu_item_with_mnemonic( menu, "Manual", "OpenManual" );
 
        // this creates all the per-game drop downs for the game pack helps
        // it will take care of hooking the Sys_OpenURL calls etc.