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

Other minor fixes

parent 813efb77

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -149,13 +149,13 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( 
	int m_FieldHJustifyCtrlNChoices = sizeof( m_FieldHJustifyCtrlChoices ) / sizeof( wxString );

	int m_FieldHJustifyCtrlNChoices = sizeof( m_FieldHJustifyCtrlChoices ) / sizeof( wxString );

	m_FieldHJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Horiz. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldHJustifyCtrlNChoices, m_FieldHJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_FieldHJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Horiz. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldHJustifyCtrlNChoices, m_FieldHJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_FieldHJustifyCtrl->SetSelection( 2 );

	m_FieldHJustifyCtrl->SetSelection( 2 );

	bSizerJustification->Add( m_FieldHJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerJustification->Add( m_FieldHJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };

	wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };

	int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );

	int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );

	m_FieldVJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Vert. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldVJustifyCtrlNChoices, m_FieldVJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_FieldVJustifyCtrl = new wxRadioBox( this, wxID_ANY, _("Vert. Justify"), wxDefaultPosition, wxDefaultSize, m_FieldVJustifyCtrlNChoices, m_FieldVJustifyCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_FieldVJustifyCtrl->SetSelection( 2 );

	m_FieldVJustifyCtrl->SetSelection( 2 );

	bSizerJustification->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerJustification->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	

	

	fieldEditBoxSizer->Add( bSizerJustification, 1, wxEXPAND|wxBOTTOM, 5 );

	fieldEditBoxSizer->Add( bSizerJustification, 1, wxEXPAND|wxBOTTOM, 5 );
@@ -188,7 +188,7 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( 
	bSizerStyle->Add( m_StyleRadioBox, 1, wxEXPAND|wxALL, 5 );

	bSizerStyle->Add( m_StyleRadioBox, 1, wxEXPAND|wxALL, 5 );

	

	

	

	

	fieldEditBoxSizer->Add( bSizerStyle, 1, wxEXPAND, 5 );

	fieldEditBoxSizer->Add( bSizerStyle, 1, wxEXPAND|wxBOTTOM, 5 );

	

	

	wxBoxSizer* fieldNameBoxSizer;

	wxBoxSizer* fieldNameBoxSizer;

	fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );

	fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );

eeschema/dialogs/dialog_edit_component_in_schematic_fbp.fbp

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

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

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

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

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

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

                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>

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

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

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

                                                    <object class="wxRadioBox" expanded="0">

                                                    <object class="wxRadioBox" expanded="0">

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

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

                                                </object>

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

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

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

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

                                                    <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>

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

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

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

                                                    <object class="wxRadioBox" expanded="0">

                                                    <object class="wxRadioBox" expanded="0">

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

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

                                        </object>

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

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

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

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

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

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

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

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

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

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

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

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

eeschema/dialogs/dialog_edit_libentry_fields_in_lib.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -266,7 +266,7 @@ void DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB::OnOKButtonClick( wxCommandEvent& event 
    /* End unused code */

    /* End unused code */





    // save old cmp in undo list

    // save old cmp in undo list

    m_parent->SaveCopyInUndoList( m_libEntry, IS_CHANGED );

    m_parent->SaveCopyInUndoList( m_libEntry );





    // delete any fields with no name or no value before we copy all of m_FieldsBuf

    // delete any fields with no name or no value before we copy all of m_FieldsBuf

    // back into the component

    // back into the component

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.cpp

+5 −6
Original line number Original line Diff line number Diff line
@@ -57,7 +57,7 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	m_FieldHJustifyCtrl->SetSelection( 1 );

	m_FieldHJustifyCtrl->SetSelection( 1 );

	m_FieldHJustifyCtrl->SetToolTip( _("Select if the component is to be rotated when drawn") );

	m_FieldHJustifyCtrl->SetToolTip( _("Select if the component is to be rotated when drawn") );

	

	

	bSizerJustify->Add( m_FieldHJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerJustify->Add( m_FieldHJustifyCtrl, 1, wxEXPAND|wxALL, 5 );

	

	

	wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };

	wxString m_FieldVJustifyCtrlChoices[] = { _("Bottom"), _("Center"), _("Top") };

	int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );

	int m_FieldVJustifyCtrlNChoices = sizeof( m_FieldVJustifyCtrlChoices ) / sizeof( wxString );
@@ -65,10 +65,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	m_FieldVJustifyCtrl->SetSelection( 0 );

	m_FieldVJustifyCtrl->SetSelection( 0 );

	m_FieldVJustifyCtrl->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") );

	m_FieldVJustifyCtrl->SetToolTip( _("Pick the graphical transformation to be used when displaying the component, if any") );

	

	

	bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	bSizerJustify->Add( m_FieldVJustifyCtrl, 1, wxEXPAND|wxALL, 5 );

	

	

	

	

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

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

	

	

	wxBoxSizer* bSizerAspect;

	wxBoxSizer* bSizerAspect;

	bSizerAspect = new wxBoxSizer( wxHORIZONTAL );

	bSizerAspect = new wxBoxSizer( wxHORIZONTAL );
@@ -93,10 +93,10 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString );

	int m_StyleRadioBoxNChoices = sizeof( m_StyleRadioBoxChoices ) / sizeof( wxString );

	m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS );

	m_StyleRadioBox = new wxRadioBox( this, wxID_ANY, _("Style:"), wxDefaultPosition, wxDefaultSize, m_StyleRadioBoxNChoices, m_StyleRadioBoxChoices, 1, wxRA_SPECIFY_COLS );

	m_StyleRadioBox->SetSelection( 0 );

	m_StyleRadioBox->SetSelection( 0 );

	bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	bSizerAspect->Add( m_StyleRadioBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	

	

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

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

	

	

	wxBoxSizer* fieldNameBoxSizer;

	wxBoxSizer* fieldNameBoxSizer;

	fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );

	fieldNameBoxSizer = new wxBoxSizer( wxVERTICAL );
@@ -199,7 +199,6 @@ DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE 
	

	

	this->SetSizer( mainSizer );

	this->SetSizer( mainSizer );

	this->Layout();

	this->Layout();

	mainSizer->Fit( this );

	

	

	// Connect Events

	// Connect Events

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) );

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_EDIT_LIBENTRY_FIELDS_IN_LIB_BASE::OnCloseDialog ) );

eeschema/dialogs/dialog_edit_libentry_fields_in_lib_base.fbp

+7 −7
Original line number Original line Diff line number Diff line
@@ -44,7 +44,7 @@ 
            <property name="minimum_size"></property>

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

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

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

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

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

            <property name="size">-1,-1</property>

            <property name="size">542,529</property>

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

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

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

            <property name="subclass">DIALOG_SHIM; dialog_shim.h</property>

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

            <property name="title">Field Properties</property>
@@ -494,7 +494,7 @@ 
                                <object class="sizeritem" expanded="1">

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

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

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

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

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

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

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

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

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

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

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

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

                                        <property name="name">bSizerJustify</property>
@@ -502,7 +502,7 @@ 
                                        <property name="permission">none</property>

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

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

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

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

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

                                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>

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

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

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

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

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

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

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

                                        </object>

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

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

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

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

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

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

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

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

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

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

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

                                                <property name="BottomDockable">1</property>
@@ -684,8 +684,8 @@ 
                                </object>

                                </object>

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

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

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

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

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

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

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

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

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

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

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

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

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

                                        <property name="name">bSizerAspect</property>
@@ -883,7 +883,7 @@ 
                                        </object>

                                        </object>

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

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

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

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

                                            <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>

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

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

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

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

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

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

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