Skip to content

K
kicad-source-mirror
Commit 04f41a4a authored by charras's avatar charras
Browse files
Options

menu cleaning and changing obscure menu info. and menu labels 

files cleaning
parent 73f83c05
Hide whitespace changes
Inline Side-by-side
Showing with 2307 additions and 2180 deletions
bitmaps/CMakeLists.txt
View file @ 04f41a4a
...@@ -19,8 +19,9 @@ set(BITMAP_SRCS ...@@ -19,8 +19,9 @@ set(BITMAP_SRCS
Add_Circle.xpm Add_Circle.xpm
Add_Component.xpm Add_Component.xpm
Add_Corner.xpm Add_Corner.xpm
add_cotation.xpm add_dimension.xpm
Add_Dashed_Line.xpm Add_Dashed_Line.xpm
add_dimension.xpm
Add_Entry.xpm Add_Entry.xpm
Add_GLabel.xpm Add_GLabel.xpm
add_hierarchical_label.xpm add_hierarchical_label.xpm
...@@ -146,6 +147,7 @@ set(BITMAP_SRCS ...@@ -146,6 +147,7 @@ set(BITMAP_SRCS
Hidden_Pin.xpm Hidden_Pin.xpm
Hierarchy_cursor.xpm Hierarchy_cursor.xpm
Hierarchy_Nav.xpm Hierarchy_Nav.xpm
hotkeys.xpm
icon_3d.xpm icon_3d.xpm
icon_cvpcb_small.xpm icon_cvpcb_small.xpm
icon_cvpcb.xpm icon_cvpcb.xpm
......
bitmaps/add_cotation.xpm → bitmaps/add_dimension.xpm
View file @ 04f41a4a
/* XPM */ /* XPM */
#ifndef XPMMAIN const char * add_dimension_xpm[] = {
extern const char* add_cotation_xpm[]; /* columns rows colors const chars-per-pixel */
#else
const char * add_cotation_xpm[] = {
"16 16 14 1", "16 16 14 1",
" c None", " c None",
". c #000000", ". c #000000",
...@@ -34,5 +32,3 @@ const char * add_cotation_xpm[] = { ...@@ -34,5 +32,3 @@ const char * add_cotation_xpm[] = {
"+ + ", "+ + ",
"+ + ", "+ + ",
" "}; " "};
#endif
bitmaps/hotkeys.xpm 0 → 100644
View file @ 04f41a4a
/* 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
View file @ 04f41a4a
...@@ -62,7 +62,7 @@ set(PCB_COMMON_SRCS ...@@ -62,7 +62,7 @@ set(PCB_COMMON_SRCS
../pcbnew/class_board_connected_item.cpp ../pcbnew/class_board_connected_item.cpp
../pcbnew/class_board_design_settings.cpp ../pcbnew/class_board_design_settings.cpp
../pcbnew/class_board_item.cpp ../pcbnew/class_board_item.cpp
../pcbnew/class_cotation.cpp ../pcbnew/class_dimension.cpp
../pcbnew/class_drawsegment.cpp ../pcbnew/class_drawsegment.cpp
../pcbnew/class_drc_item.cpp ../pcbnew/class_drc_item.cpp
../pcbnew/class_edge_mod.cpp ../pcbnew/class_edge_mod.cpp
......
common/hotkeys_basic.cpp
View file @ 04f41a4a
...@@ -615,25 +615,25 @@ wxString ReturnHotkeyConfigFilePath( int choice ) ...@@ -615,25 +615,25 @@ wxString ReturnHotkeyConfigFilePath( int choice )
/** add hotkey config options submenu to a menu /** add hotkey config options submenu to a menu
* @param menu : initial menu * @param menu : initial menu
*/ */
void AddHotkeyConfigMenu( wxMenu* menu ) void AddHotkeyConfigMenu( wxMenu* aMenu )
{ {
if( aMenu == NULL )
return;
wxMenuItem* item; wxMenuItem* item;
wxMenu* HotkeySubmenu = new wxMenu(); wxMenu* HotkeySubmenu = new wxMenu();
if( menu == NULL ) /* List existing hotkey menu*/
return;
/* Show hotkey configuration */
item = new wxMenuItem( HotkeySubmenu, item = new wxMenuItem( HotkeySubmenu,
ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST, ID_PREFERENCES_HOTKEY_SHOW_CURRENT_LIST,
_( "Show" ), _( "List Current Keys" ),
_( "Show the current hotkey configuration" ) ); _( "Displays the current hotkeys list and corresponding commands" ) );
item->SetBitmap( info_xpm ); item->SetBitmap( info_xpm );
HotkeySubmenu->Append( item ); HotkeySubmenu->Append( item );
/* (Re)create hotkey file */ /* (Re)create hotkey file */
item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_CREATE_CONFIG, 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" ) _( "Create or recreate the hotkey configuration file from current hotkey list" )
); );
item->SetBitmap( save_setup_xpm ); item->SetBitmap( save_setup_xpm );
...@@ -641,23 +641,22 @@ void AddHotkeyConfigMenu( wxMenu* menu ) ...@@ -641,23 +641,22 @@ void AddHotkeyConfigMenu( wxMenu* menu )
/* Reload hotkey file */ /* Reload hotkey file */
item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_READ_CONFIG, item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_READ_CONFIG,
_( "Reload" ), _( "Reload Hotkeys File" ),
_( "Reload the hotkey configuration file" ) ); _( "Reload the hotkey configuration file" ) );
item->SetBitmap( reload_xpm ); item->SetBitmap( reload_xpm );
HotkeySubmenu->Append( item ); HotkeySubmenu->Append( item );
/* Edit hotkey file */ /* Edit hotkey file */
item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EDIT_CONFIG, item = new wxMenuItem( HotkeySubmenu, ID_PREFERENCES_HOTKEY_EDIT_CONFIG,
_( "Edit" ), _( "Edit Hotkeys File" ),
_( "Edit the hotkey configuration file in a text editor" ) ); _( "Edit the hotkey configuration file in a text editor" ) );
item->SetBitmap( editor_xpm ); item->SetBitmap( editor_xpm );
HotkeySubmenu->Append( item ); HotkeySubmenu->Append( item );
/* Append HotkeySubmenu to menu */ /* Append HotkeySubmenu to menu */
menu->Append( ID_PREFERENCES_HOTKEY_SUBMENU, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( aMenu, HotkeySubmenu,
_("Hotkey"), ID_PREFERENCES_HOTKEY_SUBMENU, _( "Hotkeys" ),
HotkeySubmenu, _("Hotkeys configuration and preferences" ), hotkeys_xpm );
_("Hotkey configuration and preferences"));
/* Hotkey path */ /* Hotkey path */
wxMenu* HotkeyLocationSubmenu = new wxMenu(); wxMenu* HotkeyLocationSubmenu = new wxMenu();
......
common/zoom.cpp
View file @ 04f41a4a
...@@ -40,9 +40,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse ) ...@@ -40,9 +40,7 @@ void WinEDA_DrawFrame::Recadre_Trace( bool ToMouse )
/* Move the mouse cursor to the on grid graphic cursor position */ /* Move the mouse cursor to the on grid graphic cursor position */
if( ToMouse == TRUE ) if( ToMouse == TRUE )
{
DrawPanel->MouseToCursorSchema(); DrawPanel->MouseToCursorSchema();
}
} }
......
eeschema/class_library.cpp
View file @ 04f41a4a
...@@ -510,12 +510,15 @@ bool CMP_LIBRARY::Load( wxString& aErrorMsg ) ...@@ -510,12 +510,15 @@ bool CMP_LIBRARY::Load( wxString& aErrorMsg )
|| !vers.GetNextToken().ToLong( & minor ) || minor < 0L || !vers.GetNextToken().ToLong( & minor ) || minor < 0L
|| minor > 99 ) || 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 \ 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 \ 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 \ editor and save it. If this library is the project cache library, save \
the current schematic." ), the current schematic." ),
GetChars( GetName() ) ); GetChars( GetName() ) );
#endif
} }
else else
{ {
......
eeschema/menubar.cpp
View file @ 04f41a4a
...@@ -52,25 +52,31 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() ...@@ -52,25 +52,31 @@ void WinEDA_SchematicFrame::ReCreateMenuBar()
/* Open Recent submenu */ /* Open Recent submenu */
wxMenu* openRecentMenu = new wxMenu(); wxMenu* openRecentMenu = new wxMenu();
wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu ); wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu );
filesMenu->AppendSubMenu( openRecentMenu, _( "Open &Recent" ), ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, openRecentMenu,
_( "Open a recent opened document" ) ); -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" ) ); _( "Save only current schematic sheet" ) );
item->SetBitmap( save_xpm ); item->SetBitmap( save_xpm );
filesMenu->Append( item ); 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..." ) ); _( "Save current schematic sheet as..." ) );
item->SetBitmap( save_as_xpm ); item->SetBitmap( save_as_xpm );
filesMenu->Append( item ); 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(); filesMenu->AppendSeparator();
// Print and Plot section: // Print and Plot section:
......
include/bitmaps.h
View file @ 04f41a4a
...@@ -12,8 +12,8 @@ extern const char* add_bus_xpm[]; ...@@ -12,8 +12,8 @@ extern const char* add_bus_xpm[];
extern const char* add_circle_xpm[]; extern const char* add_circle_xpm[];
extern const char* add_component_xpm[]; extern const char* add_component_xpm[];
extern const char* add_corner_xpm[]; extern const char* add_corner_xpm[];
extern const char* add_cotation_xpm[];
extern const char* add_dashed_line_xpm[]; extern const char* add_dashed_line_xpm[];
extern const char* add_dimension_xpm[];
extern const char* add_entry_xpm[]; extern const char* add_entry_xpm[];
extern const char* add_glabel_xpm[]; extern const char* add_glabel_xpm[];
extern const char* add_hierarchical_label_xpm[]; extern const char* add_hierarchical_label_xpm[];
...@@ -139,6 +139,7 @@ extern const char* help_xpm[]; ...@@ -139,6 +139,7 @@ extern const char* help_xpm[];
extern const char* hidden_pin_xpm[]; extern const char* hidden_pin_xpm[];
extern const char* hierarchy_cursor_xpm[]; extern const char* hierarchy_cursor_xpm[];
extern const char* hierarchy_nav_xpm[]; extern const char* hierarchy_nav_xpm[];
extern const char* hotkeys_xpm[];
extern const char* icon_cvpcb_small_xpm[]; extern const char* icon_cvpcb_small_xpm[];
extern const char* icon_cvpcb_xpm[]; extern const char* icon_cvpcb_xpm[];
extern const char* icon_eeschema_xpm[]; extern const char* icon_eeschema_xpm[];
......
include/pcbstruct.h
View file @ 04f41a4a
...@@ -225,7 +225,7 @@ enum DisplayViaMode { ...@@ -225,7 +225,7 @@ enum DisplayViaMode {
#include "class_drawsegment.h" #include "class_drawsegment.h"
#include "class_pcb_text.h" #include "class_pcb_text.h"
#include "class_cotation.h" #include "class_dimension.h"
#include "class_mire.h" #include "class_mire.h"
#include "class_track.h" #include "class_track.h"
#include "class_marker_pcb.h" #include "class_marker_pcb.h"
......
internat/fr/kicad.mo
View file @ 04f41a4a
No preview for this file type
internat/fr/kicad.po
View file @ 04f41a4a
This source diff could not be displayed because it is too large. You can view the blob instead.
pcbnew/CMakeLists.txt
View file @ 04f41a4a
...@@ -30,7 +30,7 @@ set(PCBNEW_SRCS ...@@ -30,7 +30,7 @@ set(PCBNEW_SRCS
# cleaningoptions_dialog.cpp # cleaningoptions_dialog.cpp
connect.cpp connect.cpp
controle.cpp controle.cpp
cotation.cpp dimension.cpp
cross-probing.cpp cross-probing.cpp
debug_kbool_key_file_fct.cpp debug_kbool_key_file_fct.cpp
deltrack.cpp deltrack.cpp
......
pcbnew/class_board_item.cpp
View file @ 04f41a4a
...@@ -292,7 +292,7 @@ const char** BOARD_ITEM::MenuIcon() const ...@@ -292,7 +292,7 @@ const char** BOARD_ITEM::MenuIcon() const
break; break;
case TYPE_COTATION: case TYPE_COTATION:
xpm = add_cotation_xpm; xpm = add_dimension_xpm;
break; break;
case TYPE_MIRE: case TYPE_MIRE:
......
pcbnew/class_cotation.h → pcbnew/class_dimension.h
View file @ 04f41a4a
/*****************************/ /*****************************/
/* COTATION class definition */ /* COTATION class definition */
/*****************************/ /*****************************/
#ifndef COTATION_H #ifndef DIMENSION_H
#define COTATION_H #define DIMENSION_H
#include "base_struct.h" #include "base_struct.h"
...@@ -130,4 +130,4 @@ public: ...@@ -130,4 +130,4 @@ public:
} }
}; };
#endif // #define COTATION_H #endif // #define DIMENSION_H
pcbnew/menubar_pcbframe.cpp
View file @ 04f41a4a
...@@ -15,165 +15,166 @@ ...@@ -15,165 +15,166 @@
/** /**
* PCBNew mainframe menubar * PCBNew mainframe menubar
*/ */
void void WinEDA_PcbFrame::ReCreateMenuBar()
WinEDA_PcbFrame::ReCreateMenuBar()
{ {
wxString text; wxString text;
wxMenuItem* item; wxMenuItem* item;
wxMenuBar* menuBar = GetMenuBar(); wxMenuBar* menuBar = GetMenuBar();
/** /**
* Destroy the existing menu bar so it can be rebuilt. This allows * Destroy the existing menu bar so it can be rebuilt. This allows
* language changes of the menu text on the fly. * language changes of the menu text on the fly.
*/ */
if( menuBar ) if( menuBar )
SetMenuBar( NULL ); SetMenuBar( NULL );
menuBar = new wxMenuBar(); menuBar = new wxMenuBar();
/**
/** * File Menu
* File Menu */
*/
wxMenu* filesMenu = new wxMenu; wxMenu* filesMenu = new wxMenu;
/* New Board */ /* New Board */
item = new wxMenuItem( filesMenu, ID_NEW_BOARD, _( "&New" ), 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 ); item->SetBitmap( new_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
/* Load Board */ /* Load Board */
item = new wxMenuItem( filesMenu, ID_LOAD_FILE, _( "&Open" ), 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 ); item->SetBitmap( open_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
/* Load Recent submenu */ /* Load Recent submenu */
wxMenu* openRecentMenu = new wxMenu(); wxMenu* openRecentMenu = new wxMenu();
wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu ); wxGetApp().m_fileHistory.AddFilesToMenu( openRecentMenu );
filesMenu->AppendSubMenu( openRecentMenu, _( "Open &Recent" ), ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, openRecentMenu,
_("Open a recent opened document")); -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 */ /* Save */
item = new wxMenuItem( filesMenu, ID_SAVE_BOARD, item = new wxMenuItem( filesMenu, ID_SAVE_BOARD,
_( "&Save" ), _( "&Save" ),
_( "Save current board" ) ); _( "Save current board" ) );
item->SetBitmap( save_xpm ); item->SetBitmap( save_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
/* Save As */ /* Save As */
item = new wxMenuItem( filesMenu, ID_SAVE_BOARD_AS, item = new wxMenuItem( filesMenu, ID_SAVE_BOARD_AS,
_( "Save as..." ), _( "Save as..." ),
_( "Save the current board as.." ) ); _( "Save the current board as.." ) );
item->SetBitmap( save_as_xpm ); item->SetBitmap( save_as_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
/* Separator */ /* Separator */
filesMenu->AppendSeparator(); 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 */ /* Revert */
item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD, item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD,
_( "&Revert" ), _( "&Revert" ),
_( "Clear old board and get old version of board" ) ); _( "Clear board and get previous saved version of board" ) );
item->SetBitmap( jigsaw_xpm ); item->SetBitmap( jigsaw_xpm );
filesMenu->Append( item ); 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 */ /* Separator */
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
/* Fabrication Outputs submenu */ /* Fabrication Outputs submenu */
wxMenu* fabricationOutputsMenu = new wxMenu; wxMenu* fabricationOutputsMenu = new wxMenu;
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
_( "&Modules Position" ), _( "&Modules Position" ),
_( "Generate modules position file for pick and place" ) ); _( "Generate modules position file for pick and place" ) );
item->SetBitmap( post_compo_xpm ); item->SetBitmap( post_compo_xpm );
fabricationOutputsMenu->Append( item ); fabricationOutputsMenu->Append( item );
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE, item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_DRILL_FILE,
_( "&Drill File" ), _( "&Drill File" ),
_( "Generate excellon2 drill file" ) ); _( "Generate excellon2 drill file" ) );
item->SetBitmap( post_drill_xpm ); item->SetBitmap( post_drill_xpm );
fabricationOutputsMenu->Append( item ); fabricationOutputsMenu->Append( item );
/* Component File */ /* Component File */
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE, item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_CMP_FILE,
_( "&Component File" ), _( "&Component File" ),
_( "(Re)create components file for CvPcb" ) ); _( "(Re)create components file for CvPcb" ) );
item->SetBitmap( save_cmpstuff_xpm ); item->SetBitmap( save_cmpstuff_xpm );
fabricationOutputsMenu->Append( item ); fabricationOutputsMenu->Append( item );
/* BOM File */ /* BOM File */
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD, item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD,
_( "&BOM File" ), _( "&BOM File" ),
_( "(Re)create bill of materials file for CvPCB" ) ); _( "Create a bill of materials from schematic" ) );
item->SetBitmap( tools_xpm ); item->SetBitmap( tools_xpm );
fabricationOutputsMenu->Append( item ); fabricationOutputsMenu->Append( item );
/* Fabrications Outputs submenu append */ /* Fabrications Outputs submenu append */
filesMenu->AppendSubMenu( fabricationOutputsMenu, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, fabricationOutputsMenu,
_( "Fabrication Outputs "), -1, _( "Fabrication Outputs" ),
_( "Generate files for fabrication" ) ); _( "Generate files for fabrication" ), export_xpm );
/* Import submenu */ /* Import submenu */
wxMenu* submenuImport = new wxMenu(); 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 */ /* Specctra Session */
item = new wxMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION, item = new wxMenuItem( submenuImport, ID_GEN_IMPORT_SPECCTRA_SESSION,
_( "&Specctra Session" ), _( "&Specctra Session" ),
_( "Import a routed \"Specctra Session\" (*.ses) file" ) ); _( "Import a routed \"Specctra Session\" (*.ses) file" ) );
item->SetBitmap( import_xpm ); // @todo need better bitmap item->SetBitmap( import_xpm ); // @todo need better bitmap
submenuImport->Append( item ); submenuImport->Append( item );
/** /**
* would be implemented in WinEDA_PcbFrame::ImportSpecctraDesign() in * would be implemented in WinEDA_PcbFrame::ImportSpecctraDesign() in
* specctra_import.cpp * specctra_import.cpp
* item = new wxMenuItem(submenuImport, ID_GEN_IMPORT_SPECCTRA_DESIGN, * item = new wxMenuItem(submenuImport, ID_GEN_IMPORT_SPECCTRA_DESIGN,
* _("&Specctra Design"), _("Import a \"Specctra Design\" (*.dsn) file") ); * _("&Specctra Design"), _("Import a \"Specctra Design\" (*.dsn) file") );
* item->SetBitmap(export_xpm); // @todo need better bitmap * item->SetBitmap(export_xpm); // @todo need better bitmap
* submenuImport->Append(item); * submenuImport->Append(item);
*/ */
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuImport, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuImport,
ID_GEN_IMPORT_FILE, _( "Import" ), ID_GEN_IMPORT_FILE, _( "Import" ),
_( "Import files" ), import_xpm ); _( "Import files" ), import_xpm );
/* Export submenu */ /* Export submenu */
wxMenu* submenuexport = new wxMenu(); wxMenu* submenuexport = new wxMenu();
/* Specctra DSN */ /* Specctra DSN */
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA, item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_SPECCTRA,
_( "&Specctra DSN" ), _( "&Specctra DSN" ),
_( "Export the current board to a \"Specctra DSN\" file" ) ); _( "Export the current board to a \"Specctra DSN\" file" ) );
item->SetBitmap( export_xpm ); item->SetBitmap( export_xpm );
submenuexport->Append( item ); submenuexport->Append( item );
/* Export GenCAD Format */ /* Export GenCAD Format */
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT, item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_GENCADFORMAT,
_( "&GenCAD" ), _( "Export GenCAD Format" ) ); _( "&GenCAD" ), _( "Export GenCAD Format" ) );
item->SetBitmap( export_xpm ); item->SetBitmap( export_xpm );
submenuexport->Append( item ); submenuexport->Append( item );
/* Module Report */ /* Module Report */
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT, item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_MODULE_REPORT,
_( "&Module Report" ), _( "&Module Report" ),
_( "Create a report of all modules on the current board" ) ); _( "Create a report of all modules on the current board" ) );
item->SetBitmap( tools_xpm ); item->SetBitmap( tools_xpm );
submenuexport->Append( item ); submenuexport->Append( item );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuexport, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuexport,
...@@ -185,19 +186,19 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -185,19 +186,19 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Print */ /* Print */
item = new wxMenuItem( filesMenu, ID_GEN_PRINT, _( "P&rint" ), item = new wxMenuItem( filesMenu, ID_GEN_PRINT, _( "P&rint" ),
_( "Print pcb board" ) ); _( "Print pcb board" ) );
item->SetBitmap( print_button ); item->SetBitmap( print_button );
filesMenu->Append( item ); filesMenu->Append( item );
/* Print SVG */ /* Print SVG */
item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG, _( "Print S&VG" ), 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 ); item->SetBitmap( print_button );
filesMenu->Append( item ); filesMenu->Append( item );
/* Plot */ /* Plot */
item = new wxMenuItem( filesMenu, ID_GEN_PLOT, _( "&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 ); item->SetBitmap( plot_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
...@@ -205,13 +206,14 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -205,13 +206,14 @@ WinEDA_PcbFrame::ReCreateMenuBar()
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
wxMenu* submenuarchive = new wxMenu(); wxMenu* submenuarchive = new wxMenu();
item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES, item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_NEW_MODULES,
_( "Add New Footprints" ), _( "Add New Footprints" ),
_( "Archive new footprints only in a library (keep other footprints in this lib)" ) ); _(
"Archive new footprints only in a library (keep other footprints in this lib)" ) );
item->SetBitmap( library_update_xpm ); item->SetBitmap( library_update_xpm );
submenuarchive->Append( item ); submenuarchive->Append( item );
item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES, item = new wxMenuItem( submenuarchive, ID_MENU_ARCHIVE_ALL_MODULES,
_( "Create Footprint Archive" ), _( "Create Footprint Archive" ),
_( "Archive all footprints in a library(old lib will be deleted)" ) ); _( "Archive all footprints in a library(old lib will be deleted)" ) );
item->SetBitmap( library_xpm ); item->SetBitmap( library_xpm );
submenuarchive->Append( item ); submenuarchive->Append( item );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuarchive, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuarchive,
...@@ -223,20 +225,19 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -223,20 +225,19 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Exit */ /* Exit */
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
item = new wxMenuItem( filesMenu, ID_EXIT, _( "&Quit" ), item = new wxMenuItem( filesMenu, ID_EXIT, _( "&Quit" ),
_( "Quit PCBNew" ) ); _( "Quit PCBNew" ) );
item->SetBitmap( exit_xpm ); item->SetBitmap( exit_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
/**
/** * Edit menu
* Edit menu */
*/
wxMenu* editMenu = new wxMenu; wxMenu* editMenu = new wxMenu;
/* Undo */ /* Undo */
/* TODO add Undo hotkey */ /* 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 ); _( "Undo last edition" ), wxITEM_NORMAL );
item->SetBitmap( undo_xpm ); item->SetBitmap( undo_xpm );
editMenu->Append( item ); editMenu->Append( item );
...@@ -252,9 +253,10 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -252,9 +253,10 @@ WinEDA_PcbFrame::ReCreateMenuBar()
editMenu->AppendSeparator(); editMenu->AppendSeparator();
/* Find */ /* 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, 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 ); editMenu->Append( item );
/* Separator */ /* Separator */
...@@ -262,34 +264,34 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -262,34 +264,34 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Global Deletions */ /* Global Deletions */
item = new wxMenuItem( editMenu, ID_PCB_GLOBAL_DELETE, item = new wxMenuItem( editMenu, ID_PCB_GLOBAL_DELETE,
_( "Global &Deletions" ), _( "Global &Deletions" ),
_( "Delete tracks, modules, texts... on board" ) ); _( "Delete tracks, modules, texts... on board" ) );
item->SetBitmap( general_deletions_xpm ); item->SetBitmap( general_deletions_xpm );
editMenu->Append( item ); editMenu->Append( item );
/* Tracks */ /* Tracks */
item = new wxMenuItem( editMenu, ID_MENU_PCB_CLEAN, item = new wxMenuItem( editMenu, ID_MENU_PCB_CLEAN,
_( "&Tracks" ), _( "&Tracks" ),
_( "Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) ); _(
"Clean stubs, vias, delete break points, or connect dangling tracks to pads and vias" ) );
item->SetBitmap( delete_body_xpm ); item->SetBitmap( delete_body_xpm );
editMenu->Append( item ); editMenu->Append( item );
/* Swap Layers */ /* Swap Layers */
item = new wxMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS, item = new wxMenuItem( editMenu, ID_MENU_PCB_SWAP_LAYERS,
_( "&Swap Layers" ), _( "&Swap Layers" ),
_( "Swap tracks on copper layers or drawings on others layers" ) ); _( "Swap tracks on copper layers or drawings on others layers" ) );
item->SetBitmap( swap_layer_xpm ); item->SetBitmap( swap_layer_xpm );
editMenu->Append( item ); editMenu->Append( item );
/** /**
* View menu * View menu
*/ */
wxMenu* viewMenu = new wxMenu; wxMenu* viewMenu = new wxMenu;
/* Zoom in */ /* 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" ), item = new wxMenuItem( viewMenu, ID_ZOOM_IN, text, _( "Zoom in" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( zoom_in_xpm ); item->SetBitmap( zoom_in_xpm );
...@@ -297,7 +299,7 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -297,7 +299,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Zoom out */ /* Zoom out */
text = AddHotkeyName( _( "Zoom out" ), s_Pcbnew_Editor_Hokeys_Descr, 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" ), item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, text, _( "Zoom out" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( zoom_out_xpm ); item->SetBitmap( zoom_out_xpm );
...@@ -305,7 +307,7 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -305,7 +307,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Zoom auto */ /* Zoom auto */
text = AddHotkeyName( _( "Zoom auto" ), s_Pcbnew_Editor_Hokeys_Descr, 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" ), item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, text, _( "Zoom auto" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( zoom_auto_xpm ); item->SetBitmap( zoom_auto_xpm );
...@@ -315,7 +317,7 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -315,7 +317,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Redraw view */ /* Redraw view */
text = AddHotkeyName( _( "Redraw view" ), s_Pcbnew_Editor_Hokeys_Descr, 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" ), item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, text, _( "Zoom auto" ),
wxITEM_NORMAL ); wxITEM_NORMAL );
item->SetBitmap( zoom_redraw_xpm ); item->SetBitmap( zoom_redraw_xpm );
...@@ -326,47 +328,46 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -326,47 +328,46 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* List of Nets */ /* List of Nets */
item = new wxMenuItem( viewMenu, ID_MENU_LIST_NETS, _( "&List 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 ); item->SetBitmap( tools_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
/* 3D Display */ /* 3D Display */
item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME, 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 ); item->SetBitmap( show_3d_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
/**
/** * Preferences and configuration
* Preferences and configuration */
*/
wxMenu* configmenu = new wxMenu; wxMenu* configmenu = new wxMenu;
/* Library */ /* Library */
item = new wxMenuItem( configmenu, ID_CONFIG_REQ, _( "&Library" ), item = new wxMenuItem( configmenu, ID_CONFIG_REQ, _( "&Library" ),
_( "Setting libraries, directories and others..." ) ); _( "Setting libraries, directories and others..." ) );
item->SetBitmap( library_xpm ); item->SetBitmap( library_xpm );
configmenu->Append( item ); configmenu->Append( item );
/* Colors and Visibility */ /* Colors and Visibility */
item = new wxMenuItem( configmenu, ID_COLORS_SETUP, item = new wxMenuItem( configmenu, ID_COLORS_SETUP,
_( "&Colors and Visibility" ), _( "&Colors and Visibility" ),
_( "Select colors and visibility of layers and some items" ) ); _( "Select colors and visibility of layers and some items" ) );
item->SetBitmap( palette_xpm ); item->SetBitmap( palette_xpm );
configmenu->Append( item ); configmenu->Append( item );
/* General */ /* General */
item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&General" ), item = new wxMenuItem( configmenu, ID_OPTIONS_SETUP, _( "&General" ),
_( "Select general options for PCBnew" ) ); _( "Select general options for PCBnew" ) );
item->SetBitmap( preference_xpm ); item->SetBitmap( preference_xpm );
configmenu->Append( item ); configmenu->Append( item );
/* Display */ /* Display */
item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP, item = new wxMenuItem( configmenu, ID_PCB_DISPLAY_OPTIONS_SETUP,
_( "&Display" ), _( "&Display" ),
_( "Select how items (pads, tracks texts ... ) are displayed" ) ); _( "Select how items (pads, tracks texts ... ) are displayed" ) );
item->SetBitmap( display_options_xpm ); item->SetBitmap( display_options_xpm );
configmenu->Append( item ); configmenu->Append( item );
...@@ -375,39 +376,43 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -375,39 +376,43 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Grid */ /* Grid */
item = new wxMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP, _( "Grid" ), item = new wxMenuItem( dimensionsMenu, ID_PCB_USER_GRID_SETUP, _( "Grid" ),
_( "Adjust user grid dimensions" ) ); _( "Adjust user grid dimensions" ) );
item->SetBitmap( grid_xpm ); item->SetBitmap( grid_xpm );
dimensionsMenu->Append( item ); dimensionsMenu->Append( item );
/* Text and Drawings */ /* Text and Drawings */
item = new wxMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP, item = new wxMenuItem( dimensionsMenu, ID_PCB_DRAWINGS_WIDTHS_SETUP,
_( "Texts and Drawings" ), _( "Texts and Drawings" ),
_( "Adjust dimensions for texts and drawings" ) ); _( "Adjust dimensions for texts and drawings" ) );
item->SetBitmap( options_text_xpm ); item->SetBitmap( options_text_xpm );
dimensionsMenu->Append( item ); dimensionsMenu->Append( item );
/* Pads */ /* Pads */
item = new wxMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP, _( "Pads" ), item = new wxMenuItem( dimensionsMenu, ID_PCB_PAD_SETUP, _( "Pads" ),
_( "Adjust pads shape, dimensions, layers" ) ); _( "Adjust default pads caracteristics" ) );
item->SetBitmap( pad_xpm ); item->SetBitmap( pad_xpm );
dimensionsMenu->Append( item ); dimensionsMenu->Append( item );
/* Pads Mask Clearance */ /* Pads Mask Clearance */
item = new wxMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE, item = new wxMenuItem( dimensionsMenu, ID_PCB_MASK_CLEARANCE,
_( "Pads Mask Clearance" ), _( "Pads Mask Clearance" ),
_( "Adjust the global clearance between pads and the solder resist mask" ) ); _( "Adjust the global clearance between pads and the solder resist mask" ) );
item->SetBitmap( pad_xpm ); item->SetBitmap( pad_xpm );
dimensionsMenu->Append( item ); dimensionsMenu->Append( item );
/* Save */ /* Save dimension preferences */
dimensionsMenu->AppendSeparator(); dimensionsMenu->AppendSeparator();
item = new wxMenuItem( dimensionsMenu, ID_CONFIG_SAVE, _( "&Save" ), item = new wxMenuItem( dimensionsMenu, ID_CONFIG_SAVE, _( "&Save" ),
_( "Save dimension preferences" ) ); _( "Save dimension preferences" ) );
item->SetBitmap( save_xpm ); item->SetBitmap( save_xpm );
dimensionsMenu->Append( item ); 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 */ /* Language submenu */
wxGetApp().AddMenuLanguageList( configmenu ); wxGetApp().AddMenuLanguageList( configmenu );
...@@ -420,59 +425,56 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -420,59 +425,56 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Save Preferences */ /* Save Preferences */
item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, _( "&Save Preferences" ), item = new wxMenuItem( configmenu, ID_CONFIG_SAVE, _( "&Save Preferences" ),
_( "Save application preferences" ) ); _( "Save application preferences" ) );
item->SetBitmap( save_setup_xpm ); item->SetBitmap( save_setup_xpm );
configmenu->Append( item ); configmenu->Append( item );
/* Read Preferences */ /* Read Preferences */
item = new wxMenuItem( configmenu, ID_CONFIG_READ, _( "&Read Preferences" ), item = new wxMenuItem( configmenu, ID_CONFIG_READ, _( "&Read Preferences" ),
_( "Read application preferences" ) ); _( "Read application preferences" ) );
item->SetBitmap( read_setup_xpm ); item->SetBitmap( read_setup_xpm );
configmenu->Append( item ); configmenu->Append( item );
/**
/** * Design Rules menu
* Design Rules menu */
*/
wxMenu* designRulesMenu = new wxMenu; wxMenu* designRulesMenu = new wxMenu;
/* Design Rules */ /* Design Rules */
item = new wxMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, item = new wxMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG,
_( "Design Rules" ), _( "Design Rules" ),
_( "Open the design rules dialog editor" ) ); _( "Open the design rules dialog editor" ) );
item->SetBitmap( hammer_xpm ); item->SetBitmap( hammer_xpm );
designRulesMenu->Append( item ); designRulesMenu->Append( item );
/* Layers Setup */ /* Layers Setup */
item = new wxMenuItem( configmenu, ID_PCB_LAYERS_SETUP, _( "&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 ); item->SetBitmap( copper_layers_setup_xpm );
designRulesMenu->Append( item ); designRulesMenu->Append( item );
/** /**
* Help menu * Help menu
*/ */
wxMenu* helpMenu = new wxMenu; wxMenu* helpMenu = new wxMenu;
item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ), item = new wxMenuItem( helpMenu, ID_GENERAL_HELP, _( "&Contents" ),
_( "Open the PCBnew manual" ) ); _( "Open the PCBnew manual" ) );
item->SetBitmap( help_xpm ); item->SetBitmap( help_xpm );
helpMenu->Append( item ); helpMenu->Append( item );
item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT, _( "&About" ), item = new wxMenuItem( helpMenu, ID_KICAD_ABOUT, _( "&About" ),
_( "About PCBnew printed circuit board designer" ) ); _( "About PCBnew printed circuit board designer" ) );
item->SetBitmap( info_xpm ); item->SetBitmap( info_xpm );
helpMenu->Append( item ); helpMenu->Append( item );
/** /**
* Append all menus to the menuBar * Append all menus to the menuBar
*/ */
menuBar->Append( filesMenu, _( "&File" ) ); menuBar->Append( filesMenu, _( "&File" ) );
menuBar->Append( editMenu, _( "&Edit") ); menuBar->Append( editMenu, _( "&Edit" ) );
menuBar->Append( viewMenu, _( "&View" ) ); menuBar->Append( viewMenu, _( "&View" ) );
menuBar->Append( configmenu, _( "&Preferences" ) ); menuBar->Append( configmenu, _( "&Preferences" ) );
menuBar->Append( designRulesMenu, _( "&Design Rules" ) ); menuBar->Append( designRulesMenu, _( "&Design Rules" ) );
...@@ -481,4 +483,3 @@ WinEDA_PcbFrame::ReCreateMenuBar() ...@@ -481,4 +483,3 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Associate the menu bar with the frame */ /* Associate the menu bar with the frame */
SetMenuBar( menuBar ); SetMenuBar( menuBar );
} }
pcbnew/tool_pcb.cpp
View file @ 04f41a4a
...@@ -458,7 +458,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar() ...@@ -458,7 +458,7 @@ void WinEDA_PcbFrame::ReCreateVToolbar()
m_VToolBar->AddSeparator(); m_VToolBar->AddSeparator();
m_VToolBar->AddTool( ID_PCB_COTATION_BUTT, wxEmptyString, m_VToolBar->AddTool( ID_PCB_COTATION_BUTT, wxEmptyString,
wxBitmap( add_cotation_xpm ), wxBitmap( add_dimension_xpm ),
_( "Add dimension" ), wxITEM_CHECK ); _( "Add dimension" ), wxITEM_CHECK );
m_VToolBar->AddTool( ID_PCB_MIRE_BUTT, wxEmptyString, m_VToolBar->AddTool( ID_PCB_MIRE_BUTT, wxEmptyString,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment