Sync-ing of menu has been done in CONDITIONAL_MENU for some time now.
This commit is contained in:
parent
19638b2226
commit
b0e8443383
|
@ -977,6 +977,6 @@ void TOOL_MANAGER::UpdateUI()
|
||||||
if( frame )
|
if( frame )
|
||||||
{
|
{
|
||||||
frame->UpdateStatusBar();
|
frame->UpdateStatusBar();
|
||||||
frame->SyncMenusAndToolbars();
|
frame->SyncToolbars();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -445,7 +445,7 @@ void DISPLAY_FOOTPRINTS_FRAME::UpdateMsgPanel()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void DISPLAY_FOOTPRINTS_FRAME::SyncMenusAndToolbars()
|
void DISPLAY_FOOTPRINTS_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
m_mainToolBar->Toggle( ACTIONS::zoomTool, GetToolId() == ID_ZOOM_SELECTION );
|
m_mainToolBar->Toggle( ACTIONS::zoomTool, GetToolId() == ID_ZOOM_SELECTION );
|
||||||
m_mainToolBar->Refresh();
|
m_mainToolBar->Refresh();
|
||||||
|
|
|
@ -127,7 +127,7 @@ public:
|
||||||
// currently: do nothing in CvPcb.
|
// currently: do nothing in CvPcb.
|
||||||
}
|
}
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
|
@ -452,7 +452,7 @@ public:
|
||||||
|
|
||||||
void ShowChangedLanguage() override;
|
void ShowChangedLanguage() override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
void SetScreen( BASE_SCREEN* aScreen ) override;
|
void SetScreen( BASE_SCREEN* aScreen ) override;
|
||||||
|
|
||||||
|
|
|
@ -251,7 +251,7 @@ bool LIB_EDIT_FRAME::LoadOneLibraryPartAux( LIB_ALIAS* aEntry, const wxString& a
|
||||||
updateTitle();
|
updateTitle();
|
||||||
RebuildSymbolUnitsList();
|
RebuildSymbolUnitsList();
|
||||||
SetShowDeMorgan( GetCurPart()->HasConversion() );
|
SetShowDeMorgan( GetCurPart()->HasConversion() );
|
||||||
SyncMenusAndToolbars();
|
SyncToolbars();
|
||||||
|
|
||||||
// Display the document information based on the entry selected just in
|
// Display the document information based on the entry selected just in
|
||||||
// case the entry is an alias.
|
// case the entry is an alias.
|
||||||
|
|
|
@ -156,7 +156,7 @@ void LIB_EDIT_FRAME::ReCreateOptToolbar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void LIB_EDIT_FRAME::SyncMenusAndToolbars()
|
void LIB_EDIT_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
||||||
|
|
||||||
|
|
|
@ -1097,7 +1097,7 @@ public:
|
||||||
|
|
||||||
void ShowChangedLanguage() override;
|
void ShowChangedLanguage() override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
void SetScreen( BASE_SCREEN* aScreen ) override;
|
void SetScreen( BASE_SCREEN* aScreen ) override;
|
||||||
|
|
||||||
|
|
|
@ -167,7 +167,7 @@ void SCH_EDIT_FRAME::ReCreateOptToolbar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void SCH_EDIT_FRAME::SyncMenusAndToolbars()
|
void SCH_EDIT_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
||||||
SCH_SHEET_LIST sheetList( g_RootSheet );
|
SCH_SHEET_LIST sheetList( g_RootSheet );
|
||||||
|
|
|
@ -146,7 +146,7 @@ void LIB_VIEW_FRAME::ReCreateMenuBar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void LIB_VIEW_FRAME::SyncMenusAndToolbars()
|
void LIB_VIEW_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
LIB_PART* symbol = GetSelectedSymbol();
|
LIB_PART* symbol = GetSelectedSymbol();
|
||||||
LIB_ALIAS* alias = GetSelectedAlias();
|
LIB_ALIAS* alias = GetSelectedAlias();
|
||||||
|
|
|
@ -138,7 +138,7 @@ public:
|
||||||
|
|
||||||
const BOX2I GetDocumentExtents() const override;
|
const BOX2I GetDocumentExtents() const override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Sets up the tool framework
|
// Sets up the tool framework
|
||||||
|
|
|
@ -592,7 +592,7 @@ public:
|
||||||
*/
|
*/
|
||||||
void CommonSettingsChanged() override;
|
void CommonSettingsChanged() override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
|
@ -463,7 +463,7 @@ void GERBVIEW_FRAME::OnUpdateLayerSelectBox( wxUpdateUIEvent& aEvent )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void GERBVIEW_FRAME::SyncMenusAndToolbars()
|
void GERBVIEW_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
||||||
|
|
||||||
|
|
|
@ -414,7 +414,7 @@ public:
|
||||||
* Update the toolbars (mostly settings/check buttons/checkboxes) with the current
|
* Update the toolbars (mostly settings/check buttons/checkboxes) with the current
|
||||||
* controller state.
|
* controller state.
|
||||||
*/
|
*/
|
||||||
virtual void SyncMenusAndToolbars() { };
|
virtual void SyncToolbars() { };
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Redraw the menus and what not in current language.
|
* Redraw the menus and what not in current language.
|
||||||
|
|
|
@ -147,7 +147,7 @@ public:
|
||||||
*/
|
*/
|
||||||
void OnChangeWatchedPaths( wxCommandEvent& aEvent );
|
void OnChangeWatchedPaths( wxCommandEvent& aEvent );
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
void SetProjectFileName( const wxString& aFullProjectProFileName );
|
void SetProjectFileName( const wxString& aFullProjectProFileName );
|
||||||
const wxString GetProjectFileName();
|
const wxString GetProjectFileName();
|
||||||
|
|
|
@ -223,7 +223,7 @@ void KICAD_MANAGER_FRAME::RecreateLauncher()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void KICAD_MANAGER_FRAME::SyncMenusAndToolbars()
|
void KICAD_MANAGER_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
m_launcher->Toggle( KICAD_MANAGER_ACTIONS::editSchematic, m_active_project );
|
m_launcher->Toggle( KICAD_MANAGER_ACTIONS::editSchematic, m_active_project );
|
||||||
m_launcher->Toggle( KICAD_MANAGER_ACTIONS::editSymbols, m_active_project );
|
m_launcher->Toggle( KICAD_MANAGER_ACTIONS::editSymbols, m_active_project );
|
||||||
|
|
|
@ -162,7 +162,7 @@ public:
|
||||||
void ReCreateMenuBar() override;
|
void ReCreateMenuBar() override;
|
||||||
double BestZoom() override;
|
double BestZoom() override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
const PL_EDITOR_LAYOUT& GetPageLayout() const { return m_pageLayout; }
|
const PL_EDITOR_LAYOUT& GetPageLayout() const { return m_pageLayout; }
|
||||||
PL_EDITOR_LAYOUT& GetPageLayout() { return m_pageLayout; }
|
PL_EDITOR_LAYOUT& GetPageLayout() { return m_pageLayout; }
|
||||||
|
|
|
@ -143,7 +143,7 @@ void PL_EDITOR_FRAME::ReCreateOptToolbar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PL_EDITOR_FRAME::SyncMenusAndToolbars()
|
void PL_EDITOR_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
m_mainToolBar->Toggle( ACTIONS::save, GetScreen() && GetScreen()->IsModify() );
|
m_mainToolBar->Toggle( ACTIONS::save, GetScreen() && GetScreen()->IsModify() );
|
||||||
m_mainToolBar->Toggle( ACTIONS::undo, GetScreen() && GetScreen()->GetUndoCommandCount() > 0 );
|
m_mainToolBar->Toggle( ACTIONS::undo, GetScreen() && GetScreen()->GetUndoCommandCount() > 0 );
|
||||||
|
|
|
@ -336,7 +336,7 @@ public:
|
||||||
|
|
||||||
void KiwayMailIn( KIWAY_EXPRESS& mail ) override;
|
void KiwayMailIn( KIWAY_EXPRESS& mail ) override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
|
|
||||||
|
|
|
@ -1020,7 +1020,7 @@ public:
|
||||||
*/
|
*/
|
||||||
void CommonSettingsChanged() override;
|
void CommonSettingsChanged() override;
|
||||||
|
|
||||||
void SyncMenusAndToolbars() override;
|
void SyncToolbars() override;
|
||||||
|
|
||||||
DECLARE_EVENT_TABLE()
|
DECLARE_EVENT_TABLE()
|
||||||
};
|
};
|
||||||
|
|
|
@ -172,7 +172,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateOptToolbar()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void FOOTPRINT_EDIT_FRAME::SyncMenusAndToolbars()
|
void FOOTPRINT_EDIT_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
PCB_DISPLAY_OPTIONS* opts = (PCB_DISPLAY_OPTIONS*) GetDisplayOptions();
|
PCB_DISPLAY_OPTIONS* opts = (PCB_DISPLAY_OPTIONS*) GetDisplayOptions();
|
||||||
|
|
||||||
|
|
|
@ -694,7 +694,7 @@ void PCB_EDIT_FRAME::OnUpdateMuWaveToolbar( wxUpdateUIEvent& aEvent )
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void PCB_EDIT_FRAME::SyncMenusAndToolbars()
|
void PCB_EDIT_FRAME::SyncToolbars()
|
||||||
{
|
{
|
||||||
PCB_DISPLAY_OPTIONS* opts = (PCB_DISPLAY_OPTIONS*) GetDisplayOptions();
|
PCB_DISPLAY_OPTIONS* opts = (PCB_DISPLAY_OPTIONS*) GetDisplayOptions();
|
||||||
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();
|
||||||
|
|
Loading…
Reference in New Issue