=== modified file 'include/wxPcbStruct.h'
--- include/wxPcbStruct.h	2014-01-27 07:23:02 +0000
+++ include/wxPcbStruct.h	2014-02-26 23:22:08 +0000
@@ -279,6 +279,7 @@
     void OnUpdateSelectAutoTrackWidth( wxUpdateUIEvent& aEvent );
     void OnUpdateAutoPlaceModulesMode( wxUpdateUIEvent& aEvent );
     void OnUpdateAutoPlaceTracksMode( wxUpdateUIEvent& aEvent );
+    void OnUpdateMuWaveToolbar( wxUpdateUIEvent& aEvent );
 
     /**
      * Function RecordMacros.

=== modified file 'pcbnew/dialogs/dialog_general_options.cpp'
--- pcbnew/dialogs/dialog_general_options.cpp	2014-01-10 20:12:36 +0000
+++ pcbnew/dialogs/dialog_general_options.cpp	2014-02-27 00:10:48 +0000
@@ -237,6 +237,10 @@
         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:

=== modified file 'pcbnew/help_common_strings.h'
--- pcbnew/help_common_strings.h	2013-05-26 04:36:44 +0000
+++ pcbnew/help_common_strings.h	2014-02-27 00:18:18 +0000
@@ -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)" )

=== modified file 'pcbnew/menubar_pcbframe.cpp'
--- pcbnew/menubar_pcbframe.cpp	2014-02-06 14:13:31 +0000
+++ pcbnew/menubar_pcbframe.cpp	2014-02-26 23:44:18 +0000
@@ -482,6 +482,13 @@
                  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);

=== modified file 'pcbnew/pcbframe.cpp'
--- pcbnew/pcbframe.cpp	2014-02-03 13:14:53 +0000
+++ pcbnew/pcbframe.cpp	2014-02-26 23:52:17 +0000
@@ -141,6 +141,7 @@
     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 @@
                          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()
 
 

=== modified file 'pcbnew/pcbnew_config.cpp'
--- pcbnew/pcbnew_config.cpp	2014-01-27 07:23:02 +0000
+++ pcbnew/pcbnew_config.cpp	2014-02-26 23:50:10 +0000
@@ -77,6 +77,17 @@
                                 _("Hide &Layers Manager" ) : _("Show &Layers Manager" ));
         break;
 
+    case ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR:
+        m_show_microwave_tools  = ! m_show_microwave_tools;
+        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_PCB_LAYERS_SETUP:
         InstallDialogLayerSetup();
         break;

=== modified file 'pcbnew/pcbnew_id.h'
--- pcbnew/pcbnew_id.h	2014-01-02 09:26:03 +0000
+++ pcbnew/pcbnew_id.h	2014-02-26 23:32:32 +0000
@@ -280,6 +280,7 @@
     ID_PCB_LIB_TABLE_EDIT,
     ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG,
     ID_MENU_PCB_SHOW_HIDE_LAYERS_MANAGER_DIALOG,
+    ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR,
 
     ID_TB_OPTIONS_SHOW_MANAGE_LAYERS_VERTICAL_TOOLBAR,
     ID_TB_OPTIONS_SHOW_ZONES,

=== modified file 'pcbnew/tool_pcb.cpp'
--- pcbnew/tool_pcb.cpp	2014-02-12 21:19:12 +0000
+++ pcbnew/tool_pcb.cpp	2014-02-27 00:15:11 +0000
@@ -398,7 +398,7 @@
     m_optionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_EXTRA_VERTICAL_TOOLBAR_MICROWAVE,
                                wxEmptyString,
                                KiBitmap( mw_toolbar_xpm ),
- _( "Show/hide the toolbar for microwaves tools\n This is a experimental feature (under development)" ),
+                               HELP_SHOW_HIDE_MICROWAVE_TOOLS,
                                wxITEM_CHECK );
 
 
@@ -500,25 +500,30 @@
     // Set up toolbar
     m_microWaveToolBar->AddTool( ID_PCB_MUWAVE_TOOL_SELF_CMD, wxEmptyString,
                                  KiBitmap( mw_add_line_xpm ),
-                                 _( "Create line of specified length for microwave applications" ) );
+                                 _( "Create line of specified length for microwave applications" ),
+				 wxITEM_CHECK );
 
     m_microWaveToolBar->AddTool( ID_PCB_MUWAVE_TOOL_GAP_CMD, wxEmptyString,
                                  KiBitmap( mw_add_gap_xpm ),
-                                 _( "Create gap of specified length for microwave applications" ) );
+                                 _( "Create gap of specified length for microwave applications" ),
+				 wxITEM_CHECK );
 
     m_microWaveToolBar->AddSeparator();
 
     m_microWaveToolBar->AddTool( ID_PCB_MUWAVE_TOOL_STUB_CMD, wxEmptyString,
                                  KiBitmap( mw_add_stub_xpm ),
-                                 _( "Create stub of specified length for microwave applications" ) );
+                                 _( "Create stub of specified length for microwave applications" ),
+				 wxITEM_CHECK );
 
     m_microWaveToolBar->AddTool( ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD, wxEmptyString,
                                  KiBitmap( mw_add_stub_arc_xpm ),
-                                 _( "Create stub (arc) of specified length for microwave applications" ) );
+                                 _( "Create stub (arc) of specified length for microwave applications" ),
+				 wxITEM_CHECK );
 
     m_microWaveToolBar->AddTool( ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD, wxEmptyString,
                                  KiBitmap( mw_add_shape_xpm ),
-                                 _( "Create a polynomial shape for microwave applications" ) );
+                                 _( "Create a polynomial shape for microwave applications" ),
+				 wxITEM_CHECK );
 
     m_microWaveToolBar->Realize();
 }

=== modified file 'pcbnew/toolbars_update_user_interface.cpp'
--- pcbnew/toolbars_update_user_interface.cpp	2013-09-20 14:32:11 +0000
+++ pcbnew/toolbars_update_user_interface.cpp	2014-02-26 23:18:57 +0000
@@ -204,6 +204,12 @@
         aEvent.Check( GetToolId() == aEvent.GetId() );
 }
 
+void PCB_EDIT_FRAME::OnUpdateMuWaveToolbar( wxUpdateUIEvent& aEvent )
+{
+    if( aEvent.GetEventObject() == m_microWaveToolBar )
+        aEvent.Check( GetToolId() == aEvent.GetId() );
+}
+
 
 void PCB_EDIT_FRAME::OnUpdateAutoPlaceTracksMode( wxUpdateUIEvent& aEvent )
 {