Browse Source

Sync-ing of menu has been done in CONDITIONAL_MENU for some time now.

pull/15/head
Jeff Young 7 years ago
parent
commit
b0e8443383
  1. 2
      common/tool/tool_manager.cpp
  2. 2
      cvpcb/display_footprints_frame.cpp
  3. 2
      cvpcb/display_footprints_frame.h
  4. 2
      eeschema/libedit/lib_edit_frame.h
  5. 2
      eeschema/libedit/libedit.cpp
  6. 2
      eeschema/libedit/toolbars_libedit.cpp
  7. 2
      eeschema/sch_edit_frame.h
  8. 2
      eeschema/toolbars_sch_editor.cpp
  9. 2
      eeschema/toolbars_viewlib.cpp
  10. 2
      eeschema/viewlib_frame.h
  11. 2
      gerbview/gerbview_frame.h
  12. 2
      gerbview/toolbars_gerber.cpp
  13. 2
      include/eda_base_frame.h
  14. 2
      kicad/kicad_manager_frame.h
  15. 2
      kicad/menubar.cpp
  16. 2
      pagelayout_editor/pl_editor_frame.h
  17. 2
      pagelayout_editor/toolbars_pl_editor.cpp
  18. 2
      pcbnew/footprint_edit_frame.h
  19. 2
      pcbnew/pcb_edit_frame.h
  20. 2
      pcbnew/toolbars_footprint_editor.cpp
  21. 2
      pcbnew/toolbars_pcb_editor.cpp

2
common/tool/tool_manager.cpp

@ -977,6 +977,6 @@ void TOOL_MANAGER::UpdateUI()
if( frame )
{
frame->UpdateStatusBar();
frame->SyncMenusAndToolbars();
frame->SyncToolbars();
}
}

2
cvpcb/display_footprints_frame.cpp

@ -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->Refresh();

2
cvpcb/display_footprints_frame.h

@ -127,7 +127,7 @@ public:
// currently: do nothing in CvPcb.
}
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
DECLARE_EVENT_TABLE()
};

2
eeschema/libedit/lib_edit_frame.h

@ -452,7 +452,7 @@ public:
void ShowChangedLanguage() override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
void SetScreen( BASE_SCREEN* aScreen ) override;

2
eeschema/libedit/libedit.cpp

@ -251,7 +251,7 @@ bool LIB_EDIT_FRAME::LoadOneLibraryPartAux( LIB_ALIAS* aEntry, const wxString& a
updateTitle();
RebuildSymbolUnitsList();
SetShowDeMorgan( GetCurPart()->HasConversion() );
SyncMenusAndToolbars();
SyncToolbars();
// Display the document information based on the entry selected just in
// case the entry is an alias.

2
eeschema/libedit/toolbars_libedit.cpp

@ -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();

2
eeschema/sch_edit_frame.h

@ -1097,7 +1097,7 @@ public:
void ShowChangedLanguage() override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
void SetScreen( BASE_SCREEN* aScreen ) override;

2
eeschema/toolbars_sch_editor.cpp

@ -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();
SCH_SHEET_LIST sheetList( g_RootSheet );

2
eeschema/toolbars_viewlib.cpp

@ -146,7 +146,7 @@ void LIB_VIEW_FRAME::ReCreateMenuBar()
}
void LIB_VIEW_FRAME::SyncMenusAndToolbars()
void LIB_VIEW_FRAME::SyncToolbars()
{
LIB_PART* symbol = GetSelectedSymbol();
LIB_ALIAS* alias = GetSelectedAlias();

2
eeschema/viewlib_frame.h

@ -138,7 +138,7 @@ public:
const BOX2I GetDocumentExtents() const override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
private:
// Sets up the tool framework

2
gerbview/gerbview_frame.h

@ -592,7 +592,7 @@ public:
*/
void CommonSettingsChanged() override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
DECLARE_EVENT_TABLE()
};

2
gerbview/toolbars_gerber.cpp

@ -463,7 +463,7 @@ void GERBVIEW_FRAME::OnUpdateLayerSelectBox( wxUpdateUIEvent& aEvent )
}
void GERBVIEW_FRAME::SyncMenusAndToolbars()
void GERBVIEW_FRAME::SyncToolbars()
{
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();

2
include/eda_base_frame.h

@ -414,7 +414,7 @@ public:
* Update the toolbars (mostly settings/check buttons/checkboxes) with the current
* controller state.
*/
virtual void SyncMenusAndToolbars() { };
virtual void SyncToolbars() { };
/**
* Redraw the menus and what not in current language.

2
kicad/kicad_manager_frame.h

@ -147,7 +147,7 @@ public:
*/
void OnChangeWatchedPaths( wxCommandEvent& aEvent );
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
void SetProjectFileName( const wxString& aFullProjectProFileName );
const wxString GetProjectFileName();

2
kicad/menubar.cpp

@ -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::editSymbols, m_active_project );

2
pagelayout_editor/pl_editor_frame.h

@ -162,7 +162,7 @@ public:
void ReCreateMenuBar() override;
double BestZoom() override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
const PL_EDITOR_LAYOUT& GetPageLayout() const { return m_pageLayout; }
PL_EDITOR_LAYOUT& GetPageLayout() { return m_pageLayout; }

2
pagelayout_editor/toolbars_pl_editor.cpp

@ -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::undo, GetScreen() && GetScreen()->GetUndoCommandCount() > 0 );

2
pcbnew/footprint_edit_frame.h

@ -336,7 +336,7 @@ public:
void KiwayMailIn( KIWAY_EXPRESS& mail ) override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
DECLARE_EVENT_TABLE()

2
pcbnew/pcb_edit_frame.h

@ -1020,7 +1020,7 @@ public:
*/
void CommonSettingsChanged() override;
void SyncMenusAndToolbars() override;
void SyncToolbars() override;
DECLARE_EVENT_TABLE()
};

2
pcbnew/toolbars_footprint_editor.cpp

@ -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();

2
pcbnew/toolbars_pcb_editor.cpp

@ -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();
KIGFX::GAL_DISPLAY_OPTIONS& galOpts = GetGalDisplayOptions();

Loading…
Cancel
Save