menu cleaning and changing obscure menu info. and menu labels

files cleaning

bitmaps/CMakeLists.txt

@@ -19,8 +19,9 @@ set(BITMAP_SRCS
     Add_Circle.xpm
     Add_Component.xpm
     Add_Corner.xpm
-    add_cotation.xpm
+    add_dimension.xpm
     Add_Dashed_Line.xpm
+    add_dimension.xpm
     Add_Entry.xpm
     Add_GLabel.xpm
     add_hierarchical_label.xpm
@@ -146,6 +147,7 @@ set(BITMAP_SRCS
     Hidden_Pin.xpm
     Hierarchy_cursor.xpm
     Hierarchy_Nav.xpm
+    hotkeys.xpm
     icon_3d.xpm
     icon_cvpcb_small.xpm
     icon_cvpcb.xpm

bitmaps/add_cotation.xpm → bitmaps/add_dimension.xpm

 /* XPM */
-#ifndef XPMMAIN
-extern const char* add_cotation_xpm[];
-#else
-const char * add_cotation_xpm[] = {
+const char * add_dimension_xpm[] = {
+/* columns rows colors const chars-per-pixel */
 "16 16 14 1",
 " 	c None",
 ".	c #000000",
@@ -34,5 +32,3 @@ const char * add_cotation_xpm[] = {
 "+             + ",
 "+             + ",
 "                "};
-
-#endif

bitmaps/hotkeys.xpm

+/* XPM */
+const char *hotkeys_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 15 1",
+"@ c #AFB0AB",
+"O c #A5A5A2",
+"X c #BCBFBB",
+"% c #E7E9E6",
+". c #C4C4C4",
+"= c #DEDFDD",
+"* c #FCFAFC",
+"; c #94928D",
+"  c None",
+"+ c #9C9A94",
+"& c #F1F3EF",
+"$ c #B6B8B3",
+"- c #D4D3CF",
+"# c #ACAAAC",
+"o c #B4B2B4",
+/* pixels */
+"                ",
+"                ",
+"  .             ",
+"  ......XoOO+@  ",
+"   Xoo##o$.  O. ",
+"            @O  ",
+"          XOo   ",
+"         .OX    ",
+" OO@@@$$$$$$XX  ",
+"XX%%&&****&%%o. ",
+"O =.- --.==.=X# ",
+"+-=========%=-+ ",
+"+;;;;;;;;;;;;;O ",
+"                ",
+"                ",
+"                "
+};

common/CMakeLists.txt

@@ -62,7 +62,7 @@ set(PCB_COMMON_SRCS
     ../pcbnew/class_board_connected_item.cpp
     ../pcbnew/class_board_design_settings.cpp
     ../pcbnew/class_board_item.cpp
-    ../pcbnew/class_cotation.cpp
+    ../pcbnew/class_dimension.cpp
     ../pcbnew/class_drawsegment.cpp
     ../pcbnew/class_drc_item.cpp
     ../pcbnew/class_edge_mod.cpp

common/hotkeys_basic.cpp

@@ -615,25 +615,25 @@ wxString ReturnHotkeyConfigFilePath( int choice )
 /** add hotkey config options submenu to a menu
  * @param menu : initial menu
  */
-void AddHotkeyConfigMenu( wxMenu* menu )
+void AddHotkeyConfigMenu( wxMenu* aMenu )
 {
+    if( aMenu == NULL )
+        return;
+
     wxMenuItem* item;
     wxMenu* HotkeySubmenu = new wxMenu();
 
-    if( menu == NULL )
-        return;
-
-    /* Show hotkey configuration */
+    /* List existing hotkey menu*/
     item = new wxMenuItem( HotkeySubmenu,
                            ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
-                           _( "Show" ),
-                           _( "Show the current hotkey configuration" ) );
+                           _( "List Current Keys" ),
+                           _( "Displays the current hotkeys list and corresponding commands" ) );
     item->SetBitmap( info_xpm );
     HotkeySubmenu->Append( item );
 
     /* (Re)create hotkey file */
     item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_CREATE_CONFIG,
-                           _( "(Re)create" ),
+                           _( "(Re)create Hotkeys File" ),
                            _( "Create or recreate the hotkey configuration file from current hotkey list" )
                            );
     item->SetBitmap( save_setup_xpm );
@@ -641,23 +641,22 @@ void AddHotkeyConfigMenu( wxMenu* menu )
 
     /* Reload hotkey file */
     item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_READ_CONFIG,
-                           _( "Reload" ),
+                           _( "Reload Hotkeys File" ),
                            _( "Reload the hotkey configuration file" ) );
     item->SetBitmap( reload_xpm );
     HotkeySubmenu->Append( item );
 
     /* Edit hotkey file */
     item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EDIT_CONFIG,
-                          _( "Edit" ),
+                          _( "Edit Hotkeys File" ),
                           _( "Edit the hotkey configuration file in a text editor" ) );
     item->SetBitmap( editor_xpm );
     HotkeySubmenu->Append( item );
 
     /* Append HotkeySubmenu to menu */
-    menu->Append( ID_PREFERENCES_HOTKEY_SUBMENU,
-                  _("Hotkey"),
-                  HotkeySubmenu,
-                  _("Hotkey configuration and preferences"));
+    ADD_MENUITEM_WITH_HELP_AND_SUBMENU( aMenu, HotkeySubmenu,
+                                        ID_PREFERENCES_HOTKEY_SUBMENU, _( "Hotkeys" ),
+                              _("Hotkeys configuration and preferences" ), hotkeys_xpm );
 
     /* Hotkey path */
     wxMenu* HotkeyLocationSubmenu = new wxMenu();

common/zoom.cpp

@@ -40,9 +40,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )
 
     /* Move the mouse cursor to the on grid graphic cursor position */
     if( ToMouse == TRUE )
