From 4f4a5ae3cffe321ce714b2d4b66d328ddb520870 Mon Sep 17 00:00:00 2001 From: Seth Hillbrand Date: Wed, 13 Jan 2021 12:34:09 -0800 Subject: [PATCH] Use longer labels Removing context from labels makes it difficult for translators to correctly interpret the text. Fixes https://gitlab.com/kicad/code/kicad/issues/7091 --- .../dialogs/properties_frame_base.cpp | 11 ++++++----- .../dialogs/properties_frame_base.fbp | 16 +++++++++++----- .../dialogs/properties_frame_base.h | 6 +++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index 08d21bd711..ddb6b595eb 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.cpp +++ b/pagelayout_editor/dialogs/properties_frame_base.cpp @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Dec 30 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,7 +24,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_staticTextType = new wxStaticText( m_swItemProperties, wxID_ANY, _("Type"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextType->Wrap( -1 ); - m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); + m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_SLANT, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); bSizerButt->Add( m_staticTextType, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); @@ -56,6 +56,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_stcText->SetViewWhiteSpace( false ); m_stcText->SetMarginWidth( 2, 0 ); m_stcText->SetIndentationGuides( false ); + m_stcText->SetReadOnly( false ); m_stcText->SetMarginWidth( 1, 0 ); m_stcText->SetMarginWidth( 0, 0 ); m_stcText->MarkerDefine( wxSTC_MARKNUM_FOLDER, wxSTC_MARK_BOXPLUS ); @@ -411,7 +412,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticTextInclabel = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInclabel = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Text Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInclabel->Wrap( -1 ); fgSizer8->Add( m_staticTextInclabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -424,7 +425,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); - m_staticTextStepX = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextStepX = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("X Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepX->Wrap( -1 ); fgSizer8->Add( m_staticTextStepX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); @@ -438,7 +439,7 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_TextStepXUnits->Wrap( -1 ); fgSizer8->Add( m_TextStepXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); - m_staticTextStepY = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextStepY = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Y Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepY->Wrap( -1 ); fgSizer8->Add( m_staticTextStepY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index d27acb1459..8c8b7ce616 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -14,6 +14,7 @@ properties_frame_base 1000 none + 1 properties_frame @@ -25,6 +26,7 @@ 1 1 UI + 0 1 0 @@ -488,6 +490,7 @@ protected 1 + 0 Resizable 1 @@ -3509,11 +3512,11 @@ - + 5 wxEXPAND 0 - + m_SizerPPI wxVERTICAL @@ -3868,7 +3871,7 @@ 0 0 wxID_ANY - Text: + Text Increment: 0 0 @@ -4013,7 +4016,7 @@ 0 0 wxID_ANY - X: + X Increment: 0 0 @@ -4209,7 +4212,7 @@ 0 0 wxID_ANY - Y: + Y Increment: 0 0 @@ -4390,6 +4393,7 @@ + 0 @@ -5352,6 +5356,7 @@ + 0 @@ -6241,6 +6246,7 @@ + 0 diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h index beafe52ba1..0b96476764 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.h +++ b/pagelayout_editor/dialogs/properties_frame_base.h @@ -1,5 +1,5 @@ /////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Oct 26 2018) +// C++ code generated with wxFormBuilder (version 3.9.0 Dec 30 2020) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -24,10 +24,10 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -141,7 +141,7 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxStaticText* m_TextBottomMarginUnits; wxButton* m_buttonGeneralOptsOK; - // Virtual event handlers, overide them in your derived class + // Virtual event handlers, override them in your derived class virtual void OnPageChanged( wxNotebookEvent& event ) { event.Skip(); } virtual void OnAcceptPrms( wxCommandEvent& event ) { event.Skip(); } virtual void OnSetDefaultValues( wxCommandEvent& event ) { event.Skip(); }