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/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,