-    {
         DrawPanel->MouseToCursorSchema();
-    }
  }
 
 

eeschema/class_library.cpp

@@ -510,12 +510,15 @@ bool CMP_LIBRARY::Load( wxString& aErrorMsg )
             || !vers.GetNextToken().ToLong( & minor ) || minor < 0L
             || minor > 99 )
         {
-            wxLogWarning( _( "The component library <%s> header version \
+#if 0   // Note for defeloppers:
+        // Not sure this warning is very useful: old designs *must* be always loadable
+            wxLogWarning( wxT( "The component library <%s> header version \
 number is invalid.\n\nIn future versions of EESchema this library may not \
 load correctly.  To resolve this problem open the library in the library \
 editor and save it.  If this library is the project cache library, save \
 the current schematic." ),
                           GetChars( GetName() ) );
+#endif
         }
         else
         {

eeschema/menubar.cpp

@@ -52,25 +52,31 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
     /* Open Recent submenu */
     wxMenu* openRecentMenu = new wxMenu();
     wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu );
-    filesMenu->AppendSubMenu( openRecentMenu, _( "Open &Recent" ),
-                              _( "Open a recent opened document" ) );
+    ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, openRecentMenu,
+                                        -1, _( "Open &Recent" ),
+                              _("Open a recent opened schematic project" ), open_project_xpm );
 
-    item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET, _( "&Save" ),
+    // Save menus:
+    filesMenu->AppendSeparator();
+    
+    // Normal save command:
+    item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT, _( "&Save Whole Schematic Project" ),
+                           _( "Save all sheets in the schematic project" ) );
+    item->SetBitmap( save_project_xpm );
+    filesMenu->Append( item );
+
+    // Save current sheet only
+    item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET, _( "&Save Current Sheet Only" ),
                            _( "Save only current schematic sheet" ) );
     item->SetBitmap( save_xpm );
     filesMenu->Append( item );
 
-    item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS, _( "Save &as..." ),
+    // Save current sheet only and ask for a new name
+    item = new wxMenuItem( filesMenu, ID_SAVE_ONE_SHEET_AS, _( "Save Current Sheet &as..." ),
                            _( "Save current schematic sheet as..." ) );
     item->SetBitmap( save_as_xpm );
     filesMenu->Append( item );
 
-    filesMenu->AppendSeparator();
-    item = new wxMenuItem( filesMenu, ID_SAVE_PROJECT, _( "&Save Project" ),
-                           _( "Save all sheets in the schematic project" ) );
-    item->SetBitmap( save_project_xpm );
-    filesMenu->Append( item );
-
     filesMenu->AppendSeparator();
 
     // Print and Plot section:

