cvpcb: 2 missing .prj files added (a3c60f36) · Commits · Elphel / kicad-source-mirror

change_log.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -4,6 +4,12 @@ Started 2007-June-11
	Please add newer entries at the top, list the date and your name with		Please add newer entries at the top, list the date and your name with
	email address.		email address.

			2007-Oct-24 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
			================================================================================
			+ cvpcb:
			2 missing .prj files added (and updated)
			dialog_display_option.cpp is rebuild from its dialog_display_option.prj source


	2007-Oct-23 UPDATE Geoff Harland <gharlandau@yahoo.com.au>		2007-Oct-23 UPDATE Geoff Harland <gharlandau@yahoo.com.au>
	================================================================================		================================================================================

cvpcb/dialog_cvpcb_config.cpp

+5 −4

Original line number	Original line	Diff line number	Diff line
	@@ -261,10 +261,11 @@ wxBitmap KiConfigCvpcbFrame::GetBitmapResource( const wxString& name )
	wxIcon KiConfigCvpcbFrame::GetIconResource( const wxString& name )		wxIcon KiConfigCvpcbFrame::GetIconResource( const wxString& name )
	{		{
	// Icon retrieval		// Icon retrieval
	////@begin KiConfigCvpcbFrame icon retrieval		#ifdef __WINDOWS__
	wxUnusedVar(name);		return( wxICON(a_icon_cvpcb));
	return wxNullIcon;		#else
	////@end KiConfigCvpcbFrame icon retrieval		return( wxICON(icon_cvpcb));
			#endif
	}		}
	/*!		/*!
	* wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG		* wxEVT_COMMAND_BUTTON_CLICKED event handler for SAVE_CFG

cvpcb/dialog_cvpcb_config.pjd

0 → 100644

+1575 −0

File added.

Preview size limit exceeded, changes collapsed.

cvpcb/dialog_display_options.cpp

+114 −63

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,14 @@ IMPLEMENT_DYNAMIC_CLASS( KiDisplayOptionsFrame, wxDialog )
	BEGIN_EVENT_TABLE( KiDisplayOptionsFrame, wxDialog )		BEGIN_EVENT_TABLE( KiDisplayOptionsFrame, wxDialog )

	////@begin KiDisplayOptionsFrame event table entries		////@begin KiDisplayOptionsFrame event table entries
			EVT_RADIOBOX( EDGE_SELECT, KiDisplayOptionsFrame::OnEdgeSelectSelected )

			EVT_RADIOBOX( TEXT_SELECT, KiDisplayOptionsFrame::OnTextSelectSelected )

			EVT_CHECKBOX( PADFILL_OPT, KiDisplayOptionsFrame::OnPadfillOptClick )

			EVT_CHECKBOX( PADNUM_OPT, KiDisplayOptionsFrame::OnPadnumOptClick )

	EVT_BUTTON( ID_SAVE_CONFIG, KiDisplayOptionsFrame::OnSaveConfigClick )		EVT_BUTTON( ID_SAVE_CONFIG, KiDisplayOptionsFrame::OnSaveConfigClick )

	EVT_BUTTON( wxID_OK, KiDisplayOptionsFrame::OnOkClick )		EVT_BUTTON( wxID_OK, KiDisplayOptionsFrame::OnOkClick )
	@@ -102,17 +110,19 @@ bool KiDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID id, const wxStr
	////@begin KiDisplayOptionsFrame member initialisation		////@begin KiDisplayOptionsFrame member initialisation
	m_EdgesDisplayOption = NULL;		m_EdgesDisplayOption = NULL;
	m_TextDisplayOption = NULL;		m_TextDisplayOption = NULL;
	m_IsShowPadNum = NULL;
	m_IsShowPadFill = NULL;		m_IsShowPadFill = NULL;
			m_IsShowPadNum = NULL;
	////@end KiDisplayOptionsFrame member initialisation		////@end KiDisplayOptionsFrame member initialisation

	////@begin KiDisplayOptionsFrame creation		////@begin KiDisplayOptionsFrame creation
	SetExtraStyle(GetExtraStyle()\|wxWS_EX_BLOCK_EVENTS);		SetExtraStyle(wxWS_EX_BLOCK_EVENTS);
	wxDialog::Create( parent, id, caption, pos, size, style );		wxDialog::Create( parent, id, caption, pos, size, style );

	CreateControls();		CreateControls();
	GetSizer()->Fit(this);		if (GetSizer())
			{
	GetSizer()->SetSizeHints(this);		GetSizer()->SetSizeHints(this);
			}
	Centre();		Centre();
	////@end KiDisplayOptionsFrame creation		////@end KiDisplayOptionsFrame creation
	return true;		return true;
	@@ -127,7 +137,7 @@ void KiDisplayOptionsFrame::CreateControls()
	SetFont(*g_DialogFont);		SetFont(*g_DialogFont);

	////@begin KiDisplayOptionsFrame content construction		////@begin KiDisplayOptionsFrame content construction
	// Generated by DialogBlocks, 17/02/2006 18:31:55 (unregistered)		// Generated by DialogBlocks, 24/10/2007 22:11:46 (unregistered)

	KiDisplayOptionsFrame* itemDialog1 = this;		KiDisplayOptionsFrame* itemDialog1 = this;

	@@ -135,76 +145,65 @@ void KiDisplayOptionsFrame::CreateControls()
	itemDialog1->SetSizer(itemBoxSizer2);		itemDialog1->SetSizer(itemBoxSizer2);

	wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);		wxBoxSizer* itemBoxSizer3 = new wxBoxSizer(wxHORIZONTAL);
	// itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);		itemBoxSizer2->Add(itemBoxSizer3, 0, wxGROW\|wxALL, 5);
	itemBoxSizer2->Add(itemBoxSizer3, 0, wxALIGN_TOP\|wxALL, 5);
			wxArrayString m_EdgesDisplayOptionStrings;
	wxBoxSizer* itemBoxSizer4 = new wxBoxSizer(wxHORIZONTAL);		m_EdgesDisplayOptionStrings.Add(_("&Line"));
	// itemBoxSizer2->Add(itemBoxSizer4, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);		m_EdgesDisplayOptionStrings.Add(_("&Filled"));
	itemBoxSizer2->Add(itemBoxSizer4, 0, wxGROW\|wxALIGN_TOP\|wxALL, 5);		m_EdgesDisplayOptionStrings.Add(_("&Sketch"));
			m_EdgesDisplayOption = new wxRadioBox( itemDialog1, EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, m_EdgesDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );
	wxString m_EdgesDisplayOptionStrings[] = {		m_EdgesDisplayOption->SetSelection(0);
	_("&Filaire"),		itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxGROW\|wxALL, 5);
	_("&Filled"),
	_("&Sketch")		wxArrayString m_TextDisplayOptionStrings;
	};		m_TextDisplayOptionStrings.Add(_("&Line"));
	m_EdgesDisplayOption = new wxRadioBox( itemDialog1, EDGE_SELECT, _("Edges:"), wxDefaultPosition, wxDefaultSize, 3, m_EdgesDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );		m_TextDisplayOptionStrings.Add(_("&Filled"));
	// itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxGROW\|wxALL, 5);		m_TextDisplayOptionStrings.Add(_("&Sketch"));
	itemBoxSizer3->Add(m_EdgesDisplayOption, 0, wxALIGN_LEFT\|wxALL, 5);		m_TextDisplayOption = new wxRadioBox( itemDialog1, TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, m_TextDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );
			m_TextDisplayOption->SetSelection(0);
	wxString m_TextDisplayOptionStrings[] = {		itemBoxSizer3->Add(m_TextDisplayOption, 0, wxGROW\|wxALL, 5);
	_("&Filaire"),
	_("&Filled"),		wxBoxSizer* itemBoxSizer6 = new wxBoxSizer(wxVERTICAL);
	_("&Sketch")		itemBoxSizer3->Add(itemBoxSizer6, 0, wxGROW\|wxALL, 5);
	};
	m_TextDisplayOption = new wxRadioBox( itemDialog1, TEXT_SELECT, _("Texts:"), wxDefaultPosition, wxDefaultSize, 3, m_TextDisplayOptionStrings, 1, wxRA_SPECIFY_COLS );		m_IsShowPadFill = new wxCheckBox( itemDialog1, PADFILL_OPT, _("&Pad Filled"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
	// itemBoxSizer3->Add(m_TextDisplayOption, 0, wxGROW\|wxALL, 5);		m_IsShowPadFill->SetValue(false);
	itemBoxSizer3->Add(m_TextDisplayOption, 0, wxALIGN_LEFT\|wxALL, 5);		itemBoxSizer6->Add(m_IsShowPadFill, 0, wxGROW\|wxALL, 5);

	wxBoxSizer* itemBoxSizer5 = new wxBoxSizer(wxVERTICAL);		m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Display Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
	// itemBoxSizer3->Add(itemBoxSizer5, 0, wxGROW\|wxALIGN_CENTER_VERTICAL\|wxALL, 5);
	itemBoxSizer3->Add(itemBoxSizer5, 0, wxGROW\|wxALL, 0);

	// Provide a spacer to improve appearance of dialog box
	itemBoxSizer5->AddSpacer(5);

	m_IsShowPadNum = new wxCheckBox( itemDialog1, PADNUM_OPT, _("Pad &Num"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
	m_IsShowPadNum->SetValue(false);		m_IsShowPadNum->SetValue(false);
	// itemBoxSizer5->Add(m_IsShowPadNum, 0, wxGROW\|wxALL, 5);		if (ShowToolTips())
	itemBoxSizer5->Add(m_IsShowPadNum, 0, wxALIGN_TOP\|wxALL, 5);		m_IsShowPadNum->SetToolTip(_("Display pad number"));
			itemBoxSizer6->Add(m_IsShowPadNum, 0, wxGROW\|wxALL, 5);

	m_IsShowPadFill = new wxCheckBox( itemDialog1, PADFILL_OPT, _("&Pad Fill"), wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );		itemBoxSizer6->Add(5, 5, 0, wxGROW\|wxLEFT\|wxTOP\|wxBOTTOM, 5);
	m_IsShowPadFill->SetValue(false);
	// itemBoxSizer5->Add(m_IsShowPadFill, 0, wxGROW\|wxALL, 5);
	itemBoxSizer5->Add(m_IsShowPadFill, 0, wxALIGN_TOP\|wxALL, 5);

	// Provide a stretch spacer to improve appearance of dialog box		wxButton* itemButton10 = new wxButton( itemDialog1, ID_SAVE_CONFIG, _("Save Cfg"), wxDefaultPosition, wxDefaultSize, 0 );
	itemBoxSizer5->AddStretchSpacer();		itemBoxSizer6->Add(itemButton10, 0, wxGROW\|wxALL, 5);

	wxButton* itemButton6 = new wxButton( itemDialog1, ID_SAVE_CONFIG, _("Save Cfg..."), wxDefaultPosition, wxDefaultSize, 0 );		wxStaticLine* itemStaticLine11 = new wxStaticLine( itemDialog1, ID_STATICLINE1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
	// itemBoxSizer5->Add(itemButton6, 0, wxGROW\|wxALL, 5);		itemBoxSizer2->Add(itemStaticLine11, 0, wxGROW\|wxALL, 5);
	itemBoxSizer5->Add(itemButton6, 0, wxALIGN_BOTTOM\|wxALL, 5);

	// itemBoxSizer4->AddStretchSpacer();		wxBoxSizer* itemBoxSizer12 = new wxBoxSizer(wxHORIZONTAL);
			itemBoxSizer2->Add(itemBoxSizer12, 0, wxALIGN_CENTER_HORIZONTAL\|wxALL, 5);

	wxButton* itemButton7 = new wxButton( itemDialog1, wxID_OK, _("OK"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton13 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 );
	itemButton7->SetForegroundColour(*wxRED);		itemButton13->SetDefault();
	// itemBoxSizer4->Add(itemButton7, 0, wxGROW\|wxALL, 5);		itemButton13->SetForegroundColour(wxColour(255, 0, 0));
	itemBoxSizer4->Add(itemButton7, 0, wxALIGN_RIGHT\|wxALL, 5);		itemBoxSizer12->Add(itemButton13, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);

	wxButton* itemButton8 = new wxButton( itemDialog1, wxID_CANCEL, _("Cancel"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton14 = new wxButton( itemDialog1, wxID_CANCEL, _("&Cancel"), wxDefaultPosition, wxDefaultSize, 0 );
	itemButton8->SetForegroundColour(*wxBLUE);		itemButton14->SetForegroundColour(wxColour(0, 0, 255));
	// itemBoxSizer4->Add(itemButton8, 0, wxGROW\|wxALL, 5);		itemBoxSizer12->Add(itemButton14, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);
	itemBoxSizer4->Add(itemButton8, 0, wxALIGN_RIGHT\|wxALL, 5);

	wxButton* itemButton9 = new wxButton( itemDialog1, wxID_APPLY, _("Apply"), wxDefaultPosition, wxDefaultSize, 0 );		wxButton* itemButton15 = new wxButton( itemDialog1, wxID_APPLY, _("&Apply"), wxDefaultPosition, wxDefaultSize, 0 );
	// itemBoxSizer4->Add(itemButton9, 0, wxGROW\|wxALL, 5);		itemBoxSizer12->Add(itemButton15, 0, wxALIGN_CENTER_VERTICAL\|wxALL, 5);
	itemBoxSizer4->Add(itemButton9, 0, wxALIGN_RIGHT\|wxALL, 5);

	// Set validators		// Set validators
	m_EdgesDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModEdge) );		m_EdgesDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModEdge) );
	m_TextDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModText) );		m_TextDisplayOption->SetValidator( wxGenericValidator(& DisplayOpt.DisplayModText) );
	m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) );
	m_IsShowPadFill->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadFill) );		m_IsShowPadFill->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadFill) );
			m_IsShowPadNum->SetValidator( wxGenericValidator(& DisplayOpt.DisplayPadNum) );
	////@end KiDisplayOptionsFrame content construction		////@end KiDisplayOptionsFrame content construction
	}		}

	@@ -247,7 +246,7 @@ wxIcon KiDisplayOptionsFrame::GetIconResource( const wxString& name )
	* Update settings related to edges, text strings, and pads		* Update settings related to edges, text strings, and pads
	*/		*/

	void KiDisplayOptionsFrame::UpdateObjectSettings()		void KiDisplayOptionsFrame::UpdateObjectSettings(void)
	{		{
	// Update settings		// Update settings
	////@begin KiDisplayOptionsFrame update settings		////@begin KiDisplayOptionsFrame update settings
	@@ -305,3 +304,55 @@ void KiDisplayOptionsFrame::OnApplyClick( wxCommandEvent& event )
	}		}



			/*!
			* wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT
			*/

			void KiDisplayOptionsFrame::OnEdgeSelectSelected( wxCommandEvent& event )
			{
			////@begin wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT in KiDisplayOptionsFrame.
			// Before editing this code, remove the block markers.
			event.Skip();
			////@end wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT in KiDisplayOptionsFrame.
			}


			/*!
			* wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT
			*/

			void KiDisplayOptionsFrame::OnTextSelectSelected( wxCommandEvent& event )
			{
			////@begin wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT in KiDisplayOptionsFrame.
			// Before editing this code, remove the block markers.
			event.Skip();
			////@end wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT in KiDisplayOptionsFrame.
			}


			/*!
			* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT
			*/

			void KiDisplayOptionsFrame::OnPadfillOptClick( wxCommandEvent& event )
			{
			////@begin wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT in KiDisplayOptionsFrame.
			// Before editing this code, remove the block markers.
			event.Skip();
			////@end wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT in KiDisplayOptionsFrame.
			}


			/*!
			* wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT
			*/

			void KiDisplayOptionsFrame::OnPadnumOptClick( wxCommandEvent& event )
			{
			////@begin wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT in KiDisplayOptionsFrame.
			// Before editing this code, remove the block markers.
			event.Skip();
			////@end wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT in KiDisplayOptionsFrame.
			}

