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

Fix Bug #1335914 (Export SVG menu) hangs pcbnew permanently. 

Also a minor cosmetic enhancement in SVG export and plot dialogs.
parent 4d9f87bf

pcbnew/dialogs/dialog_SVG_print_base.cpp

+5 −4
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Jun  6 2014)

// C++ code generated with wxFormBuilder (version Nov  6 2013)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -119,9 +119,8 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c 
	m_staticText2->Wrap( -1 );

	bMainSizer->Add( m_staticText2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE );

	m_messagesBox->SetMaxLength( 0 ); 

	m_messagesBox->SetMinSize( wxSize( -1,100 ) );

	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );

	m_messagesBox->SetMinSize( wxSize( -1,150 ) );

	

	bMainSizer->Add( m_messagesBox, 1, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
@@ -130,6 +129,7 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c 
	this->Layout();

	

	// Connect Events

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_SVG_PRINT_base::OnCloseWindow ) );

	m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SVG_PRINT_base::OnOutputDirectoryBrowseClicked ), NULL, this );

	m_buttonCreateFile->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SVG_PRINT_base::OnButtonPlot ), NULL, this );

	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SVG_PRINT_base::OnButtonCloseClick ), NULL, this );
@@ -138,6 +138,7 @@ DIALOG_SVG_PRINT_base::DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id, c 
DIALOG_SVG_PRINT_base::~DIALOG_SVG_PRINT_base()

{

	// Disconnect Events

	this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_SVG_PRINT_base::OnCloseWindow ) );

	m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SVG_PRINT_base::OnOutputDirectoryBrowseClicked ), NULL, this );

	m_buttonCreateFile->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SVG_PRINT_base::OnButtonPlot ), NULL, this );

	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_SVG_PRINT_base::OnButtonCloseClick ), NULL, this );

pcbnew/dialogs/dialog_SVG_print_base.fbp

+6 −6
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="13" />

    <FileVersion major="1" minor="11" />

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

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

        <property name="code_generation">C++</property>
@@ -44,7 +44,7 @@ 
            <property name="minimum_size">-1,350</property>

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

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

            <property name="size">507,420</property>

            <property name="size">507,451</property>

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

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

            <property name="title">Export SVG file</property>
@@ -61,7 +61,7 @@ 
            <event name="OnAuiPaneRestore"></event>

            <event name="OnAuiRender"></event>

            <event name="OnChar"></event>

            <event name="OnClose"></event>

            <event name="OnClose">OnCloseWindow</event>

            <event name="OnEnterWindow"></event>

            <event name="OnEraseBackground"></event>

            <event name="OnHibernate"></event>
@@ -1358,10 +1358,10 @@ 
                        <property name="max_size"></property>

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

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

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

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

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

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

                        <property name="minimum_size">-1,100</property>

                        <property name="minimum_size">-1,150</property>

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

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

                        <property name="pane_border">1</property>
@@ -1373,7 +1373,7 @@ 
                        <property name="resize">Resizable</property>

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

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

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

                        <property name="style">wxTE_MULTILINE|wxTE_READONLY</property>

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

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

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

pcbnew/dialogs/dialog_SVG_print_base.h

+3 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Jun  6 2014)

// C++ code generated with wxFormBuilder (version Nov  6 2013)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -61,6 +61,7 @@ class DIALOG_SVG_PRINT_base : public DIALOG_SHIM 
		wxTextCtrl* m_messagesBox;

		

		// Virtual event handlers, overide them in your derived class

		virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }

		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnButtonPlot( wxCommandEvent& event ) { event.Skip(); }

		virtual void OnButtonCloseClick( wxCommandEvent& event ) { event.Skip(); }
@@ -68,7 +69,7 @@ class DIALOG_SVG_PRINT_base : public DIALOG_SHIM 
	

	public:

		

		DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export SVG file"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 507,420 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		DIALOG_SVG_PRINT_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Export SVG file"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 507,451 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 

		~DIALOG_SVG_PRINT_base();

	

};

pcbnew/dialogs/dialog_plot_base.cpp

+2 −2
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Feb 26 2014)

// C++ code generated with wxFormBuilder (version Jun  5 2014)

// http://www.wxformbuilder.org/

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -352,7 +352,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	sbSizerMsg = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Messages:") ), wxVERTICAL );

	

	m_messagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE|wxTE_READONLY );

	m_messagesBox->SetMinSize( wxSize( -1,70 ) );

	m_messagesBox->SetMinSize( wxSize( -1,150 ) );

	

	sbSizerMsg->Add( m_messagesBox, 1, wxEXPAND, 5 );

pcbnew/dialogs/dialog_plot_base.fbp

+6 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>

<wxFormBuilder_Project>

    <FileVersion major="1" minor="11" />

    <FileVersion major="1" minor="13" />

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

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

        <property name="code_generation">C++</property>
@@ -2833,6 +2833,10 @@ 
                                                        <property name="subclass"></property>

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

                                                        <property name="tooltip">Include extended attributes for non-image data in the Gerber file</property>

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

                                                        <property name="validator_style">wxFILTER_NONE</property>

                                                        <property name="validator_type">wxDefaultValidator</property>

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

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

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

                                                        <property name="window_style"></property>
@@ -4069,7 +4073,7 @@ 
                                        <property name="maxlength"></property>

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

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

                                        <property name="minimum_size">-1,70</property>

                                        <property name="minimum_size">-1,150</property>

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

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

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