include/bitmaps.h

@@ -12,8 +12,8 @@ extern const char* add_bus_xpm[];
 extern const char* add_circle_xpm[];
 extern const char* add_component_xpm[];
 extern const char* add_corner_xpm[];
-extern const char* add_cotation_xpm[];
 extern const char* add_dashed_line_xpm[];
+extern const char* add_dimension_xpm[];
 extern const char* add_entry_xpm[];
 extern const char* add_glabel_xpm[];
 extern const char* add_hierarchical_label_xpm[];
@@ -139,6 +139,7 @@ extern const char* help_xpm[];
 extern const char* hidden_pin_xpm[];
 extern const char* hierarchy_cursor_xpm[];
 extern const char* hierarchy_nav_xpm[];
+extern const char* hotkeys_xpm[];
 extern const char* icon_cvpcb_small_xpm[];
 extern const char* icon_cvpcb_xpm[];
 extern const char* icon_eeschema_xpm[];

include/pcbstruct.h

@@ -225,7 +225,7 @@ enum DisplayViaMode {
 
 #include "class_drawsegment.h"
 #include "class_pcb_text.h"
-#include "class_cotation.h"
+#include "class_dimension.h"
 #include "class_mire.h"
 #include "class_track.h"
 #include "class_marker_pcb.h"

pcbnew/CMakeLists.txt

@@ -30,7 +30,7 @@ set(PCBNEW_SRCS
 #   cleaningoptions_dialog.cpp
     connect.cpp
     controle.cpp
-    cotation.cpp
+    dimension.cpp
     cross-probing.cpp
     debug_kbool_key_file_fct.cpp
     deltrack.cpp

pcbnew/class_board_item.cpp

@@ -292,7 +292,7 @@ const char** BOARD_ITEM::MenuIcon() const
         break;
 
     case TYPE_COTATION:
-        xpm = add_cotation_xpm;
+        xpm = add_dimension_xpm;
         break;
 
     case TYPE_MIRE:

pcbnew/class_cotation.h → pcbnew/class_dimension.h

 /*****************************/
 /* COTATION class definition */
 /*****************************/
-#ifndef COTATION_H
-#define COTATION_H
+#ifndef DIMENSION_H
+#define DIMENSION_H
 
 #include "base_struct.h"
 
@@ -130,4 +130,4 @@ public:
     }
 };
 
-#endif  // #define COTATION_H
+#endif  // #define DIMENSION_H

pcbnew/menubar_pcbframe.cpp

@@ -15,165 +15,166 @@
 /**
  * PCBNew mainframe menubar
  */
-void
-WinEDA_PcbFrame::ReCreateMenuBar()
+void WinEDA_PcbFrame::ReCreateMenuBar()
 {
     wxString    text;
     wxMenuItem* item;
     wxMenuBar*  menuBar = GetMenuBar();
 
-   /**
-    * Destroy the existing menu bar so it can be rebuilt.  This allows
-    * language changes of the menu text on the fly.
-    */
+    /**
+     * Destroy the existing menu bar so it can be rebuilt.  This allows
+     * language changes of the menu text on the fly.
+     */
     if( menuBar )
         SetMenuBar( NULL );
     menuBar = new wxMenuBar();
 
 
-
-   /**
-    * File Menu
-    */
+    /**
+     * File Menu
+     */
     wxMenu* filesMenu = new wxMenu;
 
     /* New Board */
     item = new wxMenuItem( filesMenu, ID_NEW_BOARD, _( "&New" ),
-                           _( "Clear current board and initialize a new one" ));
+                          _( "Clear current board and initialize a new one" ) );
     item->SetBitmap( new_xpm );
     filesMenu->Append( item );
 
     /* Load Board */
     item = new wxMenuItem( filesMenu, ID_LOAD_FILE, _( "&Open" ),
-                           _( "Delete current board and load new board" ) );
+                          _( "Delete current board and load new board" ) );
     item->SetBitmap( open_xpm );
     filesMenu->Append( item );
 
     /* Load Recent submenu */
     wxMenu* openRecentMenu = new wxMenu();
     wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu );
