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.

common/build_version.cpp

@@ -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

@@ -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,7 +135,13 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
         break;
 
     case ID_POPUP_CANCEL_CURRENT_COMMAND:
-        SetToolID( ID_NO_TOOL_SELECTED, DrawPanel->GetDefaultCursor(), wxEmptyString );
+        if( DrawPanel->IsMouseCaptured() )
+        {
+            DrawPanel->EndMouseCapture();
+            SetToolID( GetToolId(), DrawPanel->GetCurrentCursor(), wxEmptyString );
+        }
+        else
+            SetToolID( ID_NO_TOOL_SELECTED, DrawPanel->GetDefaultCursor(), wxEmptyString );
         break;
 
     case ID_POPUP_END_LINE:

packaging/windows/nsis/install.nsi

@@ -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.h

-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Nov 18 2010)
-// http://www.wxformbuilder.org/
-//
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
-
-#ifndef __dialog_plot_base__
-#define __dialog_plot_base__
-
-#include <wx/intl.h>
-
-#include <wx/string.h>
-#include <wx/stattext.h>
-#include <wx/gdicmn.h>
-#include <wx/font.h>
-#include <wx/colour.h>
-#include <wx/settings.h>
-#include <wx/choice.h>
-#include <wx/sizer.h>
-#include <wx/textctrl.h>
-#include <wx/button.h>
-#include <wx/checklst.h>
-#include <wx/statbox.h>
-#include <wx/checkbox.h>
-#include <wx/dialog.h>
-
-///////////////////////////////////////////////////////////////////////////
-
-///////////////////////////////////////////////////////////////////////////////
-/// Class DIALOG_PLOT_BASE
-///////////////////////////////////////////////////////////////////////////////
-class DIALOG_PLOT_BASE : public wxDialog 
-{
-	private:
-	
-	protected:
-		enum
-		{
-			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
-			ID_PRINT_REF,
-			ID_MIROR_OPT,
-			ID_CREATE_DRILL_FILE,
-		};
-		
-		wxBoxSizer* m_MainSizer;
-		wxStaticText* m_staticText121;
-		wxChoice* m_plotFormatOpt;
-		wxStaticText* m_staticTextDir;
-		wxTextCtrl* m_outputDirectoryName;
-		wxButton* m_browseButton;
-		wxStaticBoxSizer* m_LayersSizer;
-		wxCheckListBox* m_layerCheckListBox;
-		wxBoxSizer* m_PlotOptionsSizer;
-		wxCheckBox* m_plotSheetRef;
-		wxCheckBox* m_plotPads_on_Silkscreen;
-		wxCheckBox* m_plotModuleValueOpt;
-		wxCheckBox* m_plotModuleRefOpt;
-		wxCheckBox* m_plotTextOther;
-		wxCheckBox* m_plotInvisibleText;
-		wxCheckBox* m_plotNoViaOnMaskOpt;
-		wxCheckBox* m_plotMirrorOpt;
-		wxStaticText* m_staticText11;
-		wxChoice* m_drillShapeOpt;
-		wxStaticText* m_staticText12;
-		wxChoice* m_scaleOpt;
-		wxStaticText* m_staticText13;
-		wxChoice* m_plotModeOpt;
-		wxStaticText* m_textDefaultPenSize;
-		wxTextCtrl* m_linesWidth;
-		wxStaticBoxSizer* m_GerberOptionsSizer;
-		wxCheckBox* m_useGerberExtensions;
-		wxCheckBox* m_excludeEdgeLayerOpt;
-		wxCheckBox* m_subtractMaskFromSilk;
-		wxCheckBox* m_useAuxOriginCheckBox;
-		wxStaticBoxSizer* m_HPGLOptionsSizer;
-		wxStaticText* m_textPenSize;
-		wxTextCtrl* m_HPGLPenSizeOpt;
-		wxStaticText* m_textPenOvr;
-		wxTextCtrl* m_HPGLPenOverlayOpt;
-		wxStaticText* m_textPenSpeed;
-		wxTextCtrl* m_HPGLPenSpeedOpt;
-		wxStaticBoxSizer* m_PSOptionsSizer;
-		wxStaticText* m_staticText7;
-		wxTextCtrl* m_fineAdjustXscaleOpt;
-		wxStaticText* m_staticText8;
-		wxTextCtrl* m_fineAdjustYscaleOpt;
-		wxCheckBox* m_plotPSNegativeOpt;
-		wxCheckBox* m_forcePSA4OutputOpt;
-		wxStaticText* m_staticText2;
-		wxTextCtrl* m_messagesBox;
-		
-		wxButton* m_plotButton;
-		wxButton* m_buttonDrill;
-		wxButton* m_buttonQuit;
-		
-		// Virtual event handlers, overide them in your derived class
-		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
-		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
-		virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
-		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
-		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
-		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
-		
-	
-	public:
-		
-		DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 447,723 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
-		~DIALOG_PLOT_BASE();
-	
-};
-
-#endif //__dialog_plot_base__
+///////////////////////////////////////////////////////////////////////////
+// C++ code generated with wxFormBuilder (version Nov 17 2010)
+// http://www.wxformbuilder.org/
+//
+// PLEASE DO "NOT" EDIT THIS FILE!
+///////////////////////////////////////////////////////////////////////////
+
+#ifndef __dialog_plot_base__
+#define __dialog_plot_base__
+
+#include <wx/intl.h>
+
+#include <wx/string.h>
+#include <wx/stattext.h>
+#include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
+#include <wx/choice.h>
+#include <wx/sizer.h>
+#include <wx/textctrl.h>
+#include <wx/button.h>
+#include <wx/checklst.h>
+#include <wx/statbox.h>
+#include <wx/checkbox.h>
+#include <wx/dialog.h>
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class DIALOG_PLOT_BASE
+///////////////////////////////////////////////////////////////////////////////
+class DIALOG_PLOT_BASE : public wxDialog 
+{
+	private:
+	
+	protected:
+		enum
+		{
+			ID_ALLOW_PRINT_PAD_ON_SILKSCREEN = 1000,
+			ID_PRINT_REF,
+			ID_MIROR_OPT,
+			ID_CREATE_DRILL_FILE,
+		};
+		
+		wxBoxSizer* m_MainSizer;
+		wxStaticText* m_staticText121;
+		wxChoice* m_plotFormatOpt;
+		wxStaticText* m_staticTextDir;
+		wxTextCtrl* m_outputDirectoryName;
+		wxButton* m_browseButton;
+		wxStaticBoxSizer* m_LayersSizer;
+		wxCheckListBox* m_layerCheckListBox;
+		wxBoxSizer* m_PlotOptionsSizer;
+		wxCheckBox* m_plotSheetRef;
+		wxCheckBox* m_plotPads_on_Silkscreen;
+		wxCheckBox* m_plotModuleValueOpt;
+		wxCheckBox* m_plotModuleRefOpt;
+		wxCheckBox* m_plotTextOther;
+		wxCheckBox* m_plotInvisibleText;
+		wxCheckBox* m_plotNoViaOnMaskOpt;
+		wxCheckBox* m_plotMirrorOpt;
+		wxStaticText* m_staticText11;
+		wxChoice* m_drillShapeOpt;
+		wxStaticText* m_staticText12;
+		wxChoice* m_scaleOpt;
+		wxStaticText* m_staticText13;
+		wxChoice* m_plotModeOpt;
+		wxStaticText* m_textDefaultPenSize;
+		wxTextCtrl* m_linesWidth;
+		wxStaticBoxSizer* m_GerberOptionsSizer;
+		wxCheckBox* m_useGerberExtensions;
+		wxCheckBox* m_excludeEdgeLayerOpt;
+		wxCheckBox* m_subtractMaskFromSilk;
+		wxCheckBox* m_useAuxOriginCheckBox;
+		wxStaticBoxSizer* m_HPGLOptionsSizer;
+		wxStaticText* m_textPenSize;
+		wxTextCtrl* m_HPGLPenSizeOpt;
+		wxStaticText* m_textPenOvr;
+		wxTextCtrl* m_HPGLPenOverlayOpt;
+		wxStaticText* m_textPenSpeed;
+		wxTextCtrl* m_HPGLPenSpeedOpt;
+		wxStaticBoxSizer* m_PSOptionsSizer;
+		wxStaticText* m_staticText7;
+		wxTextCtrl* m_fineAdjustXscaleOpt;
+		wxStaticText* m_staticText8;
+		wxTextCtrl* m_fineAdjustYscaleOpt;
+		wxCheckBox* m_plotPSNegativeOpt;
+		wxCheckBox* m_forcePSA4OutputOpt;
+		wxTextCtrl* m_messagesBox;
+		wxButton* m_plotButton;
+		wxButton* m_buttonDrill;
+		wxButton* m_buttonQuit;
+		
+		// Virtual event handlers, overide them in your derived class
+		virtual void OnClose( wxCloseEvent& event ) { event.Skip(); }
+		virtual void OnInitDialog( wxInitDialogEvent& event ) { event.Skip(); }
+		virtual void SetPlotFormat( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnSetScaleOpt( wxCommandEvent& event ) { event.Skip(); }
+		virtual void Plot( wxCommandEvent& event ) { event.Skip(); }
+		virtual void CreateDrillFile( wxCommandEvent& event ) { event.Skip(); }
+		virtual void OnQuit( wxCommandEvent& event ) { event.Skip(); }
+		
+	
+	public:
+		
+		DIALOG_PLOT_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Plot"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 474,747 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); 
+		~DIALOG_PLOT_BASE();
+	
+};
+
+#endif //__dialog_plot_base__

version.txt

 release version:
-2011 mar 03
+2011 mar 11
 files (.zip,.tgz):
-kicad-2011-03-03
+kicad-2011-03-11