Pcbnew menubar tweaks

This commit is contained in:
Michael 2018-02-19 23:05:41 +00:00 committed by Maciej Suminski
parent 702eb48ca0
commit ed8ca6ec60
1 changed files with 22 additions and 23 deletions

View File

@ -218,45 +218,37 @@ void preparePreferencesMenu( PCB_EDIT_FRAME* aFrame, wxMenu* aParentMenu )
KiBitmap( preference_xpm ) ); KiBitmap( preference_xpm ) );
#endif #endif
// Display Settings submenu aParentMenu->AppendSeparator();
wxMenu* displaySettingsSubMenu = new wxMenu;
AddMenuItem( displaySettingsSubMenu, ID_PCB_DISPLAY_OPTIONS_SETUP, AddMenuItem( aParentMenu, ID_PCB_DISPLAY_OPTIONS_SETUP,
_( "&Display Options..." ), _( "&Display Options..." ),
_( "Graphics acceleration, grid, cursor, annotation and clearance outline settings." ), _( "Graphics acceleration, grid, cursor, annotation and clearance outline settings." ),
KiBitmap( display_options_xpm ) ); KiBitmap( display_options_xpm ) );
displaySettingsSubMenu->AppendSeparator(); text = AddHotkeyName( _( "&Legacy Toolset" ), g_Pcbnew_Editor_Hotkeys_Descr,
text = AddHotkeyName( _( "Legacy Graphic&s" ), g_Pcbnew_Editor_Hotkeys_Descr,
HK_CANVAS_LEGACY ); HK_CANVAS_LEGACY );
displaySettingsSubMenu->Append( aParentMenu->Append(
new wxMenuItem( displaySettingsSubMenu, ID_MENU_CANVAS_LEGACY, new wxMenuItem( aParentMenu, ID_MENU_CANVAS_LEGACY,
text, _( "Use legacy graphics mode (not all features will be available)" ), text, _( "Use legacy graphics mode (not all features will be available)" ),
wxITEM_RADIO ) ); wxITEM_RADIO ) );
text = AddHotkeyName( _( "Modern (&Accelerated)" ), g_Pcbnew_Editor_Hotkeys_Descr, text = AddHotkeyName( _( "Modern Toolset (&Accelerated)" ), g_Pcbnew_Editor_Hotkeys_Descr,
HK_CANVAS_OPENGL ); HK_CANVAS_OPENGL );
displaySettingsSubMenu->Append( aParentMenu->Append(
new wxMenuItem( displaySettingsSubMenu, ID_MENU_CANVAS_OPENGL, new wxMenuItem( aParentMenu, ID_MENU_CANVAS_OPENGL,
text, _( "Use modern hardware-accelerated (OpenGL) graphics mode (recommended)" ), text, _( "Use modern hardware-accelerated (OpenGL) graphics mode (recommended)" ),
wxITEM_RADIO ) ); wxITEM_RADIO ) );
text = AddHotkeyName( _( "Modern (Fallba&ck)" ), g_Pcbnew_Editor_Hotkeys_Descr, text = AddHotkeyName( _( "Modern Toolset (&Fallback)" ), g_Pcbnew_Editor_Hotkeys_Descr,
HK_CANVAS_CAIRO ); HK_CANVAS_CAIRO );
displaySettingsSubMenu->Append( aParentMenu->Append(
new wxMenuItem( displaySettingsSubMenu, ID_MENU_CANVAS_CAIRO, new wxMenuItem( aParentMenu, ID_MENU_CANVAS_CAIRO,
text, _( "Use modern fallback (Cairo) graphics mode" ), text, _( "Use modern fallback (Cairo) graphics mode" ),
wxITEM_RADIO ) ); wxITEM_RADIO ) );
AddMenuItem( aParentMenu, displaySettingsSubMenu, -1, aParentMenu->AppendSeparator();
_( "&Display Settings" ),
_( "Select toolset and other display options" ),
KiBitmap( display_options_xpm ) );
// Language submenu // Language submenu
aParentMenu->AppendSeparator();
Pgm().AddMenuLanguageList( aParentMenu ); Pgm().AddMenuLanguageList( aParentMenu );
// Hotkey submenu // Hotkey submenu
@ -616,6 +608,11 @@ void prepareViewMenu( wxMenu* aParentMenu, bool aUseGal )
HELP_SHOW_HIDE_MICROWAVE_TOOLS, HELP_SHOW_HIDE_MICROWAVE_TOOLS,
KiBitmap( mw_toolbar_xpm ), wxITEM_CHECK ); KiBitmap( mw_toolbar_xpm ), wxITEM_CHECK );
AddMenuItem( aParentMenu, ID_OPEN_MODULE_VIEWER,
_( "&Library Browser" ),
_( "Open the Library Browser" ),
KiBitmap( modview_icon_xpm ) );
text = AddHotkeyName( _( "&3D Viewer" ), g_Pcbnew_Editor_Hotkeys_Descr, HK_3D_VIEWER ); text = AddHotkeyName( _( "&3D Viewer" ), g_Pcbnew_Editor_Hotkeys_Descr, HK_3D_VIEWER );
AddMenuItem( aParentMenu, ID_MENU_PCB_SHOW_3D_FRAME, AddMenuItem( aParentMenu, ID_MENU_PCB_SHOW_3D_FRAME,
text, _( "Show board in 3D viewer" ), text, _( "Show board in 3D viewer" ),
@ -727,8 +724,10 @@ void prepareViewMenu( wxMenu* aParentMenu, bool aUseGal )
_( "Sketch &Vias" ), _( "Show vias in outline mode" ), _( "Sketch &Vias" ), _( "Show vias in outline mode" ),
KiBitmap( via_sketch_xpm ), wxITEM_CHECK ); KiBitmap( via_sketch_xpm ), wxITEM_CHECK );
text = AddHotkeyName( _( "Sketch &Tracks" ), g_Pcbnew_Editor_Hotkeys_Descr,
HK_SWITCH_TRACK_DISPLAY_MODE );
AddMenuItem( drawingModeSubMenu, ID_TB_OPTIONS_SHOW_TRACKS_SKETCH, AddMenuItem( drawingModeSubMenu, ID_TB_OPTIONS_SHOW_TRACKS_SKETCH,
_( "Sketch &Tracks" ), _( "Show tracks in outline mode" ), text, _( "Show tracks in outline mode" ),
KiBitmap( showtrack_xpm ), wxITEM_CHECK ); KiBitmap( showtrack_xpm ), wxITEM_CHECK );
AddMenuItem( drawingModeSubMenu, ID_TB_OPTIONS_SHOW_GRAPHIC_SKETCH, AddMenuItem( drawingModeSubMenu, ID_TB_OPTIONS_SHOW_GRAPHIC_SKETCH,
@ -962,7 +961,7 @@ void prepareFilesMenu( wxMenu* aParentMenu, bool aIsOutsideProject )
KiBitmap( library_archive_xpm ) ); KiBitmap( library_archive_xpm ) );
aParentMenu->AppendSeparator(); aParentMenu->AppendSeparator();
AddMenuItem( aParentMenu, wxID_EXIT, _( "&Close" ), _( "Close Pcbnew" ), KiBitmap( exit_xpm ) ); AddMenuItem( aParentMenu, wxID_EXIT, _( "&Exit" ), _( "Close Pcbnew" ), KiBitmap( exit_xpm ) );
} }