-    filesMenu->AppendSubMenu( openRecentMenu, _( "Open &Recent" ),
-                              _("Open a recent opened document"));
+    ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, openRecentMenu,
+                                        -1, _( "Open &Recent" ),
+                                        _( "Open a recent opened board" ), open_project_xpm );
+
+
+    /* PCBNew Board */
+    item = new wxMenuItem( filesMenu, ID_APPEND_FILE, _( "&Append Board" ),
+                          _( "Append a other PCBNew board to the current loaded board" ) );
+    item->SetBitmap( import_xpm );
+    filesMenu->Append( item );
+
+    /* Separator */
+    filesMenu->AppendSeparator();
 
     /* Save */
     item = new wxMenuItem( filesMenu, ID_SAVE_BOARD,
-                           _( "&Save" ),
-                           _( "Save current board" ) );
+                          _( "&Save" ),
+                          _( "Save current board" ) );
     item->SetBitmap( save_xpm );
     filesMenu->Append( item );
 
     /* Save As */
     item = new wxMenuItem( filesMenu, ID_SAVE_BOARD_AS,
-                           _( "Save as..." ),
-                           _( "Save the current board as.." ) );
+                          _( "Save as..." ),
+                          _( "Save the current board as.." ) );
     item->SetBitmap( save_as_xpm );
     filesMenu->Append( item );
 
     /* Separator */
     filesMenu->AppendSeparator();
 
-    /* Rescue */
-    item = new wxMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ),
-                           _( "Clear old board and get last rescue file" ) );
-    item->SetBitmap( hammer_xpm );
-    filesMenu->Append( item );
-
     /* Revert */
     item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD,
-                           _( "&Revert" ),
-                           _( "Clear old board and get old version of board" ) );
+                          _( "&Revert" ),
+                          _( "Clear board and get previous saved version of board" ) );
     item->SetBitmap( jigsaw_xpm );
     filesMenu->Append( item );
 
+    /* Rescue */
+    item = new wxMenuItem( filesMenu, ID_MENU_RECOVER_BOARD, _( "&Rescue" ),
+                          _( "Clear old board and get last rescue file" ) );
+    item->SetBitmap( hammer_xpm );
+    filesMenu->Append( item );
+
     /* Separator */
     filesMenu->AppendSeparator();
 
 
-
     /* Fabrication Outputs submenu */
     wxMenu* fabricationOutputsMenu = new wxMenu;
     item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
-                           _( "&Modules Position" ),
-                           _( "Generate modules position file for pick and place" ) );
+                          _( "&Modules Position" ),
+                          _( "Generate modules position file for pick and place" ) );
     item->SetBitmap( post_compo_xpm );
     fabricationOutputsMenu->Append( item );
 
     item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE,
-                           _( "&Drill File" ),
-                           _( "Generate excellon2 drill file" ) );
+                          _( "&Drill File" ),
+                          _( "Generate excellon2 drill file" ) );
     item->SetBitmap( post_drill_xpm );
     fabricationOutputsMenu->Append( item );
 
     /* Component File */
     item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE,
-                           _( "&Component File" ),
-                           _( "(Re)create components file for CvPcb" ) );
+                          _( "&Component File" ),
+                          _( "(Re)create components file for CvPcb" ) );
     item->SetBitmap( save_cmpstuff_xpm );
     fabricationOutputsMenu->Append( item );
 
     /* BOM File */
     item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD,
-                _( "&BOM File" ),
-                _( "(Re)create bill of materials file for CvPCB" ) );
+                          _( "&BOM File" ),
+                          _( "Create a bill of materials from schematic" ) );
     item->SetBitmap( tools_xpm );
     fabricationOutputsMenu->Append( item );
 
     /* Fabrications Outputs submenu append */
-    filesMenu->AppendSubMenu( fabricationOutputsMenu,
-                              _( "Fabrication Outputs "),
-                   _( "Generate files for fabrication" ) );
+    ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, fabricationOutputsMenu,
+                                        -1, _( "Fabrication Outputs" ),
+                                        _( "Generate files for fabrication" ), export_xpm );
 
     /* Import submenu */
     wxMenu* submenuImport = new wxMenu();
 
