Commit fd1cd36f authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Minor changes in dialogs to ensure a better likeness between dialogs on Linux... 

Minor changes in dialogs to ensure a better likeness between dialogs on Linux and Windows (mainly, remove some wxStaticBoxSizer in dialogs)
parent 92e0eb62

eeschema/dialogs/dialog_edit_component_in_schematic.cpp

+3 −12
Original line number Diff line number Diff line
@@ -102,18 +102,9 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( wxWindow 
    columnLabel.SetText( _( "Value" ) );

    fieldListCtrl->InsertColumn( 1, columnLabel );



    wxString label = _( "Size" ) + ReturnUnitSymbol( g_UserUnit );

    textSizeLabel->SetLabel( label );



    label  = _( "Pos " );

    label += _( "X" );

    label += ReturnUnitSymbol( g_UserUnit );

    posXLabel->SetLabel( label );



    label  = _( "Pos " );

    label += _( "Y" );

    label += ReturnUnitSymbol( g_UserUnit );

    posYLabel->SetLabel( label );

    m_staticTextUnitSize->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );

    m_staticTextUnitPosX->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );

    m_staticTextUnitPosY->SetLabel( GetAbbreviatedUnitsLabel( g_UserUnit ) );



    copySelectedFieldToPanel();

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
        <property name="first_id">1000</property>

        <property name="help_provider">none</property>

        <property name="internationalize">1</property>

        <property name="name"></property>

        <property name="name">dialog_edit_component_in_schematic_base</property>

        <property name="namespace"></property>

        <property name="path">.</property>

        <property name="precompiled_header"></property>
@@ -44,7 +44,7 @@ 
            <property name="pos"></property>

            <property name="size">700,482</property>

            <property name="style">wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU</property>

            <property name="subclass"></property>

            <property name="subclass">; </property>

            <property name="title">Component Properties</property>

            <property name="tooltip"></property>

            <property name="window_extra_style"></property>

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp

+6 −6
Original line number Diff line number Diff line
@@ -25,17 +25,17 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	fieldListCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLC_HRULES|wxLC_REPORT|wxLC_SINGLE_SEL|wxLC_VRULES );

	fieldListCtrl->SetMinSize( wxSize( 220,-1 ) );

	

	bSizerFiledsList->Add( fieldListCtrl, 1, wxALL|wxEXPAND, 8 );

	bSizerFiledsList->Add( fieldListCtrl, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 8 );

	

	addFieldButton = new wxButton( this, wxID_ANY, _("Add Field"), wxDefaultPosition, wxDefaultSize, 0 );

	addFieldButton->SetToolTip( _("Add a new custom field") );

	

	bSizerFiledsList->Add( addFieldButton, 0, wxALL|wxEXPAND, 5 );

	bSizerFiledsList->Add( addFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	deleteFieldButton = new wxButton( this, wxID_ANY, _("Delete Field"), wxDefaultPosition, wxDefaultSize, 0 );

	deleteFieldButton->SetToolTip( _("Delete one of the optional fields") );

	

	bSizerFiledsList->Add( deleteFieldButton, 0, wxALL|wxEXPAND, 5 );

	bSizerFiledsList->Add( deleteFieldButton, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	moveUpButton = new wxButton( this, wxID_ANY, _("Move Up"), wxDefaultPosition, wxDefaultSize, 0 );

	moveUpButton->SetToolTip( _("Move the selected optional fields up one position") );
@@ -68,7 +68,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	fieldEditBoxSizer->Add( bSizerJustify, 0, wxEXPAND, 5 );

	fieldEditBoxSizer->Add( bSizerJustify, 0, wxEXPAND|wxBOTTOM, 5 );

	

	wxBoxSizer* bSizerAspect;

	bSizerAspect = new wxBoxSizer( wxHORIZONTAL );
@@ -96,7 +96,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	

	fieldEditBoxSizer->Add( bSizerAspect, 0, wxEXPAND, 5 );

	fieldEditBoxSizer->Add( bSizerAspect, 0, wxEXPAND|wxTOP, 5 );

	

	wxBoxSizer* fieldNameBoxSizer;

	fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );
@@ -186,7 +186,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	mainSizer->Add( bSizerFieldsSetup, 1, wxEXPAND, 5 );

	

	m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );

	mainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );

	mainSizer->Add( m_staticline1, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );

	

	stdDialogButtonSizer = new wxStdDialogButtonSizer();

	stdDialogButtonSizerOK = new wxButton( this, wxID_OK );

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp

+6 −6
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ 
                                <property name="permission">none</property>

                                <object class="sizeritem" expanded="1">

                                    <property name="border">8</property>

                                    <property name="flag">wxALL|wxEXPAND</property>

                                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>

                                    <property name="proportion">1</property>

                                    <object class="wxListCtrl" expanded="1">

                                        <property name="BottomDockable">1</property>
@@ -216,7 +216,7 @@ 
                                </object>

                                <object class="sizeritem" expanded="1">

                                    <property name="border">5</property>

                                    <property name="flag">wxALL|wxEXPAND</property>

                                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>

                                    <property name="proportion">0</property>

                                    <object class="wxButton" expanded="1">

                                        <property name="BottomDockable">1</property>
@@ -304,7 +304,7 @@ 
                                </object>

                                <object class="sizeritem" expanded="1">

                                    <property name="border">5</property>

                                    <property name="flag">wxALL|wxEXPAND</property>

                                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>

                                    <property name="proportion">0</property>

                                    <object class="wxButton" expanded="1">

                                        <property name="BottomDockable">1</property>
@@ -491,7 +491,7 @@ 
                                <property name="permission">none</property>

                                <object class="sizeritem" expanded="1">

                                    <property name="border">5</property>

                                    <property name="flag">wxEXPAND</property>

                                    <property name="flag">wxEXPAND|wxBOTTOM</property>

                                    <property name="proportion">0</property>

                                    <object class="wxBoxSizer" expanded="1">

                                        <property name="minimum_size"></property>
@@ -682,7 +682,7 @@ 
                                </object>

                                <object class="sizeritem" expanded="1">

                                    <property name="border">5</property>

                                    <property name="flag">wxEXPAND</property>

                                    <property name="flag">wxEXPAND|wxTOP</property>

                                    <property name="proportion">0</property>

                                    <object class="wxBoxSizer" expanded="1">

                                        <property name="minimum_size"></property>
@@ -2136,7 +2136,7 @@ 
                </object>

                <object class="sizeritem" expanded="1">

                    <property name="border">5</property>

                    <property name="flag">wxEXPAND | wxALL</property>

                    <property name="flag">wxEXPAND|wxTOP|wxRIGHT|wxLEFT</property>

                    <property name="proportion">0</property>

                    <object class="wxStaticLine" expanded="1">

                        <property name="BottomDockable">1</property>