From f94269093009f6b91104352e67a9cad034b82988 Mon Sep 17 00:00:00 2001 From: plyatov Date: Sun, 17 Feb 2008 21:19:13 +0000 Subject: [PATCH] Additions to the menu (see changelog). --- 3d-viewer/3d_frame.cpp | 6 +-- 3d-viewer/3d_toolbar.cpp | 4 +- change_log.txt | 8 +++ cvpcb/displayframe.cpp | 10 ++-- eeschema/controle.cpp | 4 +- eeschema/hotkeys.cpp | 8 +-- eeschema/libframe.cpp | 2 +- eeschema/menubar.cpp | 107 ++++++++++++++++++++++++------------- eeschema/schframe.cpp | 2 +- eeschema/tool_lib.cpp | 4 +- eeschema/tool_sch.cpp | 28 +++++----- eeschema/tool_viewlib.cpp | 4 +- eeschema/viewlib_frame.cpp | 2 +- gerbview/controle.cpp | 4 +- gerbview/gerberframe.cpp | 2 +- gerbview/hotkeys.cpp | 4 +- gerbview/tool_gerber.cpp | 4 +- include/id.h | 12 ++--- pcbnew/controle.cpp | 4 +- pcbnew/hotkeys.cpp | 8 +-- pcbnew/moduleframe.cpp | 2 +- pcbnew/pcbframe.cpp | 2 +- pcbnew/tool_modedit.cpp | 4 +- pcbnew/tool_pcb.cpp | 4 +- share/drawframe.cpp | 16 +++--- share/zoom.cpp | 12 ++--- 26 files changed, 153 insertions(+), 114 deletions(-) diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index 5ed85f0694..b2ea5f0b51 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -26,7 +26,7 @@ BEGIN_EVENT_TABLE(WinEDA3D_DrawFrame, wxFrame) - EVT_TOOL_RANGE(ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, + EVT_TOOL_RANGE(ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA3D_DrawFrame::Process_Zoom) EVT_TOOL_RANGE(ID_START_COMMAND_3D, ID_END_COMMAND_3D, WinEDA3D_DrawFrame::Process_Special_Functions) @@ -164,13 +164,13 @@ int ii; trackball(g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 ); break; - case ID_ZOOM_PLUS_BUTT: + case ID_ZOOM_IN_BUTT: g_Parm_3D_Visu.m_Zoom /= 1.2; if ( g_Parm_3D_Visu.m_Zoom <= 0.01) g_Parm_3D_Visu.m_Zoom = 0.01; break; - case ID_ZOOM_MOINS_BUTT: + case ID_ZOOM_OUT_BUTT: g_Parm_3D_Visu.m_Zoom *= 1.2; break; diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index 1a936683d1..043f355e62 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -40,10 +40,10 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() #endif m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), _( "zoom + (F1)" ) ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), _( "zoom - (F2)" ) ); m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), diff --git a/change_log.txt b/change_log.txt index 97173ca413..3c6699e046 100644 --- a/change_log.txt +++ b/change_log.txt @@ -5,6 +5,14 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. +2008-Feb-18 UPDATE Igor Plyatov +================================================================================ ++eeschema + Added menu View with all possible elements from the top toolbar. + Find item added in to the Edit menu. ++all + Translated part of IDs to english. + 2008-Feb-15 UPDATE Igor Plyatov ================================================================================ +eeschema diff --git a/cvpcb/displayframe.cpp b/cvpcb/displayframe.cpp index 1069aae048..1f36354f46 100644 --- a/cvpcb/displayframe.cpp +++ b/cvpcb/displayframe.cpp @@ -22,7 +22,7 @@ BEGIN_EVENT_TABLE( WinEDA_DisplayFrame, wxFrame ) COMMON_EVENTS_DRAWFRAME EVT_CLOSE( WinEDA_DisplayFrame::OnCloseWindow ) EVT_SIZE( WinEDA_DrawFrame::OnSize ) -EVT_TOOL_RANGE( ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, +EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_DisplayFrame::Process_Zoom ) EVT_TOOL( ID_OPTIONS_SETUP, WinEDA_DisplayFrame::InstallOptionsDisplay ) EVT_TOOL( ID_CVPCB_SHOW3D_FRAME, WinEDA_BasePcbFrame::Show3D_Frame ) @@ -120,10 +120,10 @@ void WinEDA_DisplayFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), _( "zoom + (F1)" ) ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), _( "zoom - (F2)" ) ); m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( repaint_xpm ), @@ -195,13 +195,13 @@ void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) switch( g_KeyPressed ) { case WXK_F1: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); flagcurseur = 2; curpos = m_CurrentScreen->m_Curseur; break; case WXK_F2: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); flagcurseur = 2; curpos = m_CurrentScreen->m_Curseur; break; diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp index 000637bdba..39eb93c259 100644 --- a/eeschema/controle.cpp +++ b/eeschema/controle.cpp @@ -270,12 +270,12 @@ void WinEDA_DrawFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixels break; case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); curpos = screen->m_Curseur; break; case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); curpos = screen->m_Curseur; break; diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index 39ec760f5c..c99621aed0 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -183,11 +183,11 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); break; case HK_ZOOM_REDRAW: @@ -453,11 +453,11 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); break; case HK_ZOOM_REDRAW: diff --git a/eeschema/libframe.cpp b/eeschema/libframe.cpp index 0fad8de8fd..030d808006 100644 --- a/eeschema/libframe.cpp +++ b/eeschema/libframe.cpp @@ -27,7 +27,7 @@ BEGIN_EVENT_TABLE( WinEDA_LibeditFrame, wxFrame ) COMMON_EVENTS_DRAWFRAME EVT_CLOSE( WinEDA_LibeditFrame::OnCloseWindow ) EVT_SIZE( WinEDA_LibeditFrame::OnSize ) -EVT_TOOL_RANGE( ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, +EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_LibeditFrame::Process_Zoom ) // Tools et boutons de Libedit: diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 932d445609..26bafb93bd 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -130,61 +130,91 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() // Menu Edit: wxMenu* editMenu = new wxMenu; - msg = AddHotkeyName( _( "&Undo\t" ), s_Schematic_Hokeys_Descr, HK_UNDO ); + msg = AddHotkeyName( _( "&Undo\t" ), s_Schematic_Hokeys_Descr, + HK_UNDO ); item = new wxMenuItem( editMenu, ID_SCHEMATIC_UNDO, - msg, - _( "Undo last edition" ) ); + msg, _( "Undo last edition" ), + wxITEM_NORMAL ); item->SetBitmap( undo_xpm ); editMenu->Append( item ); - msg = AddHotkeyName( _( "&Redo\t" ), s_Schematic_Hokeys_Descr, HK_REDO ); + msg = AddHotkeyName( _( "&Redo\t" ), s_Schematic_Hokeys_Descr, + HK_REDO ); item = new wxMenuItem( editMenu, ID_SCHEMATIC_REDO, - msg, - _( "Redo the last undo command" ) ); + msg, _( "Redo the last undo command" ), + wxITEM_NORMAL ); item->SetBitmap( redo_xpm ); editMenu->Append( item ); editMenu->AppendSeparator(); - item = new wxMenuItem( - editMenu, - ID_SCHEMATIC_DELETE_ITEM_BUTT, - _( "Delete" ), - _( "Delete items" ), - wxITEM_NORMAL - ); + item = new wxMenuItem( editMenu, ID_SCHEMATIC_DELETE_ITEM_BUTT, + _( "Delete" ), _( "Delete items" ), + wxITEM_NORMAL ); item->SetBitmap( delete_body_xpm ); editMenu->Append( item ); + editMenu->AppendSeparator(); + + item = new wxMenuItem( editMenu, ID_FIND_ITEMS, + _( "Find" ), _( "Find components and texts" ), + wxITEM_NORMAL ); + item->SetBitmap( find_xpm ); + editMenu->Append( item ); + + // Menu View: + wxMenu* viewMenu = new wxMenu; + msg = AddHotkeyName( _( "Zoom in" ), s_Schematic_Hokeys_Descr, + HK_ZOOM_IN); + item = new wxMenuItem( viewMenu, ID_ZOOM_IN_BUTT, + msg, _( "Zoom in" ), + wxITEM_NORMAL ); + item->SetBitmap( zoom_in_xpm ); + viewMenu->Append( item ); + + msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr, + HK_ZOOM_OUT ); + item = new wxMenuItem( viewMenu, ID_ZOOM_OUT_BUTT, + msg, _( "Zoom out" ), + wxITEM_NORMAL ); + item->SetBitmap( zoom_out_xpm ); + viewMenu->Append( item ); + + item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE_BUTT, + _( "Zoom auto" ), _( "Zoom auto" ), + wxITEM_NORMAL ); + item->SetBitmap( zoom_optimal_xpm ); + viewMenu->Append( item ); + + viewMenu->AppendSeparator(); + + msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, + HK_ZOOM_REDRAW ); + item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT, + msg, _( "Zoom auto" ), + wxITEM_NORMAL ); + item->SetBitmap( repaint_xpm ); + viewMenu->Append( item ); + // Place Menu //TODO: Unify the ID names! wxMenu* placeMenu = new wxMenu; - item = new wxMenuItem( - placeMenu, - ID_COMPONENT_BUTT, - _("&Component"), - _("Place a component") ); + item = new wxMenuItem( placeMenu, ID_COMPONENT_BUTT, + _( "&Component" ), _( "Place the component" ), + wxITEM_NORMAL ); item->SetBitmap( add_component_xpm ); placeMenu->Append( item ); - item = new wxMenuItem( - placeMenu, - ID_PLACE_POWER_BUTT, - _( "&Power port" ), - _( "Place the power port" ), - wxITEM_NORMAL - ); + item = new wxMenuItem( placeMenu, ID_PLACE_POWER_BUTT, + _( "&Power port" ), _( "Place the power port" ), + wxITEM_NORMAL ); item->SetBitmap( add_power_xpm ); placeMenu->Append( item ); - item = new wxMenuItem( - placeMenu, - ID_WIRE_BUTT, - _( "&Wire" ), - _( "Place the wire" ), - wxITEM_NORMAL - ); + item = new wxMenuItem( placeMenu, ID_WIRE_BUTT, + _( "&Wire" ), _( "Place the wire" ), + wxITEM_NORMAL ); item->SetBitmap( add_line_xpm ); placeMenu->Append( item ); @@ -232,7 +262,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() placeMenu, ID_LABEL_BUTT, _( "Net name" ), - _( "Place the Net name" ), + _( "Place the net name" ), wxITEM_NORMAL ); item->SetBitmap( add_line_label_xpm ); @@ -240,7 +270,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() item = new wxMenuItem( placeMenu, ID_GLABEL_BUTT, _( "Global label" ), - _( "Add global label.\nWarning: all global labels with the same name are connected in whole hierarchy" ), + _( "Place the global label. Warning: all global labels with the same name are connected in whole hierarchy" ), wxITEM_NORMAL ); item->SetBitmap( add_glabel_xpm ); @@ -262,7 +292,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() placeMenu, ID_HIERLABEL_BUTT, _( "Hierarchical label" ), - _( "Add a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ), + _( "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ), wxITEM_NORMAL ); item->SetBitmap( add_hierarchical_label_xpm ); @@ -282,7 +312,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() placeMenu, ID_IMPORT_GLABEL_BUTT, _( "Imported hierarchical label" ), - _( "Place the pinsheet (imported hierarchical label from sheet)" ), + _( "Place the pin sheet (imported hierarchical label from sheet)" ), wxITEM_NORMAL ); item->SetBitmap( import_hierarchical_label_xpm ); @@ -304,7 +334,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() placeMenu, ID_LINE_COMMENT_BUTT, _( "Graphic line or poligon" ), - _( "Place the Graphic line or poligon" ), + _( "Place the graphic line or poligon" ), wxITEM_NORMAL ); item->SetBitmap( add_dashed_line_xpm ); @@ -314,7 +344,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() placeMenu, ID_TEXT_COMMENT_BUTT, _( "Graphic text (comment)" ), - _( "Place the Graphic text (comment)" ), + _( "Place the graphic text (comment)" ), wxITEM_NORMAL ); item->SetBitmap( add_text_xpm ); @@ -374,6 +404,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() menuBar->Append( m_FilesMenu, _( "&File" ) ); menuBar->Append( editMenu, _( "&Edit" ) ); + menuBar->Append( viewMenu, _( "&View" ) ); menuBar->Append( placeMenu, _( "&Place" ) ); menuBar->Append( configmenu, _( "&Preferences" ) ); menuBar->Append( helpMenu, _( "&Help" ) ); diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index 4b09dd16d3..ef5ef1613c 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -63,7 +63,7 @@ BEGIN_EVENT_TABLE(WinEDA_SchematicFrame, wxFrame) EVT_MENU_RANGE(ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END, WinEDA_DrawFrame::SetLanguage) - EVT_TOOL_RANGE(ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, + EVT_TOOL_RANGE(ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_SchematicFrame::Process_Zoom) EVT_TOOL(ID_NEW_PROJECT, WinEDA_SchematicFrame::Process_Special_Functions) diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp index 163d3001cf..35d949fcf2 100644 --- a/eeschema/tool_lib.cpp +++ b/eeschema/tool_lib.cpp @@ -168,11 +168,11 @@ void WinEDA_LibeditFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "zoom +" ), s_Libedit_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "zoom -" ), s_Libedit_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "redraw" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW ); diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index 699367f676..54de729a69 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -99,11 +99,11 @@ void WinEDA_SchematicFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "zoom +" ), s_Schematic_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "zoom -" ), s_Schematic_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "redraw" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW ); @@ -177,57 +177,57 @@ void WinEDA_SchematicFrame::ReCreateVToolbar() m_VToolBar->AddTool( ID_WIRETOBUS_ENTRY_BUTT, wxEmptyString, BITMAP( add_line2bus_xpm ), - _( "Add wire to bus entry" ), wxITEM_CHECK ); + _( "Place the wire to bus entry" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString, BITMAP( add_bus2bus_xpm ), - _( "Add bus to bus entry" ), wxITEM_CHECK ); + _( "Place the bus to bus entry" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_NOCONN_BUTT, wxEmptyString, BITMAP( noconn_button ), - _( "Add no connect flag" ), wxITEM_CHECK ); + _( "Place the no connect flag" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LABEL_BUTT, wxEmptyString, BITMAP( add_line_label_xpm ), - _( "Add wire or bus label" ), wxITEM_CHECK ); + _( "Place the net name" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_GLABEL_BUTT, wxEmptyString, BITMAP( add_glabel_xpm ), - _( "Add global label.\nWarning: all global labels with the same name are connected in whole hierarchy" ), + _( "Place the global label.\nWarning: all global labels with the same name are connected in whole hierarchy" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_JUNCTION_BUTT, wxEmptyString, BITMAP( add_junction_xpm ), - _( "Add junction" ), wxITEM_CHECK ); + _( "Place the junction" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_HIERLABEL_BUTT, wxEmptyString, BITMAP( add_hierarchical_label_xpm ), - _( "Add a hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ), + _( "Place the hierarchical label. This label will be seen as a pin sheet in the sheet symbol" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_SHEET_SYMBOL_BUTT, wxEmptyString, BITMAP( add_hierarchical_subsheet_xpm ), - _( "Add hierarchical sheet" ), wxITEM_CHECK ); + _( "Place the hierarchical sheet" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_IMPORT_GLABEL_BUTT, wxEmptyString, BITMAP( import_hierarchical_label_xpm ), - _( "Import hierarchical label from sheet and create the corresponding pin sheet" ), + _( "Place the pin sheet (imported hierarchical label from sheet)" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_SHEET_LABEL_BUTT, wxEmptyString, BITMAP( add_hierar_pin_xpm ), - _( "Add hierachical pin to sheet" ), wxITEM_CHECK ); + _( "Place the hierachical pin to sheet" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_LINE_COMMENT_BUTT, wxEmptyString, BITMAP( add_dashed_line_xpm ), - _( "Add graphic line or polygon" ), wxITEM_CHECK ); + _( "Place the graphic line or polygon" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT, wxEmptyString, BITMAP( add_text_xpm ), - _( "Add graphic text (comment)" ), wxITEM_CHECK ); + _( "Place the graphic text (comment)" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_SCHEMATIC_DELETE_ITEM_BUTT, wxEmptyString, diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index 391dbe4565..aba3be4ab4 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -65,11 +65,11 @@ bool asdeMorgan = FALSE, state; _("Display next part")); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool(ID_ZOOM_PLUS_BUTT, wxEmptyString, + m_HToolBar->AddTool(ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP(zoom_in_xpm), _("zoom + (F1)")); - m_HToolBar->AddTool(ID_ZOOM_MOINS_BUTT, wxEmptyString, + m_HToolBar->AddTool(ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP(zoom_out_xpm), _("zoom - (F2)")); diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 58e0c3f86a..c12dc61982 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -34,7 +34,7 @@ BEGIN_EVENT_TABLE(WinEDA_ViewlibFrame, wxFrame) EVT_TOOL_RANGE(ID_LIBVIEW_START_H_TOOL, ID_LIBVIEW_END_H_TOOL, WinEDA_ViewlibFrame::Process_Special_Functions) - EVT_TOOL_RANGE(ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, + EVT_TOOL_RANGE(ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_DrawFrame::Process_Zoom) EVT_TOOL(ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC, diff --git a/gerbview/controle.cpp b/gerbview/controle.cpp index c6c0c59ff6..0783998f84 100644 --- a/gerbview/controle.cpp +++ b/gerbview/controle.cpp @@ -91,12 +91,12 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) break; case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); curpos = GetScreen()->m_Curseur; break; case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); curpos = GetScreen()->m_Curseur; break; diff --git a/gerbview/gerberframe.cpp b/gerbview/gerberframe.cpp index def49a351a..ef7dacf424 100644 --- a/gerbview/gerberframe.cpp +++ b/gerbview/gerberframe.cpp @@ -27,7 +27,7 @@ BEGIN_EVENT_TABLE(WinEDA_GerberFrame, wxFrame) EVT_CLOSE(WinEDA_GerberFrame::OnCloseWindow) EVT_SIZE(WinEDA_GerberFrame::OnSize) - EVT_TOOL_RANGE(ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, + EVT_TOOL_RANGE(ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_GerberFrame::Process_Zoom) EVT_TOOL(ID_LOAD_FILE, WinEDA_GerberFrame::Files_io) diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp index da128c556e..f6f8892a58 100644 --- a/gerbview/hotkeys.cpp +++ b/gerbview/hotkeys.cpp @@ -106,11 +106,11 @@ void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); break; case HK_ZOOM_REDRAW: diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp index a58fef011e..839f38d88f 100644 --- a/gerbview/tool_gerber.cpp +++ b/gerbview/tool_gerber.cpp @@ -269,14 +269,14 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void ) m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "zoom +" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, BITMAP( zoom_in_xpm ), wxNullBitmap, FALSE, -1, -1, (wxObject*) NULL, msg ); msg = AddHotkeyName( _( "zoom -" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, BITMAP( zoom_out_xpm ), wxNullBitmap, FALSE, -1, -1, (wxObject*) NULL, diff --git a/include/id.h b/include/id.h index 65d61d413d..4214619992 100644 --- a/include/id.h +++ b/include/id.h @@ -218,8 +218,8 @@ enum main_id { ID_POPUP_ZOOM_START_RANGE, // first number ID_POPUP_CANCEL, - ID_POPUP_ZOOM_PLUS, - ID_POPUP_ZOOM_MOINS, + ID_POPUP_ZOOM_IN, + ID_POPUP_ZOOM_OUT, ID_POPUP_ZOOM_SELECT, ID_POPUP_ZOOM_CENTER, ID_POPUP_ZOOM_AUTO, @@ -368,13 +368,13 @@ enum main_id { ID_TO_LIBRARY, ID_TO_LIBVIEW, - ID_ZOOM_PLUS_BUTT, // Gestion zoom: id consecutifs - ID_ZOOM_MOINS_BUTT, + ID_ZOOM_IN_BUTT, // Gestion zoom: id consecutifs + ID_ZOOM_OUT_BUTT, ID_ZOOM_REDRAW_BUTT, ID_ZOOM_PAGE_BUTT, ID_ZOOM_WINDOW_BUTT, - ID_ZOOM_PLUS_KEY, - ID_ZOOM_MOINS_KEY, + ID_ZOOM_IN_KEY, + ID_ZOOM_OUT_KEY, ID_ZOOM_REDRAW_KEY, ID_ZOOM_CENTER_KEY, ID_ZOOM_AUTO, diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp index 8de4c4c189..15a9649be3 100644 --- a/pcbnew/controle.cpp +++ b/pcbnew/controle.cpp @@ -291,12 +291,12 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) break; case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); oldpos = curpos = GetScreen()->m_Curseur; break; case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); oldpos = curpos = GetScreen()->m_Curseur; break; diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp index 25499091ea..e18337b8d2 100644 --- a/pcbnew/hotkeys.cpp +++ b/pcbnew/hotkeys.cpp @@ -269,11 +269,11 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); break; case HK_ZOOM_REDRAW: @@ -567,11 +567,11 @@ void WinEDA_ModuleEditFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_PLUS_KEY ); + OnZoom( ID_ZOOM_IN_KEY ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_MOINS_KEY ); + OnZoom( ID_ZOOM_OUT_KEY ); break; case HK_ZOOM_REDRAW: diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp index fcf2594c31..3cad0e876e 100644 --- a/pcbnew/moduleframe.cpp +++ b/pcbnew/moduleframe.cpp @@ -29,7 +29,7 @@ EVT_SIZE( WinEDA_ModuleEditFrame::OnSize ) EVT_KICAD_CHOICEBOX( ID_ON_ZOOM_SELECT, WinEDA_PcbFrame::OnSelectZoom ) EVT_KICAD_CHOICEBOX( ID_ON_GRID_SELECT, WinEDA_PcbFrame::OnSelectGrid ) -EVT_TOOL_RANGE( ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, +EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_ModuleEditFrame::Process_Zoom ) EVT_TOOL( ID_LIBEDIT_SELECT_CURRENT_LIB, WinEDA_ModuleEditFrame::Process_Special_Functions ) diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp index 27449f3467..95451cbd4e 100644 --- a/pcbnew/pcbframe.cpp +++ b/pcbnew/pcbframe.cpp @@ -30,7 +30,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame ) EVT_CLOSE( WinEDA_PcbFrame::OnCloseWindow ) EVT_SIZE( WinEDA_PcbFrame::OnSize ) - EVT_TOOL_RANGE( ID_ZOOM_PLUS_BUTT, ID_ZOOM_PAGE_BUTT, + EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, WinEDA_PcbFrame::Process_Zoom ) EVT_TOOL( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io ) diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp index e9a5aa6450..ec9c1e34d7 100644 --- a/pcbnew/tool_modedit.cpp +++ b/pcbnew/tool_modedit.cpp @@ -113,11 +113,11 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "zoom +" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "zoom -" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "redraw" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 8b31f95192..8f1be721ba 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -266,11 +266,11 @@ void WinEDA_PcbFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "zoom +" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_PLUS_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "zoom -" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_MOINS_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "redraw" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); diff --git a/share/drawframe.cpp b/share/drawframe.cpp index 6c6cfbdde9..33b2213a10 100644 --- a/share/drawframe.cpp +++ b/share/drawframe.cpp @@ -596,13 +596,13 @@ void WinEDA_DrawFrame::OnZoom( int zoom_type ) switch( zoom_type ) { - case ID_POPUP_ZOOM_PLUS: - case ID_ZOOM_PLUS_KEY: + case ID_POPUP_ZOOM_IN: + case ID_ZOOM_IN_KEY: move_mouse_cursor = TRUE; // fall thru - case ID_ZOOM_PLUS_BUTT: - if( zoom_type == ID_ZOOM_PLUS_BUTT ) + case ID_ZOOM_IN_BUTT: + if( zoom_type == ID_ZOOM_IN_BUTT ) GetScreen()->m_Curseur = DrawPanel->GetScreenCenterRealPosition(); GetScreen()->SetPreviousZoom(); @@ -610,13 +610,13 @@ void WinEDA_DrawFrame::OnZoom( int zoom_type ) Recadre_Trace( move_mouse_cursor ); break; - case ID_POPUP_ZOOM_MOINS: - case ID_ZOOM_MOINS_KEY: + case ID_POPUP_ZOOM_OUT: + case ID_ZOOM_OUT_KEY: move_mouse_cursor = TRUE; // fall thru - case ID_ZOOM_MOINS_BUTT: - if( zoom_type == ID_ZOOM_MOINS_BUTT ) + case ID_ZOOM_OUT_BUTT: + if( zoom_type == ID_ZOOM_OUT_BUTT ) GetScreen()->m_Curseur = DrawPanel->GetScreenCenterRealPosition(); GetScreen()->SetNextZoom(); Recadre_Trace( move_mouse_cursor ); diff --git a/share/zoom.cpp b/share/zoom.cpp index 93c3b2042d..53d82c13ad 100644 --- a/share/zoom.cpp +++ b/share/zoom.cpp @@ -154,8 +154,8 @@ void WinEDA_DrawPanel::Process_Popup_Zoom( wxCommandEvent& event ) switch( id ) { - case ID_POPUP_ZOOM_PLUS: - case ID_POPUP_ZOOM_MOINS: + case ID_POPUP_ZOOM_IN: + case ID_POPUP_ZOOM_OUT: case ID_POPUP_ZOOM_CENTER: case ID_POPUP_ZOOM_AUTO: case ID_POPUP_ZOOM_REDRAW: @@ -357,8 +357,8 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu ) ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_CENTER, _( "Center" ), zoom_center_xpm ); - ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_PLUS, _( "Zoom +" ), zoom_in_xpm ); - ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_MOINS, _( "Zoom -" ), zoom_out_xpm ); + ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_IN, _( "Zoom in" ), zoom_in_xpm ); + ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_OUT, _( "Zoom out" ), zoom_out_xpm ); wxMenu* zoom_choice = new wxMenu; ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice, @@ -461,8 +461,8 @@ void WinEDA_DrawFrame::Process_Zoom( wxCommandEvent& event ) switch( id ) { - case ID_ZOOM_PLUS_BUTT: - case ID_ZOOM_MOINS_BUTT: + case ID_ZOOM_IN_BUTT: + case ID_ZOOM_OUT_BUTT: case ID_ZOOM_REDRAW_BUTT: case ID_ZOOM_PAGE_BUTT: OnZoom( id );