haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

menu cleaning and changing obscure menu info. and menu labels 

files cleaning
This commit is contained in:
charras 2010-01-18 12:37:53 +00:00
parent 73f83c0509
commit 04f41a4a7b
19 changed files with 1863 additions and 1736 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bitmaps/CMakeLists.txt
View File

@ -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

8
bitmaps/add_cotation.xpm → bitmaps/add_dimension.xpm
View File

@ -1,8 +1,6 @@
/* 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

37
bitmaps/hotkeys.xpm Normal file
View File

@ -0,0 +1,37 @@
/* 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 ",
" ",
" ",
" "
};

2
common/CMakeLists.txt
View File

@ -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

27
common/hotkeys_basic.cpp
View File

@ -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();

2
common/zoom.cpp
View File

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

5
eeschema/class_library.cpp
View File

@ -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
{

26
eeschema/menubar.cpp
View File

@ -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:

3
include/bitmaps.h
View File

@ -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[];

2
include/pcbstruct.h
View File

@ -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"

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

3222
internat/fr/kicad.po
View File

File diff suppressed because it is too large Load Diff

2
pcbnew/CMakeLists.txt
View File

@ -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

2
pcbnew/class_board_item.cpp
View File

@ -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:

0
pcbnew/class_cotation.cpp → pcbnew/class_dimension.cpp
View File

6
pcbnew/class_cotation.h → pcbnew/class_dimension.h
View File

@ -1,8 +1,8 @@
/*****************************/
/* 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

0
pcbnew/cotation.cpp → pcbnew/dimension.cpp
View File

87
pcbnew/menubar_pcbframe.cpp
View File

@ -15,8 +15,7 @@
/**
* PCBNew mainframe menubar
*/
void
WinEDA_PcbFrame::ReCreateMenuBar()
void WinEDA_PcbFrame::ReCreateMenuBar()
{
wxString text;
wxMenuItem* item;
@ -31,7 +30,6 @@ WinEDA_PcbFrame::ReCreateMenuBar()
menuBar = new wxMenuBar();
/**
* File Menu
*/
@ -39,7 +37,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* 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 );
@ -52,8 +50,19 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* 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,
@ -72,24 +81,23 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Separator */
filesMenu->AppendSeparator();
/* Revert */
item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_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 );
/* Revert */
item = new wxMenuItem( filesMenu, ID_MENU_READ_LAST_SAVED_VERSION_BOARD,
_( "&Revert" ),
_( "Clear old board and get old version of board" ) );
item->SetBitmap( jigsaw_xpm );
filesMenu->Append( item );
/* Separator */
filesMenu->AppendSeparator();
/* Fabrication Outputs submenu */
wxMenu* fabricationOutputsMenu = new wxMenu;
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE,
@ -114,24 +122,18 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* BOM File */
item = new wxMenuItem( fabricationOutputsMenu, ID_PCB_GEN_BOM_FILE_FROM_BOARD,
_( "&BOM File" ),
_( "(Re)create bill of materials file for CvPCB" ) );
_( "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" ),
@ -153,7 +155,6 @@ WinEDA_PcbFrame::ReCreateMenuBar()
_( "Import files" ), import_xpm );
/* Export submenu */
wxMenu* submenuexport = new wxMenu();
@ -206,7 +207,8 @@ WinEDA_PcbFrame::ReCreateMenuBar()
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)" ) );
_(
"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,
@ -228,7 +230,6 @@ WinEDA_PcbFrame::ReCreateMenuBar()
filesMenu->Append( item );
/**
* Edit menu
*/
@ -236,7 +237,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* 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 */
@ -270,7 +272,8 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* Tracks */
item = new wxMenuItem( editMenu, ID_MENU_PCB_CLEAN,
_( "&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 );
editMenu->Append( item );
@ -282,14 +285,13 @@ WinEDA_PcbFrame::ReCreateMenuBar()
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 );
@ -338,7 +340,6 @@ WinEDA_PcbFrame::ReCreateMenuBar()
viewMenu->Append( item );
/**
* Preferences and configuration
*/
@ -388,7 +389,7 @@ WinEDA_PcbFrame::ReCreateMenuBar()
/* 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 );
@ -400,14 +401,18 @@ WinEDA_PcbFrame::ReCreateMenuBar()
dimensionsMenu->Append( item );
/* Save */
/* Save dimension preferences */
dimensionsMenu->AppendSeparator();
item = new wxMenuItem( dimensionsMenu, ID_CONFIG_SAVE, _( "&Save" ),
_( "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 );
@ -431,7 +436,6 @@ WinEDA_PcbFrame::ReCreateMenuBar()
configmenu->Append( item );
/**
* Design Rules menu
*/
@ -451,7 +455,6 @@ WinEDA_PcbFrame::ReCreateMenuBar()
designRulesMenu->Append( item );
/**
* Help menu
*/
@ -467,12 +470,11 @@ WinEDA_PcbFrame::ReCreateMenuBar()
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 );
}

2
pcbnew/tool_pcb.cpp
View File

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