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