Commit 6aba45eb authored by charras's avatar charras
Browse files

German translation update. Replaced dialog page settings dialogblock version... 

German translation update. Replaced dialog page settings dialogblock version by the same built with wxFormBuilder
parent bdb0ca80

CHANGELOG.txt

+6 −1
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ KiCad ChangeLog 2010 
Please add newer entries at the top, list the date and your name with

email address.



2010-mar-13 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++ All:

    Stable verion for kicad release



2010-mar-10 UPDATE Jean-Pierre Charras <jean-pierre.charras@gipsa-lab.inpg.fr>

================================================================================

++Pcbnew:

common/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ set(COMMON_SRCS 
    dialog_display_info_HTML_base.cpp

    dialog_load_error.cpp

    dcsvg.cpp

    dialog_page_settings_base.cpp

    displlst.cpp

    dlist.cpp

    drawframe.cpp

common/dialog_page_settings.cpp

0 → 100644
+267 −0
Original line number Diff line number Diff line 
/////////////////////////////////////////////////////////////////////////////

// Name:        dialog_page_settings.cpp

/////////////////////////////////////////////////////////////////////////////



/* The "Page Settings" dialog box created by this file (and setpage.h)

 * contains seven checkboxes which *are* shown when that dialog box is

 * invoked in EESchema, but which are *not* shown when that dialog box is

 * invoked in Pcbnew instead.

 */



#include "fctsys.h"

#include "common.h"

#include "base_struct.h"

#include "class_drawpanel.h"

#include "class_base_screen.h"

#include "wxstruct.h"



#include "wx/valgen.h"



#ifdef EESCHEMA

#include "program.h"

#include "general.h"

#endif



#include "dialog_page_settings.h"



#define NB_ITEMS 11

Ki_PageDescr * SheetList[NB_ITEMS + 1] =

{

    &g_Sheet_A4, &g_Sheet_A3, &g_Sheet_A2, &g_Sheet_A1, &g_Sheet_A0,

    &g_Sheet_A, &g_Sheet_B, &g_Sheet_C, &g_Sheet_D, &g_Sheet_E,

    &g_Sheet_user, NULL

};







/******************************************************************/

void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event)

/******************************************************************/

/* Creation de la fenetre de configuration

 */

{

    DIALOG_PAGES_SETTINGS frame(this);

    int diag = frame.ShowModal();

    if ( DrawPanel && diag )

        DrawPanel->Refresh();

}





DIALOG_PAGES_SETTINGS::DIALOG_PAGES_SETTINGS( WinEDA_DrawFrame* parent ):

    DIALOG_PAGES_SETTINGS_BASE( parent )

{

    m_Parent = parent;

    m_Screen = m_Parent->GetBaseScreen();

    m_Modified = 0;

    m_SelectedSheet = NULL;

    m_CurrentSelection = 0;



    initDialog( );



    GetSizer()->SetSizeHints(this);

    Centre();

}



DIALOG_PAGES_SETTINGS::~DIALOG_PAGES_SETTINGS()

{

}



void DIALOG_PAGES_SETTINGS::initDialog()

