diff --git a/pagelayout_editor/dialogs/properties_frame_base.cpp b/pagelayout_editor/dialogs/properties_frame_base.cpp index 146eff33ff..9321c3196f 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.cpp +++ b/pagelayout_editor/dialogs/properties_frame_base.cpp @@ -24,18 +24,18 @@ 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_NORMAL, wxFONTWEIGHT_NORMAL, false, wxEmptyString ) ); + m_staticTextType->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), wxFONTFAMILY_DEFAULT, wxFONTSTYLE_ITALIC, wxFONTWEIGHT_BOLD, false, wxEmptyString ) ); - bSizerButt->Add( m_staticTextType, 1, wxLEFT|wxRIGHT, 5 ); + bSizerButt->Add( m_staticTextType, 1, wxALIGN_CENTER_VERTICAL|wxALL, 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, wxEXPAND|wxRIGHT|wxLEFT, 5 ); + bSizerButt->Add( m_choicePageOpt, 0, wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL, 5 ); - m_SizerItemProperties->Add( bSizerButt, 0, wxEXPAND|wxTOP, 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 ); diff --git a/pagelayout_editor/dialogs/properties_frame_base.fbp b/pagelayout_editor/dialogs/properties_frame_base.fbp index f3ea944f0b..2e48e4f29c 100644 --- a/pagelayout_editor/dialogs/properties_frame_base.fbp +++ b/pagelayout_editor/dialogs/properties_frame_base.fbp @@ -176,7 +176,7 @@ protected 5 - wxEXPAND|wxTOP + wxEXPAND 0 @@ -185,7 +185,7 @@ none 5 - wxLEFT|wxRIGHT + wxALIGN_CENTER_VERTICAL|wxALL 1 1 @@ -211,7 +211,7 @@ 1 1 - ,90,90,-1,70,0 + ,94,92,-1,70,0 0 0 wxID_ANY @@ -246,7 +246,7 @@ 5 - wxEXPAND|wxRIGHT|wxLEFT + wxEXPAND|wxALIGN_CENTER_VERTICAL|wxALL 0 1 diff --git a/pagelayout_editor/properties_frame.cpp b/pagelayout_editor/properties_frame.cpp index 014a85261d..dce3fa1bb4 100644 --- a/pagelayout_editor/properties_frame.cpp +++ b/pagelayout_editor/properties_frame.cpp @@ -37,8 +37,9 @@ PROPERTIES_FRAME::PROPERTIES_FRAME( PL_EDITOR_FRAME* aParent ): m_parent = aParent; wxFont infoFont = wxSystemSettings::GetFont( wxSYS_DEFAULT_GUI_FONT ); - infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); + infoFont.SetSymbolicSize( wxFONTSIZE_SMALL ); m_staticTextSizeInfo->SetFont( infoFont ); + infoFont.SetSymbolicSize( wxFONTSIZE_X_SMALL ); m_staticTextInfoThickness->SetFont( infoFont ); m_buttonOK->SetDefault();