From f25f465d4c2488ade31206b02ebd06a092aa5fe8 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sun, 5 Apr 2015 11:52:41 +0200 Subject: [PATCH] Make strings translatable in Create Array dialog (and a minor cosmetic enhancement). Modview: fix issue about mouse on wrong monitor when starting Modview. --- pcbnew/dialogs/dialog_create_array.cpp | 27 +++++++++++---------- pcbnew/dialogs/dialog_create_array.h | 4 +-- pcbnew/dialogs/dialog_create_array_base.cpp | 14 +++++------ pcbnew/dialogs/dialog_create_array_base.fbp | 12 ++++----- pcbnew/dialogs/dialog_create_array_base.h | 2 +- pcbnew/modview_frame.cpp | 1 - 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/pcbnew/dialogs/dialog_create_array.cpp b/pcbnew/dialogs/dialog_create_array.cpp index b70ae8c1f2..bc50311ab5 100644 --- a/pcbnew/dialogs/dialog_create_array.cpp +++ b/pcbnew/dialogs/dialog_create_array.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -35,16 +36,6 @@ // initialise statics DIALOG_CREATE_ARRAY::CREATE_ARRAY_DIALOG_ENTRIES DIALOG_CREATE_ARRAY::m_options; -// character set -// NOTE: do not change the order of this relative to the ARRAY_NUMBERING_TYPE_T enum -static const wxString charSetDescriptions[] = -{ - "Numerals (0,1,2,...,9,10)", - "Hexadecimal (0,1,...,F,10,...)", - "Alphabet, minus IOSQXZ", - "Alphabet, full 26 characters" -}; - DIALOG_CREATE_ARRAY::DIALOG_CREATE_ARRAY( PCB_BASE_FRAME* aParent, wxPoint aOrigPos, ARRAY_OPTIONS** aSettings ) : @@ -54,9 +45,19 @@ DIALOG_CREATE_ARRAY::DIALOG_CREATE_ARRAY( PCB_BASE_FRAME* aParent, wxPoint aOrig m_originalItemPosition( aOrigPos ) { // Set up numbering scheme drop downs - m_choicePriAxisNumbering->Set( boost::size( charSetDescriptions ), charSetDescriptions ); - m_choiceSecAxisNumbering->Set( boost::size( charSetDescriptions ), charSetDescriptions ); - m_choiceCircNumberingType->Set( boost::size( charSetDescriptions ), charSetDescriptions );; + // + // character set + // NOTE: do not change the order of this relative to the ARRAY_NUMBERING_TYPE_T enum + const wxString charSetDescriptions[] = + { + _( "Numerals (0,1,2,...,9,10)" ), + _( "Hexadecimal (0,1,...,F,10,...)" ), + _( "Alphabet, minus IOSQXZ" ), + _( "Alphabet, full 26 characters" ) + }; + m_choicePriAxisNumbering->Set( DIM( charSetDescriptions ), charSetDescriptions ); + m_choiceSecAxisNumbering->Set( DIM( charSetDescriptions ), charSetDescriptions ); + m_choiceCircNumberingType->Set( DIM( charSetDescriptions ), charSetDescriptions );; m_choicePriAxisNumbering->SetSelection( 0 ); m_choiceSecAxisNumbering->SetSelection( 0 ); diff --git a/pcbnew/dialogs/dialog_create_array.h b/pcbnew/dialogs/dialog_create_array.h index 2f80d27ba0..a414d865cf 100644 --- a/pcbnew/dialogs/dialog_create_array.h +++ b/pcbnew/dialogs/dialog_create_array.h @@ -1,8 +1,8 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2014 John Beard, john.j.beard@gmail.com - * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 2015 John Beard, john.j.beard@gmail.com + * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License diff --git a/pcbnew/dialogs/dialog_create_array_base.cpp b/pcbnew/dialogs/dialog_create_array_base.cpp index 066b6629de..f58475bbc4 100644 --- a/pcbnew/dialogs/dialog_create_array_base.cpp +++ b/pcbnew/dialogs/dialog_create_array_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! @@ -128,25 +128,25 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_labelPriAxisNumbering = new wxStaticText( m_gridPanel, wxID_ANY, _("Primary axis numbering:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelPriAxisNumbering->Wrap( -1 ); - bSizer3->Add( m_labelPriAxisNumbering, 0, wxALL, 5 ); + bSizer3->Add( m_labelPriAxisNumbering, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_choicePriAxisNumberingChoices; m_choicePriAxisNumbering = new wxChoice( m_gridPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePriAxisNumberingChoices, 0 ); m_choicePriAxisNumbering->SetSelection( 0 ); - bSizer3->Add( m_choicePriAxisNumbering, 0, wxALL|wxEXPAND, 5 ); + bSizer3->Add( m_choicePriAxisNumbering, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_labelSecAxisNumbering = new wxStaticText( m_gridPanel, wxID_ANY, _("Secondary axis numbering:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelSecAxisNumbering->Wrap( -1 ); m_labelSecAxisNumbering->Enable( false ); - bSizer3->Add( m_labelSecAxisNumbering, 0, wxALL, 5 ); + bSizer3->Add( m_labelSecAxisNumbering, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_choiceSecAxisNumberingChoices; m_choiceSecAxisNumbering = new wxChoice( m_gridPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceSecAxisNumberingChoices, 0 ); m_choiceSecAxisNumbering->SetSelection( 0 ); m_choiceSecAxisNumbering->Enable( false ); - bSizer3->Add( m_choiceSecAxisNumbering, 0, wxALL|wxEXPAND, 5 ); + bSizer3->Add( m_choiceSecAxisNumbering, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer5; bSizer5 = new wxBoxSizer( wxHORIZONTAL ); @@ -255,12 +255,12 @@ DIALOG_CREATE_ARRAY_BASE::DIALOG_CREATE_ARRAY_BASE( wxWindow* parent, wxWindowID m_labelCircNumbering = new wxStaticText( m_circularPanel, wxID_ANY, _("Numbering type:"), wxDefaultPosition, wxDefaultSize, 0 ); m_labelCircNumbering->Wrap( -1 ); - bSizer6->Add( m_labelCircNumbering, 0, wxALL, 5 ); + bSizer6->Add( m_labelCircNumbering, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); wxArrayString m_choiceCircNumberingTypeChoices; m_choiceCircNumberingType = new wxChoice( m_circularPanel, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choiceCircNumberingTypeChoices, 0 ); m_choiceCircNumberingType->SetSelection( 0 ); - bSizer6->Add( m_choiceCircNumberingType, 0, wxALL|wxEXPAND, 5 ); + bSizer6->Add( m_choiceCircNumberingType, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxBoxSizer* bSizer7; bSizer7 = new wxBoxSizer( wxHORIZONTAL ); diff --git a/pcbnew/dialogs/dialog_create_array_base.fbp b/pcbnew/dialogs/dialog_create_array_base.fbp index 09c058ec23..9f50961da6 100644 --- a/pcbnew/dialogs/dialog_create_array_base.fbp +++ b/pcbnew/dialogs/dialog_create_array_base.fbp @@ -2425,7 +2425,7 @@ 5 - wxALL + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -2508,7 +2508,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -2596,7 +2596,7 @@ 5 - wxALL + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -2679,7 +2679,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -4572,7 +4572,7 @@ 5 - wxALL + wxTOP|wxRIGHT|wxLEFT 0 1 @@ -4655,7 +4655,7 @@ 5 - wxALL|wxEXPAND + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/pcbnew/dialogs/dialog_create_array_base.h b/pcbnew/dialogs/dialog_create_array_base.h index 442058e86b..b9428750d5 100644 --- a/pcbnew/dialogs/dialog_create_array_base.h +++ b/pcbnew/dialogs/dialog_create_array_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Jun 6 2014) +// C++ code generated with wxFormBuilder (version Jun 5 2014) // http://www.wxformbuilder.org/ // // PLEASE DO "NOT" EDIT THIS FILE! diff --git a/pcbnew/modview_frame.cpp b/pcbnew/modview_frame.cpp index 62a39af9ce..b348c23d75 100644 --- a/pcbnew/modview_frame.cpp +++ b/pcbnew/modview_frame.cpp @@ -256,7 +256,6 @@ FOOTPRINT_VIEWER_FRAME::FOOTPRINT_VIEWER_FRAME( KIWAY* aKiway, wxWindow* aParent #else Zoom_Automatique( false ); #endif - Zoom_Automatique( true ); Show( true );