{

    wxString msg;



    SetFocus();

    SearchPageSizeSelection();



    // Init display value for sheet User size

    wxString format = m_TextSheetCount->GetLabel();

    msg.Printf(format, m_Screen->m_NumberOfScreen);

    m_TextSheetCount->SetLabel(msg);

    format = m_TextSheetNumber->GetLabel();

    msg.Printf(format, m_Screen->m_ScreenNumber);

    m_TextSheetNumber->SetLabel(msg);



    if( g_UnitMetric )

    {

        UserSizeX = (double)g_Sheet_user.m_Size.x * 25.4 / 1000;

        UserSizeY = (double)g_Sheet_user.m_Size.y * 25.4 / 1000;

        msg.Printf( wxT("%.2f"), UserSizeX );

        m_TextUserSizeX->SetValue(msg);

        msg.Printf( wxT("%.2f"), UserSizeY );

        m_TextUserSizeY->SetValue(msg);

    }

    else

    {

        UserSizeX = (double)g_Sheet_user.m_Size.x / 1000;

        UserSizeY = (double)g_Sheet_user.m_Size.y / 1000;

        msg.Printf( wxT("%.3f"), UserSizeX );

        m_TextUserSizeX->SetValue(msg);

        msg.Printf( wxT("%.3f"), UserSizeY );

        m_TextUserSizeY->SetValue(msg);

    }

    // Set validators

    m_PageSizeBox->SetValidator( wxGenericValidator(& m_CurrentSelection) );

    m_TextRevision->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Revision) );

    m_TextTitle->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Title) );

    m_TextCompany->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Company) );

    m_TextComment1->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire1) );

    m_TextComment2->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire2) );

    m_TextComment3->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire3) );

    m_TextComment4->SetValidator( wxTextValidator(wxFILTER_NONE, & m_Screen->m_Commentaire4) );



#ifndef EESCHEMA

        m_RevisionExport->Show(false);

        m_TitleExport->Show(false);

        m_CompanyExport->Show(false);

        m_Comment1Export->Show(false);

        m_Comment2Export->Show(false);

        m_Comment3Export->Show(false);

        m_Comment4Export->Show(false);

#endif

}





/*!

 * wxEVT_CLOSE_WINDOW event handler for ID_DIALOG

 */



void DIALOG_PAGES_SETTINGS::OnCloseWindow( wxCloseEvent& event )

{

    EndModal( m_Modified );

}





/*!

 * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK

 */



void DIALOG_PAGES_SETTINGS::OnOkClick( wxCommandEvent& event )

{

    SavePageSettings( event );

    m_Modified = 1;

    Close( TRUE );

}





/*!

 * wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL

 */



void DIALOG_PAGES_SETTINGS::OnCancelClick( wxCommandEvent& event )

{

    Close( TRUE );

}





/*****************************************************************/

void DIALOG_PAGES_SETTINGS::SavePageSettings(wxCommandEvent& event)

/*****************************************************************/

/* Mise a jour effective des textes et dimensions

 */

{

    double dtmp;

    wxString msg;



    m_Screen->m_Revision = m_TextRevision->GetValue();

    m_Screen->m_Company = m_TextCompany->GetValue();

    m_Screen->m_Title = m_TextTitle->GetValue();

    m_Screen->m_Commentaire1 = m_TextComment1->GetValue();

    m_Screen->m_Commentaire2 = m_TextComment2->GetValue();

    m_Screen->m_Commentaire3 = m_TextComment3->GetValue();

    m_Screen->m_Commentaire4 = m_TextComment4->GetValue();



    msg = m_TextUserSizeX->GetValue();

    msg.ToDouble(&dtmp);

    UserSizeX = dtmp;

    msg = m_TextUserSizeY->GetValue();

    msg.ToDouble(&dtmp);

    UserSizeY = dtmp;



    int ii = m_PageSizeBox->GetSelection();



    if( ii < 0 )

        ii = 0;



    m_SelectedSheet = SheetList[ii];

    m_Screen->m_CurrentSheetDesc = m_SelectedSheet;



    if( g_UnitMetric )

    {

        g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 / 25.4 );

        g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 / 25.4 );

    }

    else

    {

        g_Sheet_user.m_Size.x = (int)( UserSizeX * 1000 );

        g_Sheet_user.m_Size.y = (int)( UserSizeY * 1000 );

    }



    if( g_Sheet_user.m_Size.x < 6000 )

        g_Sheet_user.m_Size.x = 6000;



    if( g_Sheet_user.m_Size.x > 44000 )

        g_Sheet_user.m_Size.x = 44000;



    if( g_Sheet_user.m_Size.y < 4000 )

        g_Sheet_user.m_Size.y = 4000;



    if( g_Sheet_user.m_Size.y > 44000 )

        g_Sheet_user.m_Size.y = 44000;