-    /* PCBNew Board */
-    item = new wxMenuItem( submenuImport, ID_APPEND_FILE, _( "PCBNew Board" ),
-              _( "Append a other PCBNew board to the current loaded board" ) );
-    item->SetBitmap( pcbnew_xpm );
-    submenuImport->Append( item );
-
     /* Specctra Session */
     item = new wxMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION,
-                           _( "&Specctra Session" ),
-                           _( "Import a routed \"Specctra Session\" (*.ses) file" ) );
+                          _( "&Specctra Session" ),
+                          _( "Import a routed \"Specctra Session\" (*.ses) file" ) );
     item->SetBitmap( import_xpm );    // @todo need better bitmap
     submenuImport->Append( item );
 
-   /** 
-    * would be implemented in WinEDA_PcbFrame::ImportSpecctraDesign() in
-    * specctra_import.cpp
-    *  item = new wxMenuItem(submenuImport, ID_GEN_IMPORT_SPECCTRA_DESIGN,
-    *  _("&Specctra Design"), _("Import a \"Specctra Design\" (*.dsn) file") );
-    *  item->SetBitmap(export_xpm);    // @todo need better bitmap
-    *  submenuImport->Append(item);
-    */
+    /**
+     * would be implemented in WinEDA_PcbFrame::ImportSpecctraDesign() in
+     * specctra_import.cpp
+     *  item = new wxMenuItem(submenuImport, ID_GEN_IMPORT_SPECCTRA_DESIGN,
+     *  _("&Specctra Design"), _("Import a \"Specctra Design\" (*.dsn) file") );
+     *  item->SetBitmap(export_xpm);    // @todo need better bitmap
+     *  submenuImport->Append(item);
+     */
 
     ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuImport,
                                         ID_GEN_IMPORT_FILE, _( "Import" ),
                                         _( "Import files" ), import_xpm );
 
 
-
     /* Export submenu */
     wxMenu* submenuexport = new wxMenu();
 
     /* Specctra DSN */
     item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA,
-                           _( "&Specctra DSN" ),
-                           _( "Export the current board to a \"Specctra DSN\" file" ) );
+                          _( "&Specctra DSN" ),
+                          _( "Export the current board to a \"Specctra DSN\" file" ) );
     item->SetBitmap( export_xpm );
     submenuexport->Append( item );
 
     /* Export GenCAD Format */
     item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT,
-                           _( "&GenCAD" ), _( "Export GenCAD Format" ) );
+                          _( "&GenCAD" ), _( "Export GenCAD Format" ) );
     item->SetBitmap( export_xpm );
     submenuexport->Append( item );
 
     /* Module Report */
     item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT,
-                           _( "&Module Report" ),
-                           _( "Create a report of all modules on the current board" ) );
+                          _( "&Module Report" ),
+                          _( "Create a report of all modules on the current board" ) );
     item->SetBitmap( tools_xpm );
     submenuexport->Append( item );
     ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuexport,
@@ -185,19 +186,19 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Print */
     item = new wxMenuItem( filesMenu, ID_GEN_PRINT, _( "P&rint" ),
-                           _( "Print pcb board" ) );
+                          _( "Print pcb board" ) );
     item->SetBitmap( print_button );
     filesMenu->Append( item );
 
     /* Print SVG */
     item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG, _( "Print S&VG" ),
-                           _( "Plot board in Scalable Vector Graphics format" ) );
+                          _( "Plot board in Scalable Vector Graphics format" ) );
     item->SetBitmap( print_button );
     filesMenu->Append( item );
 
     /* Plot */
     item = new wxMenuItem( filesMenu, ID_GEN_PLOT, _( "&Plot" ),
-                           _( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ) );
+                          _( "Plot board in HPGL, PostScript or Gerber RS-274X format)" ) );
     item->SetBitmap( plot_xpm );
     filesMenu->Append( item );
 
@@ -205,13 +206,14 @@ WinEDA_PcbFrame::ReCreateMenuBar()
     filesMenu->AppendSeparator();
     wxMenu* submenuarchive = new wxMenu();
     item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES,
