From 69f8f79a428c87323aadfe770ea9defe7ac3b57a Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Wed, 13 Jan 2021 18:03:36 +0000 Subject: [PATCH] Compress space out of pagelayout properties. This allows the Apply button to appear on a MacBook Pro screen without scrolling. --- .../dialogs/properties_frame.cpp | 33 +- .../dialogs/properties_frame_base.cpp | 234 +++--- .../dialogs/properties_frame_base.fbp | 666 ++++-------------- .../dialogs/properties_frame_base.h | 19 +- 4 files changed, 251 insertions(+), 701 deletions(-) diff --git a/pagelayout_editor/dialogs/properties_frame.cpp b/pagelayout_editor/dialogs/properties_frame.cpp index 0a61fa5c19..e859c74311 100644 --- a/pagelayout_editor/dialogs/properties_frame.cpp +++ b/pagelayout_editor/dialogs/properties_frame.cpp @@ -66,10 +66,8 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ) : m_scintillaTricks = new SCINTILLA_TRICKS( m_stcText, wxT( "{}" ) ); wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); - m_staticTextSizeInfo->SetFont( infoFont ); infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); - m_staticTextInfoThickness->SetFont( infoFont ); + m_staticTextSizeInfo->SetFont( infoFont ); m_buttonOK->SetDefault(); @@ -274,7 +272,7 @@ void PROPERTIES_FRAME::CopyPrmsFromItemToPanel( WS_DATA_ITEM* aItem ) WS_DATA_ITEM_BITMAP* item = (WS_DATA_ITEM_BITMAP*) aItem; // select definition in PPI msg.Printf( wxT("%d"), item->GetPPI() ); - m_textCtrlBitmapPPI->SetValue( msg ); + m_textCtrlBitmapDPI->SetValue( msg ); } m_SizerItemProperties->Show( true ); @@ -284,14 +282,22 @@ void PROPERTIES_FRAME::CopyPrmsFromItemToPanel( WS_DATA_ITEM* aItem ) m_sbSizerEndPosition->Show( aItem->GetType() == WS_DATA_ITEM::WS_SEGMENT || aItem->GetType() == WS_DATA_ITEM::WS_RECT ); - m_SizerLineThickness->Show( aItem->GetType() != WS_DATA_ITEM::WS_BITMAP ); - // Polygons have no defaut value for line width - m_staticTextInfoThickness->Show( aItem->GetType() != WS_DATA_ITEM::WS_POLYPOLYGON ); + m_textCtrlThicknessBinder.Show( aItem->GetType() != WS_DATA_ITEM::WS_BITMAP ); - m_SizerRotation->Show( aItem->GetType() == WS_DATA_ITEM::WS_TEXT - || aItem->GetType() == WS_DATA_ITEM::WS_POLYPOLYGON ); + if( aItem->GetType() == WS_DATA_ITEM::WS_TEXT + || aItem->GetType() == WS_DATA_ITEM::WS_POLYPOLYGON ) + { + m_staticTextRot->Show( true ); + m_textCtrlRotation->Show( true ); + } + else + { + m_staticTextRot->Show( false ); + m_textCtrlRotation->Show( false ); + } - m_SizerPPI->Show( aItem->GetType() == WS_DATA_ITEM::WS_BITMAP ); + m_staticTextBitmapDPI->Show( aItem->GetType() == WS_DATA_ITEM::WS_BITMAP ); + m_textCtrlBitmapDPI->Show( aItem->GetType() == WS_DATA_ITEM::WS_BITMAP ); m_staticTextInclabel->Show( aItem->GetType() == WS_DATA_ITEM::WS_TEXT ); m_textCtrlTextIncrement->Show( aItem->GetType() == WS_DATA_ITEM::WS_TEXT ); @@ -478,9 +484,10 @@ bool PROPERTIES_FRAME::CopyPrmsFromPanelToItem( WS_DATA_ITEM* aItem ) if( aItem->GetType() == WS_DATA_ITEM::WS_BITMAP ) { WS_DATA_ITEM_BITMAP* item = (WS_DATA_ITEM_BITMAP*) aItem; - // Set definition in PPI - long value; - msg = m_textCtrlBitmapPPI->GetValue(); + long value; + + msg = m_textCtrlBitmapDPI->GetValue(); + if( msg.ToLong( &value ) ) item->SetPPI( (int)value ); } diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index ddb6b595eb..acf560ac5b 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 3.9.0 Dec 30 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -26,26 +26,19 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_staticTextType->Wrap( -1 ); 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 ); + bSizerButt->Add( m_staticTextType, 1, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); wxString m_choicePageOptChoices[] = { _("Show on all pages"), _("First page only"), _("Subsequent pages only") }; int m_choicePageOptNChoices = sizeof( m_choicePageOptChoices ) / sizeof( wxString ); m_choicePageOpt = new wxChoice( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_choicePageOptNChoices, m_choicePageOptChoices, 0 ); m_choicePageOpt->SetSelection( 2 ); - bSizerButt->Add( m_choicePageOpt, 0, wxALL|wxEXPAND, 5 ); + bSizerButt->Add( m_choicePageOpt, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_SizerItemProperties->Add( bSizerButt, 0, wxEXPAND, 5 ); - m_staticline5 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_SizerItemProperties->Add( m_staticline5, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 5 ); - m_SizerTextOptions = new wxBoxSizer( wxVERTICAL ); - m_staticTextText = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextText->Wrap( -1 ); - m_SizerTextOptions->Add( m_staticTextText, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - m_stcText = new wxStyledTextCtrl( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0, wxEmptyString ); m_stcText->SetUseTabs( true ); m_stcText->SetTabWidth( 4 ); @@ -56,7 +49,6 @@ 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 ); @@ -125,80 +117,65 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_SizerTextOptions->Add( bSizerFontOpt, 0, wxEXPAND|wxBOTTOM, 2 ); wxFlexGridSizer* fgSizer2; - fgSizer2 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer2->AddGrowableCol( 0 ); + fgSizer2 = new wxFlexGridSizer( 0, 3, 3, 0 ); + fgSizer2->AddGrowableCol( 1 ); fgSizer2->SetFlexibleDirection( wxBOTH ); fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticTextTsizeX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTsizeX->Wrap( -1 ); - fgSizer2->Add( m_staticTextTsizeX, 0, wxRIGHT|wxLEFT, 5 ); - - - fgSizer2->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizer2->Add( m_staticTextTsizeX, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlTextSizeX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_textCtrlTextSizeX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer2->Add( m_textCtrlTextSizeX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_TextTextSizeXUnits = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextTextSizeXUnits->Wrap( -1 ); - fgSizer2->Add( m_TextTextSizeXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); + fgSizer2->Add( m_TextTextSizeXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); m_staticTextTsizeY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Text height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextTsizeY->Wrap( -1 ); - fgSizer2->Add( m_staticTextTsizeY, 0, wxRIGHT|wxLEFT, 5 ); - - - fgSizer2->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizer2->Add( m_staticTextTsizeY, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlTextSizeY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_textCtrlTextSizeY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer2->Add( m_textCtrlTextSizeY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_TextTextSizeYUnits = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextTextSizeYUnits->Wrap( -1 ); - fgSizer2->Add( m_TextTextSizeYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + fgSizer2->Add( m_TextTextSizeYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT|wxLEFT, 5 ); - m_staticTextConstraintX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum width:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextConstraintX = new wxStaticText( m_swItemProperties, wxID_ANY, _("Max width:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraintX->Wrap( -1 ); m_staticTextConstraintX->SetToolTip( _("Set to 0 to disable this constraint") ); - fgSizer2->Add( m_staticTextConstraintX, 0, wxRIGHT|wxLEFT, 5 ); - - - fgSizer2->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizer2->Add( m_staticTextConstraintX, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlConstraintX = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_textCtrlConstraintX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer2->Add( m_textCtrlConstraintX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_TextConstraintXUnits = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextConstraintXUnits->Wrap( -1 ); - fgSizer2->Add( m_TextConstraintXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); + fgSizer2->Add( m_TextConstraintXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); - m_staticTextConstraintY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Maximum height:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextConstraintY = new wxStaticText( m_swItemProperties, wxID_ANY, _("Max height:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextConstraintY->Wrap( -1 ); m_staticTextConstraintY->SetToolTip( _("Set to 0 to disable this constraint") ); - fgSizer2->Add( m_staticTextConstraintY, 0, wxRIGHT|wxLEFT, 5 ); - - - fgSizer2->Add( 0, 0, 1, wxEXPAND, 5 ); + fgSizer2->Add( m_staticTextConstraintY, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_textCtrlConstraintY = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer2->Add( m_textCtrlConstraintY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer2->Add( m_textCtrlConstraintY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_TextConstraintYUnits = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextConstraintYUnits->Wrap( -1 ); - fgSizer2->Add( m_TextConstraintYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + fgSizer2->Add( m_TextConstraintYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT|wxLEFT, 5 ); - m_SizerTextOptions->Add( fgSizer2, 0, wxEXPAND, 5 ); + m_SizerTextOptions->Add( fgSizer2, 0, wxEXPAND|wxBOTTOM, 3 ); m_staticTextSizeInfo = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 to use default values"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextSizeInfo->Wrap( -1 ); - m_SizerTextOptions->Add( m_staticTextSizeInfo, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_staticline6 = new wxStaticLine( m_swItemProperties, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - m_SizerTextOptions->Add( m_staticline6, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + m_SizerTextOptions->Add( m_staticTextSizeInfo, 0, wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 ); m_SizerItemProperties->Add( m_SizerTextOptions, 1, wxEXPAND, 5 ); @@ -213,36 +190,36 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c sbSizerPos = new wxStaticBoxSizer( new wxStaticBox( m_swItemProperties, wxID_ANY, _("Position") ), wxVERTICAL ); wxFlexGridSizer* fgSizer3; - fgSizer3 = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizer3 = new wxFlexGridSizer( 0, 3, 3, 0 ); fgSizer3->AddGrowableCol( 1 ); - fgSizer3->SetFlexibleDirection( wxHORIZONTAL ); + fgSizer3->SetFlexibleDirection( wxBOTH ); fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticTextPosX = new wxStaticText( sbSizerPos->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosX->Wrap( -1 ); - fgSizer3->Add( m_staticTextPosX, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_staticTextPosX, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_textCtrlPosX = new wxTextCtrl( sbSizerPos->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_textCtrlPosX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizer3->Add( m_textCtrlPosX, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_TextPosXUnits = new wxStaticText( sbSizerPos->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPosXUnits->Wrap( -1 ); - fgSizer3->Add( m_TextPosXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); + fgSizer3->Add( m_TextPosXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); m_staticTextPosY = new wxStaticText( sbSizerPos->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextPosY->Wrap( -1 ); - fgSizer3->Add( m_staticTextPosY, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer3->Add( m_staticTextPosY, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_textCtrlPosY = new wxTextCtrl( sbSizerPos->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer3->Add( m_textCtrlPosY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizer3->Add( m_textCtrlPosY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_TextPosYUnits = new wxStaticText( sbSizerPos->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextPosYUnits->Wrap( -1 ); - fgSizer3->Add( m_TextPosYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); + fgSizer3->Add( m_TextPosYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); m_staticTextOrgPos = new wxStaticText( sbSizerPos->GetStaticBox(), wxID_ANY, _("From:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgPos->Wrap( -1 ); - fgSizer3->Add( m_staticTextOrgPos, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_staticTextOrgPos, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_comboBoxCornerPos = new wxComboBox( sbSizerPos->GetStaticBox(), wxID_ANY, _("Lower Right"), wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, 0 ); m_comboBoxCornerPos->Append( _("Upper Right") ); @@ -252,13 +229,13 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_comboBoxCornerPos->SetSelection( 2 ); m_comboBoxCornerPos->SetMinSize( wxSize( 132,-1 ) ); - fgSizer3->Add( m_comboBoxCornerPos, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer3->Add( m_comboBoxCornerPos, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); fgSizer3->Add( 0, 0, 1, wxEXPAND, 5 ); - sbSizerPos->Add( fgSizer3, 0, wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT, 5 ); + sbSizerPos->Add( fgSizer3, 0, wxEXPAND|wxBOTTOM, 3 ); m_SizerItemProperties->Add( sbSizerPos, 0, wxEXPAND, 5 ); @@ -266,36 +243,36 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_sbSizerEndPosition = new wxStaticBoxSizer( new wxStaticBox( m_swItemProperties, wxID_ANY, _("End Position") ), wxVERTICAL ); wxFlexGridSizer* fgSizer4; - fgSizer4 = new wxFlexGridSizer( 0, 3, 0, 0 ); + fgSizer4 = new wxFlexGridSizer( 0, 3, 3, 0 ); fgSizer4->AddGrowableCol( 1 ); - fgSizer4->SetFlexibleDirection( wxHORIZONTAL ); + fgSizer4->SetFlexibleDirection( wxBOTH ); fgSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticTextEndX = new wxStaticText( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, _("X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndX->Wrap( -1 ); - fgSizer4->Add( m_staticTextEndX, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer4->Add( m_staticTextEndX, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_textCtrlEndX = new wxTextCtrl( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer4->Add( m_textCtrlEndX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizer4->Add( m_textCtrlEndX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_TextEndXUnits = new wxStaticText( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextEndXUnits->Wrap( -1 ); - fgSizer4->Add( m_TextEndXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); + fgSizer4->Add( m_TextEndXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); m_staticTextEndY = new wxStaticText( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, _("Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextEndY->Wrap( -1 ); - fgSizer4->Add( m_staticTextEndY, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer4->Add( m_staticTextEndY, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_textCtrlEndY = new wxTextCtrl( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer4->Add( m_textCtrlEndY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM, 5 ); + fgSizer4->Add( m_textCtrlEndY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL, 5 ); m_TextEndYUnits = new wxStaticText( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextEndYUnits->Wrap( -1 ); - fgSizer4->Add( m_TextEndYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); + fgSizer4->Add( m_TextEndYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); m_staticTextOrgEnd = new wxStaticText( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, _("From:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextOrgEnd->Wrap( -1 ); - fgSizer4->Add( m_staticTextOrgEnd, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + fgSizer4->Add( m_staticTextOrgEnd, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 3 ); m_comboBoxCornerEnd = new wxComboBox( m_sbSizerEndPosition->GetStaticBox(), wxID_ANY, _("Lower Left"), wxDefaultPosition, wxSize( -1,-1 ), 0, NULL, 0 ); m_comboBoxCornerEnd->Append( _("Upper Right") ); @@ -305,156 +282,111 @@ PANEL_PROPERTIES_BASE::PANEL_PROPERTIES_BASE( wxWindow* parent, wxWindowID id, c m_comboBoxCornerEnd->SetSelection( 3 ); m_comboBoxCornerEnd->SetMinSize( wxSize( 132,-1 ) ); - fgSizer4->Add( m_comboBoxCornerEnd, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + fgSizer4->Add( m_comboBoxCornerEnd, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); fgSizer4->Add( 0, 0, 1, wxEXPAND, 5 ); - m_sbSizerEndPosition->Add( fgSizer4, 0, wxEXPAND|wxRIGHT, 5 ); + m_sbSizerEndPosition->Add( fgSizer4, 0, wxEXPAND|wxBOTTOM, 3 ); m_SizerItemProperties->Add( m_sbSizerEndPosition, 0, wxEXPAND, 5 ); - m_SizerLineThickness = new wxBoxSizer( wxHORIZONTAL ); + wxBoxSizer* sizerMisc; + sizerMisc = new wxBoxSizer( wxHORIZONTAL ); - wxFlexGridSizer* fgSizer10; - fgSizer10 = new wxFlexGridSizer( 0, 3, 0, 0 ); - fgSizer10->SetFlexibleDirection( wxBOTH ); - fgSizer10->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxGridBagSizer* gbSizer1; + gbSizer1 = new wxGridBagSizer( 3, 0 ); + gbSizer1->SetFlexibleDirection( wxBOTH ); + gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticTextThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Line width:"), wxDefaultPosition, wxSize( -1,-1 ), 0 ); m_staticTextThickness->Wrap( -1 ); - fgSizer10->Add( m_staticTextThickness, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + gbSizer1->Add( m_staticTextThickness, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND, 3 ); m_textCtrlThickness = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer10->Add( m_textCtrlThickness, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + gbSizer1->Add( m_textCtrlThickness, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_TextLineThicknessUnits = new wxStaticText( m_swItemProperties, wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextLineThicknessUnits->Wrap( -1 ); - fgSizer10->Add( m_TextLineThicknessUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT, 5 ); - - - fgSizer10->Add( 0, 0, 1, wxEXPAND, 5 ); - - m_staticTextInfoThickness = new wxStaticText( m_swItemProperties, wxID_ANY, _("Set to 0 for default"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextInfoThickness->Wrap( -1 ); - fgSizer10->Add( m_staticTextInfoThickness, 0, wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - - fgSizer10->Add( 0, 0, 1, wxEXPAND, 5 ); - - - m_SizerLineThickness->Add( fgSizer10, 1, wxEXPAND, 5 ); - - - m_SizerItemProperties->Add( m_SizerLineThickness, 0, 0, 5 ); - - m_SizerRotation = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizerRotation; - fgSizerRotation = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizerRotation->SetFlexibleDirection( wxBOTH ); - fgSizerRotation->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + gbSizer1->Add( m_TextLineThicknessUnits, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 3 ); m_staticTextRot = new wxStaticText( m_swItemProperties, wxID_ANY, _("Rotation:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRot->Wrap( -1 ); - fgSizerRotation->Add( m_staticTextRot, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); + gbSizer1->Add( m_staticTextRot, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 3 ); m_textCtrlRotation = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerRotation->Add( m_textCtrlRotation, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); + gbSizer1->Add( m_textCtrlRotation, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 3 ); + + m_staticTextBitmapDPI = new wxStaticText( m_swItemProperties, wxID_ANY, _("Bitmap DPI:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextBitmapDPI->Wrap( -1 ); + gbSizer1->Add( m_staticTextBitmapDPI, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 3 ); + + m_textCtrlBitmapDPI = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); + gbSizer1->Add( m_textCtrlBitmapDPI, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxALIGN_CENTER_VERTICAL, 3 ); - m_SizerRotation->Add( fgSizerRotation, 0, wxEXPAND, 5 ); + gbSizer1->AddGrowableCol( 1 ); + + sizerMisc->Add( gbSizer1, 1, wxEXPAND|wxTOP|wxRIGHT, 3 ); - m_SizerItemProperties->Add( m_SizerRotation, 0, wxEXPAND, 5 ); - - m_SizerPPI = new wxBoxSizer( wxVERTICAL ); - - wxFlexGridSizer* fgSizerPPI; - fgSizerPPI = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizerPPI->SetFlexibleDirection( wxBOTH ); - fgSizerPPI->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - m_staticTextBitmapPPI1 = new wxStaticText( m_swItemProperties, wxID_ANY, _("Bitmap DPI:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticTextBitmapPPI1->Wrap( -1 ); - fgSizerPPI->Add( m_staticTextBitmapPPI1, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_textCtrlBitmapPPI = new wxTextCtrl( m_swItemProperties, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizerPPI->Add( m_textCtrlBitmapPPI, 0, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); - - - m_SizerPPI->Add( fgSizerPPI, 0, wxEXPAND, 5 ); - - - m_SizerItemProperties->Add( m_SizerPPI, 0, wxEXPAND, 5 ); + m_SizerItemProperties->Add( sizerMisc, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 2 ); wxStaticBoxSizer* m_sbStep; - m_sbStep = new wxStaticBoxSizer( new wxStaticBox( m_swItemProperties, wxID_ANY, _("Step") ), wxVERTICAL ); + m_sbStep = new wxStaticBoxSizer( new wxStaticBox( m_swItemProperties, wxID_ANY, _("Repeat") ), wxVERTICAL ); wxFlexGridSizer* fgSizer8; - fgSizer8 = new wxFlexGridSizer( 0, 2, 0, 0 ); - fgSizer8->AddGrowableCol( 0 ); + fgSizer8 = new wxFlexGridSizer( 0, 3, 3, 0 ); + fgSizer8->AddGrowableCol( 1 ); fgSizer8->SetFlexibleDirection( wxBOTH ); fgSizer8->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - m_staticTextRepeatCnt = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Repeat count:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextRepeatCnt = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Count:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextRepeatCnt->Wrap( -1 ); - fgSizer8->Add( m_staticTextRepeatCnt, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizer8->Add( m_staticTextRepeatCnt, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 3 ); m_textCtrlRepeatCount = new wxTextCtrl( m_sbStep->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_textCtrlRepeatCount, 0, wxEXPAND|wxLEFT, 5 ); + fgSizer8->Add( m_textCtrlRepeatCount, 0, wxEXPAND|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); - m_staticTextInclabel = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Text Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextInclabel = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Text:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextInclabel->Wrap( -1 ); - fgSizer8->Add( m_staticTextInclabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizer8->Add( m_staticTextInclabel, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 3 ); m_textCtrlTextIncrement = new wxTextCtrl( m_sbStep->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_textCtrlTextIncrement, 0, wxEXPAND|wxLEFT, 5 ); + fgSizer8->Add( m_textCtrlTextIncrement, 0, wxEXPAND|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); - m_staticTextStepX = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("X Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextStepX = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Step X:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepX->Wrap( -1 ); - fgSizer8->Add( m_staticTextStepX, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizer8->Add( 0, 0, 1, wxEXPAND, 5 ); + fgSizer8->Add( m_staticTextStepX, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 3 ); m_textCtrlStepX = new wxTextCtrl( m_sbStep->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( -1,-1 ), 0 ); - fgSizer8->Add( m_textCtrlStepX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 ); + fgSizer8->Add( m_textCtrlStepX, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_TextStepXUnits = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextStepXUnits->Wrap( -1 ); - fgSizer8->Add( m_TextStepXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + fgSizer8->Add( m_TextStepXUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); - m_staticTextStepY = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Y Increment:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticTextStepY = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("Step Y:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextStepY->Wrap( -1 ); - fgSizer8->Add( m_staticTextStepY, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - - fgSizer8->Add( 0, 0, 0, wxEXPAND, 5 ); + fgSizer8->Add( m_staticTextStepY, 0, wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 3 ); m_textCtrlStepY = new wxTextCtrl( m_sbStep->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer8->Add( m_textCtrlStepY, 0, wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); + fgSizer8->Add( m_textCtrlStepY, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT, 5 ); m_TextStepYUnits = new wxStaticText( m_sbStep->GetStaticBox(), wxID_ANY, _("mm"), wxDefaultPosition, wxDefaultSize, 0 ); m_TextStepYUnits->Wrap( -1 ); - fgSizer8->Add( m_TextStepYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + fgSizer8->Add( m_TextStepYUnits, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT, 5 ); - m_sbStep->Add( fgSizer8, 0, wxEXPAND, 5 ); + m_sbStep->Add( fgSizer8, 0, wxEXPAND|wxBOTTOM, 3 ); m_SizerItemProperties->Add( m_sbStep, 0, wxEXPAND, 5 ); diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index 8c8b7ce616..452785acee 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -14,7 +14,6 @@ properties_frame_base 1000 none - 1 properties_frame @@ -26,7 +25,6 @@ 1 1 UI - 0 1 0 @@ -176,17 +174,17 @@ m_SizerItemProperties wxVERTICAL protected - + 5 wxEXPAND 0 - + bSizerButt wxHORIZONTAL none - 5 + 4 wxALIGN_CENTER_VERTICAL|wxALL 1 @@ -247,8 +245,8 @@ - 5 - wxALL|wxEXPAND + 4 + wxEXPAND|wxALL|wxALIGN_CENTER_VERTICAL 0 1 @@ -312,64 +310,6 @@ - - 5 - wxTOP|wxRIGHT|wxLEFT|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline5 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - 5 wxEXPAND @@ -379,67 +319,6 @@ m_SizerTextOptions wxVERTICAL protected - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Text: - 0 - - 0 - - - 0 - - 1 - m_staticTextText - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - 5 wxEXPAND|wxRIGHT|wxLEFT @@ -490,7 +369,6 @@ protected 1 - 0 Resizable 1 @@ -935,13 +813,13 @@ - 5 - wxEXPAND + 3 + wxEXPAND|wxBOTTOM 0 - 2 + 3 wxBOTH - 0 + 1 0 @@ -949,10 +827,10 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 5 - wxRIGHT|wxLEFT + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1013,17 +891,7 @@ 5 - wxEXPAND - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1087,7 +955,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -1148,7 +1016,7 @@ 5 - wxRIGHT|wxLEFT + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1209,17 +1077,7 @@ 5 - wxEXPAND - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1283,7 +1141,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT|wxLEFT 0 1 @@ -1344,7 +1202,7 @@ 5 - wxRIGHT|wxLEFT + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1374,7 +1232,7 @@ 0 0 wxID_ANY - Maximum width: + Max width: 0 0 @@ -1405,17 +1263,7 @@ 5 - wxEXPAND - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1479,7 +1327,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -1540,7 +1388,7 @@ 5 - wxRIGHT|wxLEFT + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -1570,7 +1418,7 @@ 0 0 wxID_ANY - Maximum height: + Max height: 0 0 @@ -1601,17 +1449,7 @@ 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -1675,7 +1513,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxRIGHT|wxLEFT 0 1 @@ -1738,7 +1576,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_RIGHT|wxRIGHT|wxLEFT 0 1 @@ -1797,64 +1635,6 @@ -1 - - 5 - wxEXPAND|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline6 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - - 0 - - - - - - @@ -1994,13 +1774,13 @@ wxVERTICAL 1 protected - - 5 - wxEXPAND|wxTOP|wxBOTTOM|wxRIGHT + + 3 + wxEXPAND|wxBOTTOM 0 - + 3 - wxHORIZONTAL + wxBOTH 1 0 @@ -2009,10 +1789,10 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2073,7 +1853,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxALIGN_CENTER_VERTICAL|wxEXPAND 0 1 @@ -2137,7 +1917,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -2197,8 +1977,8 @@ - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2259,7 +2039,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -2323,7 +2103,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -2383,8 +2163,8 @@ - 5 - wxTOP|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2445,7 +2225,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -2535,12 +2315,12 @@ 1 protected - 5 - wxEXPAND|wxRIGHT + 3 + wxEXPAND|wxBOTTOM 0 3 - wxHORIZONTAL + wxBOTH 1 0 @@ -2549,10 +2329,10 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2613,7 +2393,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -2677,7 +2457,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -2737,8 +2517,8 @@ - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -2799,7 +2579,7 @@ 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM + wxEXPAND|wxALIGN_CENTER_VERTICAL 0 1 @@ -2863,7 +2643,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -2923,8 +2703,8 @@ - 5 - wxTOP|wxRIGHT|wxLEFT + 3 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -2985,7 +2765,7 @@ 5 - wxBOTTOM|wxRIGHT|wxLEFT + wxALIGN_CENTER_VERTICAL|wxRIGHT 0 1 @@ -3063,34 +2843,36 @@ - 5 - + 2 + wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT 0 - m_SizerLineThickness + sizerMisc wxHORIZONTAL - protected + none - 5 - wxEXPAND + 3 + wxEXPAND|wxTOP|wxRIGHT 1 - - 3 + + wxBOTH - + 1 0 - fgSizer10 + gbSizer1 wxFLEX_GROWMODE_SPECIFIED none - 0 - 0 - - 5 - wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL - 0 + 3 + + 3 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT|wxEXPAND + 0 + 1 1 1 @@ -3148,10 +2930,13 @@ -1 - + 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 + 1 + 1 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + 1 1 1 @@ -3212,10 +2997,13 @@ - - 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT - 0 + + 3 + 1 + 2 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + 1 1 1 @@ -3273,120 +3061,13 @@ -1 - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALIGN_CENTER|wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Set to 0 for default - 0 - - 0 - - - 0 - - 1 - m_staticTextInfoThickness - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - - - - - 5 - wxEXPAND - 0 - - - m_SizerRotation - wxVERTICAL - protected - - 5 - wxEXPAND - 0 - - 2 - wxBOTH - - - 0 - - fgSizerRotation - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 + + 3 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + 1 + 1 1 1 @@ -3444,10 +3125,13 @@ -1 - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 + + 3 + 1 + 1 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 1 + 1 1 1 @@ -3508,39 +3192,13 @@ - - - - - - 5 - wxEXPAND - 0 - - - m_SizerPPI - wxVERTICAL - protected - - 5 - wxEXPAND - 0 - - 2 - wxBOTH - - - 0 - - fgSizerPPI - wxFLEX_GROWMODE_SPECIFIED - none - 0 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT - 0 + + 3 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + 2 + 1 1 1 @@ -3578,7 +3236,7 @@ 0 -1,-1 1 - m_staticTextBitmapPPI1 + m_staticTextBitmapDPI 1 @@ -3598,10 +3256,13 @@ -1 - - 5 - wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT - 0 + + 3 + 1 + 1 + wxEXPAND|wxALIGN_CENTER_VERTICAL + 2 + 1 1 1 @@ -3638,7 +3299,7 @@ 0 1 - m_textCtrlBitmapPPI + m_textCtrlBitmapDPI 1 @@ -3672,20 +3333,20 @@ 0 wxID_ANY - Step + Repeat m_sbStep wxVERTICAL 1 none - 5 - wxEXPAND + 3 + wxEXPAND|wxBOTTOM 0 - 2 + 3 wxBOTH - 0 + 1 0 @@ -3693,10 +3354,10 @@ wxFLEX_GROWMODE_SPECIFIED none 0 - 0 + 3 - 5 - wxTOP|wxRIGHT|wxLEFT + 3 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3726,7 +3387,7 @@ 0 0 wxID_ANY - Repeat count: + Count: 0 0 @@ -3757,17 +3418,7 @@ 5 - wxEXPAND - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxLEFT + wxEXPAND|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3840,8 +3491,8 @@ - 5 - wxTOP|wxRIGHT|wxLEFT + 3 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 0 1 @@ -3871,7 +3522,7 @@ 0 0 wxID_ANY - Text Increment: + Text: 0 0 @@ -3902,17 +3553,7 @@ 5 - wxEXPAND - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxLEFT + wxEXPAND|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -3985,8 +3626,8 @@ - 5 - wxTOP|wxRIGHT|wxLEFT + 3 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -4016,7 +3657,7 @@ 0 0 wxID_ANY - X Increment: + Step X: 0 0 @@ -4047,17 +3688,7 @@ 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -4121,7 +3752,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -4181,8 +3812,8 @@ - 5 - wxTOP|wxRIGHT|wxLEFT + 3 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 0 1 @@ -4212,7 +3843,7 @@ 0 0 wxID_ANY - Y Increment: + Step Y: 0 0 @@ -4243,17 +3874,7 @@ 5 - wxEXPAND - 0 - - 0 - protected - 0 - - - - 5 - wxEXPAND|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxLEFT 0 1 @@ -4317,7 +3938,7 @@ 5 - wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxBOTTOM|wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALIGN_LEFT|wxLEFT 0 1 @@ -4393,7 +4014,6 @@ - 0 @@ -5356,7 +4976,6 @@ - 0 @@ -6246,7 +5865,6 @@ - 0 diff --git a/pagelayout_editor/dialogs/properties_frame_base.h b/pagelayout_editor/dialogs/properties_frame_base.h index 0b96476764..c5a8b696e4 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 3.9.0 Dec 30 2020) +// C++ code generated with wxFormBuilder (version Oct 26 2018) // http://www.wxformbuilder.org/ // // PLEASE DO *NOT* EDIT THIS FILE! @@ -18,16 +18,16 @@ #include #include #include -#include #include #include #include #include #include -#include +#include #include #include #include +#include #include #include #include @@ -47,9 +47,7 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxBoxSizer* m_SizerItemProperties; wxStaticText* m_staticTextType; wxChoice* m_choicePageOpt; - wxStaticLine* m_staticline5; wxBoxSizer* m_SizerTextOptions; - wxStaticText* m_staticTextText; wxStyledTextCtrl* m_stcText; wxStaticText* m_staticTextHjust; wxChoice* m_choiceHjustify; @@ -70,7 +68,6 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxTextCtrl* m_textCtrlConstraintY; wxStaticText* m_TextConstraintYUnits; wxStaticText* m_staticTextSizeInfo; - wxStaticLine* m_staticline6; wxStaticText* m_staticTextComment; wxTextCtrl* m_textCtrlComment; wxStaticBoxSizer* sbSizerPos; @@ -91,17 +88,13 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxStaticText* m_TextEndYUnits; wxStaticText* m_staticTextOrgEnd; wxComboBox* m_comboBoxCornerEnd; - wxBoxSizer* m_SizerLineThickness; wxStaticText* m_staticTextThickness; wxTextCtrl* m_textCtrlThickness; wxStaticText* m_TextLineThicknessUnits; - wxStaticText* m_staticTextInfoThickness; - wxBoxSizer* m_SizerRotation; wxStaticText* m_staticTextRot; wxTextCtrl* m_textCtrlRotation; - wxBoxSizer* m_SizerPPI; - wxStaticText* m_staticTextBitmapPPI1; - wxTextCtrl* m_textCtrlBitmapPPI; + wxStaticText* m_staticTextBitmapDPI; + wxTextCtrl* m_textCtrlBitmapDPI; wxStaticText* m_staticTextRepeatCnt; wxTextCtrl* m_textCtrlRepeatCount; wxStaticText* m_staticTextInclabel; @@ -141,7 +134,7 @@ class PANEL_PROPERTIES_BASE : public wxPanel wxStaticText* m_TextBottomMarginUnits; wxButton* m_buttonGeneralOptsOK; - // Virtual event handlers, override them in your derived class + // Virtual event handlers, overide 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(); }