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

EEschema: fix minor issue (cursoe shape lost when aborting a block command by popup menu) 

Pcbnew: dialog plot: make message window resizable, add tool tip and remove unused sizers.
parent c07b677a

common/build_version.cpp

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#endif



#ifndef KICAD_BUILD_VERSION

#define KICAD_BUILD_VERSION "(2011-03-03 BZR 2875)"

#define KICAD_BUILD_VERSION "(2011-03-11 BZR 2884)"

#endif



//#define VERSION_STABILITY      "stable"

eeschema/schedit.cpp

+10 −3
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) 
    // If needed, stop the current command and deselect current tool

    switch( id )

    {

    case wxID_CUT:

    case wxID_COPY:

    case ID_POPUP_CANCEL_CURRENT_COMMAND:

    case ID_POPUP_SCH_ENTRY_SELECT_SLASH:

    case ID_POPUP_SCH_ENTRY_SELECT_ANTISLASH:

    case ID_POPUP_END_LINE:
@@ -74,8 +77,6 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) 
    case ID_POPUP_MIRROR_Y_BLOCK:

    case ID_POPUP_SCH_DELETE_NODE:

    case ID_POPUP_SCH_DELETE_CONNECTION:

    case wxID_CUT:

    case wxID_COPY:

    case ID_POPUP_SCH_ENTER_SHEET:

    case ID_POPUP_SCH_LEAVE_SHEET:

    case ID_POPUP_SCH_ADD_JUNCTION:
@@ -134,6 +135,12 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event ) 
        break;



    case ID_POPUP_CANCEL_CURRENT_COMMAND:

        if( DrawPanel->IsMouseCaptured() )

        {

            DrawPanel->EndMouseCapture();

            SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );

        }

        else

            SetToolID( ID_NO_TOOL_SELECTED, DrawPanel->GetDefaultCursor(), wxEmptyString );

        break;

packaging/windows/nsis/install.nsi

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


; General Product Description Definitions

!define PRODUCT_NAME "KiCad"

!define PRODUCT_VERSION "2011.03.03"

!define PRODUCT_VERSION "2011.03.11"

!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"

!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"

!define COMPANY_NAME ""

pcbnew/dialogs/dialog_plot_base.cpp

+338 −353
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Nov 18 2010)

// C++ code generated with wxFormBuilder (version Nov 17 2010)

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

//

// PLEASE DO "NOT" EDIT THIS FILE!
@@ -67,7 +67,7 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	wxArrayString m_layerCheckListBoxChoices;

	m_layerCheckListBox = new wxCheckListBox( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_layerCheckListBoxChoices, 0 );

	m_LayersSizer->Add( m_layerCheckListBox, 1, wxALL|wxEXPAND, 5 );

	m_LayersSizer->Add( m_layerCheckListBox, 1, wxEXPAND, 5 );

	

	bUpperSizer->Add( m_LayersSizer, 1, wxALL|wxEXPAND, 3 );
