Make title block date field modifiable by hand. (26f2c04f) · Commits · Elphel / kicad-source-mirror

common/common.cpp

+12 −25

Original line number	Diff line number	Diff line
		@@ -289,31 +289,6 @@ wxArrayString* wxStringSplit( wxString aString, wxChar aSplitter )
		}


		/*
		* Return the string date "day month year" like "23 jun 2005"
		*/
		wxString GenDate()
		{
		static const wxString mois[12] =
		{
		wxT( "jan" ), wxT( "feb" ), wxT( "mar" ), wxT( "apr" ), wxT( "may" ), wxT( "jun" ),
		wxT( "jul" ), wxT( "aug" ), wxT( "sep" ), wxT( "oct" ), wxT( "nov" ), wxT( "dec" )
		};

		time_t buftime;
		struct tm* Date;
		wxString string_date;

		time( &buftime );

		Date = gmtime( &buftime );
		string_date.Printf( wxT( "%d %s %d" ), Date->tm_mday,
		GetChars( mois[Date->tm_mon] ),
		Date->tm_year + 1900 );
		return string_date;
		}


		int ProcessExecute( const wxString& aCommandLine, int aFlags, wxProcess *callback )
		{
		return wxExecute( aCommandLine, aFlags, callback );
		@@ -357,3 +332,15 @@ double RoundTo0( double x, double precision )

		return (double) ix / precision;
		}

		wxString FormatDateLong( const wxDateTime &aDate )
		{
		/* GetInfo was introduced only on wx 2.9; for portability reason an
		* hardcoded format is used on wx 2.8 */
		#if wxCHECK_VERSION( 2, 9, 0 )
		return aDate.Format( wxLocale::GetInfo( wxLOCALE_LONG_DATE_FMT ) );
		#else
		return aDate.Format( wxT("%d %b %Y") );
		#endif
		}

common/dialogs/dialog_page_settings.cpp

+21 −0

Original line number	Diff line number	Diff line
		@@ -182,6 +182,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()
		}

		m_TextRevision->SetValue( m_tb.GetRevision() );
		m_TextDate->SetValue( m_tb.GetDate() );
		m_TextTitle->SetValue( m_tb.GetTitle() );
		m_TextCompany->SetValue( m_tb.GetCompany() );
		m_TextComment1->SetValue( m_tb.GetComment1() );
		@@ -191,6 +192,7 @@ void DIALOG_PAGES_SETTINGS::initDialog()

		#ifndef EESCHEMA
		m_RevisionExport->Show( false );
		m_DateExport->Show( false );
		m_TitleExport->Show( false );
		m_CompanyExport->Show( false );
		m_Comment1Export->Show( false );
		@@ -310,6 +312,17 @@ void DIALOG_PAGES_SETTINGS::OnRevisionTextUpdated( wxCommandEvent& event )
		}


		void DIALOG_PAGES_SETTINGS::OnDateTextUpdated( wxCommandEvent& event )
		{
		if( m_initialized && m_TextDate->IsModified() )
		{
		GetPageLayoutInfoFromDialog();
		m_tb.SetDate( m_TextDate->GetValue() );
		UpdatePageLayoutExample();
		}
		}


		void DIALOG_PAGES_SETTINGS::OnTitleTextUpdated( wxCommandEvent& event )
		{
		if( m_initialized && m_TextTitle->IsModified() )
		@@ -375,6 +388,10 @@ void DIALOG_PAGES_SETTINGS::OnComment4TextUpdated( wxCommandEvent& event )
		}
		}

		void DIALOG_PAGES_SETTINGS::OnDateApplyClick( wxCommandEvent& event )
		{
		m_TextDate->SetValue( FormatDateLong( m_PickDate->GetValue() ) );
		}

		void DIALOG_PAGES_SETTINGS::SavePageSettings( wxCommandEvent& event )
		{
		@@ -471,6 +488,7 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ),
		m_Parent->SetPageSettings( m_pageInfo );

		m_tb.SetRevision( m_TextRevision->GetValue() );
		m_tb.SetDate( m_TextDate->GetValue() );
		m_tb.SetCompany( m_TextCompany->GetValue() );
		m_tb.SetTitle( m_TextTitle->GetValue() );
		m_tb.SetComment1( m_TextComment1->GetValue() );
		@@ -498,6 +516,9 @@ limits\n%.1f - %.1f %s!\nSelect another custom paper size?" ),
		if( m_RevisionExport->IsChecked() )
		tb2.SetRevision( m_tb.GetRevision() );

		if( m_DateExport->IsChecked() )
		tb2.SetDate( m_tb.GetDate() );

		if( m_TitleExport->IsChecked() )
		tb2.SetTitle( m_tb.GetTitle() );