-                           _( "Add New Footprints" ),
-                           _( "Archive new footprints only in a library (keep other footprints in this lib)" ) );
+                          _( "Add New Footprints" ),
+                          _(
+                              "Archive new footprints only in a library (keep other footprints in this lib)" ) );
     item->SetBitmap( library_update_xpm );
     submenuarchive->Append( item );
     item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES,
-                           _( "Create Footprint Archive" ),
-                           _( "Archive all footprints  in a library(old lib will be deleted)" ) );
+                          _( "Create Footprint Archive" ),
+                          _( "Archive all footprints  in a library(old lib will be deleted)" ) );
     item->SetBitmap( library_xpm );
     submenuarchive->Append( item );
     ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuarchive,
@@ -223,20 +225,19 @@ WinEDA_PcbFrame::ReCreateMenuBar()
     /* Exit */
     filesMenu->AppendSeparator();
     item = new wxMenuItem( filesMenu, ID_EXIT, _( "&Quit" ),
-                           _( "Quit PCBNew" ) );
+                          _( "Quit PCBNew" ) );
     item->SetBitmap( exit_xpm );
     filesMenu->Append( item );
 
 
-
-   /**
-    * Edit menu
-    */
+    /**
+     * Edit menu
+     */
     wxMenu* editMenu = new wxMenu;
 
     /* Undo */
     /* TODO add Undo hotkey */
-    item = new wxMenuItem( editMenu, ID_UNDO_BUTT, _( "Undo"),
+    item = new wxMenuItem( editMenu, ID_UNDO_BUTT, _( "Undo" ),
                            _( "Undo last edition" ), wxITEM_NORMAL );
     item->SetBitmap( undo_xpm );
     editMenu->Append( item );
@@ -252,9 +253,10 @@ WinEDA_PcbFrame::ReCreateMenuBar()
     editMenu->AppendSeparator();
 
     /* Find */
-    text  = AddHotkeyName( _( "&Find..." ), s_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM);
+    text = AddHotkeyName( _( "&Find..." ), s_Pcbnew_Editor_Hokeys_Descr, HK_FIND_ITEM );
     item = new wxMenuItem( editMenu, ID_FIND_ITEMS, text,
-                           _("Find components and text in current loaded board") );
+                          _( "Find components and text in current loaded board" ) );
+    item->SetBitmap( find_xpm );
     editMenu->Append( item );
 
     /* Separator */
@@ -262,34 +264,34 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Global Deletions */
     item = new wxMenuItem( editMenu, ID_PCB_GLOBAL_DELETE,
-                           _( "Global &Deletions" ),
-                           _( "Delete tracks, modules, texts... on board" ) );
+                          _( "Global &Deletions" ),
+                          _( "Delete tracks, modules, texts... on board" ) );
     item->SetBitmap( general_deletions_xpm );
     editMenu->Append( item );
 
     /* Tracks */
     item = new wxMenuItem( editMenu, ID_MENU_PCB_CLEAN,
-           _( "&Tracks" ),
-           _( "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) );
+                          _( "&Tracks" ),
+                          _(
+                              "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) );
     item->SetBitmap( delete_body_xpm );
     editMenu->Append( item );
 
     /* Swap Layers */
     item = new wxMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS,
-           _( "&Swap Layers" ),
-           _( "Swap tracks on copper layers or drawings on others layers" ) );
+                          _( "&Swap Layers" ),
+                          _( "Swap tracks on copper layers or drawings on others layers" ) );
     item->SetBitmap( swap_layer_xpm );
     editMenu->Append( item );
 
 
-
     /**
      * View menu
      */
     wxMenu* viewMenu = new wxMenu;
 
     /* Zoom in */
-    text  = AddHotkeyName( _( "Zoom in" ), s_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_IN);
+    text = AddHotkeyName( _( "Zoom in" ), s_Pcbnew_Editor_Hokeys_Descr, HK_ZOOM_IN );
     item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom in" ),
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_in_xpm );
@@ -297,7 +299,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Zoom out */
     text = AddHotkeyName( _( "Zoom out" ), s_Pcbnew_Editor_Hokeys_Descr,
-                         HK_ZOOM_OUT );
+                          HK_ZOOM_OUT );
     item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom out" ),
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_out_xpm );
@@ -305,7 +307,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Zoom auto */
     text = AddHotkeyName( _( "Zoom auto" ), s_Pcbnew_Editor_Hokeys_Descr,
-                         HK_ZOOM_AUTO );
+                          HK_ZOOM_AUTO );
     item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom auto" ),
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_auto_xpm );
@@ -315,7 +317,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Redraw view */
     text = AddHotkeyName( _( "Redraw view" ), s_Pcbnew_Editor_Hokeys_Descr,
-                         HK_ZOOM_REDRAW );
+                          HK_ZOOM_REDRAW );
     item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text, _( "Zoom auto" ),
                            wxITEM_NORMAL );
     item->SetBitmap( zoom_redraw_xpm );
