diff --git a/include/advanced_config.h b/include/advanced_config.h index 141f6d6ff0..6ebcb1ec10 100644 --- a/include/advanced_config.h +++ b/include/advanced_config.h @@ -222,7 +222,7 @@ public: bool m_AllowManualCanvasScale; /** - * Show the properties panel in PcbNew + * Show the properties panel in applications that it hasn't been fully released for */ bool m_ShowPropertiesPanel; diff --git a/pcbnew/menubar_pcb_editor.cpp b/pcbnew/menubar_pcb_editor.cpp index 2f89d3fea9..7e6050b91d 100644 --- a/pcbnew/menubar_pcb_editor.cpp +++ b/pcbnew/menubar_pcb_editor.cpp @@ -224,9 +224,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ACTION_MENU* viewMenu = new ACTION_MENU( false, selTool ); viewMenu->Add( PCB_ACTIONS::showLayersManager, ACTION_MENU::CHECK ); - - if( ADVANCED_CFG::GetCfg().m_ShowPropertiesPanel ) - viewMenu->Add( PCB_ACTIONS::showProperties, ACTION_MENU::CHECK ); + viewMenu->Add( PCB_ACTIONS::showProperties, ACTION_MENU::CHECK ); viewMenu->Add( PCB_ACTIONS::showSearch, ACTION_MENU::CHECK ); viewMenu->Add( ACTIONS::showFootprintBrowser ); diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index 7621bb5ed2..ab35d04299 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -245,13 +245,11 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : ReCreateVToolbar(); ReCreateOptToolbar(); - if( ADVANCED_CFG::GetCfg().m_ShowPropertiesPanel ) - { - m_propertiesPanel = new PCB_PROPERTIES_PANEL( this, this ); - float proportion = GetPcbNewSettings()->m_AuiPanels.properties_splitter_proportion; - m_propertiesPanel->SetSplitterProportion( proportion ); - } + m_propertiesPanel = new PCB_PROPERTIES_PANEL( this, this ); + + float proportion = GetPcbNewSettings()->m_AuiPanels.properties_splitter_proportion; + m_propertiesPanel->SetSplitterProportion( proportion ); m_selectionFilterPanel = new PANEL_SELECTION_FILTER( this ); @@ -295,12 +293,9 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : .Caption( _( "Selection Filter" ) ).PaneBorder( false ) .MinSize( 180, -1 ).BestSize( 180, -1 ) ); - if( ADVANCED_CFG::GetCfg().m_ShowPropertiesPanel ) - { - m_auimgr.AddPane( m_propertiesPanel, EDA_PANE().Name( "PropertiesManager" ) - .Left().Layer( 5 ).Caption( _( "Properties" ) ) - .PaneBorder( false ).MinSize( 240, -1 ).BestSize( 300, -1 ) ); - } + m_auimgr.AddPane( m_propertiesPanel, EDA_PANE().Name( "PropertiesManager" ) + .Left().Layer( 5 ).Caption( _( "Properties" ) ) + .PaneBorder( false ).MinSize( 240, -1 ).BestSize( 300, -1 ) ); // Center m_auimgr.AddPane( GetCanvas(), EDA_PANE().Canvas().Name( "DrawFrame" ) @@ -321,9 +316,7 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : m_auimgr.GetPane( "LayersManager" ).Show( m_show_layer_manager_tools ); m_auimgr.GetPane( "SelectionFilter" ).Show( m_show_layer_manager_tools ); - - bool showProperties = ADVANCED_CFG::GetCfg().m_ShowPropertiesPanel && m_show_properties; - m_auimgr.GetPane( "PropertiesManager" ).Show( showProperties ); + m_auimgr.GetPane( "PropertiesManager" ).Show( m_show_properties ); m_auimgr.GetPane( SearchPaneName() ).Show( m_show_search ); diff --git a/pcbnew/pcbnew_settings.cpp b/pcbnew/pcbnew_settings.cpp index 80479833c1..2af3a805b8 100644 --- a/pcbnew/pcbnew_settings.cpp +++ b/pcbnew/pcbnew_settings.cpp @@ -113,7 +113,7 @@ PCBNEW_SETTINGS::PCBNEW_SETTINGS() &m_AuiPanels.appearance_expand_net_display, false ) ); m_params.emplace_back( new PARAM( "aui.show_properties", - &m_AuiPanels.show_properties, true ) ); + &m_AuiPanels.show_properties, false ) ); m_params.emplace_back( new PARAM( "aui.show_search", &m_AuiPanels.show_search, false ) ); diff --git a/pcbnew/toolbars_pcb_editor.cpp b/pcbnew/toolbars_pcb_editor.cpp index 5880a1ad0a..a2bce43366 100644 --- a/pcbnew/toolbars_pcb_editor.cpp +++ b/pcbnew/toolbars_pcb_editor.cpp @@ -381,10 +381,8 @@ void PCB_EDIT_FRAME::ReCreateOptToolbar() // Tools to show/hide toolbars: m_optionsToolBar->AddScaledSeparator( this ); - m_optionsToolBar->Add( PCB_ACTIONS::showLayersManager, ACTION_TOOLBAR::TOGGLE ); - - if( ADVANCED_CFG::GetCfg().m_ShowPropertiesPanel ) - m_optionsToolBar->Add( PCB_ACTIONS::showProperties, ACTION_TOOLBAR::TOGGLE ); + m_optionsToolBar->Add( PCB_ACTIONS::showLayersManager, ACTION_TOOLBAR::TOGGLE ); + m_optionsToolBar->Add( PCB_ACTIONS::showProperties, ACTION_TOOLBAR::TOGGLE ); PCB_SELECTION_TOOL* selTool = m_toolManager->GetTool(); std::unique_ptr gridMenu = std::make_unique( false, selTool );