common/dialogs/dialog_page_settings.h

+6 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,9 @@ private:
		/// exEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXTCTRL_REVISION
		void OnRevisionTextUpdated( wxCommandEvent& event );

		/// exEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXTCTRL_DATE
		void OnDateTextUpdated( wxCommandEvent& event );

		/// exEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXTCTRL_TITLE
		void OnTitleTextUpdated( wxCommandEvent& event );

		@@ -97,6 +100,9 @@ private:
		/// exEVT_COMMAND_TEXT_UPDATED event handler for ID_TEXTCTRL_COMMENT4
		void OnComment4TextUpdated( wxCommandEvent& event );

		/// Handle button click for setting the date from the picker
		virtual void OnDateApplyClick( wxCommandEvent& event );

		void SetCurrentPageSizeSelection( const wxString& aPaperSize );

		void SavePageSettings( wxCommandEvent& event );

common/dialogs/dialog_page_settings_base.cpp

+341 −309

Original line number	Diff line number	Diff line
		///////////////////////////////////////////////////////////////////////////
		// C++ code generated with wxFormBuilder (version Apr 10 2012)
		// C++ code generated with wxFormBuilder (version Oct 8 2012)
		// http://www.wxformbuilder.org/
		//
		// PLEASE DO "NOT" EDIT THIS FILE!
		@@ -129,7 +129,7 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

		wxStaticBoxSizer* BasicInscriptionsSizer;
		BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Basic Inscriptions") ), wxVERTICAL );
		BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Title Block Parameters") ), wxVERTICAL );

		BasicInscriptionsSizer->SetMinSize( wxSize( -1,452 ) );
		wxBoxSizer* SheetInfoSizer;
		@@ -153,26 +153,49 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		RevisionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Revision") ), wxHORIZONTAL );

		m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextRevision->SetMaxLength( 0 );
		m_TextRevision->SetMinSize( wxSize( 100,-1 ) );

		RevisionSizer->Add( m_TextRevision, 0, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		RevisionSizer->Add( m_TextRevision, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_RevisionExport = new wxCheckBox( this, ID_CHECKBOX_REVISION, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		RevisionSizer->Add( m_RevisionExport, 0, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		RevisionSizer->Add( m_RevisionExport, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( RevisionSizer, 1, wxEXPAND, 5 );

		wxStaticBoxSizer* DateSizer;
		DateSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Issue Date") ), wxHORIZONTAL );

		m_TextDate = new wxTextCtrl( this, ID_TEXTCTRL_DATE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextDate->SetMaxLength( 0 );
		m_TextDate->SetMinSize( wxSize( 100,-1 ) );

		DateSizer->Add( m_TextDate, 3, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_ApplyDate = new wxButton( this, ID_BTN_APPLY_DATE, _("<-"), wxDefaultPosition, wxDefaultSize, wxBU_EXACTFIT );
		DateSizer->Add( m_ApplyDate, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_PickDate = new wxDatePickerCtrl( this, ID_PICKER_DATE, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT );
		DateSizer->Add( m_PickDate, 2, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_DateExport = new wxCheckBox( this, ID_CHECKBOX_DATE, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		DateSizer->Add( m_DateExport, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( DateSizer, 1, wxEXPAND, 5 );

		wxStaticBoxSizer* TitleSizer;
		TitleSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Title") ), wxHORIZONTAL );

		m_TextTitle = new wxTextCtrl( this, ID_TEXTCTRL_TITLE, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextTitle->SetMaxLength( 0 );
		m_TextTitle->SetMinSize( wxSize( 360,-1 ) );

		TitleSizer->Add( m_TextTitle, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		TitleSizer->Add( m_TextTitle, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		TitleSizer->Add( m_TitleExport, 0, wxALL, 5 );
		TitleSizer->Add( m_TitleExport, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( TitleSizer, 1, wxEXPAND, 5 );
		@@ -181,12 +204,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		CompanySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Company") ), wxHORIZONTAL );

		m_TextCompany = new wxTextCtrl( this, ID_TEXTCTRL_COMPANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextCompany->SetMaxLength( 0 );
		m_TextCompany->SetMinSize( wxSize( 360,-1 ) );

		CompanySizer->Add( m_TextCompany, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		CompanySizer->Add( m_TextCompany, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_CompanyExport = new wxCheckBox( this, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		CompanySizer->Add( m_CompanyExport, 0, wxALL, 5 );
		CompanySizer->Add( m_CompanyExport, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( CompanySizer, 1, wxEXPAND, 5 );
		@@ -195,12 +219,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		Comment1Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment1") ), wxHORIZONTAL );

		m_TextComment1 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextComment1->SetMaxLength( 0 );
		m_TextComment1->SetMinSize( wxSize( 360,-1 ) );

		Comment1Sizer->Add( m_TextComment1, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		Comment1Sizer->Add( m_TextComment1, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_Comment1Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		Comment1Sizer->Add( m_Comment1Export, 0, wxALL, 5 );
		Comment1Sizer->Add( m_Comment1Export, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 );
		@@ -209,12 +234,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		Comment2Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment2") ), wxHORIZONTAL );

		m_TextComment2 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextComment2->SetMaxLength( 0 );
		m_TextComment2->SetMinSize( wxSize( 360,-1 ) );

		Comment2Sizer->Add( m_TextComment2, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		Comment2Sizer->Add( m_TextComment2, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_Comment2Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		Comment2Sizer->Add( m_Comment2Export, 0, wxALL, 5 );
		Comment2Sizer->Add( m_Comment2Export, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 );
		@@ -223,12 +249,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		Comment3Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment3") ), wxHORIZONTAL );

		m_TextComment3 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextComment3->SetMaxLength( 0 );
		m_TextComment3->SetMinSize( wxSize( 360,-1 ) );

		Comment3Sizer->Add( m_TextComment3, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		Comment3Sizer->Add( m_TextComment3, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_Comment3Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		Comment3Sizer->Add( m_Comment3Export, 0, wxALL, 5 );
		Comment3Sizer->Add( m_Comment3Export, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 );
		@@ -237,12 +264,13 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		Comment4Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment4") ), wxHORIZONTAL );

		m_TextComment4 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
		m_TextComment4->SetMaxLength( 0 );
		m_TextComment4->SetMinSize( wxSize( 360,-1 ) );

		Comment4Sizer->Add( m_TextComment4, 1, wxBOTTOM\|wxRIGHT\|wxLEFT, 5 );
		Comment4Sizer->Add( m_TextComment4, 1, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );

		m_Comment4Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 );
		Comment4Sizer->Add( m_Comment4Export, 0, wxALL, 5 );
		Comment4Sizer->Add( m_Comment4Export, 0, wxALIGN_CENTER_VERTICAL\|wxBOTTOM\|wxLEFT\|wxRIGHT, 5 );


		BasicInscriptionsSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 );
		@@ -276,6 +304,8 @@ DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWind
		m_TextUserSizeX->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeXTextUpdated ), NULL, this );
		m_TextUserSizeY->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeYTextUpdated ), NULL, this );
		m_TextRevision->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnRevisionTextUpdated ), NULL, this );
		m_TextDate->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnDateTextUpdated ), NULL, this );
		m_ApplyDate->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnDateApplyClick ), NULL, this );
		m_TextTitle->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTitleTextUpdated ), NULL, this );
		m_TitleExport->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this );
		m_TextCompany->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCompanyTextUpdated ), NULL, this );
		@@ -296,6 +326,8 @@ DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE()
		m_TextUserSizeX->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeXTextUpdated ), NULL, this );
		m_TextUserSizeY->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeYTextUpdated ), NULL, this );
		m_TextRevision->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnRevisionTextUpdated ), NULL, this );
		m_TextDate->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnDateTextUpdated ), NULL, this );
		m_ApplyDate->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnDateApplyClick ), NULL, this );
		m_TextTitle->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTitleTextUpdated ), NULL, this );
		m_TitleExport->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), NULL, this );
		m_TextCompany->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCompanyTextUpdated ), NULL, this );

common/dialogs/dialog_page_settings_base.fbp

+2814 −2447

File changed.

Preview size limit exceeded, changes collapsed.

Admin message