@@ -326,47 +328,46 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* List of Nets */
     item = new wxMenuItem( viewMenu, ID_MENU_LIST_NETS, _( "&List Nets" ),
-                        _( "View a list of nets with names and id's" ) );
+                          _( "View a list of nets with names and id's" ) );
     item->SetBitmap( tools_xpm );
     viewMenu->Append( item );
 
 
     /* 3D Display */
     item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
-                       _( "3D Display" ), _( "Show board in the 3D viewer" ) );
+                          _( "3D Display" ), _( "Show board in the 3D viewer" ) );
     item->SetBitmap( show_3d_xpm );
     viewMenu->Append( item );
 
 
-
-   /**
-    * Preferences and configuration
-    */
+    /**
+     * Preferences and configuration
+     */
     wxMenu* configmenu = new wxMenu;
 
     /* Library */
     item = new wxMenuItem( configmenu, ID_CONFIG_REQ, _( "&Library" ),
-                           _( "Setting libraries, directories and others..." ) );
+                          _( "Setting libraries, directories and others..." ) );
     item->SetBitmap( library_xpm );
     configmenu->Append( item );
 
     /* Colors and Visibility */
     item = new wxMenuItem( configmenu, ID_COLORS_SETUP,
-                           _( "&Colors and Visibility" ),
-                           _( "Select colors and visibility of layers and some items" ) );
+                          _( "&Colors and Visibility" ),
+                          _( "Select colors and visibility of layers and some items" ) );
     item->SetBitmap( palette_xpm );
     configmenu->Append( item );
 
     /* General */
     item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&General" ),
-                           _( "Select general options for PCBnew" ) );
+                          _( "Select general options for PCBnew" ) );
     item->SetBitmap( preference_xpm );
     configmenu->Append( item );
 
     /* Display */
     item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP,
-                           _( "&Display" ),
-                           _( "Select how items (pads, tracks texts ... ) are displayed" ) );
+                          _( "&Display" ),
+                          _( "Select how items (pads, tracks texts ... ) are displayed" ) );
     item->SetBitmap( display_options_xpm );
     configmenu->Append( item );
 
@@ -375,39 +376,43 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Grid */
     item = new wxMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP, _( "Grid" ),
-                           _( "Adjust user grid dimensions" ) );
+                          _( "Adjust user grid dimensions" ) );
     item->SetBitmap( grid_xpm );
     dimensionsMenu->Append( item );
 
     /* Text and Drawings */
     item = new wxMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
-                           _( "Texts and Drawings" ),
-                           _( "Adjust dimensions for texts and drawings" ) );
+                          _( "Texts and Drawings" ),
+                          _( "Adjust dimensions for texts and drawings" ) );
     item->SetBitmap( options_text_xpm );
     dimensionsMenu->Append( item );
 
     /* Pads */
     item = new wxMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP, _( "Pads" ),
-                           _( "Adjust pads shape, dimensions, layers" ) );
+                          _( "Adjust default pads caracteristics" ) );
     item->SetBitmap( pad_xpm );
     dimensionsMenu->Append( item );
 
-    /* Pads Mask Clearance */ 
+    /* Pads Mask Clearance */
     item = new wxMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE,
-                           _( "Pads Mask Clearance" ),
-                           _( "Adjust the global clearance between pads and the solder resist mask" ) );
+                          _( "Pads Mask Clearance" ),
+                          _( "Adjust the global clearance between pads and the solder resist mask" ) );
     item->SetBitmap( pad_xpm );
     dimensionsMenu->Append( item );
 
 
