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

Convert gendrill dialog from Dialogblocks to wxFormBuilder. Minor fixes.

parent 7e7f101a

pcbnew/dialog_export_3Dfiles_base.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -45,10 +45,10 @@ DIALOG_EXPORT_3DFILE_BASE::DIALOG_EXPORT_3DFILE_BASE( wxWindow* parent, wxWindow 
	m_rbSelectUnits->SetSelection( 0 );

	m_rbSelectUnits->SetSelection( 0 );

	bLowerSizer->Add( m_rbSelectUnits, 1, wxALL|wxEXPAND, 5 );

	bLowerSizer->Add( m_rbSelectUnits, 1, wxALL|wxEXPAND, 5 );

	

	

	wxString m_rb3DFilesOptionChoices[] = { _("Copy 3D Shapes Files in Subdir"), _("Use Absolute Path in Wrml File ") };

	wxString m_rb3DFilesOptionChoices[] = { _("Copy 3D Shapes Files in Subdir"), _("Use Absolute Path in Vrml File ") };

	int m_rb3DFilesOptionNChoices = sizeof( m_rb3DFilesOptionChoices ) / sizeof( wxString );

	int m_rb3DFilesOptionNChoices = sizeof( m_rb3DFilesOptionChoices ) / sizeof( wxString );

	m_rb3DFilesOption = new wxRadioBox( this, wxID_ANY, _("3D Shapes Files Option:"), wxDefaultPosition, wxDefaultSize, m_rb3DFilesOptionNChoices, m_rb3DFilesOptionChoices, 1, wxRA_SPECIFY_COLS );

	m_rb3DFilesOption = new wxRadioBox( this, wxID_ANY, _("3D Shapes Files Option:"), wxDefaultPosition, wxDefaultSize, m_rb3DFilesOptionNChoices, m_rb3DFilesOptionChoices, 1, wxRA_SPECIFY_COLS );

	m_rb3DFilesOption->SetSelection( 0 );

	m_rb3DFilesOption->SetSelection( 1 );

	bLowerSizer->Add( m_rb3DFilesOption, 1, wxALL|wxEXPAND, 5 );

	bLowerSizer->Add( m_rb3DFilesOption, 1, wxALL|wxEXPAND, 5 );

	

	

	bSizer1->Add( bLowerSizer, 1, wxEXPAND, 5 );

	bSizer1->Add( bLowerSizer, 1, wxEXPAND, 5 );

pcbnew/dialog_export_3Dfiles_base.fbp

+2 −2
Original line number Original line Diff line number Diff line
@@ -365,7 +365,7 @@ 
                            <property name="proportion">1</property>

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

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

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

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

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

                                <property name="choices">&quot;Copy 3D Shapes Files in Subdir&quot; &quot;Use Absolute Path in Wrml File &quot;</property>

                                <property name="choices">&quot;Copy 3D Shapes Files in Subdir&quot; &quot;Use Absolute Path in Vrml File &quot;</property>

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

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

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

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

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

                                <property name="fg"></property>
@@ -379,7 +379,7 @@ 
                                <property name="name">m_rb3DFilesOption</property>

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

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

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

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

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

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

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

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

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

                                <property name="style">wxRA_SPECIFY_COLS</property>

                                <property name="style">wxRA_SPECIFY_COLS</property>

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

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

pcbnew/dialog_gendrill_base.cpp

+14 −14
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con 
	m_Choice_Unit->SetSelection( 1 );

	m_Choice_Unit->SetSelection( 1 );

	m_LeftBoxSizer->Add( m_Choice_Unit, 0, wxALL|wxEXPAND, 5 );

	m_LeftBoxSizer->Add( m_Choice_Unit, 0, wxALL|wxEXPAND, 5 );

	

	

	wxString m_Choice_Zeros_FormatChoices[] = { _("decimal format"), _("suppress leading zeros"), _("suppress trailing zeros"), _("keep zeros") };

	wxString m_Choice_Zeros_FormatChoices[] = { _("Decimal format"), _("Suppress leading zeros"), _("Suppress trailing zeros"), _("Keep zeros") };

	int m_Choice_Zeros_FormatNChoices = sizeof( m_Choice_Zeros_FormatChoices ) / sizeof( wxString );

	int m_Choice_Zeros_FormatNChoices = sizeof( m_Choice_Zeros_FormatChoices ) / sizeof( wxString );

	m_Choice_Zeros_Format = new wxRadioBox( this, wxID_ANY, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatNChoices, m_Choice_Zeros_FormatChoices, 1, wxRA_SPECIFY_COLS );

	m_Choice_Zeros_Format = new wxRadioBox( this, wxID_ANY, _("Zeros Format"), wxDefaultPosition, wxDefaultSize, m_Choice_Zeros_FormatNChoices, m_Choice_Zeros_FormatChoices, 1, wxRA_SPECIFY_COLS );

	m_Choice_Zeros_Format->SetSelection( 0 );

	m_Choice_Zeros_Format->SetSelection( 0 );
@@ -41,7 +41,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con 
	

	

	m_LeftBoxSizer->Add( m_Choice_Precision, 0, wxALL|wxEXPAND, 5 );

	m_LeftBoxSizer->Add( m_Choice_Precision, 0, wxALL|wxEXPAND, 5 );

	

	

	wxString m_Choice_Drill_OffsetChoices[] = { _("absolute"), _("auxiliary axis") };

	wxString m_Choice_Drill_OffsetChoices[] = { _("Absolute"), _("Auxiliary axis") };

	int m_Choice_Drill_OffsetNChoices = sizeof( m_Choice_Drill_OffsetChoices ) / sizeof( wxString );

	int m_Choice_Drill_OffsetNChoices = sizeof( m_Choice_Drill_OffsetChoices ) / sizeof( wxString );

	m_Choice_Drill_Offset = new wxRadioBox( this, wxID_ANY, _("Drill Origin:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetNChoices, m_Choice_Drill_OffsetChoices, 1, wxRA_SPECIFY_COLS );

	m_Choice_Drill_Offset = new wxRadioBox( this, wxID_ANY, _("Drill Origin:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_OffsetNChoices, m_Choice_Drill_OffsetChoices, 1, wxRA_SPECIFY_COLS );

	m_Choice_Drill_Offset->SetSelection( 0 );

	m_Choice_Drill_Offset->SetSelection( 0 );
@@ -54,7 +54,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con 
	wxBoxSizer* bMiddleBoxSizer;

	wxBoxSizer* bMiddleBoxSizer;

	bMiddleBoxSizer = new wxBoxSizer( wxVERTICAL );

	bMiddleBoxSizer = new wxBoxSizer( wxVERTICAL );

	

	

	wxString m_Choice_Drill_MapChoices[] = { _("None"), _("drill sheet (HPGL)"), _("drill sheet (PostScript)"), _("Drill sheet (Gerber)"), _("Drill sheet (DXF)") };

	wxString m_Choice_Drill_MapChoices[] = { _("None"), _("Drill map (HPGL)"), _("Drill map (PostScript)"), _("Drill map (Gerber)"), _("Drill map (DXF)") };

	int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString );

	int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString );

	m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS );

	m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS );

	m_Choice_Drill_Map->SetSelection( 0 );

	m_Choice_Drill_Map->SetSelection( 0 );
@@ -87,20 +87,20 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con 
	m_PenNum = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	m_PenNum = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	sbHPGOptionsSizer->Add( m_PenNum, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	sbHPGOptionsSizer->Add( m_PenNum, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );

	

	

	bMiddleBoxSizer->Add( sbHPGOptionsSizer, 1, wxEXPAND, 5 );

	bMiddleBoxSizer->Add( sbHPGOptionsSizer, 0, wxEXPAND, 5 );

	

	

	wxStaticBoxSizer* sbOptSizer;

	wxStaticBoxSizer* sbOptSizer;

	sbOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );

	sbOptSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options:") ), wxVERTICAL );

	

	

	m_Check_Mirror = new wxCheckBox( this, wxID_ANY, _("mirror y axis"), wxDefaultPosition, wxDefaultSize, 0 );

	m_Check_Mirror = new wxCheckBox( this, wxID_ANY, _("Mirror y axis"), wxDefaultPosition, wxDefaultSize, 0 );

	

	

	sbOptSizer->Add( m_Check_Mirror, 0, wxALL, 5 );

	sbOptSizer->Add( m_Check_Mirror, 0, wxALL, 5 );

	

	

	m_Check_Minimal = new wxCheckBox( this, wxID_ANY, _("minimal header"), wxDefaultPosition, wxDefaultSize, 0 );

	m_Check_Minimal = new wxCheckBox( this, wxID_ANY, _("Minimal header"), wxDefaultPosition, wxDefaultSize, 0 );

	

	

	sbOptSizer->Add( m_Check_Minimal, 0, wxALL, 5 );

	sbOptSizer->Add( m_Check_Minimal, 0, wxALL, 5 );

	

	

	bMiddleBoxSizer->Add( sbOptSizer, 1, wxEXPAND, 5 );

	bMiddleBoxSizer->Add( sbOptSizer, 0, wxEXPAND, 5 );

	

	

	bMainSizer->Add( bMiddleBoxSizer, 1, wxEXPAND, 5 );

	bMainSizer->Add( bMiddleBoxSizer, 1, wxEXPAND, 5 );
@@ -145,19 +145,19 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con 
	m_BuriedViasInfoMsg->Wrap( -1 );

	m_BuriedViasInfoMsg->Wrap( -1 );

	sbSizerHoles->Add( m_BuriedViasInfoMsg, 0, wxALL, 5 );

	sbSizerHoles->Add( m_BuriedViasInfoMsg, 0, wxALL, 5 );

	

	

	sbSizerInfo->Add( sbSizerHoles, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );

	

	bRightBoxSizer->Add( sbSizerInfo, 0, wxEXPAND|wxTOP, 5 );

	

	

	

	sbSizerHoles->Add( 10, 10, 1, wxEXPAND, 5 );

	bRightBoxSizer->Add( 10, 10, 1, wxEXPAND|wxALIGN_CENTER_HORIZONTAL, 5 );

	

	

	m_OkButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );

	m_OkButton = new wxButton( this, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );

	m_OkButton->SetDefault(); 

	m_OkButton->SetDefault(); 

	sbSizerHoles->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	bRightBoxSizer->Add( m_OkButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	

	m_CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );

	m_CancelButton = new wxButton( this, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );

	sbSizerHoles->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	bRightBoxSizer->Add( m_CancelButton, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	sbSizerInfo->Add( sbSizerHoles, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );

	

	bRightBoxSizer->Add( sbSizerInfo, 1, wxEXPAND|wxTOP, 5 );

	

	

	bMainSizer->Add( bRightBoxSizer, 1, wxEXPAND, 5 );

	bMainSizer->Add( bRightBoxSizer, 1, wxEXPAND, 5 );

pcbnew/dialog_gendrill_base.fbp

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

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

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

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

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

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

            <property name="size">447,439</property>

            <property name="size">447,412</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

            <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER</property>

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

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

            <property name="title">Drill Files Generation</property>

            <property name="title">Drill Files Generation</property>
@@ -144,7 +144,7 @@ 
                            <property name="proportion">0</property>

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

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

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

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

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

                                <property name="choices">&quot;decimal format&quot; &quot;suppress leading zeros&quot; &quot;suppress trailing zeros&quot; &quot;keep zeros&quot;</property>

                                <property name="choices">&quot;Decimal format&quot; &quot;Suppress leading zeros&quot; &quot;Suppress trailing zeros&quot; &quot;Keep zeros&quot;</property>

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

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

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

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

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

                                <property name="fg"></property>
@@ -252,7 +252,7 @@ 
                            <property name="proportion">0</property>

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

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

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

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

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

                                <property name="choices">&quot;absolute&quot; &quot;auxiliary axis&quot;</property>

                                <property name="choices">&quot;Absolute&quot; &quot;Auxiliary axis&quot;</property>

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

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

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

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

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

                                <property name="fg"></property>
@@ -317,7 +317,7 @@ 
                            <property name="proportion">0</property>

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

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

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

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

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

                                <property name="choices">&quot;None&quot; &quot;drill sheet (HPGL)&quot; &quot;drill sheet (PostScript)&quot; &quot;Drill sheet (Gerber)&quot; &quot;Drill sheet (DXF)&quot;</property>

                                <property name="choices">&quot;None&quot; &quot;Drill map (HPGL)&quot; &quot;Drill map (PostScript)&quot; &quot;Drill map (Gerber)&quot; &quot;Drill map (DXF)&quot;</property>

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

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

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

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

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

                                <property name="fg"></property>
@@ -422,7 +422,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</property>

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

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

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

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

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

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

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

                                <property name="label">HPGL plotter Options:</property>

                                <property name="label">HPGL plotter Options:</property>
@@ -648,7 +648,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</property>

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

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

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

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

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

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

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

                                <property name="label">Options:</property>

                                <property name="label">Options:</property>
@@ -670,7 +670,7 @@ 
                                        <property name="font"></property>

                                        <property name="font"></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">mirror y axis</property>

                                        <property name="label">Mirror y axis</property>

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

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

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

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

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

                                        <property name="name">m_Check_Mirror</property>
@@ -722,7 +722,7 @@ 
                                        <property name="font"></property>

                                        <property name="font"></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">minimal header</property>

                                        <property name="label">Minimal header</property>

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

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

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

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

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

                                        <property name="name">m_Check_Minimal</property>
@@ -777,7 +777,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|wxTOP</property>

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

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

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

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

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

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

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

                                <property name="label">Info:</property>

                                <property name="label">Info:</property>
@@ -1132,9 +1132,13 @@ 
                                                <event name="OnUpdateUI"></event>

                                                <event name="OnUpdateUI"></event>

                                            </object>

                                            </object>

                                        </object>

                                        </object>

                                    </object>

                                </object>

                            </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|wxALIGN_CENTER_HORIZONTAL</property>

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

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

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

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

                                <property name="height">10</property>

                                <property name="height">10</property>
@@ -1251,8 +1255,4 @@ 
            </object>

            </object>

        </object>

        </object>

    </object>

    </object>

                </object>

            </object>

        </object>

    </object>

</wxFormBuilder_Project>
 
</wxFormBuilder_Project>

pcbnew/dialog_gendrill_base.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -67,7 +67,7 @@ class DIALOG_GENDRILL_BASE : public wxDialog 
		

		

	

	

	public:

	public:

		DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drill Files Generation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,439 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

		DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Drill Files Generation"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,412 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER );

		~DIALOG_GENDRILL_BASE();

		~DIALOG_GENDRILL_BASE();

	

	

};

};