realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-14 02:03:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI consistency improvements

Browse Source
This commit is contained in:
JamesJCode 2024-10-02 19:31:05 +01:00
parent 38db5e13b0
commit 64c24fc04b
10 changed files with 57 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/tool/actions.cpp
View File

@ -424,7 +424,7 @@ TOOL_ACTION ACTIONS::showSearch( TOOL_ACTION_ARGS()
.Scope( AS_GLOBAL )
.DefaultHotkey( MD_CTRL + 'G' )
.LegacyHotkeyName( "Search" )
.FriendlyName( _( "Show Search Panel" ) )
.FriendlyName( _( "Search" ) )
.Tooltip( _( "Show/hide the search panel" ) )
.Icon( BITMAPS::find ) );
@ -1056,7 +1056,7 @@ TOOL_ACTION ACTIONS::showFootprintEditor( TOOL_ACTION_ARGS()
TOOL_ACTION ACTIONS::showProperties( TOOL_ACTION_ARGS()
.Name( "common.Control.showProperties" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Show Properties Manager" ) )
.FriendlyName( _( "Properties" ) )
.Tooltip( _( "Show/hide the properties manager" ) )
.Icon( BITMAPS::tools ) );

41
eeschema/menubar.cpp
View File

@ -192,23 +192,25 @@ void SCH_EDIT_FRAME::doReCreateMenuBar()
//
ACTION_MENU* viewMenu = new ACTION_MENU( false, selTool );
viewMenu->Add( ACTIONS::showSymbolBrowser );
viewMenu->Add( ACTIONS::showSearch, ACTION_MENU::CHECK );
viewMenu->Add( EE_ACTIONS::showHierarchy, ACTION_MENU::CHECK );
viewMenu->Add( ACTIONS::showProperties, ACTION_MENU::CHECK );
if( ADVANCED_CFG::GetCfg().m_IncrementalConnectivity )
viewMenu->Add( EE_ACTIONS::showNetNavigator, ACTION_MENU::CHECK );
if( ADVANCED_CFG::GetCfg().m_EnableDesignBlocks )
viewMenu->Add( ACTIONS::showLibraryTree, ACTION_MENU::CHECK, _( "Show Design Blocks" ) );
// Show / Hide Panels submenu
ACTION_MENU* showHidePanels = new ACTION_MENU( false, selTool );
showHidePanels->SetTitle( _( "Show / Hide Panels" ) );
viewMenu->AppendSeparator();
viewMenu->Add( EE_ACTIONS::navigateBack );
viewMenu->Add( EE_ACTIONS::navigateUp );
viewMenu->Add( EE_ACTIONS::navigateForward );
viewMenu->Add( EE_ACTIONS::navigatePrevious );
viewMenu->Add( EE_ACTIONS::navigateNext );
showHidePanels->Add( ACTIONS::showProperties, ACTION_MENU::CHECK );
showHidePanels->Add( ACTIONS::showSearch, ACTION_MENU::CHECK );
showHidePanels->Add( EE_ACTIONS::showHierarchy, ACTION_MENU::CHECK );
if( ADVANCED_CFG::GetCfg().m_IncrementalConnectivity )
showHidePanels->Add( EE_ACTIONS::showNetNavigator, ACTION_MENU::CHECK );
if( ADVANCED_CFG::GetCfg().m_EnableDesignBlocks )
showHidePanels->Add( EE_ACTIONS::showDesignBlockPanel, ACTION_MENU::CHECK, _( "Design Blocks" ) );
viewMenu->Add( showHidePanels );
viewMenu->AppendSeparator();
viewMenu->Add( ACTIONS::showSymbolBrowser );
viewMenu->AppendSeparator();
viewMenu->Add( ACTIONS::zoomInCenter );
@ -218,6 +220,15 @@ void SCH_EDIT_FRAME::doReCreateMenuBar()
viewMenu->Add( ACTIONS::zoomTool );
viewMenu->Add( ACTIONS::zoomRedraw );
viewMenu->AppendSeparator();
viewMenu->Add( EE_ACTIONS::navigateBack );
viewMenu->Add( EE_ACTIONS::navigateUp );
viewMenu->Add( EE_ACTIONS::navigateForward );
viewMenu->Add( EE_ACTIONS::navigatePrevious );
viewMenu->Add( EE_ACTIONS::navigateNext );
viewMenu->AppendSeparator();
viewMenu->Add( EE_ACTIONS::toggleHiddenPins, ACTION_MENU::CHECK );
viewMenu->Add( EE_ACTIONS::toggleHiddenFields, ACTION_MENU::CHECK );

2
eeschema/sch_edit_frame.cpp
View File

@ -627,7 +627,7 @@ void SCH_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( EE_ACTIONS::showHierarchy, CHECK( hierarchyNavigatorCond ) );
mgr->SetConditions( EE_ACTIONS::showNetNavigator, CHECK( netNavigatorCond ) );
mgr->SetConditions( ACTIONS::showProperties, CHECK( propertiesCond ) );
mgr->SetConditions( ACTIONS::showLibraryTree, CHECK( designBlockCond ) );
mgr->SetConditions( EE_ACTIONS::showDesignBlockPanel, CHECK( designBlockCond ) );
mgr->SetConditions( ACTIONS::toggleGrid, CHECK( cond.GridVisible() ) );
mgr->SetConditions( ACTIONS::toggleGridOverrides, CHECK( cond.GridOverrides() ) );
mgr->SetConditions( ACTIONS::toggleCursorStyle, CHECK( cond.FullscreenCursor() ) );

2
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -535,7 +535,7 @@ void SYMBOL_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( EE_ACTIONS::showElectricalTypes, CHECK( pinTypeCond ) );
mgr->SetConditions( ACTIONS::toggleBoundingBoxes, CHECK( cond.BoundingBoxes() ) );
mgr->SetConditions( ACTIONS::showLibraryTree, CHECK( showLibraryTreeCond ) );
mgr->SetConditions( EE_ACTIONS::showDesignBlockPanel, CHECK( showLibraryTreeCond ) );
mgr->SetConditions( ACTIONS::showProperties, CHECK( propertiesCond ) );
mgr->SetConditions( EE_ACTIONS::showHiddenPins, CHECK( hiddenPinCond ) );
mgr->SetConditions( EE_ACTIONS::showHiddenFields, CHECK( hiddenFieldCond ) );

4
eeschema/toolbars_sch_editor.cpp
View File

@ -235,10 +235,6 @@ void SCH_EDIT_FRAME::ReCreateOptToolbar()
m_optionsToolBar->AddScaledSeparator( this );
m_optionsToolBar->Add( EE_ACTIONS::toggleAnnotateAuto, ACTION_TOOLBAR::TOGGLE );
m_optionsToolBar->AddScaledSeparator( this );
m_optionsToolBar->Add( EE_ACTIONS::showHierarchy, ACTION_TOOLBAR::TOGGLE );
m_optionsToolBar->Add( ACTIONS::showProperties, ACTION_TOOLBAR::TOGGLE );
if( ADVANCED_CFG::GetCfg().m_DrawBoundingBoxes )
m_optionsToolBar->Add( ACTIONS::toggleBoundingBoxes, ACTION_TOOLBAR::TOGGLE );

14
eeschema/tools/ee_actions.cpp
View File

@ -153,6 +153,13 @@ TOOL_ACTION EE_ACTIONS::syncSelection( TOOL_ACTION_ARGS()
.Scope( AS_GLOBAL ) );
// SCH_DESIGN_BLOCK_CONTROL
TOOL_ACTION EE_ACTIONS::showDesignBlockPanel( TOOL_ACTION_ARGS()
.Name( "eeschema.SchDesignBlockControl.showDesignBlockPanel" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Design Blocks" ) )
.Tooltip( _( "Show/hide design blocks library" ) )
.Icon( BITMAPS::search_tree ) );
TOOL_ACTION EE_ACTIONS::saveSheetAsDesignBlock( TOOL_ACTION_ARGS()
.Name( "eeschema.SchDesignBlockControl.saveSheetAsDesignBlock" )
.Scope( AS_GLOBAL )
@ -935,7 +942,8 @@ TOOL_ACTION EE_ACTIONS::highlightNetTool( TOOL_ACTION_ARGS()
TOOL_ACTION EE_ACTIONS::showNetNavigator( TOOL_ACTION_ARGS()
.Name( "eeschema.EditorControl.showNetNavigator" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Show Net Navigator" ) ) );
.FriendlyName( _( "Net Navigator" ) )
.Tooltip( _( "Show/hide the net navigator" ) ) );
TOOL_ACTION EE_ACTIONS::editWithLibEdit( TOOL_ACTION_ARGS()
.Name( "eeschema.EditorControl.editWithSymbolEditor" )
@ -1364,8 +1372,8 @@ TOOL_ACTION EE_ACTIONS::showHierarchy( TOOL_ACTION_ARGS()
.Name( "eeschema.EditorTool.showHierarchy" )
.Scope( AS_GLOBAL )
.DefaultHotkey( MD_CTRL + 'H' )
.FriendlyName( _( "Show Hierarchy Navigator" ) )
.Tooltip( _( "Show or hide the schematic sheet hierarchy navigator" ) )
.FriendlyName( _( "Hierarchy Navigator" ) )
.Tooltip( _( "Show/hide the schematic sheet hierarchy navigator" ) )
.Icon( BITMAPS::hierarchy_nav ) );

1
eeschema/tools/ee_actions.h
View File

@ -202,6 +202,7 @@ public:
static TOOL_ACTION toggleDNP;
// Design Block management
static TOOL_ACTION showDesignBlockPanel;
static TOOL_ACTION saveSheetAsDesignBlock;
static TOOL_ACTION saveSelectionAsDesignBlock;
static TOOL_ACTION deleteDesignBlock;

4
eeschema/tools/sch_editor_control.cpp
View File

@ -2820,8 +2820,8 @@ void SCH_EDITOR_CONTROL::setTransitions()
Go( &SCH_EDITOR_CONTROL::ShowHierarchy, EE_ACTIONS::showHierarchy.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ShowNetNavigator, EE_ACTIONS::showNetNavigator.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleProperties, ACTIONS::showProperties.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleLibraryTree, ACTIONS::hideLibraryTree.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleLibraryTree, ACTIONS::showLibraryTree.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleLibraryTree, EE_ACTIONS::showDesignBlockPanel.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleLibraryTree, EE_ACTIONS::showDesignBlockPanel.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleHiddenPins, EE_ACTIONS::toggleHiddenPins.MakeEvent() );
Go( &SCH_EDITOR_CONTROL::ToggleHiddenFields, EE_ACTIONS::toggleHiddenFields.MakeEvent() );

15
pcbnew/menubar_pcb_editor.cpp
View File

@ -232,6 +232,15 @@ void PCB_EDIT_FRAME::doReCreateMenuBar()
//
ACTION_MENU* viewMenu = new ACTION_MENU( false, selTool );
ACTION_MENU* showHidePanels = new ACTION_MENU( false, selTool );
showHidePanels->SetTitle( _( "Show / Hide Panels" ) );
showHidePanels->Add( ACTIONS::showProperties, ACTION_MENU::CHECK );
showHidePanels->Add( PCB_ACTIONS::showSearch, ACTION_MENU::CHECK );
showHidePanels->Add( PCB_ACTIONS::showLayersManager, ACTION_MENU::CHECK );
showHidePanels->Add( PCB_ACTIONS::showNetInspector, ACTION_MENU::CHECK );
viewMenu->Add( showHidePanels );
viewMenu->AppendSeparator();
viewMenu->Add( ACTIONS::showFootprintBrowser );
viewMenu->Add( ACTIONS::show3DViewer );
@ -281,12 +290,6 @@ void PCB_EDIT_FRAME::doReCreateMenuBar()
viewMenu->Add( PCB_ACTIONS::flipBoard, ACTION_MENU::CHECK );
viewMenu->AppendSeparator();
viewMenu->Add( ACTIONS::showProperties, ACTION_MENU::CHECK );
viewMenu->Add( PCB_ACTIONS::showSearch, ACTION_MENU::CHECK );
viewMenu->Add( PCB_ACTIONS::showLayersManager, ACTION_MENU::CHECK );
viewMenu->Add( PCB_ACTIONS::showNetInspector, ACTION_MENU::CHECK );
#ifdef __APPLE__
viewMenu->AppendSeparator();
#endif

6
pcbnew/tools/pcb_actions.cpp
View File

@ -1316,13 +1316,15 @@ TOOL_ACTION PCB_ACTIONS::showPythonConsole( TOOL_ACTION_ARGS()
TOOL_ACTION PCB_ACTIONS::showLayersManager( TOOL_ACTION_ARGS()
.Name( "pcbnew.Control.showLayersManager" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Show Appearance Manager" ) )
.FriendlyName( _( "Appearance" ) )
.Tooltip( _( "Show/hide the appearance manager" ) )
.Icon( BITMAPS::layers_manager ) );
TOOL_ACTION PCB_ACTIONS::showNetInspector( TOOL_ACTION_ARGS()
.Name( "pcbnew.Control.showNetInspector" )
.Scope( AS_GLOBAL )
.FriendlyName( _( "Show Net Inspector" ) )
.FriendlyName( _( "Net Inspector" ) )
.Tooltip( _( "Show/hide the net inspector" ) )
.Icon( BITMAPS::tools ) );
TOOL_ACTION PCB_ACTIONS::zonesManager( "pcbnew.Control.zonesManager",