#ifdef EESCHEMA

    /* Exports settings to other sheets if requested: */

    SCH_SCREEN * screen;

    /* Build the screen list */

    EDA_ScreenList ScreenList;

    /* Update the datas */

    for( screen = ScreenList.GetFirst(); screen != NULL; screen = ScreenList.GetNext() )

    {

        if( screen == m_Screen )

            continue;



        if( m_RevisionExport->IsChecked() )

            screen->m_Revision = m_Screen->m_Revision;



        if( m_TitleExport->IsChecked() )

            screen->m_Title =m_Screen->m_Title;



        if( m_CompanyExport->IsChecked() )

            screen->m_Company = m_Screen->m_Company;



        if( m_Comment1Export->IsChecked() )

            screen->m_Commentaire1 = m_Screen->m_Commentaire1;



        if( m_Comment2Export->IsChecked() )

            screen->m_Commentaire2 = m_Screen->m_Commentaire2;



        if( m_Comment3Export->IsChecked() )

            screen->m_Commentaire3 = m_Screen->m_Commentaire3;



        if( m_Comment4Export->IsChecked() )

            screen->m_Commentaire4 = m_Screen->m_Commentaire4;

    }

#endif



    m_Screen->SetModify();

    m_Screen->SetRefreshReq();

}





/*******************************************************/

void DIALOG_PAGES_SETTINGS::SearchPageSizeSelection()

/*******************************************************/

/* Search the correct index to activate the radiobox list size selection

 * according to the current page size

 */

{

    Ki_PageDescr * sheet;

    int ii;



    m_CurrentSelection = NB_ITEMS - 1;

    for( ii = 0; ii < NB_ITEMS; ii++ )

    {

        sheet = SheetList[ii];

        if( m_Parent->GetBaseScreen()->m_CurrentSheetDesc == sheet )

            m_CurrentSelection = ii;

    }

}

common/dialog_page_settings.h

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/////////////////////////////////////////////////////////////////////////////

// Name:        setpage.h

/////////////////////////////////////////////////////////////////////////////



#ifndef _DIALOG_PAGES_SETTINGS_H_

#define _DIALOG_PAGES_SETTINGS_H_



#include "dialog_page_settings_base.h"



/*!

 * DIALOG_PAGES_SETTINGS class declaration

 */



class DIALOG_PAGES_SETTINGS: public DIALOG_PAGES_SETTINGS_BASE

{

private:

    WinEDA_DrawFrame *m_Parent;

    BASE_SCREEN * m_Screen;

    int m_Modified;

    Ki_PageDescr * m_SelectedSheet;

    float UserSizeX, UserSizeY;

    int m_CurrentSelection;



public:

    DIALOG_PAGES_SETTINGS( WinEDA_DrawFrame* parent );

    ~DIALOG_PAGES_SETTINGS();



private:

    /// Initialises member variables

    void initDialog();



    /// wxEVT_CLOSE_WINDOW event handler for ID_DIALOG

    void OnCloseWindow( wxCloseEvent& event );



    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_OK

    void OnOkClick( wxCommandEvent& event );



    /// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CANCEL

    void OnCancelClick( wxCommandEvent& event );

    void SearchPageSizeSelection();

    void SavePageSettings(wxCommandEvent& event);

    void ReturnSizeSelected(wxCommandEvent& event);



};



#endif  // _DIALOG_PAGES_SETTINGS_H_

common/dialog_page_settings_base.cpp

0 → 100644
+233 −0
Original line number Diff line number Diff line 
///////////////////////////////////////////////////////////////////////////

// C++ code generated with wxFormBuilder (version Apr 16 2008)