@@ -79,93 +79,88 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	wxBoxSizer* bSizer192;

	bSizer192 = new wxBoxSizer( wxHORIZONTAL );

	

	wxBoxSizer* bSizer201;

	bSizer201 = new wxBoxSizer( wxVERTICAL );

	wxBoxSizer* bSizerPlotItems;

	bSizerPlotItems = new wxBoxSizer( wxVERTICAL );

	

	m_plotSheetRef = new wxCheckBox( this, wxID_ANY, _("Plot sheet reference on all layers"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer201->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	bSizerPlotItems->Add( m_plotSheetRef, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	

	m_plotPads_on_Silkscreen = new wxCheckBox( this, ID_ALLOW_PRINT_PAD_ON_SILKSCREEN, _("Plot pads on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotPads_on_Silkscreen->SetToolTip( _("Enable/disable print/plot pads on silkscreen layers\nWhen disable, pads are never potted on silkscreen layers\nWhen enable, pads are potted only if they appear on silkscreen layers") );

	

	bSizer201->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	bSizerPlotItems->Add( m_plotPads_on_Silkscreen, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	

	m_plotModuleValueOpt = new wxCheckBox( this, wxID_ANY, _("Plot module value on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer201->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	bSizerPlotItems->Add( m_plotModuleValueOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	

	m_plotModuleRefOpt = new wxCheckBox( this, ID_PRINT_REF, _("Plot module reference on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer201->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	bSizerPlotItems->Add( m_plotModuleRefOpt, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	

	m_plotTextOther = new wxCheckBox( this, wxID_ANY, _("Plot other module texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotTextOther->SetToolTip( _("Enable/disable print/plot module field texts on silkscreen layers") );

	

	bSizer201->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	bSizerPlotItems->Add( m_plotTextOther, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	

	m_plotInvisibleText = new wxCheckBox( this, wxID_ANY, _("Plot invisible texts on silkscreen"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotInvisibleText->SetToolTip( _("Force print/plot module invisible texts on silkscreen layers") );

	

	bSizer201->Add( m_plotInvisibleText, 0, wxALL, 2 );

	bSizerPlotItems->Add( m_plotInvisibleText, 0, wxALL, 2 );

	

	m_plotNoViaOnMaskOpt = new wxCheckBox( this, wxID_ANY, _("Do not tent vias"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotNoViaOnMaskOpt->SetToolTip( _("Remove soldermask on vias.") );

	

	bSizer201->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );

	bSizerPlotItems->Add( m_plotNoViaOnMaskOpt, 0, wxALL, 2 );

	

	m_plotMirrorOpt = new wxCheckBox( this, ID_MIROR_OPT, _("Mirrored plot"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer201->Add( m_plotMirrorOpt, 0, wxALL, 2 );

	bSizerPlotItems->Add( m_plotMirrorOpt, 0, wxALL, 2 );

	

	bSizer192->Add( bSizer201, 0, wxEXPAND, 5 );

	bSizer192->Add( bSizerPlotItems, 0, wxEXPAND, 5 );

	

	wxBoxSizer* bSizer14;

	bSizer14 = new wxBoxSizer( wxHORIZONTAL );

	

	wxBoxSizer* bSizer15;

	bSizer15 = new wxBoxSizer( wxVERTICAL );

	bSizer14 = new wxBoxSizer( wxVERTICAL );

	

	m_staticText11 = new wxStaticText( this, wxID_ANY, _("Drill marks:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText11->Wrap( -1 );

	bSizer15->Add( m_staticText11, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	bSizer14->Add( m_staticText11, 0, wxRIGHT|wxLEFT, 5 );

	

	wxString m_drillShapeOptChoices[] = { _("None"), _("Small"), _("Actual size") };

	int m_drillShapeOptNChoices = sizeof( m_drillShapeOptChoices ) / sizeof( wxString );

	m_drillShapeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_drillShapeOptNChoices, m_drillShapeOptChoices, 0 );

	m_drillShapeOpt->SetSelection( 0 );

	bSizer15->Add( m_drillShapeOpt, 0, wxEXPAND|wxLEFT, 5 );

	bSizer14->Add( m_drillShapeOpt, 0, wxEXPAND|wxLEFT, 5 );

	

	m_staticText12 = new wxStaticText( this, wxID_ANY, _("Scaling:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText12->Wrap( -1 );

	bSizer15->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	bSizer14->Add( m_staticText12, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxString m_scaleOptChoices[] = { _("Auto"), _("1:1"), _("3:2"), _("2:1"), _("3:1") };

	int m_scaleOptNChoices = sizeof( m_scaleOptChoices ) / sizeof( wxString );

	m_scaleOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_scaleOptNChoices, m_scaleOptChoices, 0 );

	m_scaleOpt->SetSelection( 0 );

	bSizer15->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );

	bSizer14->Add( m_scaleOpt, 0, wxEXPAND|wxLEFT, 5 );

	

	m_staticText13 = new wxStaticText( this, wxID_ANY, _("Plot mode:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText13->Wrap( -1 );

	bSizer15->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	bSizer14->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	wxString m_plotModeOptChoices[] = { _("Line"), _("Filled"), _("Sketch") };

	int m_plotModeOptNChoices = sizeof( m_plotModeOptChoices ) / sizeof( wxString );

	m_plotModeOpt = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotModeOptNChoices, m_plotModeOptChoices, 0 );

	m_plotModeOpt->SetSelection( 0 );

	bSizer15->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 );

	bSizer14->Add( m_plotModeOpt, 0, wxEXPAND|wxLEFT, 5 );

	

	m_textDefaultPenSize = new wxStaticText( this, wxID_ANY, _("Default linewidth"), wxDefaultPosition, wxDefaultSize, 0 );

	m_textDefaultPenSize->Wrap( -1 );

	m_textDefaultPenSize->SetToolTip( _("Pen size used to draw items that have no pen size specified.\nUsed mainly to draw items in sketch mode.") );

	

	bSizer15->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	bSizer14->Add( m_textDefaultPenSize, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

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

	m_linesWidth->SetToolTip( _("Line width for, e.g., sheet references.") );

	

	bSizer15->Add( m_linesWidth, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 );

	

	bSizer14->Add( bSizer15, 1, wxALL, 3 );

	bSizer14->Add( m_linesWidth, 0, wxBOTTOM|wxEXPAND|wxLEFT, 5 );

	

	bSizer192->Add( bSizer14, 1, wxALL, 3 );

	bSizer192->Add( bSizer14, 1, wxRIGHT|wxLEFT, 3 );

	

	sbOptionsSizer->Add( bSizer192, 0, wxEXPAND, 5 );
@@ -189,7 +184,9 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	m_GerberOptionsSizer->Add( m_subtractMaskFromSilk, 0, wxTOP|wxRIGHT|wxLEFT, 2 );

	

	m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary origin"), wxDefaultPosition, wxDefaultSize, 0 );

	m_useAuxOriginCheckBox = new wxCheckBox( this, wxID_ANY, _("Use auxiliary axis as origin"), wxDefaultPosition, wxDefaultSize, 0 );

	m_useAuxOriginCheckBox->SetToolTip( _("Use auxiliary axis as coordinates origin in Gerber files.") );

	

	m_GerberOptionsSizer->Add( m_useAuxOriginCheckBox, 0, wxALL, 2 );

	

	m_PlotOptionsSizer->Add( m_GerberOptionsSizer, 0, wxALL|wxEXPAND, 3 );
@@ -285,44 +282,32 @@ DIALOG_PLOT_BASE::DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id, const wxStr 
	

	bSizer12->Add( bUpperSizer, 0, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerDirChoice;

	bSizerDirChoice = new wxBoxSizer( wxVERTICAL );

	

	wxBoxSizer* bSizerDirNmae;

	bSizerDirNmae = new wxBoxSizer( wxHORIZONTAL );

	

	bSizerDirChoice->Add( bSizerDirNmae, 0, wxEXPAND, 5 );

	

	bSizer12->Add( bSizerDirChoice, 0, wxEXPAND, 5 );

	

	m_staticText2 = new wxStaticText( this, wxID_ANY, _("Messages:"), wxDefaultPosition, wxDefaultSize, 0 );

	m_staticText2->Wrap( -1 );

	bSizer12->Add( m_staticText2, 0, wxALL|wxEXPAND, 5 );

	wxStaticBoxSizer* sbSizerMsg;

	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 ) );

	

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

	

	wxBoxSizer* bSizer191;

	bSizer191 = new wxBoxSizer( wxHORIZONTAL );

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

	

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

	

	bSizer191->Add( 0, 0, 1, wxEXPAND, 5 );

	wxBoxSizer* bSizerButtons;

	bSizerButtons = new wxBoxSizer( wxHORIZONTAL );

	

	m_plotButton = new wxButton( this, wxID_ANY, _("Plot"), wxDefaultPosition, wxDefaultSize, 0 );

	m_plotButton->SetDefault(); 

	bSizer191->Add( m_plotButton, 0, wxALL, 5 );

	bSizerButtons->Add( m_plotButton, 0, wxALL, 5 );

	

	m_buttonDrill = new wxButton( this, ID_CREATE_DRILL_FILE, _("Generate Drill File"), wxDefaultPosition, wxDefaultSize, 0 );

	bSizer191->Add( m_buttonDrill, 0, wxALL, 5 );

	bSizerButtons->Add( m_buttonDrill, 0, wxALL, 5 );

	

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

	bSizer191->Add( m_buttonQuit, 0, wxALL, 5 );

	bSizerButtons->Add( m_buttonQuit, 0, wxALL, 5 );

	

	bSizer12->Add( bSizer191, 0, wxALL|wxEXPAND|wxRIGHT, 5 );

	bSizer12->Add( bSizerButtons, 0, wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );

	

	m_MainSizer->Add( bSizer12, 1, wxALL, 5 );

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

	

	this->SetSizer( m_MainSizer );

	this->Layout();

pcbnew/dialogs/dialog_plot_base.fbp

+3970 −4083

File changed.

Preview size limit exceeded, changes collapsed.