cvpcb/dialog_display_options.h

+23 −10

Original line number	Original line	Diff line number	Diff line
	@@ -24,6 +24,7 @@

	////@begin includes		////@begin includes
	#include "wx/valgen.h"		#include "wx/valgen.h"
			#include "wx/statline.h"
	////@end includes		////@end includes

	/*!		/*!
	@@ -39,16 +40,17 @@

	////@begin control identifiers		////@begin control identifiers
	#define ID_DIALOG 10000		#define ID_DIALOG 10000
	#define SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE wxCAPTION\|wxSYSTEM_MENU\|wxCLOSE_BOX\|MAYBE_RESIZE_BORDER		#define EDGE_SELECT 10003
			#define TEXT_SELECT 10004
			#define PADFILL_OPT 10001
			#define PADNUM_OPT 10002
			#define ID_SAVE_CONFIG 10005
			#define ID_STATICLINE1 10007
			#define SYMBOL_KIDISPLAYOPTIONSFRAME_STYLE wxCAPTION\|wxRESIZE_BORDER\|wxSYSTEM_MENU\|wxCLOSE_BOX
	#define SYMBOL_KIDISPLAYOPTIONSFRAME_TITLE _("Options")		#define SYMBOL_KIDISPLAYOPTIONSFRAME_TITLE _("Options")
	#define SYMBOL_KIDISPLAYOPTIONSFRAME_IDNAME ID_DIALOG		#define SYMBOL_KIDISPLAYOPTIONSFRAME_IDNAME ID_DIALOG
	#define SYMBOL_KIDISPLAYOPTIONSFRAME_SIZE wxSize(400, 300)		#define SYMBOL_KIDISPLAYOPTIONSFRAME_SIZE wxSize(400, 300)
	#define SYMBOL_KIDISPLAYOPTIONSFRAME_POSITION wxDefaultPosition		#define SYMBOL_KIDISPLAYOPTIONSFRAME_POSITION wxDefaultPosition
	#define PADNUM_OPT 10002
	#define ID_SAVE_CONFIG 10005
	#define PADFILL_OPT 10001
	#define EDGE_SELECT 10003
	#define TEXT_SELECT 10004
	////@end control identifiers		////@end control identifiers

	/*!		/*!
	@@ -81,6 +83,18 @@ public:

	////@begin KiDisplayOptionsFrame event handler declarations		////@begin KiDisplayOptionsFrame event handler declarations

			/// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for EDGE_SELECT
			void OnEdgeSelectSelected( wxCommandEvent& event );

			/// wxEVT_COMMAND_RADIOBOX_SELECTED event handler for TEXT_SELECT
			void OnTextSelectSelected( wxCommandEvent& event );

			/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADFILL_OPT
			void OnPadfillOptClick( wxCommandEvent& event );

			/// wxEVT_COMMAND_CHECKBOX_CLICKED event handler for PADNUM_OPT
			void OnPadnumOptClick( wxCommandEvent& event );

	/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SAVE_CONFIG		/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_SAVE_CONFIG
	void OnSaveConfigClick( wxCommandEvent& event );		void OnSaveConfigClick( wxCommandEvent& event );

	@@ -102,19 +116,18 @@ public:

	/// Retrieves icon resources		/// Retrieves icon resources
	wxIcon GetIconResource( const wxString& name );		wxIcon GetIconResource( const wxString& name );

	/// Updates settings related to edges, text strings, and pads
	void UpdateObjectSettings();
	////@end KiDisplayOptionsFrame member function declarations		////@end KiDisplayOptionsFrame member function declarations

	/// Should we show tooltips?		/// Should we show tooltips?
	static bool ShowToolTips();		static bool ShowToolTips();

			void UpdateObjectSettings(void);

	////@begin KiDisplayOptionsFrame member variables		////@begin KiDisplayOptionsFrame member variables
	wxRadioBox* m_EdgesDisplayOption;		wxRadioBox* m_EdgesDisplayOption;
	wxRadioBox* m_TextDisplayOption;		wxRadioBox* m_TextDisplayOption;
	wxCheckBox* m_IsShowPadNum;
	wxCheckBox* m_IsShowPadFill;		wxCheckBox* m_IsShowPadFill;
			wxCheckBox* m_IsShowPadNum;
	////@end KiDisplayOptionsFrame member variables		////@end KiDisplayOptionsFrame member variables

	WinEDA_BasePcbFrame * m_Parent;		WinEDA_BasePcbFrame * m_Parent;