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

Eeschema: fix a crash when plotting a schematic. 

Pcbnew: footprint wizard dialogs: minor fixes, and fixes a not working parameters dialog under Windows, due to an incorrect Printf format.
remove scripts/packagesrc.sh, fully outdated (still refers svn repo)  and not commented.
parents 6196921a 45155ff0

common/worksheet.cpp

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ wxString WS_DRAW_ITEM_LIST::BuildFullText( const wxString& aTextbase ) 


            case 'F':

                {

                    wxFileName fn( *m_fileName );

                    wxFileName fn( m_fileName );

                    msg += fn.GetFullName();

                }

                break;

include/worksheet_shape_builder.h

+2 −3
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ protected: 
                                // for basic inscriptions, in schematic

    const TITLE_BLOCK* m_titleBlock;    // for basic inscriptions

    const wxString* m_paperFormat;      // for basic inscriptions

    const wxString* m_fileName;         // for basic inscriptions

    wxString        m_fileName;         // for basic inscriptions

    const wxString* m_sheetFullName;    // for basic inscriptions
@@ -281,7 +281,6 @@ public: 
        m_sheetCount = 1;

        m_titleBlock = NULL;

        m_paperFormat = NULL;

        m_fileName = NULL;

        m_sheetFullName = NULL;

    }
@@ -297,7 +296,7 @@ public: 
     */

    void SetFileName( const wxString & aFileName )

    {

        m_fileName = &aFileName;

        m_fileName = aFileName;

    }



    /**

pcbnew/dialogs/dialog_footprint_wizard_list.cpp

+6 −1
Original line number Diff line number Diff line
@@ -68,5 +68,10 @@ FOOTPRINT_WIZARD* DIALOG_FOOTPRINT_WIZARD_LIST::GetWizard() 


void DIALOG_FOOTPRINT_WIZARD_LIST::OnOpenButtonClick( wxCommandEvent& event )

{

    Close(true);

    EndModal( wxID_OK );

}



void DIALOG_FOOTPRINT_WIZARD_LIST::OnCancelClick( wxCommandEvent& event )

{

    EndModal( wxID_CANCEL );

}

pcbnew/dialogs/dialog_footprint_wizard_list.fbp

+19 −81
Original line number Diff line number Diff line
@@ -236,90 +236,28 @@ 
                </object>

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

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

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

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

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

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

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

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

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

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

                        <property name="aui_layer"></property>

                        <property name="aui_name"></property>

                        <property name="aui_position"></property>

                        <property name="aui_row"></property>

                        <property name="best_size"></property>

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

                        <property name="caption"></property>

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

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

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

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

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

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

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

                        <property name="dock">Dock</property>

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

                        <property name="docking">Left</property>

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

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

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

                        <property name="font"></property>

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

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

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

                        <property name="label">Open</property>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

                        <property name="name">m_btOpen</property>

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

                        <property name="pane_position"></property>

                        <property name="pane_size"></property>

                        <property name="name">m_sdbSizer</property>

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

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

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

                        <property name="resize">Resizable</property>

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

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

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

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

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

                        <property name="tooltip"></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>

                        <event name="OnButtonClick">OnOpenButtonClick</event>

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

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

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

                        <event name="OnKeyDown"></event>

                        <event name="OnKeyUp"></event>

                        <event name="OnKillFocus"></event>

                        <event name="OnLeaveWindow"></event>

                        <event name="OnLeftDClick"></event>

                        <event name="OnLeftDown"></event>

                        <event name="OnLeftUp"></event>

                        <event name="OnMiddleDClick"></event>

                        <event name="OnMiddleDown"></event>

                        <event name="OnMiddleUp"></event>

                        <event name="OnMotion"></event>

                        <event name="OnMouseEvents"></event>

                        <event name="OnMouseWheel"></event>

                        <event name="OnPaint"></event>

                        <event name="OnRightDClick"></event>

                        <event name="OnRightDown"></event>

                        <event name="OnRightUp"></event>

                        <event name="OnSetFocus"></event>

                        <event name="OnSize"></event>

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

                        <event name="OnApplyButtonClick"></event>

                        <event name="OnCancelButtonClick">OnCancelClick</event>

                        <event name="OnContextHelpButtonClick"></event>

                        <event name="OnHelpButtonClick"></event>

                        <event name="OnNoButtonClick"></event>

                        <event name="OnOKButtonClick">OnOpenButtonClick</event>

                        <event name="OnSaveButtonClick"></event>

                        <event name="OnYesButtonClick"></event>

                    </object>

                </object>

            </object>

pcbnew/dialogs/dialog_footprint_wizard_list.h

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ public: 
    FOOTPRINT_WIZARD* GetWizard();



private:



    void OnCellWizardClick( wxGridEvent& event );

    void OnOpenButtonClick( wxCommandEvent& event );

	void OnCancelClick( wxCommandEvent& event );

};



#endif  // _DIALOG_FOOTPRINT_WIZARD_LIST_H_