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

Pcbnew: fix strange things in module edit dialogs.

parent 02b5b477

common/build_version.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -7,9 +7,9 @@ 




#ifndef KICAD_BUILD_VERSION

#ifndef KICAD_BUILD_VERSION

#if defined KICAD_GOST

#if defined KICAD_GOST

#   define KICAD_BUILD_VERSION "(2013-feb-26 GOST)"

#   define KICAD_BUILD_VERSION "(2013-mar-04 GOST)"

#else

#else

#   define KICAD_BUILD_VERSION "(2013-feb-26)"

#   define KICAD_BUILD_VERSION "(2013-mar-04)"

#endif

#endif

#endif

#endif

pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -65,7 +65,6 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent 
    InitBoardProperties();

    InitBoardProperties();





    m_sdbSizerStdButtonsOK->SetDefault();

    m_sdbSizerStdButtonsOK->SetDefault();

    GetSizer()->Fit( this );

    GetSizer()->SetSizeHints( this );

    GetSizer()->SetSizeHints( this );

    Centre();

    Centre();

}

}
@@ -328,6 +327,10 @@ void DIALOG_MODULE_BOARD_EDITOR::InitModeditProperties() 
        m_3D_ShapeNameListBox->SetSelection( m_LastSelected3DShapeIndex );

        m_3D_ShapeNameListBox->SetSelection( m_LastSelected3DShapeIndex );

        Transfert3DValuesToDisplay( m_Shapes3D_list[m_LastSelected3DShapeIndex] );

        Transfert3DValuesToDisplay( m_Shapes3D_list[m_LastSelected3DShapeIndex] );

    }

    }



    // We have modified the UI, so call Fit() for m_Panel3D

    // to be sure the m_Panel3D sizers are initiliazed before opening the dialog

    m_Panel3D->GetSizer()->Fit( m_Panel3D );

}

}

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.cpp

+374 −374
Original line number Original line Diff line number Diff line
@@ -128,7 +128,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	

	

	wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };

	wxString m_AutoPlaceCtrlChoices[] = { _("Free"), _("Locked") };

	int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );

	int m_AutoPlaceCtrlNChoices = sizeof( m_AutoPlaceCtrlChoices ) / sizeof( wxString );

	m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Auto Place"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_AutoPlaceCtrl = new wxRadioBox( m_PanelProperties, wxID_ANY, _("Move and Place:"), wxDefaultPosition, wxDefaultSize, m_AutoPlaceCtrlNChoices, m_AutoPlaceCtrlChoices, 1, wxRA_SPECIFY_COLS );

	m_AutoPlaceCtrl->SetSelection( 0 );

	m_AutoPlaceCtrl->SetSelection( 0 );

	bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );

	bSizer12->Add( m_AutoPlaceCtrl, 1, wxALL|wxEXPAND, 5 );
@@ -136,7 +136,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare 
	m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 );

	m_PropRightSizer->Add( bSizer12, 1, wxEXPAND, 5 );

	

	

	wxStaticBoxSizer* sbSizerAutoplace;

	wxStaticBoxSizer* sbSizerAutoplace;

	sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Move and Place") ), wxHORIZONTAL );

	sbSizerAutoplace = new wxStaticBoxSizer( new wxStaticBox( m_PanelProperties, wxID_ANY, _("Auto Place:") ), wxHORIZONTAL );

	

	

	wxBoxSizer* bSizerRotOpt;

	wxBoxSizer* bSizerRotOpt;

	bSizerRotOpt = new wxBoxSizer( wxVERTICAL );

	bSizerRotOpt = new wxBoxSizer( wxVERTICAL );

pcbnew/dialogs/dialog_edit_module_for_BoardEditor_base.fbp

+4370 −4370
Original line number Original line Diff line number Diff line
@@ -1718,7 +1718,7 @@ 
                                                            <property name="gripper">0</property>

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

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

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

                                                            <property name="id">wxID_ANY</property>

                                                            <property name="id">wxID_ANY</property>

                                                            <property name="label">Move and Auto Place</property>

                                                            <property name="label">Move and Place:</property>

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

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

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

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

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

                                                            <property name="maximize_button">0</property>
@@ -1783,7 +1783,7 @@ 
                                                <property name="proportion">1</property>

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

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

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

                                                    <property name="id">wxID_ANY</property>

                                                    <property name="id">wxID_ANY</property>

                                                    <property name="label">Auto Move and Place</property>

                                                    <property name="label">Auto Place:</property>

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

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

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

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

                                                    <property name="orient">wxHORIZONTAL</property>

                                                    <property name="orient">wxHORIZONTAL</property>

pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp

+4 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,6 @@ DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME* 




    initModeditProperties();

    initModeditProperties();

    m_sdbSizerStdButtonsOK->SetDefault();

    m_sdbSizerStdButtonsOK->SetDefault();

    GetSizer()->Fit( this );

    GetSizer()->SetSizeHints( this );

    GetSizer()->SetSizeHints( this );

    Centre();

    Centre();

}

}
@@ -208,6 +207,10 @@ void DIALOG_MODULE_MODULE_EDITOR::initModeditProperties() 
        m_3D_ShapeNameListBox->SetSelection( m_lastSelected3DShapeIndex );

        m_3D_ShapeNameListBox->SetSelection( m_lastSelected3DShapeIndex );

        Transfert3DValuesToDisplay( m_shapes3D_list[m_lastSelected3DShapeIndex] );

        Transfert3DValuesToDisplay( m_shapes3D_list[m_lastSelected3DShapeIndex] );

    }

    }



    // We have modified the UI, so call Fit() for m_Panel3D

    // to be sure the m_Panel3D sizers are initialized before opening the dialog

    m_Panel3D->GetSizer()->Fit( m_Panel3D );

}

}