Commit 29e7638a authored by Martin Janitschke's avatar Martin Janitschke Committed by jean-pierre charras
Browse files

make microwave toolbar accessible from menu (Bug #1285425 )

parent 031202a8

include/wxPcbStruct.h

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ public: 
    void OnUpdateSelectAutoTrackWidth( wxUpdateUIEvent& aEvent );

    void OnUpdateAutoPlaceModulesMode( wxUpdateUIEvent& aEvent );

    void OnUpdateAutoPlaceTracksMode( wxUpdateUIEvent& aEvent );

    void OnUpdateMuWaveToolbar( wxUpdateUIEvent& aEvent );



    /**

     * Function RecordMacros.

pcbnew/dialogs/dialog_general_options.cpp

+4 −0
Original line number Diff line number Diff line
@@ -237,6 +237,10 @@ void PCB_EDIT_FRAME::OnSelectOptionToolbar( wxCommandEvent& event ) 
        m_show_microwave_tools = state;

        m_auimgr.GetPane( wxT( "m_microWaveToolBar" ) ).Show( m_show_microwave_tools );

        m_auimgr.Update();



        GetMenuBar()->SetLabel( ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR,

                        m_show_microwave_tools ?

                        _( "Hide Microwave Toolbar" ): _( "Show Microwave Toolbar" ));

        break;



    case ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR:

pcbnew/help_common_strings.h

+2 −0
Original line number Diff line number Diff line
@@ -22,3 +22,5 @@ 
#define HELP_ZOOM_REDRAW _( "Redraw the screen of the board" )



#define HELP_SHOW_HIDE_LAYERMANAGER _( "Show/hide the layers manager toolbar" )



#define HELP_SHOW_HIDE_MICROWAVE_TOOLS _( "Show/hide the toolbar for microwave tools\nThis is a experimental feature (under development)" )

pcbnew/menubar_pcbframe.cpp

+7 −0
Original line number Diff line number Diff line
@@ -482,6 +482,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() 
                 HELP_SHOW_HIDE_LAYERMANAGER,

                 KiBitmap( layers_manager_xpm ) );



    AddMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR,

                 m_show_microwave_tools ?

                 _( "Hide Microwave Toolbar" ): _( "Show Microwave Toolbar" ),

                 HELP_SHOW_HIDE_MICROWAVE_TOOLS,

                 KiBitmap( mw_toolbar_xpm ) );





    // General

#ifdef __WXMAC__

    configmenu->Append(wxID_PREFERENCES);

pcbnew/pcbframe.cpp

+3 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME ) 
    EVT_MENU_RANGE( ID_PREFERENCES_HOTKEY_START, ID_PREFERENCES_HOTKEY_END,

                    PCB_EDIT_FRAME::Process_Config )

    EVT_MENU( ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG, PCB_EDIT_FRAME::Process_Config )

    EVT_MENU( ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR, PCB_EDIT_FRAME::Process_Config )

    EVT_MENU( wxID_PREFERENCES, PCB_EDIT_FRAME::Process_Config )

    EVT_MENU( ID_PCB_LAYERS_SETUP, PCB_EDIT_FRAME::Process_Config )

    EVT_MENU( ID_PCB_MASK_CLEARANCE, PCB_EDIT_FRAME::Process_Config )
@@ -292,6 +293,8 @@ BEGIN_EVENT_TABLE( PCB_EDIT_FRAME, PCB_BASE_FRAME ) 
                         PCB_EDIT_FRAME::OnUpdateVerticalToolbar )

    EVT_UPDATE_UI_RANGE( ID_TB_OPTIONS_SHOW_ZONES, ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY,

                         PCB_EDIT_FRAME::OnUpdateZoneDisplayStyle )

    EVT_UPDATE_UI_RANGE( ID_PCB_MUWAVE_START_CMD, ID_PCB_MUWAVE_END_CMD,

                         PCB_EDIT_FRAME::OnUpdateMuWaveToolbar )

END_EVENT_TABLE()