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

Printing functions fixes, and other minor enhancements

parent e846be13

eeschema/dialog_print_using_printer_base.cpp

+74 −74
Original line number Diff line number Diff line
@@ -36,16 +36,16 @@ DIALOG_PRINT_USING_PRINTER_BASE::DIALOG_PRINT_USING_PRINTER_BASE( wxWindow* pare 
	bbuttonsSizer = new wxBoxSizer( wxVERTICAL );

	

	m_buttonPageSetup = new wxButton( this, wxID_ANY, _("Page Setup"), wxDefaultPosition, wxDefaultSize, 0 );

	bbuttonsSizer->Add( m_buttonPageSetup, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5 );

	bbuttonsSizer->Add( m_buttonPageSetup, 0, wxALIGN_CENTER_HORIZONTAL|wxALL|wxEXPAND, 5 );

	

	m_buttonPreview = new wxButton( this, wxID_ANY, _("Preview"), wxDefaultPosition, wxDefaultSize, 0 );

	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	bbuttonsSizer->Add( m_buttonPreview, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonPrint = new wxButton( this, wxID_ANY, _("Print"), wxDefaultPosition, wxDefaultSize, 0 );

	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	bbuttonsSizer->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );

	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL, 5 );

	bbuttonsSizer->Add( m_buttonQuit, 0, wxALL|wxALIGN_CENTER_HORIZONTAL|wxEXPAND, 5 );

	

	bMainSizer->Add( bbuttonsSizer, 0, wxALL, 12 );

eeschema/dialog_print_using_printer_base.fbp

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

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

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

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

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

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

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

                                <property name="bg"></property>
@@ -253,7 +253,7 @@ 
                        </object>

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

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

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

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

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

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

                                <property name="bg"></property>
@@ -305,7 +305,7 @@ 
                        </object>

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

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

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

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

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

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

                                <property name="bg"></property>
@@ -357,7 +357,7 @@ 
                        </object>

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

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

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

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

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

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

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

include/wxPcbStruct.h

+13 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,19 @@ public: 
     */

    void         ToPrinter( wxCommandEvent& event );



    /** Virtual function PrintPage

     * used to print a page

     * Print the page pointed by ActiveScreen, set by the calling print function

     * @param aDC = wxDC given by the calling print function

     * @param aPrint_Sheet_Ref = true to print page references

     * @param aPrintMask = not used here

     * @param aPrintMirrorMode = not used here (Set when printing in mirror mode)

     * @param aData = a pointer on an auxiliary data (NULL if not used)

     */

    virtual void PrintPage( wxDC* aDC, bool aPrint_Sheet_Ref,

                    int aPrintMask, bool aPrintMirrorMode,

                    void * aData = NULL);



    // BOARD handling



    /** function Clear_Pcb()

pcbnew/dialog_print_using_printer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public: 


private:

    void OnCloseWindow( wxCloseEvent& event );

    void OnPrintSetup( wxCommandEvent& event );

    void OnPageSetup( wxCommandEvent& event );

    void OnPrintPreview( wxCommandEvent& event );

    void OnPrintButtonClick( wxCommandEvent& event );
@@ -414,7 +414,7 @@ void DIALOG_PRINT_USING_PRINTER::SetPenWidth() 




/**********************************************************/

void DIALOG_PRINT_USING_PRINTER::OnPrintSetup( wxCommandEvent& event )

void DIALOG_PRINT_USING_PRINTER::OnPageSetup( wxCommandEvent& event )

/**********************************************************/



/* Open a dialog box for printer setup (printer options, page size ...)

pcbnew/dialog_print_using_printer_base.cpp

+165 −165
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ DIALOG_PRINT_USING_PRINTER_base::DIALOG_PRINT_USING_PRINTER_base( wxWindow* pare 
	

	// Connect Events

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

	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), NULL, this );

	m_buttonOption->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );

	m_buttonPreview->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );

	m_buttonPrint->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );

	m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );
@@ -158,7 +158,7 @@ DIALOG_PRINT_USING_PRINTER_base::~DIALOG_PRINT_USING_PRINTER_base() 
{

	// Disconnect Events

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

	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintSetup ), NULL, this );

	m_buttonOption->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPageSetup ), NULL, this );

	m_buttonPreview->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintPreview ), NULL, this );

	m_buttonPrint->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnPrintButtonClick ), NULL, this );

	m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PRINT_USING_PRINTER_base::OnButtonCancelClick ), NULL, this );