diff --git a/common/common.cpp b/common/common.cpp index 524a833ddd..dfea7180b4 100644 --- a/common/common.cpp +++ b/common/common.cpp @@ -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 +} + diff --git a/common/dialogs/dialog_page_settings.cpp b/common/dialogs/dialog_page_settings.cpp index 3e4279c86d..996997d1f4 100644 --- a/common/dialogs/dialog_page_settings.cpp +++ b/common/dialogs/dialog_page_settings.cpp @@ -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() ); diff --git a/common/dialogs/dialog_page_settings.h b/common/dialogs/dialog_page_settings.h index 5bffdb36be..e0ffc56e14 100644 --- a/common/dialogs/dialog_page_settings.h +++ b/common/dialogs/dialog_page_settings.h @@ -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 ); diff --git a/common/dialogs/dialog_page_settings_base.cpp b/common/dialogs/dialog_page_settings_base.cpp index fded851900..1ec4b6e182 100644 --- a/common/dialogs/dialog_page_settings_base.cpp +++ b/common/dialogs/dialog_page_settings_base.cpp @@ -1,309 +1,341 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#include "dialog_page_settings_base.h" - -/////////////////////////////////////////////////////////////////////////// - -DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) -{ - this->SetSizeHints( wxDefaultSize, wxDefaultSize ); - - wxBoxSizer* bMainSizer; - bMainSizer = new wxBoxSizer( wxVERTICAL ); - - wxBoxSizer* bUpperSizerH; - bUpperSizerH = new wxBoxSizer( wxHORIZONTAL ); - - wxFlexGridSizer* LeftColumnSizer; - LeftColumnSizer = new wxFlexGridSizer( 3, 1, 0, 0 ); - LeftColumnSizer->AddGrowableRow( 0 ); - LeftColumnSizer->AddGrowableRow( 1 ); - LeftColumnSizer->AddGrowableRow( 2 ); - LeftColumnSizer->SetFlexibleDirection( wxBOTH ); - LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - wxStaticBoxSizer* PaperSizer; - PaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper") ), wxVERTICAL ); - - m_staticText5 = new wxStaticText( this, wxID_ANY, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText5->Wrap( -1 ); - PaperSizer->Add( m_staticText5, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxString m_paperSizeComboBoxChoices[] = { _("dummy text") }; - int m_paperSizeComboBoxNChoices = sizeof( m_paperSizeComboBoxChoices ) / sizeof( wxString ); - m_paperSizeComboBox = new wxChoice( this, ID_CHICE_PAGE_SIZE, wxDefaultPosition, wxDefaultSize, m_paperSizeComboBoxNChoices, m_paperSizeComboBoxChoices, 0 ); - m_paperSizeComboBox->SetSelection( 0 ); - PaperSizer->Add( m_paperSizeComboBox, 0, wxALL|wxEXPAND, 5 ); - - m_staticText6 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText6->Wrap( -1 ); - PaperSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); - - wxString m_orientationComboBoxChoices[] = { _("Landscape"), _("Portrait") }; - int m_orientationComboBoxNChoices = sizeof( m_orientationComboBoxChoices ) / sizeof( wxString ); - m_orientationComboBox = new wxChoice( this, ID_CHOICE_PAGE_ORIENTATION, wxDefaultPosition, wxDefaultSize, m_orientationComboBoxNChoices, m_orientationComboBoxChoices, 0 ); - m_orientationComboBox->SetSelection( 0 ); - PaperSizer->Add( m_orientationComboBox, 0, wxEXPAND|wxALL, 5 ); - - - PaperSizer->Add( 0, 10, 0, 0, 5 ); - - wxStaticBoxSizer* CustomPaperSizer; - CustomPaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Custom Size") ), wxHORIZONTAL ); - - - CustomPaperSizer->Add( 5, 0, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* CustomPaperWidth; - CustomPaperWidth = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Width:") ), wxVERTICAL ); - - m_TextUserSizeX = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_X, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_LEFT ); - m_TextUserSizeX->SetMaxLength( 6 ); - m_TextUserSizeX->SetToolTip( _("Custom paper width.") ); - - CustomPaperWidth->Add( m_TextUserSizeX, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND, 5 ); - - - CustomPaperSizer->Add( CustomPaperWidth, 0, wxEXPAND, 5 ); - - - CustomPaperSizer->Add( 10, 0, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* CustomPaperHeight; - CustomPaperHeight = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Height:") ), wxVERTICAL ); - - m_TextUserSizeY = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_Y, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_LEFT ); - m_TextUserSizeY->SetMaxLength( 6 ); - m_TextUserSizeY->SetToolTip( _("Custom paper height.") ); - - CustomPaperHeight->Add( m_TextUserSizeY, 0, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); - - - CustomPaperSizer->Add( CustomPaperHeight, 0, wxEXPAND, 5 ); - - - CustomPaperSizer->Add( 5, 50, 0, 0, 5 ); - - - PaperSizer->Add( CustomPaperSizer, 1, wxEXPAND, 5 ); - - - LeftColumnSizer->Add( PaperSizer, 1, wxALL, 5 ); - - wxStaticBoxSizer* PageLayoutExampleSizer; - PageLayoutExampleSizer = new wxStaticBoxSizer( new wxStaticBox( this, ID_PAGE_LAYOUT_EXAMPLE_SIZER, _("Layout Preview") ), wxVERTICAL ); - - PageLayoutExampleSizer->SetMinSize( wxSize( 240,-1 ) ); - m_PageLayoutExampleBitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER ); - m_PageLayoutExampleBitmap->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - m_PageLayoutExampleBitmap->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); - - PageLayoutExampleSizer->Add( m_PageLayoutExampleBitmap, 0, wxALIGN_CENTER|wxALL, 5 ); - - - LeftColumnSizer->Add( PageLayoutExampleSizer, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); - - - LeftColumnSizer->Add( 0, 1, 1, wxEXPAND, 5 ); - - - bUpperSizerH->Add( LeftColumnSizer, 0, wxALL|wxEXPAND, 5 ); - - wxFlexGridSizer* RightColumnSizer; - RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 ); - RightColumnSizer->AddGrowableCol( 0 ); - RightColumnSizer->AddGrowableRow( 0 ); - RightColumnSizer->AddGrowableRow( 1 ); - RightColumnSizer->AddGrowableRow( 2 ); - RightColumnSizer->AddGrowableRow( 3 ); - RightColumnSizer->AddGrowableRow( 4 ); - RightColumnSizer->AddGrowableRow( 5 ); - RightColumnSizer->AddGrowableRow( 6 ); - RightColumnSizer->AddGrowableRow( 7 ); - RightColumnSizer->SetFlexibleDirection( wxBOTH ); - RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - - wxStaticBoxSizer* BasicInscriptionsSizer; - BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Basic Inscriptions") ), wxVERTICAL ); - - BasicInscriptionsSizer->SetMinSize( wxSize( -1,452 ) ); - wxBoxSizer* SheetInfoSizer; - SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); - - m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextSheetCount->Wrap( -1 ); - SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 ); - - - SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 ); - - m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); - m_TextSheetNumber->Wrap( -1 ); - SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( SheetInfoSizer, 0, 0, 5 ); - - wxStaticBoxSizer* RevisionSizer; - RevisionSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Revision") ), wxHORIZONTAL ); - - m_TextRevision = new wxTextCtrl( this, ID_TEXTCTRL_REVISION, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextRevision->SetMinSize( wxSize( 100,-1 ) ); - - RevisionSizer->Add( m_TextRevision, 0, wxBOTTOM|wxRIGHT|wxLEFT, 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 ); - - - BasicInscriptionsSizer->Add( RevisionSizer, 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->SetMinSize( wxSize( 360,-1 ) ); - - TitleSizer->Add( m_TextTitle, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_TitleExport = new wxCheckBox( this, wxID_ANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - TitleSizer->Add( m_TitleExport, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( TitleSizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* CompanySizer; - CompanySizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Company") ), wxHORIZONTAL ); - - m_TextCompany = new wxTextCtrl( this, ID_TEXTCTRL_COMPANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextCompany->SetMinSize( wxSize( 360,-1 ) ); - - CompanySizer->Add( m_TextCompany, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_CompanyExport = new wxCheckBox( this, ID_CHECKBOX_COMPANY, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - CompanySizer->Add( m_CompanyExport, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( CompanySizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment1Sizer; - Comment1Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment1") ), wxHORIZONTAL ); - - m_TextComment1 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT1, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextComment1->SetMinSize( wxSize( 360,-1 ) ); - - Comment1Sizer->Add( m_TextComment1, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment1Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT1, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment1Sizer->Add( m_Comment1Export, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment2Sizer; - Comment2Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment2") ), wxHORIZONTAL ); - - m_TextComment2 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT2, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextComment2->SetMinSize( wxSize( 360,-1 ) ); - - Comment2Sizer->Add( m_TextComment2, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment2Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT2, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment2Sizer->Add( m_Comment2Export, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment3Sizer; - Comment3Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment3") ), wxHORIZONTAL ); - - m_TextComment3 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT3, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextComment3->SetMinSize( wxSize( 360,-1 ) ); - - Comment3Sizer->Add( m_TextComment3, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment3Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT3, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment3Sizer->Add( m_Comment3Export, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 ); - - wxStaticBoxSizer* Comment4Sizer; - Comment4Sizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Comment4") ), wxHORIZONTAL ); - - m_TextComment4 = new wxTextCtrl( this, ID_TEXTCTRL_COMMENT4, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); - m_TextComment4->SetMinSize( wxSize( 360,-1 ) ); - - Comment4Sizer->Add( m_TextComment4, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - - m_Comment4Export = new wxCheckBox( this, ID_CHECKBOX_COMMENT4, _("Export to other sheets"), wxDefaultPosition, wxDefaultSize, 0 ); - Comment4Sizer->Add( m_Comment4Export, 0, wxALL, 5 ); - - - BasicInscriptionsSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 ); - - - RightColumnSizer->Add( BasicInscriptionsSizer, 1, wxALL|wxEXPAND, 5 ); - - - bUpperSizerH->Add( RightColumnSizer, 1, wxALL|wxEXPAND, 5 ); - - - bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 ); - - m_sdbSizer1 = new wxStdDialogButtonSizer(); - m_sdbSizer1OK = new wxButton( this, wxID_OK ); - m_sdbSizer1->AddButton( m_sdbSizer1OK ); - m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); - m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); - m_sdbSizer1->Realize(); - - bMainSizer->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 ); - - - this->SetSizer( bMainSizer ); - this->Layout(); - - // Connect Events - this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); - m_paperSizeComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this ); - m_orientationComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this ); - 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_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 ); - m_TextComment1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment1TextUpdated ), NULL, this ); - m_TextComment2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this ); - m_TextComment3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this ); - m_TextComment4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this ); - m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); -} - -DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE() -{ - // Disconnect Events - this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); - m_paperSizeComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this ); - m_orientationComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this ); - 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_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 ); - m_TextComment1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment1TextUpdated ), NULL, this ); - m_TextComment2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this ); - m_TextComment3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this ); - m_TextComment4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this ); - m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); - m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); - -} +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 8 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#include "dialog_page_settings_base.h" + +/////////////////////////////////////////////////////////////////////////// + +DIALOG_PAGES_SETTINGS_BASE::DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : DIALOG_SHIM( parent, id, title, pos, size, style ) +{ + this->SetSizeHints( wxDefaultSize, wxDefaultSize ); + + wxBoxSizer* bMainSizer; + bMainSizer = new wxBoxSizer( wxVERTICAL ); + + wxBoxSizer* bUpperSizerH; + bUpperSizerH = new wxBoxSizer( wxHORIZONTAL ); + + wxFlexGridSizer* LeftColumnSizer; + LeftColumnSizer = new wxFlexGridSizer( 3, 1, 0, 0 ); + LeftColumnSizer->AddGrowableRow( 0 ); + LeftColumnSizer->AddGrowableRow( 1 ); + LeftColumnSizer->AddGrowableRow( 2 ); + LeftColumnSizer->SetFlexibleDirection( wxBOTH ); + LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + wxStaticBoxSizer* PaperSizer; + PaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper") ), wxVERTICAL ); + + m_staticText5 = new wxStaticText( this, wxID_ANY, _("Size:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText5->Wrap( -1 ); + PaperSizer->Add( m_staticText5, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxString m_paperSizeComboBoxChoices[] = { _("dummy text") }; + int m_paperSizeComboBoxNChoices = sizeof( m_paperSizeComboBoxChoices ) / sizeof( wxString ); + m_paperSizeComboBox = new wxChoice( this, ID_CHICE_PAGE_SIZE, wxDefaultPosition, wxDefaultSize, m_paperSizeComboBoxNChoices, m_paperSizeComboBoxChoices, 0 ); + m_paperSizeComboBox->SetSelection( 0 ); + PaperSizer->Add( m_paperSizeComboBox, 0, wxALL|wxEXPAND, 5 ); + + m_staticText6 = new wxStaticText( this, wxID_ANY, _("Orientation:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText6->Wrap( -1 ); + PaperSizer->Add( m_staticText6, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); + + wxString m_orientationComboBoxChoices[] = { _("Landscape"), _("Portrait") }; + int m_orientationComboBoxNChoices = sizeof( m_orientationComboBoxChoices ) / sizeof( wxString ); + m_orientationComboBox = new wxChoice( this, ID_CHOICE_PAGE_ORIENTATION, wxDefaultPosition, wxDefaultSize, m_orientationComboBoxNChoices, m_orientationComboBoxChoices, 0 ); + m_orientationComboBox->SetSelection( 0 ); + PaperSizer->Add( m_orientationComboBox, 0, wxEXPAND|wxALL, 5 ); + + + PaperSizer->Add( 0, 10, 0, 0, 5 ); + + wxStaticBoxSizer* CustomPaperSizer; + CustomPaperSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Custom Size") ), wxHORIZONTAL ); + + + CustomPaperSizer->Add( 5, 0, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* CustomPaperWidth; + CustomPaperWidth = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Width:") ), wxVERTICAL ); + + m_TextUserSizeX = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_X, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_LEFT ); + m_TextUserSizeX->SetMaxLength( 6 ); + m_TextUserSizeX->SetToolTip( _("Custom paper width.") ); + + CustomPaperWidth->Add( m_TextUserSizeX, 0, wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND, 5 ); + + + CustomPaperSizer->Add( CustomPaperWidth, 0, wxEXPAND, 5 ); + + + CustomPaperSizer->Add( 10, 0, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* CustomPaperHeight; + CustomPaperHeight = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Height:") ), wxVERTICAL ); + + m_TextUserSizeY = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_Y, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_LEFT ); + m_TextUserSizeY->SetMaxLength( 6 ); + m_TextUserSizeY->SetToolTip( _("Custom paper height.") ); + + CustomPaperHeight->Add( m_TextUserSizeY, 0, wxALIGN_TOP|wxALL|wxEXPAND, 5 ); + + + CustomPaperSizer->Add( CustomPaperHeight, 0, wxEXPAND, 5 ); + + + CustomPaperSizer->Add( 5, 50, 0, 0, 5 ); + + + PaperSizer->Add( CustomPaperSizer, 1, wxEXPAND, 5 ); + + + LeftColumnSizer->Add( PaperSizer, 1, wxALL, 5 ); + + wxStaticBoxSizer* PageLayoutExampleSizer; + PageLayoutExampleSizer = new wxStaticBoxSizer( new wxStaticBox( this, ID_PAGE_LAYOUT_EXAMPLE_SIZER, _("Layout Preview") ), wxVERTICAL ); + + PageLayoutExampleSizer->SetMinSize( wxSize( 240,-1 ) ); + m_PageLayoutExampleBitmap = new wxStaticBitmap( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxSize( -1,-1 ), wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER ); + m_PageLayoutExampleBitmap->SetForegroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + m_PageLayoutExampleBitmap->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); + + PageLayoutExampleSizer->Add( m_PageLayoutExampleBitmap, 0, wxALIGN_CENTER|wxALL, 5 ); + + + LeftColumnSizer->Add( PageLayoutExampleSizer, 0, wxALIGN_CENTER|wxALL|wxEXPAND, 5 ); + + + LeftColumnSizer->Add( 0, 1, 1, wxEXPAND, 5 ); + + + bUpperSizerH->Add( LeftColumnSizer, 0, wxALL|wxEXPAND, 5 ); + + wxFlexGridSizer* RightColumnSizer; + RightColumnSizer = new wxFlexGridSizer( 8, 1, 0, 0 ); + RightColumnSizer->AddGrowableCol( 0 ); + RightColumnSizer->AddGrowableRow( 0 ); + RightColumnSizer->AddGrowableRow( 1 ); + RightColumnSizer->AddGrowableRow( 2 ); + RightColumnSizer->AddGrowableRow( 3 ); + RightColumnSizer->AddGrowableRow( 4 ); + RightColumnSizer->AddGrowableRow( 5 ); + RightColumnSizer->AddGrowableRow( 6 ); + RightColumnSizer->AddGrowableRow( 7 ); + RightColumnSizer->SetFlexibleDirection( wxBOTH ); + RightColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + + wxStaticBoxSizer* BasicInscriptionsSizer; + BasicInscriptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Title Block Parameters") ), wxVERTICAL ); + + BasicInscriptionsSizer->SetMinSize( wxSize( -1,452 ) ); + wxBoxSizer* SheetInfoSizer; + SheetInfoSizer = new wxBoxSizer( wxHORIZONTAL ); + + m_TextSheetCount = new wxStaticText( this, wxID_ANY, _("Number of sheets: %d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextSheetCount->Wrap( -1 ); + SheetInfoSizer->Add( m_TextSheetCount, 0, wxALL, 5 ); + + + SheetInfoSizer->Add( 5, 5, 1, wxEXPAND, 5 ); + + m_TextSheetNumber = new wxStaticText( this, wxID_ANY, _("Sheet number: %d"), wxDefaultPosition, wxDefaultSize, 0 ); + m_TextSheetNumber->Wrap( -1 ); + SheetInfoSizer->Add( m_TextSheetNumber, 0, wxALL, 5 ); + + + BasicInscriptionsSizer->Add( SheetInfoSizer, 0, 0, 5 ); + + wxStaticBoxSizer* RevisionSizer; + 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, 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, 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, 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, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + + BasicInscriptionsSizer->Add( TitleSizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* CompanySizer; + 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, 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, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + + BasicInscriptionsSizer->Add( CompanySizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment1Sizer; + 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, 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, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + + BasicInscriptionsSizer->Add( Comment1Sizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment2Sizer; + 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, 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, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + + BasicInscriptionsSizer->Add( Comment2Sizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment3Sizer; + 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, 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, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + + BasicInscriptionsSizer->Add( Comment3Sizer, 1, wxEXPAND, 5 ); + + wxStaticBoxSizer* Comment4Sizer; + 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, 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, wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); + + + BasicInscriptionsSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 ); + + + RightColumnSizer->Add( BasicInscriptionsSizer, 1, wxALL|wxEXPAND, 5 ); + + + bUpperSizerH->Add( RightColumnSizer, 1, wxALL|wxEXPAND, 5 ); + + + bMainSizer->Add( bUpperSizerH, 1, wxEXPAND, 5 ); + + m_sdbSizer1 = new wxStdDialogButtonSizer(); + m_sdbSizer1OK = new wxButton( this, wxID_OK ); + m_sdbSizer1->AddButton( m_sdbSizer1OK ); + m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL ); + m_sdbSizer1->AddButton( m_sdbSizer1Cancel ); + m_sdbSizer1->Realize(); + + bMainSizer->Add( m_sdbSizer1, 0, wxALIGN_RIGHT|wxALL, 5 ); + + + this->SetSizer( bMainSizer ); + this->Layout(); + + // Connect Events + this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); + m_paperSizeComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this ); + m_orientationComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this ); + 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 ); + m_TextComment1->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment1TextUpdated ), NULL, this ); + m_TextComment2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this ); + m_TextComment3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this ); + m_TextComment4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this ); + m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); +} + +DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE() +{ + // Disconnect Events + this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) ); + m_paperSizeComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this ); + m_orientationComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this ); + 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 ); + m_TextComment1->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment1TextUpdated ), NULL, this ); + m_TextComment2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this ); + m_TextComment3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this ); + m_TextComment4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this ); + m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this ); + m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this ); + +} diff --git a/common/dialogs/dialog_page_settings_base.fbp b/common/dialogs/dialog_page_settings_base.fbp index b7c9e6b11f..f9bd906d31 100644 --- a/common/dialogs/dialog_page_settings_base.fbp +++ b/common/dialogs/dialog_page_settings_base.fbp @@ -1,2447 +1,2814 @@ - - - - - - C++ - 1 - source_name - 0 - 0 - res - UTF-8 - connect - dialog_page_settings_base - 1000 - none - 1 - dialog_page_settings_base - - . - - 1 - 1 - 1 - 0 - 0 - - 0 - wxAUI_MGR_DEFAULT - - - - 1 - 1 - impl_virtual - - - - 0 - wxID_ANY - - - DIALOG_PAGES_SETTINGS_BASE - - 748,495 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - DIALOG_SHIM; dialog_shim.h - Page Settings - - - - - - - - - - - - - - OnCloseWindow - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1,-1 - bMainSizer - wxVERTICAL - none - - 5 - wxEXPAND - 1 - - - bUpperSizerH - wxHORIZONTAL - none - - 5 - wxALL|wxEXPAND - 0 - - 1 - wxBOTH - - 0,1,2 - 0 - - LeftColumnSizer - wxFLEX_GROWMODE_SPECIFIED - none - 3 - 0 - - 5 - wxALL - 1 - - wxID_ANY - Paper - - PaperSizer - wxVERTICAL - none - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Size: - - 0 - - - 0 - - 1 - m_staticText5 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "dummy text" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHICE_PAGE_SIZE - - 0 - - - 0 - - 1 - m_paperSizeComboBox - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPaperSizeChoice - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxTOP|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Orientation: - - 0 - - - 0 - - 1 - m_staticText6 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - "Landscape" "Portrait" - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHOICE_PAGE_ORIENTATION - - 0 - - - 0 - - 1 - m_orientationComboBox - 1 - - - protected - 1 - - Resizable - 0 - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnPageOrientationChoice - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - 10 - protected - 0 - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Custom Size - - CustomPaperSizer - wxHORIZONTAL - none - - - 5 - wxEXPAND - 1 - - 0 - protected - 5 - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Width: - - CustomPaperWidth - wxVERTICAL - none - - - 5 - wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_USER_PAGE_SIZE_X - - 0 - - 6 - - 0 - - 1 - m_TextUserSizeX - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_LEFT - - 0 - Custom paper width. - - wxFILTER_NONE - wxTextValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUserPageSizeXTextUpdated - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 10 - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Height: - - CustomPaperHeight - wxVERTICAL - none - - - 5 - wxALIGN_TOP|wxALL|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_USER_PAGE_SIZE_Y - - 0 - - 6 - - 0 - - 1 - m_TextUserSizeY - 1 - - - protected - 1 - - Resizable - 1 - - wxTE_LEFT - - 0 - Custom paper height. - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnUserPageSizeYTextUpdated - - - - - - - - - - 5 - - 0 - - 50 - protected - 5 - - - - - - - - 5 - wxALIGN_CENTER|wxALL|wxEXPAND - 0 - - ID_PAGE_LAYOUT_EXAMPLE_SIZER - Layout Preview - 240,-1 - PageLayoutExampleSizer - wxVERTICAL - none - - - 5 - wxALIGN_CENTER|wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - wxSYS_COLOUR_WINDOW - Load From Icon Resource; - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - wxSYS_COLOUR_WINDOW - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - -1,-1 - 1 - m_PageLayoutExampleBitmap - 1 - - - protected - 1 - - Resizable - 1 - -1,-1 - - 0 - - - - wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 1 - protected - 0 - - - - - - 5 - wxALL|wxEXPAND - 1 - - 1 - wxBOTH - 0 - 0,1,2,3,4,5,6,7 - 0 - - RightColumnSizer - wxFLEX_GROWMODE_SPECIFIED - none - 8 - 0 - - 5 - wxALL|wxEXPAND - 1 - - wxID_ANY - Basic Inscriptions - -1,452 - BasicInscriptionsSizer - wxVERTICAL - none - - - 5 - - 0 - - - SheetInfoSizer - wxHORIZONTAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Number of sheets: %d - - 0 - - - 0 - - 1 - m_TextSheetCount - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 5 - protected - 5 - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Sheet number: %d - - 0 - - - 0 - - 1 - m_TextSheetNumber - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Revision - - RevisionSizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_REVISION - - 0 - - 0 - - 0 - 100,-1 - 1 - m_TextRevision - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnRevisionTextUpdated - - - - - - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_REVISION - Export to other sheets - - 0 - - - 0 - - 1 - m_RevisionExport - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Title - - TitleSizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_TITLE - - 0 - - 0 - - 0 - 360,-1 - 1 - m_TextTitle - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnTitleTextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Export to other sheets - - 0 - - - 0 - - 1 - m_TitleExport - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - OnCheckboxTitleClick - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Company - - CompanySizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMPANY - - 0 - - 0 - - 0 - 360,-1 - 1 - m_TextCompany - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnCompanyTextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMPANY - Export to other sheets - - 0 - - - 0 - - 1 - m_CompanyExport - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Comment1 - - Comment1Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT1 - - 0 - - 0 - - 0 - 360,-1 - 1 - m_TextComment1 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnComment1TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT1 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment1Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Comment2 - - Comment2Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT2 - - 0 - - 0 - - 0 - 360,-1 - 1 - m_TextComment2 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnComment2TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT2 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment2Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Comment3 - - Comment3Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT3 - - 0 - - 0 - - 0 - 360,-1 - 1 - m_TextComment3 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnComment3TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT3 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment3Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - wxID_ANY - Comment4 - - Comment4Sizer - wxHORIZONTAL - none - - - 5 - wxBOTTOM|wxRIGHT|wxLEFT - 1 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_TEXTCTRL_COMMENT4 - - 0 - - 0 - - 0 - 360,-1 - 1 - m_TextComment4 - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - OnComment4TextUpdated - - - - - - - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - ID_CHECKBOX_COMMENT4 - Export to other sheets - - 0 - - - 0 - - 1 - m_Comment4Export - 1 - - - protected - 1 - - Resizable - 1 - - - - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_RIGHT|wxALL - 0 - - 0 - 1 - 0 - 0 - 0 - 1 - 0 - 0 - - m_sdbSizer1 - protected - - OnCancelClick - - - - OnOkClick - - - - - - - - + + + + + + C++ + 1 + source_name + 0 + 0 + res + UTF-8 + connect + dialog_page_settings_base + 1000 + none + 1 + dialog_page_settings_base + + . + + 1 + 1 + 1 + 0 + 0 + + 0 + wxAUI_MGR_DEFAULT + + + + 1 + 1 + impl_virtual + + + + 0 + wxID_ANY + + + DIALOG_PAGES_SETTINGS_BASE + + 748,495 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + DIALOG_SHIM; dialog_shim.h + Page Settings + + + + + + + + + + + + + + OnCloseWindow + + + + + + + + + + + + + + + + + + + + + + + + + + + + -1,-1 + bMainSizer + wxVERTICAL + none + + 5 + wxEXPAND + 1 + + + bUpperSizerH + wxHORIZONTAL + none + + 5 + wxALL|wxEXPAND + 0 + + 1 + wxBOTH + + 0,1,2 + 0 + + LeftColumnSizer + wxFLEX_GROWMODE_SPECIFIED + none + 3 + 0 + + 5 + wxALL + 1 + + wxID_ANY + Paper + + PaperSizer + wxVERTICAL + none + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Size: + + 0 + + + 0 + + 1 + m_staticText5 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "dummy text" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHICE_PAGE_SIZE + + 0 + + + 0 + + 1 + m_paperSizeComboBox + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPaperSizeChoice + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxTOP|wxRIGHT|wxLEFT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Orientation: + + 0 + + + 0 + + 1 + m_staticText6 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + "Landscape" "Portrait" + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHOICE_PAGE_ORIENTATION + + 0 + + + 0 + + 1 + m_orientationComboBox + 1 + + + protected + 1 + + Resizable + 0 + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnPageOrientationChoice + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + + 0 + + 10 + protected + 0 + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Custom Size + + CustomPaperSizer + wxHORIZONTAL + none + + + 5 + wxEXPAND + 1 + + 0 + protected + 5 + + + + 5 + wxEXPAND + 0 + + wxID_ANY + Width: + + CustomPaperWidth + wxVERTICAL + none + + + 5 + wxALIGN_LEFT|wxALIGN_TOP|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_USER_PAGE_SIZE_X + + 0 + + 6 + + 0 + + 1 + m_TextUserSizeX + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_LEFT + + 0 + Custom paper width. + + wxFILTER_NONE + wxTextValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUserPageSizeXTextUpdated + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 10 + + + + 5 + wxEXPAND + 0 + + wxID_ANY + Height: + + CustomPaperHeight + wxVERTICAL + none + + + 5 + wxALIGN_TOP|wxALL|wxEXPAND + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_USER_PAGE_SIZE_Y + + 0 + + 6 + + 0 + + 1 + m_TextUserSizeY + 1 + + + protected + 1 + + Resizable + 1 + + wxTE_LEFT + + 0 + Custom paper height. + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnUserPageSizeYTextUpdated + + + + + + + + + + 5 + + 0 + + 50 + protected + 5 + + + + + + + + 5 + wxALIGN_CENTER|wxALL|wxEXPAND + 0 + + ID_PAGE_LAYOUT_EXAMPLE_SIZER + Layout Preview + 240,-1 + PageLayoutExampleSizer + wxVERTICAL + none + + + 5 + wxALIGN_CENTER|wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + wxSYS_COLOUR_WINDOW + Load From Icon Resource; + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + wxSYS_COLOUR_WINDOW + 1 + + 0 + 0 + wxID_ANY + + 0 + + + 0 + -1,-1 + 1 + m_PageLayoutExampleBitmap + 1 + + + protected + 1 + + Resizable + 1 + -1,-1 + + 0 + + + + wxFULL_REPAINT_ON_RESIZE|wxSIMPLE_BORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 1 + protected + 0 + + + + + + 5 + wxALL|wxEXPAND + 1 + + 1 + wxBOTH + 0 + 0,1,2,3,4,5,6,7 + 0 + + RightColumnSizer + wxFLEX_GROWMODE_SPECIFIED + none + 8 + 0 + + 5 + wxALL|wxEXPAND + 1 + + wxID_ANY + Title Block Parameters + -1,452 + BasicInscriptionsSizer + wxVERTICAL + none + + + 5 + + 0 + + + SheetInfoSizer + wxHORIZONTAL + none + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Number of sheets: %d + + 0 + + + 0 + + 1 + m_TextSheetCount + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 5 + protected + 5 + + + + 5 + wxALL + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Sheet number: %d + + 0 + + + 0 + + 1 + m_TextSheetNumber + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Revision + + RevisionSizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_REVISION + + 0 + + 0 + + 0 + 100,-1 + 1 + m_TextRevision + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnRevisionTextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_REVISION + Export to other sheets + + 0 + + + 0 + + 1 + m_RevisionExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Issue Date + + DateSizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 3 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_DATE + + 0 + + 0 + + 0 + 100,-1 + 1 + m_TextDate + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnDateTextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_BTN_APPLY_DATE + <- + + 0 + + + 0 + + 1 + m_ApplyDate + 1 + + + protected + 1 + + Resizable + 1 + + wxBU_EXACTFIT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + OnDateApplyClick + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 2 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_PICKER_DATE + + 0 + + + 0 + + 1 + m_PickDate + 1 + + + protected + 1 + + Resizable + 1 + + wxDP_DEFAULT + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_DATE + Export to other sheets + + 0 + + + 0 + + 1 + m_DateExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Title + + TitleSizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_TITLE + + 0 + + 0 + + 0 + 360,-1 + 1 + m_TextTitle + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnTitleTextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Export to other sheets + + 0 + + + 0 + + 1 + m_TitleExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + OnCheckboxTitleClick + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Company + + CompanySizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMPANY + + 0 + + 0 + + 0 + 360,-1 + 1 + m_TextCompany + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnCompanyTextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMPANY + Export to other sheets + + 0 + + + 0 + + 1 + m_CompanyExport + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment1 + + Comment1Sizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT1 + + 0 + + 0 + + 0 + 360,-1 + 1 + m_TextComment1 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment1TextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT1 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment1Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment2 + + Comment2Sizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT2 + + 0 + + 0 + + 0 + 360,-1 + 1 + m_TextComment2 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment2TextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT2 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment2Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment3 + + Comment3Sizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT3 + + 0 + + 0 + + 0 + 360,-1 + 1 + m_TextComment3 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment3TextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT3 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment3Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + wxID_ANY + Comment4 + + Comment4Sizer + wxHORIZONTAL + none + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_TEXTCTRL_COMMENT4 + + 0 + + 0 + + 0 + 360,-1 + 1 + m_TextComment4 + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + OnComment4TextUpdated + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT + 0 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + ID_CHECKBOX_COMMENT4 + Export to other sheets + + 0 + + + 0 + + 1 + m_Comment4Export + 1 + + + protected + 1 + + Resizable + 1 + + + + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + 0 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + + m_sdbSizer1 + protected + + OnCancelClick + + + + OnOkClick + + + + + + + + diff --git a/common/dialogs/dialog_page_settings_base.h b/common/dialogs/dialog_page_settings_base.h index 2bdb65f231..37f4c38222 100644 --- a/common/dialogs/dialog_page_settings_base.h +++ b/common/dialogs/dialog_page_settings_base.h @@ -1,115 +1,129 @@ -/////////////////////////////////////////////////////////////////////////// -// C++ code generated with wxFormBuilder (version Apr 10 2012) -// http://www.wxformbuilder.org/ -// -// PLEASE DO "NOT" EDIT THIS FILE! -/////////////////////////////////////////////////////////////////////////// - -#ifndef __DIALOG_PAGE_SETTINGS_BASE_H__ -#define __DIALOG_PAGE_SETTINGS_BASE_H__ - -#include -#include -#include -#include "dialog_shim.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -/////////////////////////////////////////////////////////////////////////// - -#define ID_CHICE_PAGE_SIZE 1000 -#define ID_CHOICE_PAGE_ORIENTATION 1001 -#define ID_TEXTCTRL_USER_PAGE_SIZE_X 1002 -#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 1003 -#define ID_PAGE_LAYOUT_EXAMPLE_SIZER 1004 -#define ID_TEXTCTRL_REVISION 1005 -#define ID_CHECKBOX_REVISION 1006 -#define ID_TEXTCTRL_TITLE 1007 -#define ID_TEXTCTRL_COMPANY 1008 -#define ID_CHECKBOX_COMPANY 1009 -#define ID_TEXTCTRL_COMMENT1 1010 -#define ID_CHECKBOX_COMMENT1 1011 -#define ID_TEXTCTRL_COMMENT2 1012 -#define ID_CHECKBOX_COMMENT2 1013 -#define ID_TEXTCTRL_COMMENT3 1014 -#define ID_CHECKBOX_COMMENT3 1015 -#define ID_TEXTCTRL_COMMENT4 1016 -#define ID_CHECKBOX_COMMENT4 1017 - -/////////////////////////////////////////////////////////////////////////////// -/// Class DIALOG_PAGES_SETTINGS_BASE -/////////////////////////////////////////////////////////////////////////////// -class DIALOG_PAGES_SETTINGS_BASE : public DIALOG_SHIM -{ - private: - - protected: - wxStaticText* m_staticText5; - wxChoice* m_paperSizeComboBox; - wxStaticText* m_staticText6; - wxChoice* m_orientationComboBox; - wxTextCtrl* m_TextUserSizeX; - wxTextCtrl* m_TextUserSizeY; - wxStaticBitmap* m_PageLayoutExampleBitmap; - wxStaticText* m_TextSheetCount; - wxStaticText* m_TextSheetNumber; - wxTextCtrl* m_TextRevision; - wxCheckBox* m_RevisionExport; - wxTextCtrl* m_TextTitle; - wxCheckBox* m_TitleExport; - wxTextCtrl* m_TextCompany; - wxCheckBox* m_CompanyExport; - wxTextCtrl* m_TextComment1; - wxCheckBox* m_Comment1Export; - wxTextCtrl* m_TextComment2; - wxCheckBox* m_Comment2Export; - wxTextCtrl* m_TextComment3; - wxCheckBox* m_Comment3Export; - wxTextCtrl* m_TextComment4; - wxCheckBox* m_Comment4Export; - wxStdDialogButtonSizer* m_sdbSizer1; - wxButton* m_sdbSizer1OK; - wxButton* m_sdbSizer1Cancel; - - // Virtual event handlers, overide them in your derived class - virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } - virtual void OnPaperSizeChoice( wxCommandEvent& event ) { event.Skip(); } - virtual void OnPageOrientationChoice( wxCommandEvent& event ) { event.Skip(); } - virtual void OnUserPageSizeXTextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnUserPageSizeYTextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnRevisionTextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnTitleTextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCheckboxTitleClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCompanyTextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnComment1TextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnComment2TextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnComment3TextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnComment4TextUpdated( wxCommandEvent& event ) { event.Skip(); } - virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } - virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } - - - public: - - DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Page Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 748,495 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); - ~DIALOG_PAGES_SETTINGS_BASE(); - -}; - -#endif //__DIALOG_PAGE_SETTINGS_BASE_H__ +/////////////////////////////////////////////////////////////////////////// +// C++ code generated with wxFormBuilder (version Oct 8 2012) +// http://www.wxformbuilder.org/ +// +// PLEASE DO "NOT" EDIT THIS FILE! +/////////////////////////////////////////////////////////////////////////// + +#ifndef __DIALOG_PAGE_SETTINGS_BASE_H__ +#define __DIALOG_PAGE_SETTINGS_BASE_H__ + +#include +#include +#include +class DIALOG_SHIM; + +#include "dialog_shim.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/////////////////////////////////////////////////////////////////////////// + +#define ID_CHICE_PAGE_SIZE 1000 +#define ID_CHOICE_PAGE_ORIENTATION 1001 +#define ID_TEXTCTRL_USER_PAGE_SIZE_X 1002 +#define ID_TEXTCTRL_USER_PAGE_SIZE_Y 1003 +#define ID_PAGE_LAYOUT_EXAMPLE_SIZER 1004 +#define ID_TEXTCTRL_REVISION 1005 +#define ID_CHECKBOX_REVISION 1006 +#define ID_TEXTCTRL_DATE 1007 +#define ID_BTN_APPLY_DATE 1008 +#define ID_PICKER_DATE 1009 +#define ID_CHECKBOX_DATE 1010 +#define ID_TEXTCTRL_TITLE 1011 +#define ID_TEXTCTRL_COMPANY 1012 +#define ID_CHECKBOX_COMPANY 1013 +#define ID_TEXTCTRL_COMMENT1 1014 +#define ID_CHECKBOX_COMMENT1 1015 +#define ID_TEXTCTRL_COMMENT2 1016 +#define ID_CHECKBOX_COMMENT2 1017 +#define ID_TEXTCTRL_COMMENT3 1018 +#define ID_CHECKBOX_COMMENT3 1019 +#define ID_TEXTCTRL_COMMENT4 1020 +#define ID_CHECKBOX_COMMENT4 1021 + +/////////////////////////////////////////////////////////////////////////////// +/// Class DIALOG_PAGES_SETTINGS_BASE +/////////////////////////////////////////////////////////////////////////////// +class DIALOG_PAGES_SETTINGS_BASE : public DIALOG_SHIM +{ + private: + + protected: + wxStaticText* m_staticText5; + wxChoice* m_paperSizeComboBox; + wxStaticText* m_staticText6; + wxChoice* m_orientationComboBox; + wxTextCtrl* m_TextUserSizeX; + wxTextCtrl* m_TextUserSizeY; + wxStaticBitmap* m_PageLayoutExampleBitmap; + wxStaticText* m_TextSheetCount; + wxStaticText* m_TextSheetNumber; + wxTextCtrl* m_TextRevision; + wxCheckBox* m_RevisionExport; + wxTextCtrl* m_TextDate; + wxButton* m_ApplyDate; + wxDatePickerCtrl* m_PickDate; + wxCheckBox* m_DateExport; + wxTextCtrl* m_TextTitle; + wxCheckBox* m_TitleExport; + wxTextCtrl* m_TextCompany; + wxCheckBox* m_CompanyExport; + wxTextCtrl* m_TextComment1; + wxCheckBox* m_Comment1Export; + wxTextCtrl* m_TextComment2; + wxCheckBox* m_Comment2Export; + wxTextCtrl* m_TextComment3; + wxCheckBox* m_Comment3Export; + wxTextCtrl* m_TextComment4; + wxCheckBox* m_Comment4Export; + wxStdDialogButtonSizer* m_sdbSizer1; + wxButton* m_sdbSizer1OK; + wxButton* m_sdbSizer1Cancel; + + // Virtual event handlers, overide them in your derived class + virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); } + virtual void OnPaperSizeChoice( wxCommandEvent& event ) { event.Skip(); } + virtual void OnPageOrientationChoice( wxCommandEvent& event ) { event.Skip(); } + virtual void OnUserPageSizeXTextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnUserPageSizeYTextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnRevisionTextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnDateTextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnDateApplyClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnTitleTextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCheckboxTitleClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCompanyTextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnComment1TextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnComment2TextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnComment3TextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnComment4TextUpdated( wxCommandEvent& event ) { event.Skip(); } + virtual void OnCancelClick( wxCommandEvent& event ) { event.Skip(); } + virtual void OnOkClick( wxCommandEvent& event ) { event.Skip(); } + + + public: + + DIALOG_PAGES_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Page Settings"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 748,495 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER ); + ~DIALOG_PAGES_SETTINGS_BASE(); + +}; + +#endif //__DIALOG_PAGE_SETTINGS_BASE_H__ diff --git a/common/worksheet.cpp b/common/worksheet.cpp index f6b99b2b7f..ebc77e2036 100644 --- a/common/worksheet.cpp +++ b/common/worksheet.cpp @@ -222,21 +222,19 @@ void TITLE_BLOCK::Format( OUTPUTFORMATTER* aFormatter, int aNestLevel, int aCont throw( IO_ERROR ) { // Don't write the title block information if there is nothing to write. - if( !m_title.IsEmpty() || /* !m_date.IsEmpty() || */ !m_revision.IsEmpty() + if( !m_title.IsEmpty() || !m_date.IsEmpty() || !m_revision.IsEmpty() || !m_company.IsEmpty() || !m_comment1.IsEmpty() || !m_comment2.IsEmpty() || !m_comment3.IsEmpty() || !m_comment4.IsEmpty() ) { - aFormatter->Print( aNestLevel, "(title_block \n" ); + aFormatter->Print( aNestLevel, "(title_block\n" ); if( !m_title.IsEmpty() ) aFormatter->Print( aNestLevel+1, "(title %s)\n", aFormatter->Quotew( m_title ).c_str() ); - /* version control users were complaining, see mailing list. if( !m_date.IsEmpty() ) aFormatter->Print( aNestLevel+1, "(date %s)\n", aFormatter->Quotew( m_date ).c_str() ); - */ if( !m_revision.IsEmpty() ) aFormatter->Print( aNestLevel+1, "(rev %s)\n", diff --git a/eeschema/annotate.cpp b/eeschema/annotate.cpp index 6e54263381..1e7225d69e 100644 --- a/eeschema/annotate.cpp +++ b/eeschema/annotate.cpp @@ -71,9 +71,6 @@ void SCH_EDIT_FRAME::AnnotateComponents( bool aAnnotateSchematic, if( aResetAnnotation ) DeleteAnnotation( !aAnnotateSchematic ); - // Update the screen date. - screens.SetDate( GenDate() ); - // Set sheet number and number of sheets. SetSheetNumberAndCount(); diff --git a/eeschema/sch_screen.cpp b/eeschema/sch_screen.cpp index d0f3a5bcb9..d95b21c627 100644 --- a/eeschema/sch_screen.cpp +++ b/eeschema/sch_screen.cpp @@ -153,7 +153,6 @@ void SCH_SCREEN::Clear() m_ScreenNumber = m_NumberOfScreens = 1; m_titles.Clear(); - m_titles.SetDate(); } @@ -1455,17 +1454,6 @@ int SCH_SCREENS::ReplaceDuplicateTimeStamps() } -void SCH_SCREENS::SetDate( const wxString& aDate ) -{ - for( size_t i = 0; i < m_screens.size(); i++ ) - { - TITLE_BLOCK tb = m_screens[i]->GetTitleBlock(); - tb.SetDate( aDate ); - m_screens[i]->SetTitleBlock( tb ); - } -} - - void SCH_SCREENS::DeleteAllMarkers( int aMarkerType ) { SCH_ITEM* item; diff --git a/eeschema/schframe.cpp b/eeschema/schframe.cpp index be801f3735..d3bc8ea108 100644 --- a/eeschema/schframe.cpp +++ b/eeschema/schframe.cpp @@ -352,10 +352,6 @@ void SCH_EDIT_FRAME::CreateScreens() g_RootSheet->GetScreen()->SetFileName( m_DefaultSchematicFileName ); - TITLE_BLOCK tb = g_RootSheet->GetScreen()->GetTitleBlock(); - tb.SetDate(); - g_RootSheet->GetScreen()->SetTitleBlock( tb ); - m_CurrentSheet->Clear(); m_CurrentSheet->Push( g_RootSheet ); @@ -560,15 +556,6 @@ void SCH_EDIT_FRAME::OnModify() if( m_dlgFindReplace == NULL ) m_foundItems.SetForceSearch(); - - SCH_SCREENS s_list; - - // Set the date for each sheet - // There are 2 possibilities: - // >> change only the current sheet - // >> change all sheets. - // I believe all sheets in a project must have the same date - s_list.SetDate(); } diff --git a/include/class_sch_screen.h b/include/class_sch_screen.h index 14cdefa81d..b04dc3871b 100644 --- a/include/class_sch_screen.h +++ b/include/class_sch_screen.h @@ -546,14 +546,6 @@ public: */ int ReplaceDuplicateTimeStamps(); - /** - * Function SetDate - * sets the date string for every screen to \a aDate. - * @see GetDate() - * @param aDate The date string to set for each screen. - */ - void SetDate( const wxString& aDate = GenDate() ); - /** * Function DeleteAllMarkers * deletes all electronic rules check markers of \a aMarkerType from all the screens in diff --git a/include/class_title_block.h b/include/class_title_block.h index 59c66eba1b..efbe13599c 100644 --- a/include/class_title_block.h +++ b/include/class_title_block.h @@ -30,9 +30,6 @@ class OUTPUTFORMATTER; struct IO_ERROR; -extern wxString GenDate(); - - /** * Class TITLE_BLOCK * holds the information shown in the lower right corner of a plot, printout, or @@ -54,7 +51,7 @@ public: * Function SetDate * sets the date field, and defaults to the current time and date. */ - void SetDate( const wxString& aDate = GenDate() ) { m_date = aDate; } + void SetDate( const wxString& aDate ) { m_date = aDate; } const wxString& GetDate() const { return m_date; } void SetRevision( const wxString& aRevision ) { m_revision = aRevision; } diff --git a/include/common.h b/include/common.h index d2a27d1f9b..b321f6e45e 100644 --- a/include/common.h +++ b/include/common.h @@ -620,13 +620,6 @@ double RoundTo0( double x, double precision ); */ wxArrayString* wxStringSplit( wxString aString, wxChar aSplitter ); -/** - * Function GenDate - * @return A wxString object containing the date in the format "day month year" like - * "23 jun 2005". - */ -wxString GenDate(); - /** * Function GetRunningMicroSecs * returns an ever increasing indication of elapsed microseconds. Use this @@ -635,4 +628,13 @@ wxString GenDate(); */ unsigned GetRunningMicroSecs(); +/** + * Formats a wxDateTime using the long date format (on wx 2.9) or + * an hardcoded format in wx 2.8; the idea is to avoid like the plague + * the numeric-only date formats: it's difficult to discriminate between + * dd/mm/yyyy and mm/dd/yyyy. The output is meant for user consumption + * so no attempt to parse it should be done + */ +wxString FormatDateLong( const wxDateTime &aDate ); + #endif // INCLUDE__COMMON_H_ diff --git a/pcbnew/basepcbframe.cpp b/pcbnew/basepcbframe.cpp index 3e9ee74e58..fc7d20a57d 100644 --- a/pcbnew/basepcbframe.cpp +++ b/pcbnew/basepcbframe.cpp @@ -738,9 +738,6 @@ void PCB_BASE_FRAME::OnModify() { GetScreen()->SetModify(); GetScreen()->SetSave(); - - wxASSERT( m_Pcb ); - m_Pcb->GetTitleBlock().SetDate(); } diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 9be8af1641..9e16cfdfdc 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -491,15 +491,6 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF } } - // If changes are made, update the board date - if( GetScreen()->IsModify() ) - { - TITLE_BLOCK tb = GetTitleBlock(); - - tb.SetDate(); - SetTitleBlock( tb ); - } - if( !IsWritable( pcbFileName ) ) return false;