diff --git a/cvpcb/menubar.cpp b/cvpcb/menubar.cpp index cb37586401..139643d6c0 100644 --- a/cvpcb/menubar.cpp +++ b/cvpcb/menubar.cpp @@ -106,7 +106,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() // Quit AddMenuItem( filesMenu, wxID_EXIT, - _( "&Quit" ), _( "Quit CvPcb" ), + _( "&Close" ), _( "Close CvPcb" ), KiBitmap( exit_xpm ) ); // Menu Preferences: @@ -134,7 +134,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() // Keep open on save item = new wxMenuItem( preferencesMenu, ID_CVPCB_CONFIG_KEEP_OPEN_ON_SAVE, - _( "Keep Open On Save" ), + _( "&Keep Open On Save" ), _( "Prevent CvPcb from exiting after saving netlist file" ), wxITEM_CHECK ); preferencesMenu->Append( item ); diff --git a/eeschema/menubar.cpp b/eeschema/menubar.cpp index 26957253c2..19800cae60 100644 --- a/eeschema/menubar.cpp +++ b/eeschema/menubar.cpp @@ -102,7 +102,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() } AddMenuItem( fileMenu, - ID_APPEND_PROJECT, _( "&Append Schematic Sheet" ), + ID_APPEND_PROJECT, _( "App&end Schematic Sheet" ), _( "Append schematic sheet to current project" ), KiBitmap( open_document_xpm ) ); @@ -125,7 +125,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() { AddMenuItem( fileMenu, ID_SAVE_ONE_SHEET_UNDER_NEW_NAME, - _( "Save Current Sheet &As" ), + _( "Save C&urrent Sheet As" ), _( "Save current schematic sheet as..." ), KiBitmap( save_as_xpm ) ); } @@ -156,7 +156,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() // Plot to Clipboard (Windows only) AddMenuItem( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD, - _( "Plot to &Clipboard" ), + _( "Plot to C&lipboard" ), _( "Export drawings to clipboard" ), KiBitmap( copy_button_xpm ) ); @@ -183,8 +183,8 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() // Quit AddMenuItem( fileMenu, wxID_EXIT, - _( "&Quit" ), - _( "Quit Eeschema" ), + _( "&Close" ), + _( "Close Eeschema" ), KiBitmap( exit_xpm ) ); // Menu Edit: @@ -361,14 +361,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() HELP_PLACE_GRAPHICLINES, KiBitmap( add_dashed_line_xpm ) ); - text = AddHotkeyName( _( "Graphic &Text" ), g_Schematic_Hokeys_Descr, + text = AddHotkeyName( _( "&Graphic Text" ), g_Schematic_Hokeys_Descr, HK_ADD_GRAPHIC_TEXT, IS_ACCELERATOR ); // add an accelerator, not a shortcut AddMenuItem( placeMenu, ID_TEXT_COMMENT_BUTT, text, HELP_PLACE_GRAPHICTEXTS, KiBitmap( add_text_xpm ) ); // Graphic image - AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _( "Image" ), + AddMenuItem( placeMenu, ID_ADD_IMAGE_BUTT, _( "&Image" ), HELP_PLACE_GRAPHICIMAGES, KiBitmap( image_xpm ) ); diff --git a/eeschema/sch_sheet_path.cpp b/eeschema/sch_sheet_path.cpp index de309de11d..7fab9e8ff2 100644 --- a/eeschema/sch_sheet_path.cpp +++ b/eeschema/sch_sheet_path.cpp @@ -202,7 +202,7 @@ wxString SCH_SHEET_PATH::Path() const // it's timestamp changes anyway. for( unsigned i = 1; i < m_numSheets; i++ ) { - t.Printf( _( "%8.8lX/" ), m_sheets[i]->GetTimeStamp() ); + t.Printf( _( "%8.8lX/" ), (long unsigned) m_sheets[i]->GetTimeStamp() ); s = s + t; } diff --git a/eeschema/sheet.cpp b/eeschema/sheet.cpp index c3b6db7c5a..8254ef4eea 100644 --- a/eeschema/sheet.cpp +++ b/eeschema/sheet.cpp @@ -239,7 +239,8 @@ bool SCH_EDIT_FRAME::EditSheet( SCH_SHEET* aSheet, wxDC* aDC ) aSheet->SetSheetNameSize( ValueFromString( g_UserUnit, dlg.GetSheetNameTextSize() ) ); if( aSheet->GetName().IsEmpty() ) - aSheet->SetName( wxString::Format( wxT( "Sheet%8.8lX" ), aSheet->GetTimeStamp() ) ); + aSheet->SetName( wxString::Format( wxT( "Sheet%8.8lX" ), + (long unsigned) aSheet->GetTimeStamp() ) ); m_canvas->MoveCursorToCrossHair(); m_canvas->SetIgnoreMouseEvents( false ); diff --git a/gerbview/menubar.cpp b/gerbview/menubar.cpp index 4703b6da66..b5c5429849 100644 --- a/gerbview/menubar.cpp +++ b/gerbview/menubar.cpp @@ -112,7 +112,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Clear all AddMenuItem( fileMenu, ID_GERBVIEW_ERASE_ALL, - _( "&Clear All" ), + _( "Clear &All" ), _( "Clear all layers. All data will be deleted" ), KiBitmap( gerbview_clear_layers_xpm ) ); @@ -142,8 +142,8 @@ void GERBVIEW_FRAME::ReCreateMenuBar() // Exit AddMenuItem( fileMenu, wxID_EXIT, - _( "E&xit" ), - _( "Quit GerbView" ), + _( "&Close" ), + _( "Close GerbView" ), KiBitmap( exit_xpm ) ); // Menu for configuration and preferences diff --git a/kicad/menubar.cpp b/kicad/menubar.cpp index 6e11dd987e..a9e09559cd 100644 --- a/kicad/menubar.cpp +++ b/kicad/menubar.cpp @@ -278,8 +278,8 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar() // Quit AddMenuItem( fileMenu, wxID_EXIT, - _( "&Quit" ), - _( "Quit KiCad" ), + _( "&Close" ), + _( "Close KiCad" ), KiBitmap( exit_xpm ) ); // Menu Browse: diff --git a/pagelayout_editor/menubar.cpp b/pagelayout_editor/menubar.cpp index 3276af3eb7..cfd674d40e 100644 --- a/pagelayout_editor/menubar.cpp +++ b/pagelayout_editor/menubar.cpp @@ -62,7 +62,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() _( "&New Page Layout Design" ), wxEmptyString, KiBitmap( pagelayout_new_xpm ) ); AddMenuItem( fileMenu, wxID_OPEN, - _( "Load &Page Layout File" ), + _( "Load Page Layout &File" ), wxEmptyString, KiBitmap( pagelayout_load_xpm ) ); AddMenuItem( fileMenu, ID_LOAD_DEFAULT_PAGE_LAYOUT, _( "Load &Default Page Layout" ), @@ -108,8 +108,8 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // Exit AddMenuItem( fileMenu, wxID_EXIT, - _( "E&xit" ), - _( "Quit Pl_Editor" ), + _( "&Close" ), + _( "&Close Page Layout Editor" ), KiBitmap( exit_xpm ) ); // Menu for preferences @@ -155,7 +155,7 @@ void PL_EDITOR_FRAME::ReCreateMenuBar() // About GerbView AddMenuItem( helpMenu, wxID_ABOUT, - _( "&About Pl_Editor" ), + _( "&About Page Layout Editor" ), _( "About page layout description editor" ), KiBitmap( online_help_xpm ) ); diff --git a/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp b/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp index 8a3f0eb53c..65c8b2af57 100644 --- a/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp +++ b/pcbnew/dialogs/dialog_pcb_text_properties_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -32,7 +32,7 @@ DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* pare bSizer9->Add( m_TextContentCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 ); wxFlexGridSizer* fgSizer1; - fgSizer1 = new wxFlexGridSizer( 0, 4, 0, 0 ); + fgSizer1 = new wxFlexGridSizer( 6, 4, 0, 0 ); fgSizer1->AddGrowableCol( 0 ); fgSizer1->AddGrowableCol( 1 ); fgSizer1->AddGrowableCol( 2 ); @@ -40,82 +40,82 @@ DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* pare fgSizer1->SetFlexibleDirection( wxBOTH ); fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_SizeXLabel = new wxStaticText( this, wxID_ANY, _("Size X"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeXLabel = new wxStaticText( this, wxID_ANY, _("Width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXLabel->Wrap( -1 ); - fgSizer1->Add( m_SizeXLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_SizeXLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_PositionXLabel = new wxStaticText( this, wxID_ANY, _("Position X"), wxDefaultPosition, wxDefaultSize, 0 ); + m_PositionXLabel = new wxStaticText( this, wxID_ANY, _("Position X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PositionXLabel->Wrap( -1 ); - fgSizer1->Add( m_PositionXLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_PositionXLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_LayerLabel = new wxStaticText( this, wxID_ANY, _("Layer:"), wxDefaultPosition, wxDefaultSize, 0 ); m_LayerLabel->Wrap( -1 ); - fgSizer1->Add( m_LayerLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_LayerLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_staticText10 = new wxStaticText( this, wxID_ANY, _("Display:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText10->Wrap( -1 ); - fgSizer1->Add( m_staticText10, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_staticText10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_SizeXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizeXCtrl->SetMaxLength( 0 ); - fgSizer1->Add( m_SizeXCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_SizeXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_PositionXCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PositionXCtrl->SetMaxLength( 0 ); - fgSizer1->Add( m_PositionXCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_PositionXCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_LayerSelectionCtrl = new PCB_LAYER_BOX_SELECTOR( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 ); - fgSizer1->Add( m_LayerSelectionCtrl, 0, wxALL, 5 ); + fgSizer1->Add( m_LayerSelectionCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); wxString m_DisplayCtrlChoices[] = { _("Normal"), _("Mirrored") }; int m_DisplayCtrlNChoices = sizeof( m_DisplayCtrlChoices ) / sizeof( wxString ); m_DisplayCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_DisplayCtrlNChoices, m_DisplayCtrlChoices, 0 ); m_DisplayCtrl->SetSelection( 0 ); - fgSizer1->Add( m_DisplayCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_DisplayCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Size Y"), wxDefaultPosition, wxDefaultSize, 0 ); + m_SizeYLabel = new wxStaticText( this, wxID_ANY, _("Height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYLabel->Wrap( -1 ); - fgSizer1->Add( m_SizeYLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_SizeYLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y"), wxDefaultPosition, wxDefaultSize, 0 ); + m_PositionYLabel = new wxStaticText( this, wxID_ANY, _("Position Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_PositionYLabel->Wrap( -1 ); - fgSizer1->Add( m_PositionYLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_PositionYLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_staticText9 = new wxStaticText( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); - fgSizer1->Add( m_staticText9, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_staticText9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_staticText11 = new wxStaticText( this, wxID_ANY, _("Justification:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); - fgSizer1->Add( m_staticText11, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_staticText11, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_SizeYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_SizeYCtrl->SetMaxLength( 0 ); - fgSizer1->Add( m_SizeYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_SizeYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_PositionYCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PositionYCtrl->SetMaxLength( 0 ); - fgSizer1->Add( m_PositionYCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_PositionYCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); wxString m_StyleCtrlChoices[] = { _("Normal"), _("Italic") }; int m_StyleCtrlNChoices = sizeof( m_StyleCtrlChoices ) / sizeof( wxString ); m_StyleCtrl = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_StyleCtrlNChoices, m_StyleCtrlChoices, 0 ); m_StyleCtrl->SetSelection( 0 ); - fgSizer1->Add( m_StyleCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_StyleCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); wxString m_justifyChoiceChoices[] = { _("Left"), _("Center"), _("Right") }; int m_justifyChoiceNChoices = sizeof( m_justifyChoiceChoices ) / sizeof( wxString ); m_justifyChoice = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_justifyChoiceNChoices, m_justifyChoiceChoices, 0 ); m_justifyChoice->SetSelection( 0 ); - fgSizer1->Add( m_justifyChoice, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_justifyChoice, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness"), wxDefaultPosition, wxDefaultSize, 0 ); + m_ThicknessLabel = new wxStaticText( this, wxID_ANY, _("Thickness:"), wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessLabel->Wrap( -1 ); - fgSizer1->Add( m_ThicknessLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_ThicknessLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_orientationLabel = new wxStaticText( this, wxID_ANY, _("Orientation (0.1 deg):"), wxDefaultPosition, wxDefaultSize, 0 ); m_orientationLabel->Wrap( -1 ); - fgSizer1->Add( m_orientationLabel, 0, wxLEFT|wxRIGHT|wxTOP, 5 ); + fgSizer1->Add( m_orientationLabel, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); fgSizer1->Add( 0, 0, 1, wxEXPAND, 5 ); @@ -125,14 +125,14 @@ DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* pare m_ThicknessCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_ThicknessCtrl->SetMaxLength( 0 ); - fgSizer1->Add( m_ThicknessCtrl, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); + fgSizer1->Add( m_ThicknessCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); m_OrientationCtrl = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_OrientationCtrl->SetMaxLength( 0 ); - fgSizer1->Add( m_OrientationCtrl, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer1->Add( m_OrientationCtrl, 0, wxALIGN_CENTER_VERTICAL|wxALL, 3 ); - bSizer9->Add( fgSizer1, 1, wxEXPAND, 5 ); + bSizer9->Add( fgSizer1, 1, wxALL|wxEXPAND, 5 ); m_StandardSizer = new wxStdDialogButtonSizer(); m_StandardSizerOK = new wxButton( this, wxID_OK ); @@ -141,7 +141,7 @@ DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* pare m_StandardSizer->AddButton( m_StandardSizerCancel ); m_StandardSizer->Realize(); - bSizer9->Add( m_StandardSizer, 0, wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL, 5 ); + bSizer9->Add( m_StandardSizer, 0, wxALL|wxEXPAND, 5 ); bMainSizer->Add( bSizer9, 1, wxALL|wxEXPAND, 5 ); @@ -149,6 +149,7 @@ DIALOG_PCB_TEXT_PROPERTIES_BASE::DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* pare this->SetSizer( bMainSizer ); this->Layout(); + bMainSizer->Fit( this ); this->Centre( wxBOTH ); diff --git a/pcbnew/dialogs/dialog_pcb_text_properties_base.fbp b/pcbnew/dialogs/dialog_pcb_text_properties_base.fbp index 547aa6b19b..103fea24f0 100644 --- a/pcbnew/dialogs/dialog_pcb_text_properties_base.fbp +++ b/pcbnew/dialogs/dialog_pcb_text_properties_base.fbp @@ -44,7 +44,7 @@ -1,-1 DIALOG_PCB_TEXT_PROPERTIES_BASE - 483,450 + -1,-1 wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU DIALOG_SHIM; dialog_shim.h Text Properties @@ -278,7 +278,7 @@ 5 - wxEXPAND + wxALL|wxEXPAND 1 4 @@ -290,11 +290,11 @@ fgSizer1 wxFLEX_GROWMODE_SPECIFIED none - 0 + 6 0 - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -324,7 +324,7 @@ 0 0 wxID_ANY - Size X + Width: 0 @@ -376,8 +376,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -407,7 +407,7 @@ 0 0 wxID_ANY - Position X + Position X: 0 @@ -459,8 +459,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -542,8 +542,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -625,8 +625,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -716,8 +716,8 @@ - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -807,8 +807,8 @@ - 5 - wxALL + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -898,8 +898,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -986,8 +986,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1017,7 +1017,7 @@ 0 0 wxID_ANY - Size Y + Height: 0 @@ -1069,8 +1069,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1100,7 +1100,7 @@ 0 0 wxID_ANY - Position Y + Position Y: 0 @@ -1152,8 +1152,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1235,8 +1235,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1318,8 +1318,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1409,8 +1409,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1500,8 +1500,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1588,8 +1588,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1676,8 +1676,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1707,7 +1707,7 @@ 0 0 wxID_ANY - Thickness + Thickness: 0 @@ -1759,8 +1759,8 @@ - 5 - wxLEFT|wxRIGHT|wxTOP + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1862,8 +1862,8 @@ - 5 - wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -1953,8 +1953,8 @@ - 5 - wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxALL 0 1 @@ -2047,7 +2047,7 @@ 5 - wxALIGN_BOTTOM|wxALIGN_RIGHT|wxALL + wxALL|wxEXPAND 0 0 diff --git a/pcbnew/dialogs/dialog_pcb_text_properties_base.h b/pcbnew/dialogs/dialog_pcb_text_properties_base.h index d134b4c08a..ddadfbe75c 100644 --- a/pcbnew/dialogs/dialog_pcb_text_properties_base.h +++ b/pcbnew/dialogs/dialog_pcb_text_properties_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Mar 13 2015) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -73,7 +73,7 @@ class DIALOG_PCB_TEXT_PROPERTIES_BASE : public DIALOG_SHIM public: - DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 483,450 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); + DIALOG_PCB_TEXT_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Text Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSYSTEM_MENU ); ~DIALOG_PCB_TEXT_PROPERTIES_BASE(); }; diff --git a/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp b/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp index dccb74e815..64c3ef01e7 100644 --- a/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp +++ b/pcbnew/dialogs/dialog_pns_length_tuning_settings.cpp @@ -48,27 +48,27 @@ DIALOG_PNS_LENGTH_TUNING_SETTINGS::DIALOG_PNS_LENGTH_TUNING_SETTINGS( wxWindow* switch( aMode ) { - case PNS_MODE_TUNE_SINGLE: - SetTitle( _( "Single track length tuning" ) ); - m_legend->SetBitmap( KiBitmap( tune_single_track_length_legend_xpm ) ); - m_targetLength.SetValue( m_settings.m_targetLength ); - break; + case PNS_MODE_TUNE_SINGLE: + SetTitle( _( "Single Track Length Tuning" ) ); + m_legend->SetBitmap( KiBitmap( tune_single_track_length_legend_xpm ) ); + m_targetLength.SetValue( m_settings.m_targetLength ); + break; - case PNS_MODE_TUNE_DIFF_PAIR: - SetTitle( _( "Differential pair length tuning" ) ); - m_legend->SetBitmap( KiBitmap( tune_diff_pair_length_legend_xpm ) ); - m_targetLength.SetValue( m_settings.m_targetLength ); - break; + case PNS_MODE_TUNE_DIFF_PAIR: + SetTitle( _( "Differential Pair Length Tuning" ) ); + m_legend->SetBitmap( KiBitmap( tune_diff_pair_length_legend_xpm ) ); + m_targetLength.SetValue( m_settings.m_targetLength ); + break; - case PNS_MODE_TUNE_DIFF_PAIR_SKEW: - SetTitle( _( "Differential pair skew tuning" ) ); - m_legend->SetBitmap( KiBitmap( tune_diff_pair_skew_legend_xpm ) ); - m_targetLengthLabel->SetLabel( _( "Target skew: " ) ); - m_targetLength.SetValue ( m_settings.m_targetSkew ); - break; + case PNS_MODE_TUNE_DIFF_PAIR_SKEW: + SetTitle( _( "Differential Pair Skew Tuning" ) ); + m_legend->SetBitmap( KiBitmap( tune_diff_pair_skew_legend_xpm ) ); + m_targetLengthLabel->SetLabel( _( "Target skew: " ) ); + m_targetLength.SetValue ( m_settings.m_targetSkew ); + break; - default: - break; + default: + break; } m_stdButtonsOK->SetDefault(); diff --git a/pcbnew/menubar_modedit.cpp b/pcbnew/menubar_modedit.cpp index 4696d348f4..a3c1ad0ae7 100644 --- a/pcbnew/menubar_modedit.cpp +++ b/pcbnew/menubar_modedit.cpp @@ -64,7 +64,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() wxMenu* fileMenu = new wxMenu; // Active library selection - AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Set Active Library"), + AddMenuItem( fileMenu, ID_MODEDIT_SELECT_CURRENT_LIB, _("Set Acti&ve Library"), _( "Select active library" ), KiBitmap( open_library_xpm ) ); fileMenu->AppendSeparator(); @@ -104,7 +104,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() // Save the currently loaded legacy library as an s-expression library. AddMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBRARY_AS, - _( "Save Current Library As..." ), + _( "Save &Current Library As..." ), _( "Save entire current library under a new name." ), KiBitmap( copy_library_xpm ) ); @@ -233,7 +233,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() viewMenu->AppendSeparator(); // 3D view - text = AddHotkeyName( _( "3&D Viewer" ), g_Module_Editor_Hokeys_Descr, HK_3D_VIEWER ); + text = AddHotkeyName( _( "&3D Viewer" ), g_Module_Editor_Hokeys_Descr, HK_3D_VIEWER ); AddMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME, text, _( "Show footprint in 3D viewer" ), KiBitmap( three_d_xpm ) ); diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index cdd799feb7..93921ba9d3 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -136,12 +136,12 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() filesMenu->AppendSeparator(); AddMenuItem( filesMenu, ID_MENU_READ_BOARD_BACKUP_FILE, - _( "Revert to Last" ), + _( "Revert to Las&t" ), _( "Clear board and get previous backup version of board" ), KiBitmap( revert_pcbnew_xpm ) ); AddMenuItem( filesMenu, ID_MENU_RECOVER_BOARD_AUTOSAVE, - _( "Rescue" ), + _( "Resc&ue" ), _( "Clear board and get last rescue file automatically saved by Pcbnew" ), KiBitmap( rescue_pcbnew_xpm ) ); filesMenu->AppendSeparator(); @@ -149,7 +149,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() //----- Fabrication Outputs submenu ----------------------------------------- wxMenu* fabricationOutputsMenu = new wxMenu; AddMenuItem( fabricationOutputsMenu, ID_PCB_GEN_POS_MODULES_FILE, - _( "&Footprint Position (.pos) File" ), + _( "Footprint &Position (.pos) File" ), _( "Generate footprint position file for pick and place" ), KiBitmap( post_compo_xpm ) ); @@ -269,8 +269,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() KiBitmap( library_xpm ) ); filesMenu->AppendSeparator(); - AddMenuItem( filesMenu, wxID_EXIT, _( "&Quit" ), _( "Quit Pcbnew" ), - KiBitmap( exit_xpm ) ); + AddMenuItem( filesMenu, wxID_EXIT, _( "&Close" ), _( "Close Pcbnew" ), KiBitmap( exit_xpm ) ); //----- Edit menu ----------------------------------------------------------- wxMenu* editMenu = new wxMenu; @@ -357,21 +356,21 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() viewMenu->AppendSeparator(); text = AddHotkeyName( _( "&Switch canvas to default" ), g_Pcbnew_Editor_Hokeys_Descr, - HK_CANVAS_DEFAULT ); + HK_CANVAS_DEFAULT ); AddMenuItem( viewMenu, ID_MENU_CANVAS_DEFAULT, text, _( "Switch the canvas implementation to default" ), KiBitmap( tools_xpm ) ); - text = AddHotkeyName( _( "&Switch canvas to OpenGL" ), g_Pcbnew_Editor_Hokeys_Descr, - HK_CANVAS_OPENGL ); + text = AddHotkeyName( _( "Switch canvas to Open&GL" ), g_Pcbnew_Editor_Hokeys_Descr, + HK_CANVAS_OPENGL ); AddMenuItem( viewMenu, ID_MENU_CANVAS_OPENGL, text, _( "Switch the canvas implementation to OpenGL" ), KiBitmap( tools_xpm ) ); - text = AddHotkeyName( _( "&Switch canvas to Cairo" ), g_Pcbnew_Editor_Hokeys_Descr, - HK_CANVAS_CAIRO ); + text = AddHotkeyName( _( "Switch canvas to &Cairo" ), g_Pcbnew_Editor_Hokeys_Descr, + HK_CANVAS_CAIRO ); AddMenuItem( viewMenu, ID_MENU_CANVAS_CAIRO, text, _( "Switch the canvas implementation to Cairo" ), @@ -425,7 +424,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() placeMenu->AppendSeparator(); AddMenuItem( placeMenu, ID_PCB_PLACE_OFFSET_COORD_BUTT, - _( "Drill and Place O&ffset" ), + _( "Drill and &Place Offset" ), _( "Place the origin point for drill and place files" ), KiBitmap( pcb_offset_xpm ) ); @@ -437,29 +436,29 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() wxMenu* routeMenu = new wxMenu; AddMenuItem( routeMenu, ID_TRACK_BUTT, - _( "Single Track" ), + _( "&Single Track" ), _( "Interactively route a single track" ), KiBitmap( add_tracks_xpm ) ); AddMenuItem( routeMenu, ID_DIFF_PAIR_BUTT, - _( "Differential Pair" ), + _( "&Differential Pair" ), _( "Interactively route a differential pair" ), KiBitmap( ps_diff_pair_xpm ) ); routeMenu->AppendSeparator(); AddMenuItem( routeMenu, ID_TUNE_SINGLE_TRACK_LEN_BUTT, - _( "Tune Track Length" ), + _( "&Tune Track Length" ), _( "Tune length of a single track" ), KiBitmap( ps_tune_length_xpm ) ); AddMenuItem( routeMenu, ID_TUNE_DIFF_PAIR_LEN_BUTT, - _( "Tune Differential Pair Length" ), + _( "Tune Differential Pair &Length" ), _( "Tune length of a differential pair" ), KiBitmap( ps_diff_pair_tune_length_xpm ) ); AddMenuItem( routeMenu, ID_TUNE_DIFF_PAIR_SKEW_BUTT, - _( "Tune Differential Pair Skew/Phase" ), + _( "Tune Differential Pair &Skew/Phase" ), _( "Tune skew/phase of a differential pair" ), KiBitmap( ps_diff_pair_tune_phase_xpm ) ); @@ -504,13 +503,13 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() AddMenuItem( configmenu, ID_MENU_PCB_SHOW_HIDE_MUWAVE_TOOLBAR, m_show_microwave_tools ? - _( "Hide Microwave Toolbar" ): _( "Show Microwave Toolbar" ), + _( "Hide Microwa&ve Toolbar" ): _( "Show Microwave Toolbar" ), HELP_SHOW_HIDE_MICROWAVE_TOOLS, KiBitmap( mw_toolbar_xpm ) ); // General #ifdef __WXMAC__ - configmenu->Append(wxID_PREFERENCES); + configmenu->Append( wxID_PREFERENCES ); #else AddMenuItem( configmenu, wxID_PREFERENCES, _( "&General" ), _( "Select general options for Pcbnew" ), @@ -523,7 +522,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() KiBitmap( display_options_xpm ) ); AddMenuItem( configmenu, ID_MENU_INTERACTIVE_ROUTER_SETTINGS, - _( "Interactive Routing" ), + _( "&Interactive Routing" ), _( "Configure Interactive Routing." ), KiBitmap( add_tracks_xpm ) ); // fixme: icon @@ -549,7 +548,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() KiBitmap( pads_mask_layers_xpm ) ); AddMenuItem( dimensionsMenu, ID_MENU_DIFF_PAIR_DIMENSIONS, - _( "Differential Pairs" ), + _( "&Differential Pairs" ), _( "Define the global gap/width for differential pairs." ), KiBitmap( ps_diff_pair_xpm ) ); @@ -625,7 +624,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() wxMenu* designRulesMenu = new wxMenu; AddMenuItem( designRulesMenu, ID_MENU_PCB_SHOW_DESIGN_RULES_DIALOG, - _( "Design Rules" ), + _( "&Design Rules" ), _( "Open the design rules editor" ), KiBitmap( hammer_xpm ) ); AddMenuItem( designRulesMenu, ID_PCB_LAYERS_SETUP, @@ -657,7 +656,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() menuBar->Append( editMenu, _( "&Edit" ) ); menuBar->Append( viewMenu, _( "&View" ) ); menuBar->Append( placeMenu, _( "&Place" ) ); - menuBar->Append( routeMenu, _( "&Route" ) ); + menuBar->Append( routeMenu, _( "Ro&ute" ) ); menuBar->Append( configmenu, _( "P&references" ) ); menuBar->Append( dimensionsMenu, _( "D&imensions" ) ); menuBar->Append( toolsMenu, _( "&Tools" ) );