// 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 ) : wxDialog( 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( 6, 1, 0, 0 );

	LeftColumnSizer->AddGrowableRow( 1 );

	LeftColumnSizer->AddGrowableRow( 3 );

	LeftColumnSizer->AddGrowableRow( 4 );

	LeftColumnSizer->AddGrowableRow( 5 );

	LeftColumnSizer->SetFlexibleDirection( wxBOTH );

	LeftColumnSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );

	

	wxString m_PageSizeBoxChoices[] = { _("Size A4"), _("Size A3"), _("Size A2"), _("Size A1"), _("Size A0"), _("Size A"), _("Size B"), _("Size C"), _("Size D"), _("Size E"), _("User size") };

	int m_PageSizeBoxNChoices = sizeof( m_PageSizeBoxChoices ) / sizeof( wxString );

	m_PageSizeBox = new wxRadioBox( this, wxID_ANY, _("wxRadioBox"), wxDefaultPosition, wxDefaultSize, m_PageSizeBoxNChoices, m_PageSizeBoxChoices, 1, wxRA_SPECIFY_COLS );

	m_PageSizeBox->SetSelection( 1 );

	LeftColumnSizer->Add( m_PageSizeBox, 0, wxALL|wxEXPAND, 5 );

	

	

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

	

	wxBoxSizer* bSizerXsize;

	bSizerXsize = new wxBoxSizer( wxVERTICAL );

	

	UserPageSizeX = new wxStaticText( this, wxID_ANY, _("User Page Size X: "), wxDefaultPosition, wxDefaultSize, 0 );

	UserPageSizeX->Wrap( -1 );

	bSizerXsize->Add( UserPageSizeX, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_TextUserSizeX = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_X, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	bSizerXsize->Add( m_TextUserSizeX, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	LeftColumnSizer->Add( bSizerXsize, 1, wxEXPAND, 5 );

	

	wxBoxSizer* bSizerYsize;

	bSizerYsize = new wxBoxSizer( wxVERTICAL );

	

	UserPageSizeY = new wxStaticText( this, wxID_ANY, _("User Page Size Y: "), wxDefaultPosition, wxDefaultSize, 0 );

	UserPageSizeY->Wrap( -1 );

	bSizerYsize->Add( UserPageSizeY, 0, wxTOP|wxRIGHT|wxLEFT, 5 );

	

	m_TextUserSizeY = new wxTextCtrl( this, ID_TEXTCTRL_USER_PAGE_SIZE_Y, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );

	bSizerYsize->Add( m_TextUserSizeY, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );

	

	LeftColumnSizer->Add( bSizerYsize, 1, wxEXPAND, 5 );

	

	

	LeftColumnSizer->Add( 5, 5, 1, wxEXPAND, 5 );

	

	

	LeftColumnSizer->Add( 5, 5, 1, wxEXPAND, 5 );

	

	bUpperSizerH->Add( LeftColumnSizer, 0, 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 );

	

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

	

	RightColumnSizer->Add( SheetInfoSizer, 1, 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, wxALL, 5 );

	

	RightColumnSizer->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( 400,-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 );

	

	RightColumnSizer->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( 400,-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 );

	

	RightColumnSizer->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( 400,-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 );

	

	RightColumnSizer->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( 400,-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 );

	

	RightColumnSizer->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( 400,-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 );

	

	RightColumnSizer->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( 400,-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 );

	

	RightColumnSizer->Add( Comment4Sizer, 1, wxEXPAND, 5 );

	

	bUpperSizerH->Add( RightColumnSizer, 1, 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, wxEXPAND|wxALIGN_RIGHT|wxALL, 5 );

	

	this->SetSizer( bMainSizer );

	this->Layout();

	

	// Connect Events

	this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) );

	m_TextUserSizeX->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeXTextUpdated ), NULL, this );

	m_TextUserSizeY->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeYTextUpdated ), NULL, this );

	m_TitleExport->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), 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_TextUserSizeX->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeXTextUpdated ), NULL, this );

	m_TextUserSizeY->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnTextctrlUserPageSizeYTextUpdated ), NULL, this );

	m_TitleExport->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCheckboxTitleClick ), 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 );

}