-    /* Save */
+    /* Save dimension preferences */
     dimensionsMenu->AppendSeparator();
     item = new wxMenuItem( dimensionsMenu, ID_CONFIG_SAVE, _( "&Save" ),
-                           _( "Save dimension preferences" ) );
+                          _( "Save dimension preferences" ) );
     item->SetBitmap( save_xpm );
     dimensionsMenu->Append( item );
-    configmenu->AppendSubMenu( dimensionsMenu, _( "Di&mensions" ),
-                               _( "Global dimensions preferences" ));
+
+    /* append dimension menu to config menu */
+    ADD_MENUITEM_WITH_HELP_AND_SUBMENU( configmenu, dimensionsMenu,
+                                        -1, _( "Di&mensions" ),
+                                        _( "Global dimensions preferences" ),
+                                        add_dimension_xpm );
 
     /* Language submenu */
     wxGetApp().AddMenuLanguageList( configmenu );
@@ -420,59 +425,56 @@ WinEDA_PcbFrame::ReCreateMenuBar()
 
     /* Save Preferences */
     item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, _( "&Save Preferences" ),
-                           _( "Save application preferences" ) );
+                          _( "Save application preferences" ) );
     item->SetBitmap( save_setup_xpm );
     configmenu->Append( item );
 
     /* Read Preferences */
     item = new wxMenuItem( configmenu, ID_CONFIG_READ, _( "&Read Preferences" ),
-                           _( "Read application preferences" ) );
+                          _( "Read application preferences" ) );
     item->SetBitmap( read_setup_xpm );
     configmenu->Append( item );
 
 
-
-   /**
-    * Design Rules menu
-    */ 
+    /**
+     * Design Rules menu
+     */
     wxMenu* designRulesMenu = new wxMenu;
 
     /* Design Rules */
     item = new wxMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG,
-                           _( "Design Rules" ),
-                           _( "Open the design rules dialog editor" ) );
+                          _( "Design Rules" ),
+                          _( "Open the design rules dialog editor" ) );
     item->SetBitmap( hammer_xpm );
     designRulesMenu->Append( item );
 
     /* Layers Setup */
     item = new wxMenuItem( configmenu, ID_PCB_LAYERS_SETUP, _( "&Layers Setup" ),
-                           _( "Enable and set properties of layers" ) );
+                          _( "Enable and set properties of layers" ) );
     item->SetBitmap( copper_layers_setup_xpm );
     designRulesMenu->Append( item );
 
 
-
     /**
      * Help menu
      */
     wxMenu* helpMenu = new wxMenu;
     item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
-                           _( "Open the PCBnew manual" ) );
+                          _( "Open the PCBnew manual" ) );
     item->SetBitmap( help_xpm );
     helpMenu->Append( item );
 
     item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT, _( "&About" ),
-                           _( "About PCBnew printed circuit board designer" ) );
+                          _( "About PCBnew printed circuit board designer" ) );
     item->SetBitmap( info_xpm );
     helpMenu->Append( item );
 
 
-
     /**
      * Append all menus to the menuBar
      */
     menuBar->Append( filesMenu, _( "&File" ) );
-    menuBar->Append( editMenu, _( "&Edit") );
+    menuBar->Append( editMenu, _( "&Edit" ) );
     menuBar->Append( viewMenu, _( "&View" ) );
     menuBar->Append( configmenu, _( "&Preferences" ) );
     menuBar->Append( designRulesMenu, _( "&Design Rules" ) );
@@ -481,4 +483,3 @@ WinEDA_PcbFrame::ReCreateMenuBar()
     /* Associate the menu bar with the frame */
     SetMenuBar( menuBar );
 }
-

pcbnew/tool_pcb.cpp

@@ -458,7 +458,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar()
 
     m_VToolBar->AddSeparator();
     m_VToolBar->AddTool( ID_PCB_COTATION_BUTT, wxEmptyString,
-                         wxBitmap( add_cotation_xpm ),
+                         wxBitmap( add_dimension_xpm ),
                          _( "Add dimension" ), wxITEM_CHECK );
 
     m_VToolBar->AddTool( ID_PCB_MIRE_BUTT, wxEmptyString,