From 4a489895a370689343f0253c63d87de0bd1f33c2 Mon Sep 17 00:00:00 2001 From: stambaughw Date: Wed, 7 Jan 2009 15:59:49 +0000 Subject: [PATCH] More zoom clean ups and code cleaning. --- 3d-viewer/3d_frame.cpp | 11 +- 3d-viewer/3d_toolbar.cpp | 8 +- CHANGELOG.txt | 15 + common/drawframe.cpp | 84 +-- common/drawpanel.cpp | 35 +- common/edaappl.cpp | 1008 +++++++++++++++++----------------- common/zoom.cpp | 137 ++--- cvpcb/displayframe.cpp | 28 +- eeschema/class_screen.cpp | 3 +- eeschema/controle.cpp | 45 -- eeschema/hotkeys.cpp | 33 +- eeschema/libframe.cpp | 6 +- eeschema/menubar.cpp | 8 +- eeschema/schframe.cpp | 158 +++--- eeschema/tool_lib.cpp | 135 +++-- eeschema/tool_sch.cpp | 143 +++-- eeschema/tool_viewlib.cpp | 205 +++---- eeschema/viewlib_frame.cpp | 33 +- gerbview/controle.cpp | 15 - gerbview/gerberframe.cpp | 6 +- gerbview/hotkeys.cpp | 18 +- gerbview/tool_gerber.cpp | 193 ++++--- include/drawpanel_wxstruct.h | 2 - include/id.h | 21 +- include/wxstruct.h | 12 +- pcbnew/basepcbframe.cpp | 1 - pcbnew/class_module.cpp | 2 +- pcbnew/class_module.h | 2 +- pcbnew/controle.cpp | 15 - pcbnew/hotkeys.cpp | 32 +- pcbnew/moduleframe.cpp | 6 +- pcbnew/pcbframe.cpp | 4 +- pcbnew/tool_modedit.cpp | 8 +- pcbnew/tool_pcb.cpp | 28 +- 34 files changed, 1174 insertions(+), 1286 deletions(-) diff --git a/3d-viewer/3d_frame.cpp b/3d-viewer/3d_frame.cpp index c1f1abcca8..a2e02faabe 100644 --- a/3d-viewer/3d_frame.cpp +++ b/3d-viewer/3d_frame.cpp @@ -27,8 +27,7 @@ BEGIN_EVENT_TABLE( WinEDA3D_DrawFrame, wxFrame ) - EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA3D_DrawFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA3D_DrawFrame::Process_Zoom ) EVT_TOOL_RANGE( ID_START_COMMAND_3D, ID_END_COMMAND_3D, WinEDA3D_DrawFrame::Process_Special_Functions ) EVT_MENU( wxID_EXIT, WinEDA3D_DrawFrame::Exit3DFrame ) @@ -172,7 +171,7 @@ void WinEDA3D_DrawFrame::Process_Zoom( wxCommandEvent& event ) switch( event.GetId() ) { - case ID_ZOOM_PAGE_BUTT: + case ID_ZOOM_PAGE: for( ii = 0; ii < 4; ii++ ) g_Parm_3D_Visu.m_Rot[ii] = 0.0; @@ -181,17 +180,17 @@ void WinEDA3D_DrawFrame::Process_Zoom( wxCommandEvent& event ) trackball( g_Parm_3D_Visu.m_Quat, 0.0, 0.0, 0.0, 0.0 ); break; - case ID_ZOOM_IN_BUTT: + case ID_ZOOM_IN: 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_OUT_BUTT: + case ID_ZOOM_OUT: g_Parm_3D_Visu.m_Zoom *= 1.2; break; - case ID_ZOOM_REDRAW_BUTT: + case ID_ZOOM_REDRAW: break; default: diff --git a/3d-viewer/3d_toolbar.cpp b/3d-viewer/3d_toolbar.cpp index b3685dea33..e3babb6edd 100644 --- a/3d-viewer/3d_toolbar.cpp +++ b/3d-viewer/3d_toolbar.cpp @@ -39,16 +39,16 @@ void WinEDA3D_DrawFrame::ReCreateHToolbar() #endif m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, BITMAP( zoom_in_xpm ), _( "Zoom in" ) ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, BITMAP( zoom_out_xpm ), _( "Zoom out" ) ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, BITMAP( zoom_redraw_xpm ), _( "Redraw view" ) ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ), + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, BITMAP( zoom_auto_xpm ), _( "Zoom auto" ) ); m_HToolBar->AddSeparator(); diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0f2339fb10..a2d9a4949f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -5,6 +5,21 @@ Started 2007-June-11 Please add newer entries at the top, list the date and your name with email address. +2009-Jan-07 UPDATE Wayne Stambaugh +================================================================================ +++all + * Don't pan or zoom on mouse wheel events when the cursor is not in the + drawing area. + * Reduce all zoom code to a single zoom command handler. + * Eliminate redundant zoom command identifiers. + * Move pop up zoom command handler from DrawPanel to DrawFrame. + * Change hot key zoom handlers to use command events. + * Added DrawFrame event table to replace COMMON_EVENTS_DRAWFRAME macro. + * Added locale path relative to binary path for development purposes. + * Minor code clean ups and duplicate header removal in files that were + updated. + + 2009-Jan-04 UPDATE Dick Hollenbeck ================================================================================ ++all diff --git a/common/drawframe.cpp b/common/drawframe.cpp index c586fa7348..9a6bbdff7e 100644 --- a/common/drawframe.cpp +++ b/common/drawframe.cpp @@ -15,6 +15,15 @@ #include +BEGIN_EVENT_TABLE( WinEDA_DrawFrame, WinEDA_BasicFrame ) + EVT_MOUSEWHEEL( WinEDA_DrawFrame::OnMouseEvent ) + EVT_MENU_OPEN( WinEDA_DrawFrame::OnMenuOpen ) + EVT_ACTIVATE( WinEDA_DrawFrame::OnActivate ) + EVT_MENU_RANGE( ID_POPUP_ZOOM_START_RANGE, ID_POPUP_ZOOM_END_RANGE, + WinEDA_DrawFrame::OnZoom ) +END_EVENT_TABLE() + + /*******************************************************/ /* Constructeur de WinEDA_DrawFrame: la fenetre generale */ /*******************************************************/ @@ -533,81 +542,6 @@ void WinEDA_DrawFrame::SetToolID( int id, int new_cursor_id, } -/********************************************/ -void WinEDA_DrawFrame::OnZoom( int zoom_type ) -/********************************************/ - -/* Fonction de traitement du zoom - * Modifie le facteur de zoom et reaffiche l'ecran - * Pour les commandes par menu Popup ou par le clavier, le curseur est - * replac� au centre de l'ecran - */ -{ - if( DrawPanel == NULL ) - return; - - BASE_SCREEN* screen = GetBaseScreen(); - bool move_mouse_cursor = FALSE; - int x, y; - wxPoint old_pos; - - DrawPanel->GetViewStart( &x, &y ); - old_pos = GetBaseScreen()->m_Curseur; - - switch( zoom_type ) - { - case ID_POPUP_ZOOM_IN: - case ID_ZOOM_IN_KEY: - move_mouse_cursor = TRUE; - // fall thru - - case ID_ZOOM_IN_BUTT: - if( zoom_type == ID_ZOOM_IN_BUTT ) - GetBaseScreen()->m_Curseur = DrawPanel->GetScreenCenterRealPosition(); - - screen->SetPreviousZoom(); - - Recadre_Trace( move_mouse_cursor ); - break; - - case ID_POPUP_ZOOM_OUT: - case ID_ZOOM_OUT_KEY: - move_mouse_cursor = TRUE; - // fall thru - - case ID_ZOOM_OUT_BUTT: - if( zoom_type == ID_ZOOM_OUT_BUTT ) - screen->m_Curseur = DrawPanel->GetScreenCenterRealPosition(); - screen->SetNextZoom(); - Recadre_Trace( move_mouse_cursor ); - break; - - case ID_POPUP_ZOOM_REDRAW: - case ID_ZOOM_REDRAW_KEY: - case ID_ZOOM_REDRAW_BUTT: - DrawPanel->Refresh(); - break; - - case ID_POPUP_ZOOM_CENTER: - case ID_ZOOM_CENTER_KEY: - Recadre_Trace( TRUE ); - break; - - case ID_ZOOM_PAGE_BUTT: - case ID_ZOOM_AUTO: - case ID_POPUP_ZOOM_AUTO: - Zoom_Automatique( FALSE ); - break; - - default: - wxMessageBox( wxT( "WinEDA_DrawFrame::OnZoom switch Error" ) ); - break; - } - - Affiche_Status_Box(); -} - - /*****************************/ /* default virtual fonctions */ /*****************************/ diff --git a/common/drawpanel.cpp b/common/drawpanel.cpp index 0de76ecea5..2bb19aa0c9 100644 --- a/common/drawpanel.cpp +++ b/common/drawpanel.cpp @@ -33,8 +33,6 @@ BEGIN_EVENT_TABLE( WinEDA_DrawPanel, wxScrolledWindow ) EVT_SCROLLWIN( WinEDA_DrawPanel::OnScroll ) EVT_ACTIVATE( WinEDA_DrawPanel::OnActivate ) - EVT_MENU_RANGE( ID_POPUP_ZOOM_START_RANGE, ID_POPUP_ZOOM_END_RANGE, - WinEDA_DrawPanel::Process_Popup_Zoom ) EVT_MENU_RANGE( ID_POPUP_GRID_LEVEL_1000, ID_POPUP_GRID_USER, WinEDA_DrawPanel::OnPopupGridSelect ) EVT_MENU_RANGE( ID_PAN_UP, ID_PAN_RIGHT, WinEDA_DrawPanel::OnPan ) @@ -50,7 +48,6 @@ WinEDA_DrawPanel::WinEDA_DrawPanel( WinEDA_DrawFrame* parent, int id, wxBORDER | wxNO_FULL_REPAINT_ON_RESIZE ) { m_Parent = parent; - m_Ident = m_Parent->m_Ident; m_Scroll_unit = 1; m_ScrollButt_unit = 40; @@ -902,10 +899,14 @@ void WinEDA_DrawPanel::OnMouseLeaving( wxMouseEvent& event ) // Auto pan if mouse is leave working aera: wxSize size = GetClientSize(); - if( ( size.x < event.GetX() ) - || ( size.y < event.GetY() ) - || ( event.GetX() <= 0) || ( event.GetY() <= 0 ) ) - m_Parent->OnZoom( ID_POPUP_ZOOM_CENTER ); + + if( ( size.x < event.GetX() ) || ( size.y < event.GetY() ) + || ( event.GetX() <= 0) || ( event.GetY() <= 0 ) ) + { + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED, ID_POPUP_ZOOM_CENTER ); + cmd.SetEventObject( this ); + GetEventHandler()->ProcessEvent( cmd ); + } } @@ -918,16 +919,23 @@ void WinEDA_DrawPanel::OnMouseLeaving( wxMouseEvent& event ) */ void WinEDA_DrawPanel::OnMouseWheel( wxMouseEvent& event ) { - if( event.GetWheelRotation() == 0 ) + wxRect rect = GetRect(); + + wxLogDebug( wxT( "OnMouseWheel() cursor position: (%d, %d)." ), + event.m_x, event.m_y ); + + /* Ignore scroll events if the cursor is outside the drawing area. */ + if( event.GetWheelRotation() == 0 || !GetParent()->IsEnabled() + || !rect.Contains( event.GetPosition() ) ) { event.Skip(); return; } - wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); cmd.SetEventObject( this ); - // This is a zoom in ou out command + // This is a zoom in or out command if( event.GetWheelRotation() > 0 ) { if( event.ShiftDown() && !event.ControlDown() ) @@ -1073,8 +1081,11 @@ void WinEDA_DrawPanel::OnMouseEvent( wxMouseEvent& event ) if( event.ButtonUp( 2 ) && (screen->BlockLocate.m_State == STATE_NO_BLOCK) ) { // The middle button has been relached, with no block command: - // We use it for a zoom center command - g_KeyPressed = localkey = EDA_ZOOM_CENTER_FROM_MOUSE; + // We use it for a zoom center at cursor position command + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED, + ID_POPUP_ZOOM_CENTER ); + cmd.SetEventObject( this ); + GetEventHandler()->ProcessEvent( cmd ); } diff --git a/common/edaappl.cpp b/common/edaappl.cpp index 673fb5cbcc..141fb9dadf 100644 --- a/common/edaappl.cpp +++ b/common/edaappl.cpp @@ -1,4 +1,5 @@ /* TODO ENGLISH BRIEF TODO */ + /*** * @file edaapl.cpp * @brief methodes relative a la classe winEDA_App, communes @@ -9,12 +10,13 @@ #define COMMON_GLOBL #ifdef KICAD_PYTHON -# include +# include #endif #include "fctsys.h" #include "wx/html/htmlwin.h" #include "wx/fs_zip.h" +#include #include "common.h" #include "worksheet.h" @@ -27,10 +29,9 @@ #ifdef __UNIX__ -# define TMP_FILE "/tmp/kicad.tmp" +# define TMP_FILE "/tmp/kicad.tmp" #endif - /* Just add new languages to the list. This macro will properly recalculate * the size of the array. */ #define LANGUAGE_DESCR_COUNT ( sizeof( s_Language_List ) / \ @@ -50,156 +51,158 @@ * add a new item to s_Language_List[LANGUAGE_DESCR_COUNT] * and set LANGUAGE_DESCR_COUNT to the new value */ -struct -LANGUAGE_DESCR +struct LANGUAGE_DESCR { - /* wxWidgets locale identifier (See wxWidgets doc) */ - int m_WX_Lang_Identifier; - /* KiCad identifier used in menu selection (See id.h) */ - int m_KI_Lang_Identifier; - /* The menu language icons */ - const char** m_Lang_Icon; - /* Labels used in menus */ - const wxChar* m_Lang_Label; - /* Set to true if the m_Lang_Label must not be translated */ - bool m_DoNotTranslate; + /* wxWidgets locale identifier (See wxWidgets doc) */ + int m_WX_Lang_Identifier; + + /* KiCad identifier used in menu selection (See id.h) */ + int m_KI_Lang_Identifier; + + /* The menu language icons */ + const char** m_Lang_Icon; + + /* Labels used in menus */ + const wxChar* m_Lang_Label; + + /* Set to true if the m_Lang_Label must not be translated */ + bool m_DoNotTranslate; }; /** * Language list struct */ -static struct -LANGUAGE_DESCR s_Language_List[] = +static struct LANGUAGE_DESCR s_Language_List[] = { - /* Default language */ - { - wxLANGUAGE_DEFAULT, - ID_LANGUAGE_DEFAULT, - lang_def_xpm, - _( "Default" ) - }, - - /* English language */ - { - wxLANGUAGE_ENGLISH, - ID_LANGUAGE_ENGLISH, - lang_en_xpm, - wxT( "English" ), - true - }, - - /* French language */ - { - wxLANGUAGE_FRENCH, - ID_LANGUAGE_FRENCH, - lang_fr_xpm, - _( "French" ) - }, - - /* Spanish language */ - { - wxLANGUAGE_SPANISH, - ID_LANGUAGE_SPANISH, - lang_es_xpm, - _( "Spanish" ) - }, - - /* Portugese language */ - { - wxLANGUAGE_PORTUGUESE, - ID_LANGUAGE_PORTUGUESE, - lang_pt_xpm, - _( "Portuguese" ) + /* Default language */ + { + wxLANGUAGE_DEFAULT, + ID_LANGUAGE_DEFAULT, + lang_def_xpm, + _( "Default" ) }, - /* Italian language */ - { - wxLANGUAGE_ITALIAN, - ID_LANGUAGE_ITALIAN, - lang_it_xpm, - _( "Italian" ) - }, + /* English language */ + { + wxLANGUAGE_ENGLISH, + ID_LANGUAGE_ENGLISH, + lang_en_xpm, + wxT( "English" ), + true + }, - /* German language */ - { - wxLANGUAGE_GERMAN, - ID_LANGUAGE_GERMAN, - lang_de_xpm, - _( "German" ) - }, + /* French language */ + { + wxLANGUAGE_FRENCH, + ID_LANGUAGE_FRENCH, + lang_fr_xpm, + _( "French" ) + }, - /* Slovenian language */ - { - wxLANGUAGE_SLOVENIAN, - ID_LANGUAGE_SLOVENIAN, - lang_sl_xpm, - _( "Slovenian" ) - }, + /* Spanish language */ + { + wxLANGUAGE_SPANISH, + ID_LANGUAGE_SPANISH, + lang_es_xpm, + _( "Spanish" ) + }, - /* Hungarian language */ - { - wxLANGUAGE_HUNGARIAN, - ID_LANGUAGE_HUNGARIAN, - lang_hu_xpm, - _( "Hungarian" ) - }, + /* Portugese language */ + { + wxLANGUAGE_PORTUGUESE, + ID_LANGUAGE_PORTUGUESE, + lang_pt_xpm, + _( "Portuguese" ) + }, - /* Polish language */ - { - wxLANGUAGE_POLISH, - ID_LANGUAGE_POLISH, - lang_pl_xpm, - _( "Polish" ) - }, + /* Italian language */ + { + wxLANGUAGE_ITALIAN, + ID_LANGUAGE_ITALIAN, + lang_it_xpm, + _( "Italian" ) + }, - /* Czech language */ - { - wxLANGUAGE_CZECH, - ID_LANGUAGE_CZECH, - lang_cs_xpm, - _( "Czech" ) - }, + /* German language */ + { + wxLANGUAGE_GERMAN, + ID_LANGUAGE_GERMAN, + lang_de_xpm, + _( "German" ) + }, - /* Russian language */ - { - wxLANGUAGE_RUSSIAN, - ID_LANGUAGE_RUSSIAN, - lang_ru_xpm, - _( "Russian" ) - }, + /* Slovenian language */ + { + wxLANGUAGE_SLOVENIAN, + ID_LANGUAGE_SLOVENIAN, + lang_sl_xpm, + _( "Slovenian" ) + }, - /* Korean language */ - { - wxLANGUAGE_KOREAN, - ID_LANGUAGE_KOREAN, - lang_ko_xpm, - _( "Korean" ) - }, + /* Hungarian language */ + { + wxLANGUAGE_HUNGARIAN, + ID_LANGUAGE_HUNGARIAN, + lang_hu_xpm, + _( "Hungarian" ) + }, - /* Chinese simplified */ - { - wxLANGUAGE_CHINESE_SIMPLIFIED, - ID_LANGUAGE_CHINESE_SIMPLIFIED, - lang_chinese_xpm, - _( "Chinese simplified" ) - }, + /* Polish language */ + { + wxLANGUAGE_POLISH, + ID_LANGUAGE_POLISH, + lang_pl_xpm, + _( "Polish" ) + }, - /* Catalan language */ - { - wxLANGUAGE_CATALAN, - ID_LANGUAGE_CATALAN, - lang_catalan_xpm, - _( "Catalan" ) - }, + /* Czech language */ + { + wxLANGUAGE_CZECH, + ID_LANGUAGE_CZECH, + lang_cs_xpm, + _( "Czech" ) + }, - /* Dutch language */ - { - wxLANGUAGE_DUTCH, - ID_LANGUAGE_DUTCH, - lang_nl_xpm, - _( "Dutch" ) - } + /* Russian language */ + { + wxLANGUAGE_RUSSIAN, + ID_LANGUAGE_RUSSIAN, + lang_ru_xpm, + _( "Russian" ) + }, + + /* Korean language */ + { + wxLANGUAGE_KOREAN, + ID_LANGUAGE_KOREAN, + lang_ko_xpm, + _( "Korean" ) + }, + + /* Chinese simplified */ + { + wxLANGUAGE_CHINESE_SIMPLIFIED, + ID_LANGUAGE_CHINESE_SIMPLIFIED, + lang_chinese_xpm, + _( "Chinese simplified" ) + }, + + /* Catalan language */ + { + wxLANGUAGE_CATALAN, + ID_LANGUAGE_CATALAN, + lang_catalan_xpm, + _( "Catalan" ) + }, + + /* Dutch language */ + { + wxLANGUAGE_DUTCH, + ID_LANGUAGE_DUTCH, + lang_nl_xpm, + _( "Dutch" ) + } }; @@ -208,16 +211,16 @@ LANGUAGE_DESCR s_Language_List[] = */ WinEDA_App::WinEDA_App() { - m_Checker = NULL; - m_LastProjectMaxCount = 10; - m_HtmlCtrl = NULL; - m_EDA_CommonConfig = NULL; - m_EDA_Config = NULL; - m_Env_Defined = FALSE; - m_LanguageId = wxLANGUAGE_DEFAULT; - m_Language_Menu = NULL; - m_Locale = NULL; - m_PdfBrowserIsDefault = TRUE; + m_Checker = NULL; + m_LastProjectMaxCount = 10; + m_HtmlCtrl = NULL; + m_EDA_CommonConfig = NULL; + m_EDA_Config = NULL; + m_Env_Defined = FALSE; + m_LanguageId = wxLANGUAGE_DEFAULT; + m_Language_Menu = NULL; + m_Locale = NULL; + m_PdfBrowserIsDefault = TRUE; } @@ -226,159 +229,140 @@ WinEDA_App::WinEDA_App() */ WinEDA_App::~WinEDA_App() { - SaveSettings(); + SaveSettings(); - /* delete user datas */ - delete g_Prj_Config; - delete m_EDA_Config; - delete m_EDA_CommonConfig; - delete g_StdFont; - delete g_DialogFont; - delete g_ItalicFont; - delete g_FixedFont; - delete g_MsgFont; - if( m_Checker ) - delete m_Checker; - delete m_Locale; + /* delete user datas */ + delete g_Prj_Config; + delete m_EDA_Config; + delete m_EDA_CommonConfig; + delete g_StdFont; + delete g_DialogFont; + delete g_ItalicFont; + delete g_FixedFont; + delete g_MsgFont; + if( m_Checker ) + delete m_Checker; + delete m_Locale; } - /** * TODO brief */ -void -WinEDA_App::InitEDA_Appl( const wxString& name ) +void WinEDA_App::InitEDA_Appl( const wxString& name ) { - wxString ident; - wxString EnvLang; + wxString ident; + wxString EnvLang; - ident = name + wxT( "-" ) + wxGetUserId(); - m_Checker = new wxSingleInstanceChecker( ident ); + ident = name + wxT( "-" ) + wxGetUserId(); + m_Checker = new wxSingleInstanceChecker( ident ); - /* Init kicad environment - * the environment variable KICAD (if exists) gives the kicad path: - * something like set KICAD=d:\kicad - */ - m_Env_Defined = wxGetEnv( wxT( "KICAD" ), &m_KicadEnv ); - if( m_Env_Defined ) // ensure m_KicadEnv ends by "/" - { - m_KicadEnv.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP ); - if( m_KicadEnv.Last() != '/' ) - m_KicadEnv += UNIX_STRING_DIR_SEP; - } + /* Init kicad environment + * the environment variable KICAD (if exists) gives the kicad path: + * something like set KICAD=d:\kicad + */ + m_Env_Defined = wxGetEnv( wxT( "KICAD" ), &m_KicadEnv ); + if( m_Env_Defined ) // ensure m_KicadEnv ends by "/" + { + m_KicadEnv.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP ); + if( m_KicadEnv.Last() != '/' ) + m_KicadEnv += UNIX_STRING_DIR_SEP; + } -/* Prepare On Line Help. Use only lower case for help filenames, -* in order to avoid problems with upper/lower case filenames under windows and unix */ +/* Prepare On Line Help. Use only lower case for help filenames, in order to + * avoid problems with upper/lower case filenames under windows and unix */ #if defined ONLINE_HELP_FILES_FORMAT_IS_HTML - m_HelpFileName = name.Lower() + wxT( ".html" ); + m_HelpFileName = name.Lower() + wxT( ".html" ); #elif defined ONLINE_HELP_FILES_FORMAT_IS_PDF - m_HelpFileName = name.Lower() + wxT( ".pdf" ); + m_HelpFileName = name.Lower() + wxT( ".pdf" ); #else - #error Help files format not defined + #error Help files format not defined #endif - /* Init parameters for configuration */ - SetVendorName( wxT( "kicad" ) ); - SetAppName( name ); - m_EDA_Config = new wxConfig( name ); - m_EDA_CommonConfig = new wxConfig( wxT( "kicad_common" ) ); + /* Init parameters for configuration */ + SetVendorName( wxT( "kicad" ) ); + SetAppName( name ); + m_EDA_Config = new wxConfig( name ); + m_EDA_CommonConfig = new wxConfig( wxT( "kicad_common" ) ); - /* Create the fonts used in dialogs and messages */ - g_StdFontPointSize = FONT_DEFAULT_SIZE; - g_MsgFontPointSize = FONT_DEFAULT_SIZE; - g_DialogFontPointSize = FONT_DEFAULT_SIZE; - g_FixedFontPointSize = FONT_DEFAULT_SIZE; + /* Create the fonts used in dialogs and messages */ + g_StdFontPointSize = FONT_DEFAULT_SIZE; + g_MsgFontPointSize = FONT_DEFAULT_SIZE; + g_DialogFontPointSize = FONT_DEFAULT_SIZE; + g_FixedFontPointSize = FONT_DEFAULT_SIZE; - g_StdFont = new wxFont( - g_StdFontPointSize, - wxFONTFAMILY_ROMAN, - wxNORMAL, - wxNORMAL ); + g_StdFont = new wxFont( g_StdFontPointSize, wxFONTFAMILY_ROMAN, + wxNORMAL, wxNORMAL ); - g_MsgFont = new wxFont( - g_StdFontPointSize, - wxFONTFAMILY_ROMAN, - wxNORMAL, - wxNORMAL ); + g_MsgFont = new wxFont( g_StdFontPointSize, wxFONTFAMILY_ROMAN, + wxNORMAL, wxNORMAL ); - g_DialogFont = new wxFont( - g_DialogFontPointSize, - wxFONTFAMILY_ROMAN, - wxNORMAL, - wxNORMAL ); + g_DialogFont = new wxFont( g_DialogFontPointSize, wxFONTFAMILY_ROMAN, + wxNORMAL, wxNORMAL ); - g_ItalicFont = new wxFont( - g_DialogFontPointSize, - wxFONTFAMILY_ROMAN, - wxFONTSTYLE_ITALIC, - wxNORMAL ); + g_ItalicFont = new wxFont( g_DialogFontPointSize, wxFONTFAMILY_ROMAN, + wxFONTSTYLE_ITALIC, wxNORMAL ); - g_FixedFont = new wxFont( - g_FixedFontPointSize, - wxFONTFAMILY_MODERN, - wxNORMAL, - wxNORMAL ); + g_FixedFont = new wxFont( g_FixedFontPointSize, wxFONTFAMILY_MODERN, + wxNORMAL, wxNORMAL ); - /* TODO installation des gestionnaires de visu d'images (pour help) TODO*/ - wxImage::AddHandler( new wxPNGHandler ); - wxImage::AddHandler( new wxGIFHandler ); - wxImage::AddHandler( new wxJPEGHandler ); - wxFileSystem::AddHandler( new wxZipFSHandler ); + /* TODO installation des gestionnaires de visu d'images (pour help) TODO*/ + wxImage::AddHandler( new wxPNGHandler ); + wxImage::AddHandler( new wxGIFHandler ); + wxImage::AddHandler( new wxJPEGHandler ); + wxFileSystem::AddHandler( new wxZipFSHandler ); - // Analyse the command line & init binary path - SetBinDir(); - ReadPdfBrowserInfos(); + // Analyse the command line & init binary path + SetBinDir(); + ReadPdfBrowserInfos(); - // Internationalisation: loading the kicad suitable Dictionnary - m_EDA_CommonConfig->Read( wxT( "Language" ), &m_LanguageId, - wxLANGUAGE_DEFAULT ); + // Internationalisation: loading the kicad suitable Dictionnary + m_EDA_CommonConfig->Read( wxT( "Language" ), &m_LanguageId, + wxLANGUAGE_DEFAULT ); - bool succes = SetLanguage( TRUE ); - if( !succes ) - { - } + bool succes = SetLanguage( TRUE ); + if( !succes ) + { + } - /* Set locale option for separator used in float numbers */ - SetLocaleTo_Default(); + /* Set locale option for separator used in float numbers */ + SetLocaleTo_Default(); #ifdef KICAD_PYTHON - PyHandler::GetInstance()->SetAppName( name ); + PyHandler::GetInstance()->SetAppName( name ); #endif } - /** * Init online help * @return none */ /*****************************************/ -void -WinEDA_App::InitOnLineHelp() +void WinEDA_App::InitOnLineHelp() /*****************************************/ { - wxString fullfilename = FindKicadHelpPath(); + wxString fullfilename = FindKicadHelpPath(); #if defined ONLINE_HELP_FILES_FORMAT_IS_HTML - m_HelpFileName = fullfilename + wxT( ".html" ); - fullfilename += wxT( "kicad.hhp" ); + m_HelpFileName = fullfilename + wxT( ".html" ); + fullfilename += wxT( "kicad.hhp" ); - if( wxFileExists( fullfilename ) ) - { - m_HtmlCtrl = new wxHtmlHelpController( wxHF_TOOLBAR | wxHF_CONTENTS | - wxHF_PRINT | wxHF_OPEN_FILES - /*| wxHF_SEARCH */ ); - m_HtmlCtrl->UseConfig( m_EDA_CommonConfig ); - m_HtmlCtrl->SetTitleFormat( wxT( "Kicad Help" ) ); - m_HtmlCtrl->AddBook( fullfilename ); - } + if( wxFileExists( fullfilename ) ) + { + m_HtmlCtrl = new wxHtmlHelpController( wxHF_TOOLBAR | wxHF_CONTENTS | + wxHF_PRINT | wxHF_OPEN_FILES + /*| wxHF_SEARCH */ ); + m_HtmlCtrl->UseConfig( m_EDA_CommonConfig ); + m_HtmlCtrl->SetTitleFormat( wxT( "Kicad Help" ) ); + m_HtmlCtrl->AddBook( fullfilename ); + } #elif defined ONLINE_HELP_FILES_FORMAT_IS_PDF - m_HtmlCtrl = NULL; + m_HtmlCtrl = NULL; #else - #error Help files format not defined + #error Help files format not defined #endif } @@ -388,73 +372,73 @@ WinEDA_App::InitOnLineHelp() * @return TODO */ /*******************************/ -bool -WinEDA_App::SetBinDir() +bool WinEDA_App::SetBinDir() /*******************************/ { /* Apple MacOSx */ #ifdef __APPLE__ - /* Derive path from location of the app bundle */ - CFBundleRef mainBundle = CFBundleGetMainBundle(); - if( mainBundle == NULL ) - return false; + /* Derive path from location of the app bundle */ + CFBundleRef mainBundle = CFBundleGetMainBundle(); + if( mainBundle == NULL ) + return false; - CFURLRef urlref = CFBundleCopyBundleURL( mainBundle ); - if( urlref == NULL ) - return false; + CFURLRef urlref = CFBundleCopyBundleURL( mainBundle ); + if( urlref == NULL ) + return false; - CFStringRef str = CFURLCopyFileSystemPath( urlref, kCFURLPOSIXPathStyle ); - if( str == NULL ) - return false; + CFStringRef str = CFURLCopyFileSystemPath( urlref, kCFURLPOSIXPathStyle ); + if( str == NULL ) + return false; - char* native_str = NULL; - int len = CFStringGetMaximumSizeForEncoding( CFStringGetLength( str ), - kCFStringEncodingUTF8 ) + 1; - native_str = new char[len]; + char* native_str = NULL; + int len = CFStringGetMaximumSizeForEncoding( CFStringGetLength( str ), + kCFStringEncodingUTF8 ) + 1; + native_str = new char[len]; - CFStringGetCString( str, native_str, len, kCFStringEncodingUTF8 ); - m_BinDir = CONV_FROM_UTF8( native_str ); - delete[] native_str; + CFStringGetCString( str, native_str, len, kCFStringEncodingUTF8 ); + m_BinDir = CONV_FROM_UTF8( native_str ); + delete[] native_str; /* Linux and Unix */ #elif defined (__UNIX__) - // Under Linux, if argv[0] doesn't the complete path to the executable, - // it's necessary to obtain it using "which ". - FILE* ftmp; - char Line[1024]; - char FileName[1024]; - wxString str_arg0; - int ii; + // Under Linux, if argv[0] doesn't the complete path to the executable, + // it's necessary to obtain it using "which ". + FILE* ftmp; - FileName[0] = 0; - str_arg0 = argv[0]; - if( strchr( (const char*) argv[0], '/' ) == NULL ) // no path - { - sprintf( FileName, "which %s > %s", CONV_TO_UTF8( str_arg0 ), TMP_FILE ); - ii = system( FileName ); + char Line[1024]; + char FileName[1024]; + wxString str_arg0; + int ii; - if( ( ftmp = fopen( TMP_FILE, "rt" ) ) != NULL ) - { - fgets( Line, 1000, ftmp ); - fclose( ftmp ); - remove( TMP_FILE ); - } - m_BinDir = CONV_FROM_UTF8( Line ); - } - else - m_BinDir = argv[0]; + FileName[0] = 0; + str_arg0 = argv[0]; + if( strchr( (const char*) argv[0], '/' ) == NULL ) // no path + { + sprintf( FileName, "which %s > %s", CONV_TO_UTF8( str_arg0 ), TMP_FILE ); + ii = system( FileName ); + + if( ( ftmp = fopen( TMP_FILE, "rt" ) ) != NULL ) + { + fgets( Line, 1000, ftmp ); + fclose( ftmp ); + remove( TMP_FILE ); + } + m_BinDir = CONV_FROM_UTF8( Line ); + } + else + m_BinDir = argv[0]; #else - m_BinDir = argv[0]; + m_BinDir = argv[0]; #endif /* __UNIX__ */ - m_BinDir.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP ); - while( m_BinDir.Last() != '/' ) - m_BinDir.RemoveLast(); + m_BinDir.Replace( WIN_STRING_DIR_SEP, UNIX_STRING_DIR_SEP ); + while( m_BinDir.Last() != '/' ) + m_BinDir.RemoveLast(); - return TRUE; + return TRUE; } @@ -463,98 +447,98 @@ WinEDA_App::SetBinDir() * @return none */ /*********************************/ -void -WinEDA_App::GetSettings() +void WinEDA_App::GetSettings() /*********************************/ { - wxString Line, Ident; - unsigned ii; + wxString Line, Ident; + unsigned ii; - m_HelpSize.x = 500; - m_HelpSize.y = 400; + m_HelpSize.x = 500; + m_HelpSize.y = 400; - if( m_EDA_CommonConfig ) - { - m_LanguageId = m_EDA_CommonConfig->Read( wxT( "Language" ), - wxLANGUAGE_DEFAULT ); - g_EditorName = m_EDA_CommonConfig->Read( wxT( "Editor" ) ); - g_ConfigFileLocationChoice = m_EDA_CommonConfig->Read( HOTKEY_CFG_PATH_OPT, 0L ); - } + if( m_EDA_CommonConfig ) + { + m_LanguageId = m_EDA_CommonConfig->Read( wxT( "Language" ), + wxLANGUAGE_DEFAULT ); + g_EditorName = m_EDA_CommonConfig->Read( wxT( "Editor" ) ); + g_ConfigFileLocationChoice = m_EDA_CommonConfig->Read( HOTKEY_CFG_PATH_OPT, + 0L ); + } - if( !m_EDA_Config ) - return; + if( !m_EDA_Config ) + return; - /* Last 10 project settings */ - for( ii = 0; ii < 10; ii++ ) - { - Ident = wxT( "LastProject" ); + /* Last 10 project settings */ + for( ii = 0; ii < 10; ii++ ) + { + Ident = wxT( "LastProject" ); - if( ii ) - Ident << ii; + if( ii ) + Ident << ii; - if( m_EDA_Config->Read( Ident, &Line ) ) - m_LastProject.Add( Line ); - } + if( m_EDA_Config->Read( Ident, &Line ) ) + m_LastProject.Add( Line ); + } - /* Set default font sizes */ - g_StdFontPointSize = m_EDA_Config->Read( wxT( "SdtFontSize" ), - FONT_DEFAULT_SIZE ); - g_MsgFontPointSize = m_EDA_Config->Read( wxT( "MsgFontSize" ), - FONT_DEFAULT_SIZE ); - g_DialogFontPointSize = m_EDA_Config->Read( wxT( "DialogFontSize" ), - FONT_DEFAULT_SIZE ); - g_FixedFontPointSize = m_EDA_Config->Read( wxT( "FixedFontSize" ), - FONT_DEFAULT_SIZE ); + /* Set default font sizes */ + g_StdFontPointSize = m_EDA_Config->Read( wxT( "SdtFontSize" ), + FONT_DEFAULT_SIZE ); + g_MsgFontPointSize = m_EDA_Config->Read( wxT( "MsgFontSize" ), + FONT_DEFAULT_SIZE ); + g_DialogFontPointSize = m_EDA_Config->Read( wxT( "DialogFontSize" ), + FONT_DEFAULT_SIZE ); + g_FixedFontPointSize = m_EDA_Config->Read( wxT( "FixedFontSize" ), + FONT_DEFAULT_SIZE ); - /* Sdt font type */ - Line = m_EDA_Config->Read( wxT( "SdtFontType" ), wxEmptyString ); - if( !Line.IsEmpty() ) - g_StdFont->SetFaceName( Line ); + /* Sdt font type */ + Line = m_EDA_Config->Read( wxT( "SdtFontType" ), wxEmptyString ); + if( !Line.IsEmpty() ) + g_StdFont->SetFaceName( Line ); - /* Sdt font style */ - ii = m_EDA_Config->Read( wxT( "SdtFontStyle" ), wxFONTFAMILY_ROMAN ); - g_StdFont->SetStyle( ii ); - - /* Sdt font weight */ - ii = m_EDA_Config->Read( wxT( "SdtFontWeight" ), wxNORMAL ); - g_StdFont->SetWeight( ii ); - g_StdFont->SetPointSize( g_StdFontPointSize ); + /* Sdt font style */ + ii = m_EDA_Config->Read( wxT( "SdtFontStyle" ), wxFONTFAMILY_ROMAN ); + g_StdFont->SetStyle( ii ); - /* Msg font type */ - Line = m_EDA_Config->Read( wxT( "MsgFontType" ), wxEmptyString ); - if( !Line.IsEmpty() ) - g_MsgFont->SetFaceName( Line ); + /* Sdt font weight */ + ii = m_EDA_Config->Read( wxT( "SdtFontWeight" ), wxNORMAL ); + g_StdFont->SetWeight( ii ); + g_StdFont->SetPointSize( g_StdFontPointSize ); - /* Msg font style */ - ii = m_EDA_Config->Read( wxT( "MsgFontStyle" ), wxFONTFAMILY_ROMAN ); - g_MsgFont->SetStyle( ii ); + /* Msg font type */ + Line = m_EDA_Config->Read( wxT( "MsgFontType" ), wxEmptyString ); + if( !Line.IsEmpty() ) + g_MsgFont->SetFaceName( Line ); - /* Msg font weight */ - ii = m_EDA_Config->Read( wxT( "MsgFontWeight" ), wxNORMAL ); - g_MsgFont->SetWeight( ii ); - g_MsgFont->SetPointSize( g_MsgFontPointSize ); + /* Msg font style */ + ii = m_EDA_Config->Read( wxT( "MsgFontStyle" ), wxFONTFAMILY_ROMAN ); + g_MsgFont->SetStyle( ii ); - - Line = m_EDA_Config->Read( wxT( "DialogFontType" ), wxEmptyString ); - if( !Line.IsEmpty() ) - g_DialogFont->SetFaceName( Line ); + /* Msg font weight */ + ii = m_EDA_Config->Read( wxT( "MsgFontWeight" ), wxNORMAL ); + g_MsgFont->SetWeight( ii ); + g_MsgFont->SetPointSize( g_MsgFontPointSize ); - ii = m_EDA_Config->Read( wxT( "DialogFontStyle" ), wxFONTFAMILY_ROMAN ); - g_DialogFont->SetStyle( ii ); - ii = m_EDA_Config->Read( wxT( "DialogFontWeight" ), wxNORMAL ); - g_DialogFont->SetWeight( ii ); - g_DialogFont->SetPointSize( g_DialogFontPointSize ); - g_FixedFont->SetPointSize( g_FixedFontPointSize ); + Line = m_EDA_Config->Read( wxT( "DialogFontType" ), wxEmptyString ); + if( !Line.IsEmpty() ) + g_DialogFont->SetFaceName( Line ); - m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits ); + ii = m_EDA_Config->Read( wxT( "DialogFontStyle" ), wxFONTFAMILY_ROMAN ); + g_DialogFont->SetStyle( ii ); + ii = m_EDA_Config->Read( wxT( "DialogFontWeight" ), wxNORMAL ); + g_DialogFont->SetWeight( ii ); + g_DialogFont->SetPointSize( g_DialogFontPointSize ); - if( m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) ) - { - if( wxDirExists( Line ) ) - wxSetWorkingDirectory( Line ); - } - m_EDA_Config->Read( wxT( "BgColor" ), &g_DrawBgColor ); + g_FixedFont->SetPointSize( g_FixedFontPointSize ); + + m_EDA_Config->Read( wxT( "ShowPageLimits" ), &g_ShowPageLimits ); + + if( m_EDA_Config->Read( wxT( "WorkingDir" ), &Line ) ) + { + if( wxDirExists( Line ) ) + wxSetWorkingDirectory( Line ); + } + m_EDA_Config->Read( wxT( "BgColor" ), &g_DrawBgColor ); } @@ -563,67 +547,51 @@ WinEDA_App::GetSettings() * @return none */ /**********************************/ -void -WinEDA_App::SaveSettings() +void WinEDA_App::SaveSettings() /**********************************/ { - unsigned int i; + unsigned int i; - if( m_EDA_Config == NULL ) - return; + if( m_EDA_Config == NULL ) + return; - /* Sdt font settings */ - m_EDA_Config->Write( wxT( "SdtFontSize" ), - g_StdFontPointSize ); - m_EDA_Config->Write( wxT( "SdtFontType" ), - g_StdFont->GetFaceName() ); - m_EDA_Config->Write( wxT( "SdtFontStyle" ), - g_StdFont->GetStyle() ); - m_EDA_Config->Write( wxT( "SdtFontWeight" ), - g_StdFont->GetWeight() ); + /* Sdt font settings */ + m_EDA_Config->Write( wxT( "SdtFontSize" ), g_StdFontPointSize ); + m_EDA_Config->Write( wxT( "SdtFontType" ), g_StdFont->GetFaceName() ); + m_EDA_Config->Write( wxT( "SdtFontStyle" ), g_StdFont->GetStyle() ); + m_EDA_Config->Write( wxT( "SdtFontWeight" ), g_StdFont->GetWeight() ); - /* Msg font settings */ - m_EDA_Config->Write( wxT( "MsgFontSize" ), - g_MsgFontPointSize ); - m_EDA_Config->Write( wxT( "MsgFontType" ), - g_MsgFont->GetFaceName() ); - m_EDA_Config->Write( wxT( "MsgFontStyle" ), - g_MsgFont->GetStyle() ); - m_EDA_Config->Write( wxT( "MsgFontWeight" ), - g_MsgFont->GetWeight() ); + /* Msg font settings */ + m_EDA_Config->Write( wxT( "MsgFontSize" ), g_MsgFontPointSize ); + m_EDA_Config->Write( wxT( "MsgFontType" ), g_MsgFont->GetFaceName() ); + m_EDA_Config->Write( wxT( "MsgFontStyle" ), g_MsgFont->GetStyle() ); + m_EDA_Config->Write( wxT( "MsgFontWeight" ), g_MsgFont->GetWeight() ); - /* Dialog font settings */ - m_EDA_Config->Write( wxT( "DialogFontSize" ), - g_DialogFontPointSize ); - m_EDA_Config->Write( wxT( "DialogFontType" ), - g_DialogFont->GetFaceName() ); - m_EDA_Config->Write( wxT( "DialogFontStyle" ), - g_DialogFont->GetStyle() ); - m_EDA_Config->Write( wxT( "DialogFontWeight" ), - g_DialogFont->GetWeight() ); + /* Dialog font settings */ + m_EDA_Config->Write( wxT( "DialogFontSize" ), g_DialogFontPointSize ); + m_EDA_Config->Write( wxT( "DialogFontType" ), g_DialogFont->GetFaceName() ); + m_EDA_Config->Write( wxT( "DialogFontStyle" ), g_DialogFont->GetStyle() ); + m_EDA_Config->Write( wxT( "DialogFontWeight" ), g_DialogFont->GetWeight() ); - /* Misc settings */ - m_EDA_Config->Write( wxT( "FixedFontSize" ), - g_FixedFontPointSize ); + /* Misc settings */ + m_EDA_Config->Write( wxT( "FixedFontSize" ), g_FixedFontPointSize ); - m_EDA_Config->Write( wxT( "ShowPageLimits" ), - g_ShowPageLimits ); + m_EDA_Config->Write( wxT( "ShowPageLimits" ), g_ShowPageLimits ); - m_EDA_Config->Write( wxT( "WorkingDir" ), - wxGetCwd() ); + m_EDA_Config->Write( wxT( "WorkingDir" ), wxGetCwd() ); - /* Save last 10 project list */ - for( i = 0; i < 10; i++ ) - { - wxString msg = wxT( "LastProject" ); - if( i ) - msg << i; + /* Save last 10 project list */ + for( i = 0; i < 10; i++ ) + { + wxString msg = wxT( "LastProject" ); + if( i ) + msg << i; - if( i < m_LastProject.GetCount() ) - m_EDA_Config->Write( msg, m_LastProject[i] ); - else - m_EDA_Config->Write( msg, wxEmptyString ); - } + if( i < m_LastProject.GetCount() ) + m_EDA_Config->Write( msg, m_LastProject[i] ); + else + m_EDA_Config->Write( msg, wxEmptyString ); + } } @@ -636,42 +604,79 @@ WinEDA_App::SaveSettings() * @return TODO */ /*********************************************/ -bool -WinEDA_App::SetLanguage( bool first_time ) +bool WinEDA_App::SetLanguage( bool first_time ) /*********************************************/ { - // dictionary file name without extend (full name is kicad.mo) - wxString DictionaryName( wxT( "kicad" ) ); - // Real path is kicad/internat/xx_XX or kicad/internat/xx - wxString BaseDictionaryPath( wxT( "internat" ) ); - wxString dic_path; + // dictionary file name without extend (full name is kicad.mo) + wxString DictionaryName( wxT( "kicad" ) ); - if( m_Locale != NULL ) - delete m_Locale; - m_Locale = new wxLocale(); - m_Locale->Init( m_LanguageId ); - dic_path = ReturnKicadDatasPath() + BaseDictionaryPath; + // Real path is kicad/internat/xx_XX or kicad/internat/xx + wxString BaseDictionaryPath( wxT( "internat" ) ); + wxString dic_path; + bool retv = true; - wxLogDebug( wxT( "Adding prefix <" ) + dic_path + - wxT( "> to language lookup path." ) ); + if( m_Locale != NULL ) + delete m_Locale; + m_Locale = new wxLocale(); - m_Locale->AddCatalogLookupPathPrefix( dic_path ); + dic_path = ReturnKicadDatasPath() + BaseDictionaryPath; - if( !first_time ) - { - if( m_EDA_CommonConfig ) - m_EDA_CommonConfig->Write( wxT( "Language" ), m_LanguageId ); - } + wxLogDebug( wxT( "Adding prefix <" ) + dic_path + + wxT( "> to language lookup path." ) ); - if( !m_Locale->IsLoaded( DictionaryName ) ) - m_Locale->AddCatalog( DictionaryName ); - SetLanguageList( NULL ); + m_Locale->AddCatalogLookupPathPrefix( dic_path ); - return m_Locale->IsOk(); + /* + * Add binary path minus the current subdirectory ( typically /bin ) to + * the locale search path. This way the locales can be found when using + * custom CMake install paths. + * + * FIXME: This should be changed when configurable data path support is + * added to Kicad. + */ + if( !m_BinDir.IsEmpty() ) + { + wxFileName fn( m_BinDir, wxEmptyString ); + dic_path = fn.GetPath(); + int n = dic_path.Find( wxFileName::GetPathSeparator(), true ); + + if( n != wxNOT_FOUND ) + { + dic_path = dic_path( 0, n ); + } + + wxLogDebug( wxT( "Adding prefix <" ) + dic_path + + wxT( "> to language lookup path." ) ); + m_Locale->AddCatalogLookupPathPrefix( dic_path ); + } + + if( !m_Locale->Init( m_LanguageId, wxLOCALE_CONV_ENCODING ) ) + { + wxLogDebug( wxT( "Failed to initialize " ) + m_Locale->GetName() ); + + delete m_Locale; + m_Locale = new wxLocale(); + m_LanguageId = wxLANGUAGE_DEFAULT; + m_Locale->Init(); + retv = false; + } + + if( !first_time ) + { + if( m_EDA_CommonConfig ) + m_EDA_CommonConfig->Write( wxT( "Language" ), m_LanguageId ); + } + + if( !m_Locale->IsLoaded( DictionaryName ) ) + m_Locale->AddCatalog( DictionaryName ); + + if( !retv ) + return retv; + + return m_Locale->IsOk(); } - /** * Return in m_LanguageId the wxWidgets language identifier Id * from the kicad menu id (internal menu identifier) @@ -679,76 +684,79 @@ WinEDA_App::SetLanguage( bool first_time ) * @return none */ /**************************************************/ -void -WinEDA_App::SetLanguageIdentifier( int menu_id ) +void WinEDA_App::SetLanguageIdentifier( int menu_id ) /**************************************************/ { - unsigned int ii; + unsigned int ii; - wxLogDebug( wxT( "Select language ID %d from %d possible languages." ), - menu_id, - LANGUAGE_DESCR_COUNT ); + wxLogDebug( wxT( "Select language ID %d from %d possible languages." ), + menu_id, LANGUAGE_DESCR_COUNT ); - for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) - { - if( menu_id == s_Language_List[ii].m_KI_Lang_Identifier ) - { - m_LanguageId = s_Language_List[ii].m_WX_Lang_Identifier; - break; - } - } + for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + { + if( menu_id == s_Language_List[ii].m_KI_Lang_Identifier ) + { + m_LanguageId = s_Language_List[ii].m_WX_Lang_Identifier; + break; + } + } } - /** * Create menu list for language choice. * @param MasterMenu TODO * @return TODO */ /*********************************************************/ -wxMenu* -WinEDA_App::SetLanguageList( wxMenu* MasterMenu ) +wxMenu* WinEDA_App::SetLanguageList( wxMenu* MasterMenu ) /*********************************************************/ { - wxMenuItem* item; - unsigned int ii; + wxMenuItem* item; + unsigned int ii; - if( m_Language_Menu == NULL ) - { - m_Language_Menu = new wxMenu; - for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) - { - wxString MenuLabel = s_Language_List[ii].m_DoNotTranslate ? - s_Language_List[ii].m_Lang_Label : - wxGetTranslation( s_Language_List[ii].m_Lang_Label ); + if( m_Language_Menu == NULL ) + { + m_Language_Menu = new wxMenu; + for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + { + wxString MenuLabel = s_Language_List[ii].m_DoNotTranslate ? + s_Language_List[ii].m_Lang_Label : + wxGetTranslation( + s_Language_List[ii].m_Lang_Label ); - item = new wxMenuItem( m_Language_Menu, s_Language_List[ii].m_KI_Lang_Identifier, - MenuLabel, wxEmptyString, wxITEM_CHECK ); + item = new wxMenuItem( m_Language_Menu, + s_Language_List[ii].m_KI_Lang_Identifier, + MenuLabel, + wxEmptyString, + wxITEM_CHECK ); - SETBITMAPS( s_Language_List[ii].m_Lang_Icon ); - m_Language_Menu->Append( item ); - } - } + SETBITMAPS( s_Language_List[ii].m_Lang_Icon ); + m_Language_Menu->Append( item ); + } + } - for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) - { - if( m_LanguageId == s_Language_List[ii].m_WX_Lang_Identifier ) - m_Language_Menu->Check( s_Language_List[ii].m_KI_Lang_Identifier, true ); - else - m_Language_Menu->Check( s_Language_List[ii].m_KI_Lang_Identifier, false ); - } + for( ii = 0; ii < LANGUAGE_DESCR_COUNT; ii++ ) + { + if( m_LanguageId == s_Language_List[ii].m_WX_Lang_Identifier ) + m_Language_Menu->Check( s_Language_List[ii].m_KI_Lang_Identifier, + true ); + else + m_Language_Menu->Check( s_Language_List[ii].m_KI_Lang_Identifier, + false ); + } - if( MasterMenu ) - { - ADD_MENUITEM_WITH_HELP_AND_SUBMENU( MasterMenu, - m_Language_Menu, - ID_LANGUAGE_CHOICE, - _( "Language" ), - _( "Select application language (only for testing!)" ), - language_xpm ); - } - return m_Language_Menu; + if( MasterMenu ) + { + ADD_MENUITEM_WITH_HELP_AND_SUBMENU( MasterMenu, + m_Language_Menu, + ID_LANGUAGE_CHOICE, + _( "Language" ), + _( "Select application language (only for testing!)" ), + language_xpm ); + } + + return m_Language_Menu; } @@ -757,13 +765,11 @@ WinEDA_App::SetLanguageList( wxMenu* MasterMenu ) * @return TODO */ /**********************/ -int -WinEDA_App::OnRun() +int WinEDA_App::OnRun() /**********************/ { -# ifdef KICAD_PYTHON - PyHandler::GetInstance()->RunScripts(); -# endif - return wxApp::OnRun(); +#ifdef KICAD_PYTHON + PyHandler::GetInstance()->RunScripts(); +#endif + return wxApp::OnRun(); } - diff --git a/common/zoom.cpp b/common/zoom.cpp index 425ec2792f..3410eeb964 100644 --- a/common/zoom.cpp +++ b/common/zoom.cpp @@ -118,98 +118,128 @@ void WinEDA_DrawFrame::Window_Zoom( EDA_Rect& Rect ) /*****************************************************************/ -void WinEDA_DrawPanel::Process_Popup_Zoom( wxCommandEvent& event ) -/*****************************************************************/ - -/* Handle only the Popup command zoom and grid level - */ +void WinEDA_DrawFrame::OnZoom( wxCommandEvent& event ) { - int id = event.GetId(); + if( DrawPanel == NULL ) + { + wxLogDebug( wxT( "No DrawPanel object definedin " \ + "WinEDA_DrawFrame::OnZoom()." ) ); + return; + } + + bool zoom_at_cursor = false; + int id = event.GetId(); + BASE_SCREEN* screen = GetBaseScreen(); switch( id ) { case ID_POPUP_ZOOM_IN: + zoom_at_cursor = true; + // fall thru + + case ID_ZOOM_IN: + if( id == ID_ZOOM_IN ) + screen->m_Curseur = DrawPanel->GetScreenCenterRealPosition(); + screen->SetPreviousZoom(); + Recadre_Trace( zoom_at_cursor ); + break; + case ID_POPUP_ZOOM_OUT: + zoom_at_cursor = true; + // fall thru + + case ID_ZOOM_OUT: + if( id == ID_ZOOM_OUT ) + screen->m_Curseur = DrawPanel->GetScreenCenterRealPosition(); + screen->SetNextZoom(); + Recadre_Trace( zoom_at_cursor ); + break; + + case ID_ZOOM_REDRAW: + DrawPanel->Refresh(); + break; + case ID_POPUP_ZOOM_CENTER: - case ID_POPUP_ZOOM_AUTO: - case ID_POPUP_ZOOM_REDRAW: - m_Parent->OnZoom( id ); + Recadre_Trace( true ); + break; + + case ID_ZOOM_PAGE: + Zoom_Automatique( false ); break; case ID_POPUP_ZOOM_SELECT: break; case ID_POPUP_CANCEL: - MouseToCursorSchema(); + DrawPanel->MouseToCursorSchema(); break; case ID_POPUP_ZOOM_LEVEL_1: - GetScreen()->SetZoom( 1 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 1 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_2: - GetScreen()->SetZoom( 2 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 2 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_4: - GetScreen()->SetZoom( 4 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 4 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_8: - GetScreen()->SetZoom( 8 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 8 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_16: - GetScreen()->SetZoom( 16 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 16 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_32: - GetScreen()->SetZoom( 32 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 32 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_64: - GetScreen()->SetZoom( 64 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 64 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_128: - GetScreen()->SetZoom( 128 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 128 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_256: - GetScreen()->SetZoom( 256 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 256 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_512: - GetScreen()->SetZoom( 512 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 512 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_1024: - GetScreen()->SetZoom( 1024 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 1024 ); + Recadre_Trace( true ); break; case ID_POPUP_ZOOM_LEVEL_2048: - GetScreen()->SetZoom( 2048 ); - m_Parent->Recadre_Trace( TRUE ); + screen->SetZoom( 2048 ); + Recadre_Trace( true ); break; default: - DisplayError( this, - wxT( "WinEDA_DrawPanel::Process_Popup_Zoom() ID error" ) ); - break; + wxLogDebug( wxT( "WinEDA_DrawFram::OnZoom() unhandled ID %d" ), id ); + return; } - m_Parent->Affiche_Status_Box(); + Affiche_Status_Box(); } void WinEDA_DrawPanel::OnPopupGridSelect( wxCommandEvent& event ) @@ -239,15 +269,14 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu ) zoom_center_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 ); - ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_AUTO, _( "Zoom auto" ), - zoom_auto_xpm ); + ADD_MENUITEM( MasterMenu, ID_ZOOM_PAGE, _( "Zoom auto" ), zoom_auto_xpm ); wxMenu* zoom_choice = new wxMenu; ADD_MENUITEM_WITH_SUBMENU( MasterMenu, zoom_choice, ID_POPUP_ZOOM_SELECT, _( "Zoom select" ), zoom_select_xpm ); - ADD_MENUITEM( MasterMenu, ID_POPUP_ZOOM_REDRAW, _( "Redraw view" ), + ADD_MENUITEM( MasterMenu, ID_ZOOM_REDRAW, _( "Redraw view" ), zoom_redraw_xpm ); /* Create the basic zoom list: */ @@ -299,29 +328,3 @@ void WinEDA_DrawPanel::AddMenuZoom( wxMenu* MasterMenu ) MasterMenu->AppendSeparator(); ADD_MENUITEM( MasterMenu, ID_POPUP_CANCEL, _( "Close" ), cancel_xpm ); } - - -/**********************************************************/ -void WinEDA_DrawFrame::Process_Zoom( wxCommandEvent& event ) -/**********************************************************/ - -/* Handle the Zoom commands from the zoom tools in the main toolbar. - * Calls the active window Zoom function - */ -{ - int id = event.GetId(); - - switch( id ) - { - case ID_ZOOM_IN_BUTT: - case ID_ZOOM_OUT_BUTT: - case ID_ZOOM_REDRAW_BUTT: - case ID_ZOOM_PAGE_BUTT: - OnZoom( id ); - break; - - default: - DisplayError( this, wxT( "WinEDA_DrawFrame::Process_Zoom id Error" ) ); - break; - } -} diff --git a/cvpcb/displayframe.cpp b/cvpcb/displayframe.cpp index 9dca9b3e8f..e4133304e9 100644 --- a/cvpcb/displayframe.cpp +++ b/cvpcb/displayframe.cpp @@ -16,12 +16,10 @@ /* Construction de la table des evenements pour WinEDA_DrawFrame */ /*****************************************************************/ -BEGIN_EVENT_TABLE( WinEDA_DisplayFrame, wxFrame ) - COMMON_EVENTS_DRAWFRAME +BEGIN_EVENT_TABLE( WinEDA_DisplayFrame, WinEDA_DrawFrame ) EVT_CLOSE( WinEDA_DisplayFrame::OnCloseWindow ) EVT_SIZE( WinEDA_DrawFrame::OnSize ) - EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_DisplayFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_DisplayFrame::OnZoom ) EVT_TOOL( ID_OPTIONS_SETUP, WinEDA_DisplayFrame::InstallOptionsDisplay ) EVT_TOOL( ID_CVPCB_SHOW3D_FRAME, WinEDA_BasePcbFrame::Show3D_Frame ) END_EVENT_TABLE() @@ -119,19 +117,19 @@ void WinEDA_DisplayFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ), _( "zoom + (F1)" ) ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ), _( "zoom - (F2)" ) ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), _( "redraw (F3)" ) ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), _( "1:1 zoom" ) ); @@ -183,6 +181,8 @@ void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) int flagcurseur = 0; int zoom = GetScreen()->GetZoom(); wxPoint curpos, oldpos; + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + cmd.SetEventObject( this ); curpos = DrawPanel->CursorRealPosition( Mouse ); oldpos = GetScreen()->m_Curseur; @@ -199,24 +199,28 @@ void WinEDA_DisplayFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) switch( g_KeyPressed ) { case WXK_F1: - OnZoom( ID_ZOOM_IN_KEY ); + cmd.SetId( ID_POPUP_ZOOM_IN ); + GetEventHandler()->ProcessEvent( cmd ); flagcurseur = 2; curpos = GetScreen()->m_Curseur; break; case WXK_F2: - OnZoom( ID_ZOOM_OUT_KEY ); + cmd.SetId( ID_POPUP_ZOOM_OUT ); + GetEventHandler()->ProcessEvent( cmd ); flagcurseur = 2; curpos = GetScreen()->m_Curseur; break; case WXK_F3: - OnZoom( ID_ZOOM_REDRAW_KEY ); + cmd.SetId( ID_ZOOM_REDRAW ); + GetEventHandler()->ProcessEvent( cmd ); flagcurseur = 2; break; case WXK_F4: - OnZoom( ID_ZOOM_CENTER_KEY ); + cmd.SetId( ID_POPUP_ZOOM_CENTER ); + GetEventHandler()->ProcessEvent( cmd ); flagcurseur = 2; curpos = GetScreen()->m_Curseur; break; diff --git a/eeschema/class_screen.cpp b/eeschema/class_screen.cpp index a3e3507f70..bb3f84fd40 100644 --- a/eeschema/class_screen.cpp +++ b/eeschema/class_screen.cpp @@ -57,8 +57,7 @@ void SCH_ITEM::Place( WinEDA_SchematicFrame* frame, wxDC* DC ) if( !screen->CheckIfOnDrawList( this ) ) //don't want a loop! screen->AddToDrawList( this ); g_ItemToRepeat = this; - if( frame->m_Ident == SCHEMATIC_FRAME ) - frame->SaveCopyInUndoList( this, IS_NEW ); + frame->SaveCopyInUndoList( this, IS_NEW ); } m_Flags = 0; diff --git a/eeschema/controle.cpp b/eeschema/controle.cpp index 33326b2ed7..8f5a8175f6 100644 --- a/eeschema/controle.cpp +++ b/eeschema/controle.cpp @@ -244,21 +244,6 @@ void WinEDA_SchematicFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPi case 0: break; - case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_IN_KEY ); - curpos = screen->m_Curseur; - break; - - case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_OUT_KEY ); - curpos = screen->m_Curseur; - break; - - case EDA_ZOOM_CENTER_FROM_MOUSE: - OnZoom( ID_ZOOM_CENTER_KEY ); - curpos = screen->m_Curseur; - break; - case WXK_NUMPAD8: /* Deplacement curseur vers le haut */ case WXK_UP: MousePositionInPixels.y -= delta.y; @@ -355,21 +340,6 @@ void WinEDA_LibeditFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixe case 0: break; - case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_IN_KEY ); - curpos = screen->m_Curseur; - break; - - case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_OUT_KEY ); - curpos = screen->m_Curseur; - break; - - case EDA_ZOOM_CENTER_FROM_MOUSE: - OnZoom( ID_ZOOM_CENTER_KEY ); - curpos = screen->m_Curseur; - break; - case WXK_NUMPAD8: /* Deplacement curseur vers le haut */ case WXK_UP: MousePositionInPixels.y -= delta.y; @@ -465,21 +435,6 @@ void WinEDA_ViewlibFrame::GeneralControle( wxDC* DC, wxPoint MousePositionInPixe case 0: break; - case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_IN_KEY ); - curpos = screen->m_Curseur; - break; - - case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_OUT_KEY ); - curpos = screen->m_Curseur; - break; - - case EDA_ZOOM_CENTER_FROM_MOUSE: - OnZoom( ID_ZOOM_CENTER_KEY ); - curpos = screen->m_Curseur; - break; - case WXK_NUMPAD8: /* Deplacement curseur vers le haut */ case WXK_UP: MousePositionInPixels.y -= delta.y; diff --git a/eeschema/hotkeys.cpp b/eeschema/hotkeys.cpp index 620c463a4a..0b9828e288 100644 --- a/eeschema/hotkeys.cpp +++ b/eeschema/hotkeys.cpp @@ -4,8 +4,6 @@ #include "fctsys.h" -#include "gr_basic.h" - #include "common.h" #include "program.h" #include "libcmp.h" @@ -145,6 +143,9 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey, * Commands are case insensitive */ { + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + cmd.SetEventObject( this ); + bool ItemInEdit = GetScreen()->GetCurItem() && GetScreen()->GetCurItem()->m_Flags; bool RefreshToolBar = FALSE; // We must refresh tool bar when the undo/redo tool state is modified @@ -172,7 +173,6 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey, default: case HK_NOT_FOUND: return; - break; case HK_HELP: // Display Current hotkey list DisplayHotkeyList( this, s_Schematic_Hokeys_Descr ); @@ -183,19 +183,23 @@ void WinEDA_SchematicFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_IN_KEY ); + cmd.SetId( ID_POPUP_ZOOM_IN ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_OUT_KEY ); + cmd.SetId( ID_POPUP_ZOOM_OUT ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_REDRAW: - OnZoom( ID_ZOOM_REDRAW_KEY ); + cmd.SetId( ID_ZOOM_REDRAW ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_CENTER: - OnZoom( ID_ZOOM_CENTER_KEY ); + cmd.SetId( ID_POPUP_ZOOM_CENTER ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_UNDO: @@ -413,6 +417,9 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey, * Commands are case insensitive */ { + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + cmd.SetEventObject( this ); + bool ItemInEdit = GetScreen()->GetCurItem() && GetScreen()->GetCurItem()->m_Flags; bool RefreshToolBar = FALSE; // We must refresh tool bar when the undo/redo tool state is modified @@ -451,19 +458,23 @@ void WinEDA_LibeditFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_IN_KEY ); + cmd.SetId( ID_POPUP_ZOOM_IN ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_OUT_KEY ); + cmd.SetId( ID_POPUP_ZOOM_OUT ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_REDRAW: - OnZoom( ID_ZOOM_REDRAW_KEY ); + cmd.SetId( ID_ZOOM_REDRAW ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_CENTER: - OnZoom( ID_ZOOM_CENTER_KEY ); + cmd.SetId( ID_POPUP_ZOOM_CENTER ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_UNDO: diff --git a/eeschema/libframe.cpp b/eeschema/libframe.cpp index 7d0d45ff39..7e04210508 100644 --- a/eeschema/libframe.cpp +++ b/eeschema/libframe.cpp @@ -20,13 +20,11 @@ /*****************************/ /* class WinEDA_LibeditFrame */ /*****************************/ -BEGIN_EVENT_TABLE( WinEDA_LibeditFrame, wxFrame ) - COMMON_EVENTS_DRAWFRAME +BEGIN_EVENT_TABLE( WinEDA_LibeditFrame, WinEDA_DrawFrame ) EVT_CLOSE( WinEDA_LibeditFrame::OnCloseWindow ) EVT_SIZE( WinEDA_LibeditFrame::OnSize ) - EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_LibeditFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_LibeditFrame::OnZoom ) // Tools et boutons de Libedit: diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 51a2111021..c6a1ba48de 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -168,7 +168,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() wxMenu* viewMenu = new wxMenu; msg = AddHotkeyName( _( "Zoom in" ), s_Schematic_Hokeys_Descr, HK_ZOOM_IN); - item = new wxMenuItem( viewMenu, ID_ZOOM_IN_BUTT, + item = new wxMenuItem( viewMenu, ID_ZOOM_IN, msg, _( "Zoom in" ), wxITEM_NORMAL ); item->SetBitmap( zoom_in_xpm ); @@ -176,13 +176,13 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr, HK_ZOOM_OUT ); - item = new wxMenuItem( viewMenu, ID_ZOOM_OUT_BUTT, + item = new wxMenuItem( viewMenu, ID_ZOOM_OUT, msg, _( "Zoom out" ), wxITEM_NORMAL ); item->SetBitmap( zoom_out_xpm ); viewMenu->Append( item ); - item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE_BUTT, + item = new wxMenuItem( viewMenu, ID_ZOOM_PAGE, _( "Zoom auto" ), _( "Zoom auto" ), wxITEM_NORMAL ); item->SetBitmap( zoom_auto_xpm ); @@ -192,7 +192,7 @@ void WinEDA_SchematicFrame::ReCreateMenuBar() msg = AddHotkeyName( _( "Redraw view" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW ); - item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW_BUTT, + item = new wxMenuItem( viewMenu, ID_ZOOM_REDRAW, msg, _( "Zoom auto" ), wxITEM_NORMAL ); item->SetBitmap( zoom_redraw_xpm ); diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index de811e1a4a..a1807dfbea 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -29,99 +29,95 @@ /* class WinEDA_SchematicFrame */ /*******************************/ -BEGIN_EVENT_TABLE( WinEDA_SchematicFrame, wxFrame ) -COMMON_EVENTS_DRAWFRAME EVT_SOCKET( - ID_EDA_SOCKET_EVENT_SERV, - WinEDA_DrawFrame:: - OnSockRequestServer ) -EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_DrawFrame::OnSockRequest ) +BEGIN_EVENT_TABLE( WinEDA_SchematicFrame, WinEDA_DrawFrame ) + EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, + WinEDA_DrawFrame::OnSockRequestServer ) + EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_DrawFrame::OnSockRequest ) -EVT_CLOSE( WinEDA_SchematicFrame::OnCloseWindow ) -EVT_SIZE( WinEDA_SchematicFrame::OnSize ) + EVT_CLOSE( WinEDA_SchematicFrame::OnCloseWindow ) + EVT_SIZE( WinEDA_SchematicFrame::OnSize ) -EVT_MENU( ID_NEW_PROJECT, WinEDA_SchematicFrame::OnNewProject ) -EVT_MENU( ID_LOAD_PROJECT, WinEDA_SchematicFrame::OnLoadProject ) + EVT_MENU( ID_NEW_PROJECT, WinEDA_SchematicFrame::OnNewProject ) + EVT_MENU( ID_LOAD_PROJECT, WinEDA_SchematicFrame::OnLoadProject ) -EVT_MENU_RANGE( ID_LOAD_FILE_1, ID_LOAD_FILE_10, - WinEDA_SchematicFrame::OnLoadFile ) + EVT_MENU_RANGE( ID_LOAD_FILE_1, ID_LOAD_FILE_10, + WinEDA_SchematicFrame::OnLoadFile ) -EVT_TOOL( ID_NEW_PROJECT, WinEDA_SchematicFrame::OnNewProject ) -EVT_TOOL( ID_LOAD_PROJECT, WinEDA_SchematicFrame::OnLoadProject ) + EVT_TOOL( ID_NEW_PROJECT, WinEDA_SchematicFrame::OnNewProject ) + EVT_TOOL( ID_LOAD_PROJECT, WinEDA_SchematicFrame::OnLoadProject ) -EVT_TOOL_RANGE( ID_SCHEMATIC_MAIN_TOOLBAR_START, - ID_SCHEMATIC_MAIN_TOOLBAR_END, - WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL_RANGE( ID_SCHEMATIC_MAIN_TOOLBAR_START, + ID_SCHEMATIC_MAIN_TOOLBAR_END, + WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_MENU_RANGE( ID_PREFERENCES_FONT_INFOSCREEN, ID_PREFERENCES_FONT_END, - WinEDA_DrawFrame::ProcessFontPreferences ) + EVT_MENU_RANGE( ID_PREFERENCES_FONT_INFOSCREEN, ID_PREFERENCES_FONT_END, + WinEDA_DrawFrame::ProcessFontPreferences ) -EVT_MENU( ID_SAVE_PROJECT, WinEDA_SchematicFrame::Save_File ) -EVT_MENU( ID_SAVE_ONE_SHEET, WinEDA_SchematicFrame::Save_File ) -EVT_MENU( ID_SAVE_ONE_SHEET_AS, WinEDA_SchematicFrame::Save_File ) -EVT_TOOL( ID_SAVE_PROJECT, WinEDA_SchematicFrame::Save_File ) -EVT_MENU( ID_GEN_PRINT, WinEDA_SchematicFrame::ToPrinter ) -EVT_MENU( ID_GEN_PLOT_PS, WinEDA_SchematicFrame::ToPlot_PS ) -EVT_MENU( ID_GEN_PLOT_HPGL, WinEDA_SchematicFrame::ToPlot_HPGL ) -EVT_MENU( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print ) -EVT_MENU( ID_GEN_COPY_SHEET_TO_CLIPBOARD, WinEDA_DrawFrame::CopyToClipboard ) -EVT_MENU( ID_GEN_COPY_BLOCK_TO_CLIPBOARD, WinEDA_DrawFrame::CopyToClipboard ) -EVT_MENU( ID_EXIT, WinEDA_SchematicFrame::OnExit ) + EVT_MENU( ID_SAVE_PROJECT, WinEDA_SchematicFrame::Save_File ) + EVT_MENU( ID_SAVE_ONE_SHEET, WinEDA_SchematicFrame::Save_File ) + EVT_MENU( ID_SAVE_ONE_SHEET_AS, WinEDA_SchematicFrame::Save_File ) + EVT_TOOL( ID_SAVE_PROJECT, WinEDA_SchematicFrame::Save_File ) + EVT_MENU( ID_GEN_PRINT, WinEDA_SchematicFrame::ToPrinter ) + EVT_MENU( ID_GEN_PLOT_PS, WinEDA_SchematicFrame::ToPlot_PS ) + EVT_MENU( ID_GEN_PLOT_HPGL, WinEDA_SchematicFrame::ToPlot_HPGL ) + EVT_MENU( ID_GEN_PLOT_SVG, WinEDA_DrawFrame::SVG_Print ) + EVT_MENU( ID_GEN_COPY_SHEET_TO_CLIPBOARD, WinEDA_DrawFrame::CopyToClipboard ) + EVT_MENU( ID_GEN_COPY_BLOCK_TO_CLIPBOARD, WinEDA_DrawFrame::CopyToClipboard ) + EVT_MENU( ID_EXIT, WinEDA_SchematicFrame::OnExit ) -EVT_MENU_RANGE( ID_CONFIG_AND_PREFERENCES_START, - ID_CONFIG_AND_PREFERENCES_END, - WinEDA_SchematicFrame::Process_Config ) -EVT_TOOL( ID_COLORS_SETUP, WinEDA_SchematicFrame::Process_Config ) -EVT_TOOL( ID_OPTIONS_SETUP, WinEDA_SchematicFrame::Process_Config ) + EVT_MENU_RANGE( ID_CONFIG_AND_PREFERENCES_START, + ID_CONFIG_AND_PREFERENCES_END, + WinEDA_SchematicFrame::Process_Config ) + EVT_TOOL( ID_COLORS_SETUP, WinEDA_SchematicFrame::Process_Config ) + EVT_TOOL( ID_OPTIONS_SETUP, WinEDA_SchematicFrame::Process_Config ) -EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END, - WinEDA_DrawFrame::SetLanguage ) + EVT_MENU_RANGE( ID_LANGUAGE_CHOICE, ID_LANGUAGE_CHOICE_END, + WinEDA_DrawFrame::SetLanguage ) -EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_SchematicFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_SchematicFrame::OnZoom ) -EVT_TOOL( ID_TO_LIBRARY, WinEDA_SchematicFrame::OnOpenLibraryEditor ) -EVT_TOOL( ID_TO_LIBVIEW, WinEDA_SchematicFrame::OnOpenLibraryViewer ) + EVT_TOOL( ID_TO_LIBRARY, WinEDA_SchematicFrame::OnOpenLibraryEditor ) + EVT_TOOL( ID_TO_LIBVIEW, WinEDA_SchematicFrame::OnOpenLibraryViewer ) -EVT_TOOL( ID_TO_PCB, WinEDA_SchematicFrame::OnOpenPcbnew ) -EVT_TOOL( ID_TO_CVPCB, WinEDA_SchematicFrame::OnOpenCvpcb ) + EVT_TOOL( ID_TO_PCB, WinEDA_SchematicFrame::OnOpenPcbnew ) + EVT_TOOL( ID_TO_CVPCB, WinEDA_SchematicFrame::OnOpenCvpcb ) -EVT_TOOL( ID_SHEET_SET, WinEDA_DrawFrame::Process_PageSettings ) -EVT_TOOL( ID_HIERARCHY, WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_TOOL( wxID_CUT, WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_TOOL( wxID_COPY, WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_TOOL( wxID_PASTE, WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_TOOL( ID_UNDO_BUTT, WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_TOOL( ID_GET_ANNOTATE, WinEDA_SchematicFrame::OnAnnotate ) -EVT_TOOL( ID_GEN_PRINT, WinEDA_SchematicFrame::ToPrinter ) -EVT_TOOL( ID_GET_ERC, WinEDA_SchematicFrame::OnErc ) -EVT_TOOL( ID_GET_NETLIST, WinEDA_SchematicFrame::OnCreateNetlist ) -EVT_TOOL( ID_GET_TOOLS, WinEDA_SchematicFrame::OnCreateBillOfMaterials ) -EVT_TOOL( ID_FIND_ITEMS, WinEDA_SchematicFrame::OnFindItems ) -EVT_TOOL( ID_BACKANNO_ITEMS, WinEDA_SchematicFrame::OnLoadStuffFile ) + EVT_TOOL( ID_SHEET_SET, WinEDA_DrawFrame::Process_PageSettings ) + EVT_TOOL( ID_HIERARCHY, WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL( wxID_CUT, WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL( wxID_COPY, WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL( wxID_PASTE, WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL( ID_UNDO_BUTT, WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL( ID_GET_ANNOTATE, WinEDA_SchematicFrame::OnAnnotate ) + EVT_TOOL( ID_GEN_PRINT, WinEDA_SchematicFrame::ToPrinter ) + EVT_TOOL( ID_GET_ERC, WinEDA_SchematicFrame::OnErc ) + EVT_TOOL( ID_GET_NETLIST, WinEDA_SchematicFrame::OnCreateNetlist ) + EVT_TOOL( ID_GET_TOOLS, WinEDA_SchematicFrame::OnCreateBillOfMaterials ) + EVT_TOOL( ID_FIND_ITEMS, WinEDA_SchematicFrame::OnFindItems ) + EVT_TOOL( ID_BACKANNO_ITEMS, WinEDA_SchematicFrame::OnLoadStuffFile ) -EVT_MENU( ID_GENERAL_HELP, WinEDA_DrawFrame::GetKicadHelp ) -EVT_MENU( ID_KICAD_ABOUT, WinEDA_DrawFrame::GetKicadAbout ) + EVT_MENU( ID_GENERAL_HELP, WinEDA_DrawFrame::GetKicadHelp ) + EVT_MENU( ID_KICAD_ABOUT, WinEDA_DrawFrame::GetKicadAbout ) // Tools et boutons de Schematique, Vertical toolbar: -EVT_TOOL_RANGE( ID_SCHEMATIC_VERTICAL_TOOLBAR_START, - ID_SCHEMATIC_VERTICAL_TOOLBAR_END, - WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL_RANGE( ID_SCHEMATIC_VERTICAL_TOOLBAR_START, + ID_SCHEMATIC_VERTICAL_TOOLBAR_END, + WinEDA_SchematicFrame::Process_Special_Functions ) -EVT_TOOL_RCLICKED( ID_LABEL_BUTT, WinEDA_SchematicFrame::ToolOnRightClick ) -EVT_TOOL_RCLICKED( ID_GLABEL_BUTT, WinEDA_SchematicFrame::ToolOnRightClick ) -EVT_TOOL_RCLICKED( ID_HIERLABEL_BUTT, - WinEDA_SchematicFrame::ToolOnRightClick ) + EVT_TOOL_RCLICKED( ID_LABEL_BUTT, WinEDA_SchematicFrame::ToolOnRightClick ) + EVT_TOOL_RCLICKED( ID_GLABEL_BUTT, WinEDA_SchematicFrame::ToolOnRightClick ) + EVT_TOOL_RCLICKED( ID_HIERLABEL_BUTT, + WinEDA_SchematicFrame::ToolOnRightClick ) -EVT_MENU_RANGE( ID_POPUP_START_RANGE, ID_POPUP_END_RANGE, - WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_MENU_RANGE( ID_POPUP_START_RANGE, ID_POPUP_END_RANGE, + WinEDA_SchematicFrame::Process_Special_Functions ) // Tools et boutons de Schematique, Options toolbar: -EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END, - WinEDA_SchematicFrame::OnSelectOptionToolbar ) - -EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE, - WinEDA_SchematicFrame::Process_Special_Functions ) + EVT_TOOL_RANGE( ID_TB_OPTIONS_START, ID_TB_OPTIONS_END, + WinEDA_SchematicFrame::OnSelectOptionToolbar ) + EVT_MENU_RANGE( ID_POPUP_GENERAL_START_RANGE, ID_POPUP_GENERAL_END_RANGE, + WinEDA_SchematicFrame::Process_Special_Functions ) END_EVENT_TABLE() @@ -359,7 +355,7 @@ void WinEDA_SchematicFrame::OnCloseWindow( wxCloseEvent& Event ) } if( !g_RootSheet->m_AssociatedScreen->m_FileName.IsEmpty() - && (g_RootSheet->m_AssociatedScreen->EEDrawList != NULL) ) + && (g_RootSheet->m_AssociatedScreen->EEDrawList != NULL) ) SetLastProject( g_RootSheet->m_AssociatedScreen->m_FileName ); ClearProjectDrawList( g_RootSheet->m_AssociatedScreen, TRUE ); @@ -430,7 +426,7 @@ void WinEDA_SchematicFrame::SetToolbars() { m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SHOW_GRID, m_Draw_Grid ); m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_SHOW_GRID, - m_Draw_Grid ? _( "Grid not show" ) : _( "Show Grid" ) ); + m_Draw_Grid ? _( "Grid not show" ) : _( "Show Grid" ) ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_SELECT_UNIT_MM, g_UnitMetric == MILLIMETRE ? TRUE : FALSE ); @@ -441,15 +437,13 @@ void WinEDA_SchematicFrame::SetToolbars() g_CursorShape ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_HIDDEN_PINS, g_ShowAllPins ); m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_HIDDEN_PINS, - g_ShowAllPins ? _( "No show Hidden Pins" ) : _( + g_ShowAllPins ? _( "No show Hidden Pins" ) : _( "Show Hidden Pins" ) ); m_OptionsToolBar->ToggleTool( ID_TB_OPTIONS_BUS_WIRES_ORIENT, g_HVLines ); m_OptionsToolBar->SetToolShortHelp( ID_TB_OPTIONS_BUS_WIRES_ORIENT, - g_HVLines ? _( - "Allows any direction for wires and busses" ) : - _( - "Allows horizontal and vertical wires and busses only" ) ); + g_HVLines ? _( "Allows any direction for wires and busses" ) : + _( "Allows horizontal and vertical wires and busses only" ) ); } DisplayUnitsMsg(); @@ -640,9 +634,9 @@ void WinEDA_SchematicFrame::OnOpenLibraryEditor( wxCommandEvent& event ) else { m_LibeditFrame = new WinEDA_LibeditFrame( this, - wxT( "Library Editor" ), - wxPoint( -1, -1 ), - wxSize( 600, 400 ) ); + wxT( "Library Editor" ), + wxPoint( -1, -1 ), + wxSize( 600, 400 ) ); ActiveScreen = g_ScreenLib; m_LibeditFrame->AdjustScrollBars(); } diff --git a/eeschema/tool_lib.cpp b/eeschema/tool_lib.cpp index cc3a5796b5..c0e60bfc41 100644 --- a/eeschema/tool_lib.cpp +++ b/eeschema/tool_lib.cpp @@ -3,7 +3,6 @@ /********************************************/ #include "fctsys.h" -#include "gr_basic.h" #include "common.h" #include "program.h" @@ -13,8 +12,6 @@ #include "protos.h" #include "hotkeys.h" -#define BITMAP wxBitmap - #ifdef __UNIX__ #define LISTBOX_WIDTH 140 #else @@ -41,52 +38,52 @@ void WinEDA_LibeditFrame::ReCreateVToolbar() // Set up toolbar m_VToolBar->AddTool( ID_NO_SELECT_BUTT, wxEmptyString, - BITMAP( cursor_xpm ), + wxBitmap( cursor_xpm ), _( "deselect current tool" ), wxITEM_CHECK ); m_VToolBar->ToggleTool( ID_NO_SELECT_BUTT, TRUE ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_LIBEDIT_PIN_BUTT, wxEmptyString, - BITMAP( pin_xpm ), + wxBitmap( pin_xpm ), _( "Add Pins" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LIBEDIT_BODY_TEXT_BUTT, wxEmptyString, - BITMAP( add_text_xpm ), + wxBitmap( add_text_xpm ), _( "Add graphic text" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LIBEDIT_BODY_RECT_BUTT, wxEmptyString, - BITMAP( add_rectangle_xpm ), + wxBitmap( add_rectangle_xpm ), _( "Add rectangles" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LIBEDIT_BODY_CIRCLE_BUTT, wxEmptyString, - BITMAP( add_circle_xpm ), + wxBitmap( add_circle_xpm ), _( "Add circles" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LIBEDIT_BODY_ARC_BUTT, wxEmptyString, - BITMAP( add_arc_xpm ), + wxBitmap( add_arc_xpm ), _( "Add arcs" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LIBEDIT_BODY_LINE_BUTT, wxEmptyString, - BITMAP( add_polygon_xpm ), + wxBitmap( add_polygon_xpm ), _( "Add lines and polygons" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_LIBEDIT_ANCHOR_ITEM_BUTT, wxEmptyString, - BITMAP( anchor_xpm ), + wxBitmap( anchor_xpm ), _( "Move part anchor" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_LIBEDIT_IMPORT_BODY_BUTT, wxEmptyString, - BITMAP( import_xpm ), + wxBitmap( import_xpm ), _( "Import existing drawings" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LIBEDIT_EXPORT_BODY_BUTT, wxEmptyString, - BITMAP( export_xpm ), + wxBitmap( export_xpm ), _( "Export current drawing" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_LIBEDIT_DELETE_ITEM_BUTT, wxEmptyString, - BITMAP( delete_body_xpm ), + wxBitmap( delete_body_xpm ), _( "Delete items" ), wxITEM_CHECK ); m_VToolBar->Realize(); @@ -113,115 +110,115 @@ void WinEDA_LibeditFrame::ReCreateHToolbar() SetToolBar( m_HToolBar ); // Set up toolbar - m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_LIB, wxEmptyString, BITMAP( save_library_xpm ), - _( "Save current loaded library on disk (file update)" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_LIB, wxEmptyString, wxBitmap( save_library_xpm ), + _( "Save current loaded library on disk (file update)" ) ); - m_HToolBar->AddTool( ID_LIBEDIT_SELECT_CURRENT_LIB, wxEmptyString, BITMAP( library_xpm ), - _( "Select working library" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_SELECT_CURRENT_LIB, wxEmptyString, wxBitmap( library_xpm ), + _( "Select working library" ) ); - m_HToolBar->AddTool( ID_LIBEDIT_DELETE_PART, wxEmptyString, BITMAP( delete_xpm ), - _( "Delete component in current library" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_DELETE_PART, wxEmptyString, wxBitmap( delete_xpm ), + _( "Delete component in current library" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART, wxEmptyString, BITMAP( new_component_xpm ), - _( "New component" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART, wxEmptyString, wxBitmap( new_component_xpm ), + _( "New component" ) ); - m_HToolBar->AddTool( ID_LIBEDIT_SELECT_PART, BITMAP( add_component_xpm ), - _( "Select component to edit" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_SELECT_PART, wxBitmap( add_component_xpm ), + _( "Select component to edit" ) ); m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_PART, wxEmptyString, - BITMAP( save_part_in_mem_xpm ), - _( "Save current component into current loaded library (in memory)" ) ); + wxBitmap( save_part_in_mem_xpm ), + _( "Save current component into current loaded library (in memory)" ) ); - m_HToolBar->AddTool( ID_LIBEDIT_IMPORT_PART, wxEmptyString, BITMAP( import_xpm ), - _( "import component" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_IMPORT_PART, wxEmptyString, wxBitmap( import_xpm ), + _( "import component" ) ); - m_HToolBar->AddTool( ID_LIBEDIT_EXPORT_PART, wxEmptyString, BITMAP( export_xpm ), - _( "export component" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_EXPORT_PART, wxEmptyString, wxBitmap( export_xpm ), + _( "export component" ) ); m_HToolBar->AddTool( ID_LIBEDIT_CREATE_NEW_LIB_AND_SAVE_CURRENT_PART, - wxEmptyString, BITMAP( new_library_xpm ), - _( "Create a new library an save current component into" ) ); + wxEmptyString, wxBitmap( new_library_xpm ), + _( "Create a new library an save current component into" ) ); m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Undo last edition" ), s_Schematic_Hokeys_Descr, HK_UNDO ); - m_HToolBar->AddTool( ID_LIBEDIT_UNDO, wxEmptyString, BITMAP( undo_xpm ), msg ); + m_HToolBar->AddTool( ID_LIBEDIT_UNDO, wxEmptyString, wxBitmap( undo_xpm ), msg ); msg = AddHotkeyName( _( "Redo the last undo command" ), s_Schematic_Hokeys_Descr, HK_REDO ); - m_HToolBar->AddTool( ID_LIBEDIT_REDO, wxEmptyString, BITMAP( redo_xpm ), msg ); + m_HToolBar->AddTool( ID_LIBEDIT_REDO, wxEmptyString, wxBitmap( redo_xpm ), msg ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_LIBEDIT_GET_FRAME_EDIT_PART, BITMAP( part_properties_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Edit component properties" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_GET_FRAME_EDIT_PART, wxBitmap( part_properties_xpm ), + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Edit component properties" ) ); - m_HToolBar->AddTool( ID_LIBEDIT_GET_FRAME_EDIT_FIELDS, BITMAP( add_text_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Add, remove fields and edit fields properties" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_GET_FRAME_EDIT_FIELDS, wxBitmap( add_text_xpm ), + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Add, remove fields and edit fields properties" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_LIBEDIT_CHECK_PART, BITMAP( erc_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Test duplicate pins" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_CHECK_PART, wxBitmap( erc_xpm ), + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Test duplicate pins" ) ); m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), s_Libedit_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "Zoom out" ), s_Libedit_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "Redraw view" ), s_Libedit_Hokeys_Descr, HK_ZOOM_REDRAW ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, - BITMAP( zoom_auto_xpm ), - _( "Zoom auto" ) ); + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, + wxBitmap( zoom_auto_xpm ), + _( "Zoom auto" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_DE_MORGAN_NORMAL_BUTT, wxEmptyString, - BITMAP( morgan1_xpm ), + wxBitmap( morgan1_xpm ), _( "show as \"De Morgan\" normal part" ), wxITEM_CHECK ); m_HToolBar->ToggleTool( ID_DE_MORGAN_NORMAL_BUTT, (CurrentConvert <= 1) ? TRUE : FALSE ); m_HToolBar->AddTool( ID_DE_MORGAN_CONVERT_BUTT, wxEmptyString, - BITMAP( morgan2_xpm ), + wxBitmap( morgan2_xpm ), _( "show as \"De Morgan\" convert part" ), wxITEM_CHECK ); m_HToolBar->ToggleTool( ID_DE_MORGAN_CONVERT_BUTT, (CurrentConvert >= 2) ? TRUE : FALSE ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_LIBEDIT_VIEW_DOC, BITMAP( datasheet_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Documents" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_VIEW_DOC, wxBitmap( datasheet_xpm ), + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Documents" ) ); m_HToolBar->EnableTool( ID_LIBEDIT_VIEW_DOC, FALSE ); m_HToolBar->AddSeparator(); m_SelpartBox = new WinEDAChoiceBox( m_HToolBar, ID_LIBEDIT_SELECT_PART_NUMBER, - wxDefaultPosition, wxSize( LISTBOX_WIDTH, -1 ) ); + wxDefaultPosition, wxSize( LISTBOX_WIDTH, -1 ) ); m_HToolBar->AddControl( m_SelpartBox ); m_SelAliasBox = new WinEDAChoiceBox( m_HToolBar, ID_LIBEDIT_SELECT_ALIAS, - wxDefaultPosition, wxSize( LISTBOX_WIDTH, -1 ) ); + wxDefaultPosition, wxSize( LISTBOX_WIDTH, -1 ) ); m_HToolBar->AddControl( m_SelAliasBox ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_LIBEDIT_EDIT_PIN_BY_PIN, BITMAP( pin2pin_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Edit pins part per part (Carefully use!)" ) ); + m_HToolBar->AddTool( ID_LIBEDIT_EDIT_PIN_BY_PIN, wxBitmap( pin2pin_xpm ), + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Edit pins part per part (Carefully use!)" ) ); m_HToolBar->ToggleTool( ID_LIBEDIT_EDIT_PIN_BY_PIN, g_EditPinByPinIsOn ); // after adding the buttons to the toolbar, must call Realize() to reflect the changes diff --git a/eeschema/tool_sch.cpp b/eeschema/tool_sch.cpp index e60f3c8a89..8985e70b46 100644 --- a/eeschema/tool_sch.cpp +++ b/eeschema/tool_sch.cpp @@ -3,7 +3,6 @@ /*****************************************************/ #include "fctsys.h" -#include "gr_basic.h" #include "common.h" #include "program.h" @@ -13,8 +12,6 @@ #include "protos.h" #include "hotkeys.h" -#define BITMAP wxBitmap - #include "bitmaps.h" #include "id.h" @@ -35,94 +32,94 @@ void WinEDA_SchematicFrame::ReCreateHToolbar() SetToolBar( m_HToolBar ); // Set up toolbar - m_HToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, BITMAP( new_xpm ), - _( "New schematic project" ) ); + m_HToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, wxBitmap( new_xpm ), + _( "New schematic project" ) ); - m_HToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, BITMAP( open_xpm ), - _( "Open schematic project" ) ); + m_HToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, wxBitmap( open_xpm ), + _( "Open schematic project" ) ); - m_HToolBar->AddTool( ID_SAVE_PROJECT, wxEmptyString, BITMAP( save_project_xpm ), - _( "Save schematic project" ) ); + m_HToolBar->AddTool( ID_SAVE_PROJECT, wxEmptyString, wxBitmap( save_project_xpm ), + _( "Save schematic project" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_SHEET_SET, wxEmptyString, BITMAP( sheetset_xpm ), - _( "Page settings" ) ); + m_HToolBar->AddTool( ID_SHEET_SET, wxEmptyString, wxBitmap( sheetset_xpm ), + _( "Page settings" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_TO_LIBRARY, wxEmptyString, BITMAP( libedit_xpm ), - _( "Library editor" ) ); + m_HToolBar->AddTool( ID_TO_LIBRARY, wxEmptyString, wxBitmap( libedit_xpm ), + _( "Library editor" ) ); - m_HToolBar->AddTool( ID_TO_LIBVIEW, wxEmptyString, BITMAP( library_browse_xpm ), - _( "Library browser" ) ); + m_HToolBar->AddTool( ID_TO_LIBVIEW, wxEmptyString, wxBitmap( library_browse_xpm ), + _( "Library browser" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_HIERARCHY, wxEmptyString, BITMAP( hierarchy_nav_xpm ), - _( "Schematic hierarchy navigator" ) ); + m_HToolBar->AddTool( ID_HIERARCHY, wxEmptyString, wxBitmap( hierarchy_nav_xpm ), + _( "Schematic hierarchy navigator" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( wxID_CUT, wxEmptyString, BITMAP( cut_button ), - _( "Cut selected item" ) ); + m_HToolBar->AddTool( wxID_CUT, wxEmptyString, wxBitmap( cut_button ), + _( "Cut selected item" ) ); - m_HToolBar->AddTool( wxID_COPY, wxEmptyString, BITMAP( copy_button ), - _( "Copy selected item" ) ); + m_HToolBar->AddTool( wxID_COPY, wxEmptyString, wxBitmap( copy_button ), + _( "Copy selected item" ) ); - m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, BITMAP( paste_xpm ), - _( "Paste" ) ); + m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, wxBitmap( paste_xpm ), + _( "Paste" ) ); m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Undo last edition" ), s_Schematic_Hokeys_Descr, HK_UNDO ); - m_HToolBar->AddTool( ID_SCHEMATIC_UNDO, wxEmptyString, BITMAP( undo_xpm ), msg ); + m_HToolBar->AddTool( ID_SCHEMATIC_UNDO, wxEmptyString, wxBitmap( undo_xpm ), msg ); msg = AddHotkeyName( _( "Redo the last undo command" ), s_Schematic_Hokeys_Descr, HK_REDO ); - m_HToolBar->AddTool( ID_SCHEMATIC_REDO, wxEmptyString, BITMAP( redo_xpm ), msg ); + m_HToolBar->AddTool( ID_SCHEMATIC_REDO, wxEmptyString, wxBitmap( redo_xpm ), msg ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, BITMAP( print_button ), - _( "Print schematic" ) ); + m_HToolBar->AddTool( ID_GEN_PRINT, wxEmptyString, wxBitmap( print_button ), + _( "Print schematic" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_TO_CVPCB, wxEmptyString, BITMAP( cvpcb_xpm ), - _( "Run Cvpcb" ) ); + m_HToolBar->AddTool( ID_TO_CVPCB, wxEmptyString, wxBitmap( cvpcb_xpm ), + _( "Run Cvpcb" ) ); - m_HToolBar->AddTool( ID_TO_PCB, wxEmptyString, BITMAP( pcbnew_xpm ), - _( "Run pcbnew" ) ); + m_HToolBar->AddTool( ID_TO_PCB, wxEmptyString, wxBitmap( pcbnew_xpm ), + _( "Run pcbnew" ) ); m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), s_Schematic_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, BITMAP( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "Zoom out" ), s_Schematic_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, BITMAP( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "Redraw view" ), s_Schematic_Hokeys_Descr, HK_ZOOM_REDRAW ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, BITMAP( zoom_redraw_xpm ), + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, BITMAP( zoom_auto_xpm ), - _( "Zoom auto" ) ); + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), + _( "Zoom auto" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, BITMAP( find_xpm ), - _( "Find components and texts" ) ); + m_HToolBar->AddTool( ID_FIND_ITEMS, wxEmptyString, wxBitmap( find_xpm ), + _( "Find components and texts" ) ); m_HToolBar->AddSeparator(); - m_HToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, BITMAP( netlist_xpm ), - _( "Netlist generation" ) ); + m_HToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, wxBitmap( netlist_xpm ), + _( "Netlist generation" ) ); - m_HToolBar->AddTool( ID_GET_ANNOTATE, wxEmptyString, BITMAP( annotate_xpm ), - _( "Schematic Annotation" ) ); + m_HToolBar->AddTool( ID_GET_ANNOTATE, wxEmptyString, wxBitmap( annotate_xpm ), + _( "Schematic Annotation" ) ); - m_HToolBar->AddTool( ID_GET_ERC, wxEmptyString, BITMAP( erc_xpm ), - _( "Schematic Electric Rules Check" ) ); + m_HToolBar->AddTool( ID_GET_ERC, wxEmptyString, wxBitmap( erc_xpm ), + _( "Schematic Electric Rules Check" ) ); - m_HToolBar->AddTool( ID_GET_TOOLS, wxEmptyString, BITMAP( tools_xpm ), - _( "Bill of material and/or Crossreferences" ) ); + m_HToolBar->AddTool( ID_GET_TOOLS, wxEmptyString, wxBitmap( tools_xpm ), + _( "Bill of material and/or Crossreferences" ) ); - m_HToolBar->AddTool( ID_BACKANNO_ITEMS, wxEmptyString, BITMAP( backanno_xpm ), - _( "Backannotate footprint" ) ); + m_HToolBar->AddTool( ID_BACKANNO_ITEMS, wxEmptyString, wxBitmap( backanno_xpm ), + _( "Backannotate footprint" ) ); // after adding the tools to the toolbar, must call Realize() to reflect the changes m_HToolBar->Realize(); @@ -143,88 +140,88 @@ void WinEDA_SchematicFrame::ReCreateVToolbar() // Set up toolbar m_VToolBar->AddTool( ID_NO_SELECT_BUTT, wxEmptyString, - BITMAP( cursor_xpm ), wxEmptyString, wxITEM_CHECK ); + wxBitmap( cursor_xpm ), wxEmptyString, wxITEM_CHECK ); m_VToolBar->ToggleTool( ID_NO_SELECT_BUTT, TRUE ); m_VToolBar->AddTool( ID_HIERARCHY_PUSH_POP_BUTT, wxEmptyString, - BITMAP( hierarchy_cursor_xpm ), + wxBitmap( hierarchy_cursor_xpm ), _( "Hierarchy Push/Pop" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_COMPONENT_BUTT, wxEmptyString, - BITMAP( add_component_xpm ), + wxBitmap( add_component_xpm ), _( "Place a component" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_PLACE_POWER_BUTT, wxEmptyString, - BITMAP( add_power_xpm ), + wxBitmap( add_power_xpm ), _( "Place a power port" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_WIRE_BUTT, wxEmptyString, - BITMAP( add_line_xpm ), + wxBitmap( add_line_xpm ), _( "Place a wire" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_BUS_BUTT, wxEmptyString, - BITMAP( add_bus_xpm ), + wxBitmap( add_bus_xpm ), _( "Place a bus" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_WIRETOBUS_ENTRY_BUTT, wxEmptyString, - BITMAP( add_line2bus_xpm ), + wxBitmap( add_line2bus_xpm ), _( "Place a wire to bus entry" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString, - BITMAP( add_bus2bus_xpm ), + wxBitmap( add_bus2bus_xpm ), _( "Place a bus to bus entry" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_NOCONN_BUTT, wxEmptyString, - BITMAP( noconn_button ), + wxBitmap( noconn_button ), _( "Place no connect flag" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_LABEL_BUTT, wxEmptyString, - BITMAP( add_line_label_xpm ), + wxBitmap( add_line_label_xpm ), _( "Place net name" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_GLABEL_BUTT, wxEmptyString, - BITMAP( add_glabel_xpm ), + wxBitmap( add_glabel_xpm ), _( "Place a 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 ), + wxBitmap( add_junction_xpm ), _( "Place a junction" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_HIERLABEL_BUTT, wxEmptyString, - BITMAP( add_hierarchical_label_xpm ), + wxBitmap( add_hierarchical_label_xpm ), _( "Place a 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 ), + wxBitmap( add_hierarchical_subsheet_xpm ), _( "Place hierarchical sheet" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_IMPORT_GLABEL_BUTT, wxEmptyString, - BITMAP( import_hierarchical_label_xpm ), + wxBitmap( import_hierarchical_label_xpm ), _( "Place a pin sheet , imported from a hierarchical label in sheet" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_SHEET_LABEL_BUTT, wxEmptyString, - BITMAP( add_hierar_pin_xpm ), + wxBitmap( add_hierar_pin_xpm ), _( "Place hierarchical pin to sheet" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_LINE_COMMENT_BUTT, wxEmptyString, - BITMAP( add_dashed_line_xpm ), + wxBitmap( add_dashed_line_xpm ), _( "Place graphic line or polygon" ), wxITEM_CHECK ); m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT, wxEmptyString, - BITMAP( add_text_xpm ), + wxBitmap( add_text_xpm ), _( "Place graphic text (comment)" ), wxITEM_CHECK ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_SCHEMATIC_DELETE_ITEM_BUTT, wxEmptyString, - BITMAP( delete_body_xpm ), + wxBitmap( delete_body_xpm ), _( "Delete items" ), wxITEM_CHECK ); m_VToolBar->Realize(); @@ -246,29 +243,29 @@ void WinEDA_SchematicFrame::ReCreateOptToolbar() m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, FALSE ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxEmptyString, - BITMAP( grid_xpm ), + wxBitmap( grid_xpm ), _( "Display Grid OFF" ), wxITEM_CHECK ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString, - BITMAP( unit_inch_xpm ), + wxBitmap( unit_inch_xpm ), _( "Units in inches" ), wxITEM_CHECK ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_MM, wxEmptyString, - BITMAP( unit_mm_xpm ), + wxBitmap( unit_mm_xpm ), _( "Units in millimeters" ), wxITEM_CHECK ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxEmptyString, - BITMAP( cursor_shape_xpm ), + wxBitmap( cursor_shape_xpm ), _( "Change Cursor Shape" ), wxITEM_CHECK ); m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_HIDDEN_PINS, wxEmptyString, - BITMAP( hidden_pin_xpm ), + wxBitmap( hidden_pin_xpm ), _( "Show Hidden Pins" ), wxITEM_CHECK ); m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_BUS_WIRES_ORIENT, wxEmptyString, - BITMAP( lines90_xpm ), + wxBitmap( lines90_xpm ), _( "HV orientation for Wires and Bus" ), wxITEM_CHECK ); m_OptionsToolBar->Realize(); diff --git a/eeschema/tool_viewlib.cpp b/eeschema/tool_viewlib.cpp index a2dc4afd20..e0265c7345 100644 --- a/eeschema/tool_viewlib.cpp +++ b/eeschema/tool_viewlib.cpp @@ -3,7 +3,6 @@ /****************************************************************/ #include "fctsys.h" -#include "gr_basic.h" #include "common.h" #include "program.h" @@ -14,8 +13,6 @@ #include "protos.h" -#define BITMAP wxBitmap - #include "bitmaps.h" #include "id.h" @@ -24,126 +21,138 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar() /****************************************************/ { -int ii; -EDA_LibComponentStruct * RootLibEntry = NULL, * CurrentLibEntry = NULL; -bool asdeMorgan = FALSE, state; + int ii; + EDA_LibComponentStruct* RootLibEntry = NULL, * CurrentLibEntry = NULL; + bool asdeMorgan = FALSE, state; - if ( (g_CurrentViewLibraryName != wxEmptyString) && (g_CurrentViewComponentName != wxEmptyString) ) - { - RootLibEntry = FindLibPart(g_CurrentViewComponentName.GetData(), - g_CurrentViewLibraryName.GetData(), FIND_ROOT); - if ( RootLibEntry && LookForConvertPart(RootLibEntry) > 1 ) - asdeMorgan = TRUE; - CurrentLibEntry = FindLibPart(g_CurrentViewComponentName.GetData(), - g_CurrentViewLibraryName.GetData(), FIND_ALIAS); - } + if( (g_CurrentViewLibraryName != wxEmptyString) + && (g_CurrentViewComponentName != wxEmptyString) ) + { + RootLibEntry = FindLibPart( g_CurrentViewComponentName.GetData(), + g_CurrentViewLibraryName.GetData(), + FIND_ROOT ); + if( RootLibEntry && LookForConvertPart( RootLibEntry ) > 1 ) + asdeMorgan = TRUE; + CurrentLibEntry = FindLibPart( g_CurrentViewComponentName.GetData(), + g_CurrentViewLibraryName.GetData(), + FIND_ALIAS ); + } - if ( m_HToolBar == NULL ) - { - m_HToolBar = new WinEDA_Toolbar(TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE); - SetToolBar(m_HToolBar); + if( m_HToolBar == NULL ) + { + m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, + this, + ID_H_TOOLBAR, + TRUE ); + SetToolBar( m_HToolBar ); - // Set up toolbar - m_HToolBar->AddTool(ID_LIBVIEW_SELECT_LIB, wxEmptyString, - BITMAP(library_xpm), - _("Select library to browse")); + // Set up toolbar + m_HToolBar->AddTool( ID_LIBVIEW_SELECT_LIB, wxEmptyString, + wxBitmap( library_xpm ), + _( "Select library to browse" ) ); - m_HToolBar->AddTool(ID_LIBVIEW_SELECT_PART, wxEmptyString, - BITMAP(add_component_xpm), - _("Select part to browse")); + m_HToolBar->AddTool( ID_LIBVIEW_SELECT_PART, wxEmptyString, + wxBitmap( add_component_xpm ), + _( "Select part to browse" ) ); - m_HToolBar->AddSeparator(); - m_HToolBar->AddTool(ID_LIBVIEW_PREVIOUS, wxEmptyString, - BITMAP(lib_previous_xpm), - _("Display previous part")); + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_LIBVIEW_PREVIOUS, wxEmptyString, + wxBitmap( lib_previous_xpm ), + _( "Display previous part" ) ); - m_HToolBar->AddTool(ID_LIBVIEW_NEXT, wxEmptyString, - BITMAP(lib_next_xpm), - _("Display next part")); + m_HToolBar->AddTool( ID_LIBVIEW_NEXT, wxEmptyString, + wxBitmap( lib_next_xpm ), + _( "Display next part" ) ); - m_HToolBar->AddSeparator(); - m_HToolBar->AddTool(ID_ZOOM_IN_BUTT, wxEmptyString, - BITMAP(zoom_in_xpm), - _("Zoom in")); + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, + wxBitmap( zoom_in_xpm ), + _( "Zoom in" ) ); - m_HToolBar->AddTool(ID_ZOOM_OUT_BUTT, wxEmptyString, - BITMAP(zoom_out_xpm), - _("Zoom out")); + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, + wxBitmap( zoom_out_xpm ), + _( "Zoom out" ) ); - m_HToolBar->AddTool(ID_ZOOM_REDRAW_BUTT, wxEmptyString, - BITMAP(zoom_redraw_xpm), - _("Redraw view")); + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, + wxBitmap( zoom_redraw_xpm ), + _( "Redraw view" ) ); - m_HToolBar->AddTool(ID_ZOOM_PAGE_BUTT, wxEmptyString, - BITMAP(zoom_auto_xpm), - _("Best zoom")); + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, + wxBitmap( zoom_auto_xpm ), + _( "Best zoom" ) ); - m_HToolBar->AddSeparator(); - m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString, - BITMAP(morgan1_xpm), - _("Show as \"De Morgan\" normal part"), wxITEM_CHECK); + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, wxEmptyString, + wxBitmap( morgan1_xpm ), + _( "Show as \"De Morgan\" normal part" ), + wxITEM_CHECK ); - m_HToolBar->AddTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, wxEmptyString, - BITMAP(morgan2_xpm), - _("Show as \"De Morgan\" convert part"), wxITEM_CHECK); + m_HToolBar->AddTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, wxEmptyString, + wxBitmap( morgan2_xpm ), + _( "Show as \"De Morgan\" convert part" ), + wxITEM_CHECK ); - m_HToolBar->AddSeparator(); + m_HToolBar->AddSeparator(); - SelpartBox = new WinEDAChoiceBox(m_HToolBar, ID_LIBVIEW_SELECT_PART_NUMBER, - wxDefaultPosition, wxSize(150,-1)); - m_HToolBar->AddControl(SelpartBox); + SelpartBox = + new WinEDAChoiceBox( m_HToolBar, ID_LIBVIEW_SELECT_PART_NUMBER, + wxDefaultPosition, wxSize( 150, -1 ) ); + m_HToolBar->AddControl( SelpartBox ); - m_HToolBar->AddSeparator(); - m_HToolBar->AddTool(ID_LIBVIEW_VIEWDOC, wxEmptyString, BITMAP(datasheet_xpm), - _("View component documents") ); - m_HToolBar->EnableTool(ID_LIBVIEW_VIEWDOC, FALSE); + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_LIBVIEW_VIEWDOC, wxEmptyString, + wxBitmap( datasheet_xpm ), + _( "View component documents" ) ); + m_HToolBar->EnableTool( ID_LIBVIEW_VIEWDOC, FALSE ); - if ( m_Semaphore ) // The lib browser is called from a "load component" command - { - m_HToolBar->AddSeparator(); - m_HToolBar->AddTool(ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC, wxEmptyString, - BITMAP(export_xpm), - _("Insert component in schematic") ); - } + if( m_Semaphore ) // The lib browser is called from a "load component" command + { + m_HToolBar->AddSeparator(); + m_HToolBar->AddTool( ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC, + wxEmptyString, + wxBitmap( export_xpm ), + _( "Insert component in schematic" ) ); + } - // after adding the buttons to the toolbar, must call Realize() to reflect - // the changes - m_HToolBar->Realize(); - } + // after adding the buttons to the toolbar, must call Realize() to reflect + // the changes + m_HToolBar->Realize(); + } - // Must be AFTER Realize(): - m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, - (g_ViewConvert <= 1) ? TRUE : FALSE); - m_HToolBar->ToggleTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, - (g_ViewConvert >= 2) ? TRUE : FALSE ); - m_HToolBar->EnableTool(ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, asdeMorgan); - m_HToolBar->EnableTool(ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, asdeMorgan); + // Must be AFTER Realize(): + m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, + (g_ViewConvert <= 1) ? TRUE : FALSE ); + m_HToolBar->ToggleTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, + (g_ViewConvert >= 2) ? TRUE : FALSE ); + m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT, asdeMorgan ); + m_HToolBar->EnableTool( ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT, asdeMorgan ); - int jj = 1; - if( RootLibEntry ) jj = MAX(RootLibEntry->m_UnitCount, 1); - SelpartBox->Clear(); - for ( ii = 0; ii < jj ; ii ++ ) - { - wxString msg; - msg.Printf( _("Part %c"), 'A' + ii); - SelpartBox->Append(msg); - } - SelpartBox->SetSelection(0); - state = FALSE; - if ( CurrentLibEntry && jj > 1 ) state = TRUE; - SelpartBox->Enable(state); + int jj = 1; + if( RootLibEntry ) + jj = MAX( RootLibEntry->m_UnitCount, 1 ); + SelpartBox->Clear(); + for( ii = 0; ii < jj; ii++ ) + { + wxString msg; + msg.Printf( _( "Part %c" ), 'A' + ii ); + SelpartBox->Append( msg ); + } - state = FALSE; - if( CurrentLibEntry && (CurrentLibEntry->m_DocFile != wxEmptyString) ) - state = TRUE; - m_HToolBar->EnableTool(ID_LIBVIEW_VIEWDOC, state); + SelpartBox->SetSelection( 0 ); + state = FALSE; + if( CurrentLibEntry && jj > 1 ) + state = TRUE; + SelpartBox->Enable( state ); + + state = FALSE; + if( CurrentLibEntry && (CurrentLibEntry->m_DocFile != wxEmptyString) ) + state = TRUE; + m_HToolBar->EnableTool( ID_LIBVIEW_VIEWDOC, state ); } - /****************************************************/ void WinEDA_ViewlibFrame::ReCreateVToolbar() /****************************************************/ { } - diff --git a/eeschema/viewlib_frame.cpp b/eeschema/viewlib_frame.cpp index 1e8b8913f4..ce3620ce45 100644 --- a/eeschema/viewlib_frame.cpp +++ b/eeschema/viewlib_frame.cpp @@ -18,25 +18,24 @@ /*****************************/ /* class WinEDA_ViewlibFrame */ /*****************************/ -BEGIN_EVENT_TABLE( WinEDA_ViewlibFrame, wxFrame ) -COMMON_EVENTS_DRAWFRAME EVT_CLOSE( WinEDA_ViewlibFrame::OnCloseWindow ) -EVT_SIZE( WinEDA_ViewlibFrame::OnSize ) -EVT_ACTIVATE( WinEDA_DrawFrame::OnActivate ) +BEGIN_EVENT_TABLE( WinEDA_ViewlibFrame, WinEDA_DrawFrame ) + EVT_CLOSE( WinEDA_ViewlibFrame::OnCloseWindow ) + EVT_SIZE( WinEDA_ViewlibFrame::OnSize ) + EVT_ACTIVATE( WinEDA_DrawFrame::OnActivate ) -EVT_TOOL_RANGE( ID_LIBVIEW_START_H_TOOL, ID_LIBVIEW_END_H_TOOL, - WinEDA_ViewlibFrame::Process_Special_Functions ) + EVT_TOOL_RANGE( ID_LIBVIEW_START_H_TOOL, ID_LIBVIEW_END_H_TOOL, + WinEDA_ViewlibFrame::Process_Special_Functions ) -EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_DrawFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_DrawFrame::OnZoom ) -EVT_TOOL( ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC, - WinEDA_ViewlibFrame::ExportToSchematicLibraryPart ) + EVT_TOOL( ID_LIBVIEW_CMP_EXPORT_TO_SCHEMATIC, + WinEDA_ViewlibFrame::ExportToSchematicLibraryPart ) -EVT_KICAD_CHOICEBOX( ID_LIBVIEW_SELECT_PART_NUMBER, - WinEDA_ViewlibFrame::Process_Special_Functions ) + EVT_KICAD_CHOICEBOX( ID_LIBVIEW_SELECT_PART_NUMBER, + WinEDA_ViewlibFrame::Process_Special_Functions ) -EVT_LISTBOX( ID_LIBVIEW_LIB_LIST, WinEDA_ViewlibFrame::ClickOnLibList ) -EVT_LISTBOX( ID_LIBVIEW_CMP_LIST, WinEDA_ViewlibFrame::ClickOnCmpList ) + EVT_LISTBOX( ID_LIBVIEW_LIB_LIST, WinEDA_ViewlibFrame::ClickOnLibList ) + EVT_LISTBOX( ID_LIBVIEW_CMP_LIST, WinEDA_ViewlibFrame::ClickOnCmpList ) END_EVENT_TABLE() @@ -153,8 +152,8 @@ void WinEDA_ViewlibFrame::OnSize( wxSizeEvent& SizeEv ) if( DrawPanel ) { DrawPanel->SetSize( m_LibListSize.x + m_CmpListSize.x, 0, - size.x - Vtoolbar_size.x - m_LibListSize.x - m_CmpListSize.x, - size.y ); + size.x - Vtoolbar_size.x - m_LibListSize.x - m_CmpListSize.x, + size.y ); } if( m_LibList ) @@ -195,7 +194,7 @@ int WinEDA_ViewlibFrame::BestZoom() size = DrawPanel->GetClientSize(); size -= wxSize( 100, 100 ); // reserve a 100 mils margin - ii = (double) itemsize.x / size.x; + ii = itemsize.x / size.x; jj = itemsize.y / size.y; bestzoom = MAX( ii, jj ) + 1; diff --git a/gerbview/controle.cpp b/gerbview/controle.cpp index 034d73ce9b..14c91a57a0 100644 --- a/gerbview/controle.cpp +++ b/gerbview/controle.cpp @@ -71,21 +71,6 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) switch( g_KeyPressed ) { - case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_IN_KEY ); - curpos = GetScreen()->m_Curseur; - break; - - case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_OUT_KEY ); - curpos = GetScreen()->m_Curseur; - break; - - case EDA_ZOOM_CENTER_FROM_MOUSE: - OnZoom( ID_ZOOM_CENTER_KEY ); - curpos = GetScreen()->m_Curseur; - break; - case WXK_NUMPAD8: /* Deplacement curseur vers le haut */ case WXK_UP: Mouse.y -= delta.y; diff --git a/gerbview/gerberframe.cpp b/gerbview/gerberframe.cpp index bb806d9388..219cf91fa2 100644 --- a/gerbview/gerberframe.cpp +++ b/gerbview/gerberframe.cpp @@ -21,13 +21,11 @@ /* class WinEDA_GerberFrame for GerbView*/ /****************************************/ -BEGIN_EVENT_TABLE( WinEDA_GerberFrame, wxFrame ) - COMMON_EVENTS_DRAWFRAME +BEGIN_EVENT_TABLE( WinEDA_GerberFrame, WinEDA_BasePcbFrame ) EVT_CLOSE( WinEDA_GerberFrame::OnCloseWindow ) EVT_SIZE( WinEDA_GerberFrame::OnSize ) - EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_GerberFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_GerberFrame::OnZoom ) EVT_TOOL( ID_LOAD_FILE, WinEDA_GerberFrame::Files_io ) EVT_TOOL( ID_APPEND_FILE, WinEDA_GerberFrame::Files_io ) diff --git a/gerbview/hotkeys.cpp b/gerbview/hotkeys.cpp index f6f8892a58..01c1bb3e01 100644 --- a/gerbview/hotkeys.cpp +++ b/gerbview/hotkeys.cpp @@ -84,6 +84,9 @@ void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey, */ { + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + cmd.SetEventObject( this ); + // Remap the control key Ctrl A (0x01) to GR_KB_CTRL + 'A' (easier to handle...) if( (hotkey & GR_KB_CTRL) != 0 ) hotkey += 'A' - 1; @@ -99,34 +102,35 @@ void WinEDA_GerberFrame::OnHotKey( wxDC* DC, int hotkey, default: case HK_NOT_FOUND: return; - break; case HK_HELP: // Display Current hotkey list DisplayHotkeyList( this, s_Gerbview_Hokeys_Descr ); break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_IN_KEY ); + cmd.SetId( ID_POPUP_ZOOM_IN ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_OUT_KEY ); + cmd.SetId( ID_POPUP_ZOOM_OUT ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_REDRAW: - OnZoom( ID_ZOOM_REDRAW_KEY ); + cmd.SetId( ID_ZOOM_REDRAW ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_CENTER: - OnZoom( ID_ZOOM_CENTER_KEY ); + cmd.SetId( ID_POPUP_ZOOM_CENTER ); + GetEventHandler()->ProcessEvent( cmd ); break; - case HK_RESET_LOCAL_COORD: /*Reset the relative coord */ GetScreen()->m_O_Curseur = GetScreen()->m_Curseur; break; - case HK_SWITCH_UNITS: g_UnitMetric = (g_UnitMetric == INCHES ) ? MILLIMETRE : INCHES; break; diff --git a/gerbview/tool_gerber.cpp b/gerbview/tool_gerber.cpp index 768a4541ea..93e574f0a9 100644 --- a/gerbview/tool_gerber.cpp +++ b/gerbview/tool_gerber.cpp @@ -209,27 +209,27 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void ) // Set up toolbar m_HToolBar->AddTool( ID_NEW_BOARD, wxBitmap( new_xpm ), - wxNullBitmap, FALSE, - -1, -1, (wxObject*) NULL, - _( "New World" ) ); + wxNullBitmap, FALSE, + -1, -1, (wxObject*) NULL, + _( "New World" ) ); m_HToolBar->AddTool( ID_LOAD_FILE, wxBitmap( open_xpm ), - wxNullBitmap, FALSE, - -1, -1, (wxObject*) NULL, - _( "Open existing Layer" ) ); + wxNullBitmap, FALSE, + -1, -1, (wxObject*) NULL, + _( "Open existing Layer" ) ); #if 0 m_HToolBar->AddTool( ID_SAVE_PROJECT, wxBitmap( save_button ), - wxNullBitmap, FALSE, - -1, -1, (wxObject*) NULL, - _( "Save World" ) ); + wxNullBitmap, FALSE, + -1, -1, (wxObject*) NULL, + _( "Save World" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_SHEET_SET, wxBitmap( sheetset_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "page settings (size, texts)" ) ); + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "page settings (size, texts)" ) ); #endif @@ -237,70 +237,70 @@ void WinEDA_GerberFrame::ReCreateHToolbar( void ) #if 0 m_HToolBar->AddTool( wxID_CUT, wxBitmap( cut_button ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Cut selected item" ) ); + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Cut selected item" ) ); m_HToolBar->AddTool( wxID_COPY, wxBitmap( copy_button ), - wxNullBitmap, FALSE, - -1, -1, (wxObject*) NULL, - _( "Copy selected item" ) ); + wxNullBitmap, FALSE, + -1, -1, (wxObject*) NULL, + _( "Copy selected item" ) ); m_HToolBar->AddTool( wxID_PASTE, wxBitmap( paste_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Paste" ) ); + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Paste" ) ); #endif m_HToolBar->AddTool( ID_UNDO_BUTT, wxBitmap( undelete_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Undelete" ) ); + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Undelete" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_GEN_PRINT, wxBitmap( print_button ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Print World" ) ); + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Print World" ) ); m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxBitmap( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN, wxBitmap( zoom_in_xpm ), wxNullBitmap, FALSE, -1, -1, (wxObject*) NULL, msg ); msg = AddHotkeyName( _( "Zoom out" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxBitmap( zoom_out_xpm ), + m_HToolBar->AddTool( ID_ZOOM_OUT, wxBitmap( zoom_out_xpm ), wxNullBitmap, FALSE, -1, -1, (wxObject*) NULL, msg ); msg = AddHotkeyName( _( "Redraw view" ), s_Gerbview_Hokeys_Descr, HK_ZOOM_REDRAW ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxBitmap( zoom_redraw_xpm ), + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxBitmap( zoom_redraw_xpm ), wxNullBitmap, FALSE, -1, -1, (wxObject*) NULL, msg ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxBitmap( zoom_auto_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Zoom auto" ) ); + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxBitmap( zoom_auto_xpm ), + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Zoom auto" ) ); m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_FIND_ITEMS, wxBitmap( find_xpm ), - wxNullBitmap, - FALSE, - -1, -1, (wxObject*) NULL, - _( "Find D-codes" ) ); + wxNullBitmap, + FALSE, + -1, -1, (wxObject*) NULL, + _( "Find D-codes" ) ); wxArrayString choices; m_HToolBar->AddSeparator(); @@ -360,37 +360,37 @@ create or update the right vertical toolbar #if 0 m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_COMPONENT_BUTT, - wxBitmap( component_button ), - wxNullBitmap, TRUE, - -1, -1, (wxObject*) NULL, - _( "Add Flashes" ) ); + wxBitmap( component_button ), + wxNullBitmap, TRUE, + -1, -1, (wxObject*) NULL, + _( "Add Flashes" ) ); m_VToolBar->AddTool( ID_BUS_BUTT, - wxBitmap( bus_button ), - wxNullBitmap, TRUE, - -1, -1, (wxObject*) NULL, - _( "Add Lines" ) ); + wxBitmap( bus_button ), + wxNullBitmap, TRUE, + -1, -1, (wxObject*) NULL, + _( "Add Lines" ) ); m_VToolBar->AddTool( ID_JUNCTION_BUTT, - wxBitmap( junction_xpm ), - wxNullBitmap, TRUE, - -1, -1, (wxObject*) NULL, - _( "Add layer alignment target" ) ); + wxBitmap( junction_xpm ), + wxNullBitmap, TRUE, + -1, -1, (wxObject*) NULL, + _( "Add layer alignment target" ) ); m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_TEXT_COMMENT_BUTT, - wxBitmap( tool_text_xpm ), - wxNullBitmap, TRUE, - -1, -1, (wxObject*) NULL, - _( "Add Text" ) ); + wxBitmap( tool_text_xpm ), + wxNullBitmap, TRUE, + -1, -1, (wxObject*) NULL, + _( "Add Text" ) ); #endif m_VToolBar->AddSeparator(); m_VToolBar->AddTool( ID_PCB_DELETE_ITEM_BUTT, - wxBitmap( delete_body_xpm ), - wxNullBitmap, TRUE, - -1, -1, (wxObject*) NULL, - _( "Delete items" ) ); + wxBitmap( delete_body_xpm ), + wxNullBitmap, TRUE, + -1, -1, (wxObject*) NULL, + _( "Delete items" ) ); m_VToolBar->Realize(); SetToolbars(); @@ -411,16 +411,16 @@ create or update the left vertical toolbar (option toolbar m_OptionsToolBar = new WinEDA_Toolbar( TOOLBAR_OPTION, this, ID_OPT_TOOLBAR, FALSE ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_GRID, wxBitmap( grid_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Display Grid OFF" ) ); + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Display Grid OFF" ) ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLAR_COORD, wxBitmap( polar_coord_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Display Polar Coord ON" ) ); + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Display Polar Coord ON" ) ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_UNIT_INCH, wxEmptyString, wxBitmap( unit_inch_xpm ), @@ -431,42 +431,41 @@ create or update the left vertical toolbar (option toolbar _( "Units in millimeters" ), wxITEM_CHECK ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SELECT_CURSOR, wxBitmap( cursor_shape_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Change Cursor Shape" ) ); + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Change Cursor Shape" ) ); m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_PADS_SKETCH, - wxBitmap( pad_sketch_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Show Spots in Sketch Mode" ) ); + wxBitmap( pad_sketch_xpm ), + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Show Spots in Sketch Mode" ) ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_TRACKS_SKETCH, - wxBitmap( showtrack_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Show Lines in Sketch Mode" ) ); + wxBitmap( showtrack_xpm ), + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Show Lines in Sketch Mode" ) ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_POLYGONS_SKETCH, - wxBitmap( opt_show_polygon_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Show Polygons in Sketch Mode" ) ); + wxBitmap( opt_show_polygon_xpm ), + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Show Polygons in Sketch Mode" ) ); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_DCODES, - wxBitmap( show_dcodenumber_xpm ), - wxNullBitmap, - TRUE, - -1, -1, (wxObject*) NULL, - _( "Show dcode number" ) ); + wxBitmap( show_dcodenumber_xpm ), + wxNullBitmap, + TRUE, + -1, -1, (wxObject*) NULL, + _( "Show dcode number" ) ); m_OptionsToolBar->Realize(); SetToolbars(); } - diff --git a/include/drawpanel_wxstruct.h b/include/drawpanel_wxstruct.h index 2deedbd14e..565022059f 100644 --- a/include/drawpanel_wxstruct.h +++ b/include/drawpanel_wxstruct.h @@ -40,7 +40,6 @@ WX_DECLARE_OBJARRAY( GRID_TYPE, GridArray ); class WinEDA_DrawPanel : public wxScrolledWindow { public: - int m_Ident; WinEDA_DrawFrame* m_Parent; EDA_Rect m_ClipBox; // the clipbox used in screen redraw (usually gives the visible area in internal units) wxPoint m_CursorStartPos; // utile dans controles du mouvement curseur @@ -114,7 +113,6 @@ public: void AddMenuZoom( wxMenu* MasterMenu ); bool OnRightClick( wxMouseEvent& event ); - void Process_Popup_Zoom( wxCommandEvent& event ); void OnPopupGridSelect( wxCommandEvent& event ); void Process_Special_Functions( wxCommandEvent& event ); wxPoint CursorRealPosition( const wxPoint& ScreenPos ); diff --git a/include/id.h b/include/id.h index 1c31ce0186..4351cf9956 100644 --- a/include/id.h +++ b/include/id.h @@ -223,8 +223,6 @@ enum main_id { ID_POPUP_ZOOM_OUT, ID_POPUP_ZOOM_SELECT, ID_POPUP_ZOOM_CENTER, - ID_POPUP_ZOOM_AUTO, - ID_POPUP_ZOOM_REDRAW, ID_POPUP_ZOOM_LEVEL_1, ID_POPUP_ZOOM_LEVEL_2, ID_POPUP_ZOOM_LEVEL_4, @@ -370,21 +368,10 @@ enum main_id { ID_TO_LIBRARY, ID_TO_LIBVIEW, - 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_IN_KEY, - ID_ZOOM_OUT_KEY, - ID_ZOOM_REDRAW_KEY, - ID_ZOOM_CENTER_KEY, - ID_ZOOM_AUTO, - ID_ZOOM_UNUSED0, - ID_ZOOM_UNUSED1, - ID_ZOOM_UNUSED2, - ID_ZOOM_UNUSED3, - ID_ZOOM_ENDLIST, + ID_ZOOM_IN, // Gestion zoom: id consecutifs + ID_ZOOM_OUT, + ID_ZOOM_REDRAW, + ID_ZOOM_PAGE, /* Panning command event IDs. */ ID_PAN_UP, diff --git a/include/wxstruct.h b/include/wxstruct.h index 8f22eb1a0d..fcc3d58daa 100644 --- a/include/wxstruct.h +++ b/include/wxstruct.h @@ -174,8 +174,6 @@ public: class WinEDA_DrawFrame : public WinEDA_BasicFrame { - - public: WinEDA_DrawPanel* DrawPanel; // Draw area WinEDA_MsgPanel* MsgPanel; // Zone d'affichage de caracteristiques @@ -260,7 +258,7 @@ public: // void OnChar(wxKeyEvent& event); void SetToolbarBgColor( int color_num ); - void OnZoom( int zoom_type ); + virtual void OnZoom( wxCommandEvent& event ); void OnGrid( int grid_type ); void Recadre_Trace( bool ToMouse ); void PutOnGrid( wxPoint* coord ); /* set the coordiante "coord" to the nearest grid coordinate */ @@ -314,14 +312,10 @@ public: /* interprocess communication */ void OnSockRequest( wxSocketEvent& evt ); void OnSockRequestServer( wxSocketEvent& evt ); + + DECLARE_EVENT_TABLE(); }; -#define COMMON_EVENTS_DRAWFRAME \ - EVT_MOUSEWHEEL( WinEDA_DrawFrame::OnMouseEvent ) \ - EVT_MENU_OPEN( WinEDA_DrawFrame::OnMenuOpen ) \ - EVT_ACTIVATE( WinEDA_DrawFrame::OnActivate ) - - /****************************************************/ /* classe representant un ecran graphique de dessin */ diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp index 13cac09acd..6c280f7525 100644 --- a/pcbnew/basepcbframe.cpp +++ b/pcbnew/basepcbframe.cpp @@ -23,7 +23,6 @@ /*******************************/ BEGIN_EVENT_TABLE( WinEDA_BasePcbFrame, WinEDA_DrawFrame ) - COMMON_EVENTS_DRAWFRAME EVT_MENU_RANGE( ID_POPUP_PCB_ITEM_SELECTION_START, ID_POPUP_PCB_ITEM_SELECTION_END, WinEDA_BasePcbFrame::ProcessItemSelection ) diff --git a/pcbnew/class_module.cpp b/pcbnew/class_module.cpp index 4e8c7a917c..81bbaec43c 100644 --- a/pcbnew/class_module.cpp +++ b/pcbnew/class_module.cpp @@ -891,7 +891,7 @@ EDA_Rect MODULE::GetBoundingBox() /*******************************************************/ -void MODULE::Display_Infos( WinEDA_DrawFrame* frame ) +void MODULE::Display_Infos( WinEDA_BasePcbFrame* frame ) /*******************************************************/ { int nbpad; diff --git a/pcbnew/class_module.h b/pcbnew/class_module.h index 9cbfd729c9..bc65e624f8 100644 --- a/pcbnew/class_module.h +++ b/pcbnew/class_module.h @@ -195,7 +195,7 @@ public: * about this object into the frame's message panel. * @param frame A WinEDA_DrawFrame in which to print status information. */ - void Display_Infos( WinEDA_DrawFrame* frame ); + void Display_Infos( WinEDA_BasePcbFrame* frame ); /** diff --git a/pcbnew/controle.cpp b/pcbnew/controle.cpp index f016ae36f6..1133ef060c 100644 --- a/pcbnew/controle.cpp +++ b/pcbnew/controle.cpp @@ -530,21 +530,6 @@ void WinEDA_BasePcbFrame::GeneralControle( wxDC* DC, wxPoint Mouse ) switch( g_KeyPressed ) { - case EDA_ZOOM_IN_FROM_MOUSE: - OnZoom( ID_ZOOM_IN_KEY ); - oldpos = curpos = GetScreen()->m_Curseur; - break; - - case EDA_ZOOM_OUT_FROM_MOUSE: - OnZoom( ID_ZOOM_OUT_KEY ); - oldpos = curpos = GetScreen()->m_Curseur; - break; - - case EDA_ZOOM_CENTER_FROM_MOUSE: - OnZoom( ID_ZOOM_CENTER_KEY ); - oldpos = curpos = GetScreen()->m_Curseur; - break; - case WXK_NUMPAD8: /* Deplacement curseur vers le haut */ case WXK_UP: Mouse.y -= delta.y; diff --git a/pcbnew/hotkeys.cpp b/pcbnew/hotkeys.cpp index 097f419fc1..87c422b65f 100644 --- a/pcbnew/hotkeys.cpp +++ b/pcbnew/hotkeys.cpp @@ -4,8 +4,6 @@ #include "fctsys.h" -#include "gr_basic.h" - #include "common.h" #include "pcbnew.h" #include "id.h" @@ -172,6 +170,9 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, */ { + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + cmd.SetEventObject( this ); + bool PopupOn = (GetCurItem() && GetCurItem()->m_Flags); bool ItemFree = (GetCurItem()==0 || GetCurItem()->m_Flags==0); @@ -269,19 +270,23 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_IN_KEY ); + cmd.SetId( ID_POPUP_ZOOM_IN ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_OUT_KEY ); + cmd.SetId( ID_POPUP_ZOOM_OUT ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_REDRAW: - OnZoom( ID_ZOOM_REDRAW_KEY ); + cmd.SetId( ID_ZOOM_REDRAW ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_CENTER: - OnZoom( ID_ZOOM_CENTER_KEY ); + cmd.SetId( ID_POPUP_ZOOM_CENTER ); + GetEventHandler()->ProcessEvent( cmd ); break; @@ -534,6 +539,9 @@ void WinEDA_ModuleEditFrame::OnHotKey( wxDC* DC, int hotkey, if( hotkey == 0 ) return; + wxCommandEvent cmd( wxEVT_COMMAND_MENU_SELECTED ); + cmd.SetEventObject( this ); + /* Convert lower to upper case (the usual toupper function has problem with non ascii codes like function keys */ if( (hotkey >= 'a') && (hotkey <= 'z') ) hotkey += 'A' - 'a'; @@ -564,19 +572,23 @@ void WinEDA_ModuleEditFrame::OnHotKey( wxDC* DC, int hotkey, break; case HK_ZOOM_IN: - OnZoom( ID_ZOOM_IN_KEY ); + cmd.SetId( ID_POPUP_ZOOM_IN ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_OUT: - OnZoom( ID_ZOOM_OUT_KEY ); + cmd.SetId( ID_POPUP_ZOOM_OUT ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_REDRAW: - OnZoom( ID_ZOOM_REDRAW_KEY ); + cmd.SetId( ID_ZOOM_REDRAW ); + GetEventHandler()->ProcessEvent( cmd ); break; case HK_ZOOM_CENTER: - OnZoom( ID_ZOOM_CENTER_KEY ); + cmd.SetId( ID_POPUP_ZOOM_CENTER ); + GetEventHandler()->ProcessEvent( cmd ); break; } } diff --git a/pcbnew/moduleframe.cpp b/pcbnew/moduleframe.cpp index 74fa7ab2e4..4f8103cb05 100644 --- a/pcbnew/moduleframe.cpp +++ b/pcbnew/moduleframe.cpp @@ -18,8 +18,7 @@ /********************************/ /* class WinEDA_ModuleEditFrame */ /********************************/ -BEGIN_EVENT_TABLE( WinEDA_ModuleEditFrame, wxFrame ) - COMMON_EVENTS_DRAWFRAME +BEGIN_EVENT_TABLE( WinEDA_ModuleEditFrame, WinEDA_BasePcbFrame ) EVT_MENU_RANGE( ID_POPUP_PCB_ITEM_SELECTION_START, ID_POPUP_PCB_ITEM_SELECTION_END, WinEDA_BasePcbFrame::ProcessItemSelection ) @@ -29,8 +28,7 @@ BEGIN_EVENT_TABLE( WinEDA_ModuleEditFrame, wxFrame ) 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_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_ModuleEditFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_ModuleEditFrame::OnZoom ) EVT_TOOL( ID_LIBEDIT_SELECT_CURRENT_LIB, WinEDA_ModuleEditFrame::Process_Special_Functions ) diff --git a/pcbnew/pcbframe.cpp b/pcbnew/pcbframe.cpp index cd774c989d..d351754d30 100644 --- a/pcbnew/pcbframe.cpp +++ b/pcbnew/pcbframe.cpp @@ -19,7 +19,6 @@ /*******************************/ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame ) - COMMON_EVENTS_DRAWFRAME EVT_SOCKET( ID_EDA_SOCKET_EVENT_SERV, WinEDA_PcbFrame::OnSockRequestServer ) EVT_SOCKET( ID_EDA_SOCKET_EVENT, WinEDA_PcbFrame::OnSockRequest ) @@ -29,8 +28,7 @@ BEGIN_EVENT_TABLE( WinEDA_PcbFrame, WinEDA_BasePcbFrame ) EVT_CLOSE( WinEDA_PcbFrame::OnCloseWindow ) EVT_SIZE( WinEDA_PcbFrame::OnSize ) - EVT_TOOL_RANGE( ID_ZOOM_IN_BUTT, ID_ZOOM_PAGE_BUTT, - WinEDA_PcbFrame::Process_Zoom ) + EVT_TOOL_RANGE( ID_ZOOM_IN, ID_ZOOM_PAGE, WinEDA_PcbFrame::OnZoom ) EVT_TOOL( ID_LOAD_FILE, WinEDA_PcbFrame::Files_io ) EVT_TOOL( ID_MENU_READ_LAST_SAVED_VERSION_BOARD, WinEDA_PcbFrame::Files_io ) diff --git a/pcbnew/tool_modedit.cpp b/pcbnew/tool_modedit.cpp index 1e55ee259a..2ce207908c 100644 --- a/pcbnew/tool_modedit.cpp +++ b/pcbnew/tool_modedit.cpp @@ -104,20 +104,20 @@ void WinEDA_ModuleEditFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "Zoom out" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "Redraw view" ), s_Module_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), _( "Zoom auto" ) ); diff --git a/pcbnew/tool_pcb.cpp b/pcbnew/tool_pcb.cpp index 9ee108f8b3..99546d4c9b 100644 --- a/pcbnew/tool_pcb.cpp +++ b/pcbnew/tool_pcb.cpp @@ -260,20 +260,20 @@ void WinEDA_PcbFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); msg = AddHotkeyName( _( "Zoom in" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_IN ); - m_HToolBar->AddTool( ID_ZOOM_IN_BUTT, wxEmptyString, wxBitmap( zoom_in_xpm ), + m_HToolBar->AddTool( ID_ZOOM_IN, wxEmptyString, wxBitmap( zoom_in_xpm ), msg ); msg = AddHotkeyName( _( "Zoom out" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_OUT ); - m_HToolBar->AddTool( ID_ZOOM_OUT_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_OUT, wxEmptyString, wxBitmap( zoom_out_xpm ), msg ); msg = AddHotkeyName( _( "Redraw view" ), s_Board_Editor_Hokeys_Descr, HK_ZOOM_REDRAW ); - m_HToolBar->AddTool( ID_ZOOM_REDRAW_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_REDRAW, wxEmptyString, wxBitmap( zoom_redraw_xpm ), msg ); - m_HToolBar->AddTool( ID_ZOOM_PAGE_BUTT, wxEmptyString, + m_HToolBar->AddTool( ID_ZOOM_PAGE, wxEmptyString, wxBitmap( zoom_auto_xpm ), _( "Zoom auto" ) ); @@ -286,9 +286,9 @@ void WinEDA_PcbFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); m_HToolBar->AddTool( ID_GET_NETLIST, wxEmptyString, wxBitmap( netlist_xpm ), - _( "Read netlist" ) ); + _( "Read netlist" ) ); m_HToolBar->AddTool( ID_DRC_CONTROL, wxEmptyString, wxBitmap( erc_xpm ), - _( "Pcb Design Rules Check" ) ); + _( "Pcb Design Rules Check" ) ); m_HToolBar->AddSeparator(); @@ -370,14 +370,14 @@ void WinEDA_PcbFrame::ReCreateOptToolbar() m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddRadioTool( ID_TB_OPTIONS_SHOW_ZONES, wxEmptyString, - wxBitmap( show_zone_xpm ), wxNullBitmap, - _( "Show filled areas in zones" ) ); + wxBitmap( show_zone_xpm ), wxNullBitmap, + _( "Show filled areas in zones" ) ); m_OptionsToolBar->AddRadioTool( ID_TB_OPTIONS_SHOW_ZONES_DISABLE, wxEmptyString, - wxBitmap( show_zone_disable_xpm ), wxNullBitmap, - _( "Do not show filled areas in zones" )); + wxBitmap( show_zone_disable_xpm ), wxNullBitmap, + _( "Do not show filled areas in zones" )); m_OptionsToolBar->AddRadioTool( ID_TB_OPTIONS_SHOW_ZONES_OUTLINES_ONLY, wxEmptyString, - wxBitmap( show_zone_outline_only_xpm ), wxNullBitmap, - _( "Show outlines of filled areas only in zones" ) ); + wxBitmap( show_zone_outline_only_xpm ), wxNullBitmap, + _( "Show outlines of filled areas only in zones" ) ); m_OptionsToolBar->AddSeparator(); m_OptionsToolBar->AddTool( ID_TB_OPTIONS_SHOW_PADS_SKETCH, wxEmptyString, @@ -573,8 +573,8 @@ void WinEDA_PcbFrame::ReCreateAuxiliaryToolbar() // Set up toolbar m_AuxiliaryToolBar->AddSeparator(); m_SelTrackWidthBox = new WinEDAChoiceBox( m_AuxiliaryToolBar, - ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, - wxPoint( -1, -1 ), + ID_AUX_TOOLBAR_PCB_TRACK_WIDTH, + wxPoint( -1, -1 ), wxSize( LISTBOX_WIDTH + 20, -1 ) ); m_AuxiliaryToolBar->AddControl( m_SelTrackWidthBox ); m_SelTrackWidthBox_Changed = TRUE;