Commit 04f41a4a authored by charras's avatar charras

menu cleaning and changing obscure menu info. and menu labels

files cleaning
parent 73f83c05
...@@ -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
......
/* 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
/* 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 ",
" ",
" ",
" "
};
...@@ -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
......
...@@ -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();
......
...@@ -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();
}
} }
......
...@@ -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
{ {
......
...@@ -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:
......
...@@ -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[];
......
...@@ -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"
......
No preview for this file type
This diff is collapsed.
...@@ -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
......
...@@ -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:
......
/*****************************/ /*****************************/
/* 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
This diff is collapsed.
...@@ -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