← Back to branch summary

~cern-kicad/kicad/kicad-pns-tom

« back to all changes in this revision

Viewing changes to common/dialogs/dialog_page_settings_base.cpp

  • Committer: Maciej Suminski
  • Date: 2013-08-02 13:57:24 UTC
  • mfrom: (4024.1.238 kicad)
  • mto: This revision was merged to the branch mainline in revision 4221.
  • Revision ID: maciej.suminski@cern.ch-20130802135724-gix6orezshkukodv
Upstream merge.

Show diffs side-by-side

added added

removed removed

Lines of Context:
common/dialogs/dialog_page_settings_base.cpp
139
139
        
140
140
        m_staticTextDate = new wxStaticText( this, wxID_ANY, _("Issue Date"), wxDefaultPosition, wxDefaultSize, 0 );
141
141
        m_staticTextDate->Wrap( -1 );
142
 
        bSizerDate->Add( m_staticTextDate, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
142
        bSizerDate->Add( m_staticTextDate, 0, wxRIGHT|wxLEFT, 5 );
143
143
        
144
144
        wxBoxSizer* bSizerissuedate;
145
145
        bSizerissuedate = new wxBoxSizer( wxHORIZONTAL );
195
195
        
196
196
        m_staticTextTitle = new wxStaticText( this, wxID_ANY, _("Title"), wxDefaultPosition, wxDefaultSize, 0 );
197
197
        m_staticTextTitle->Wrap( -1 );
198
 
        bSizerTitle->Add( m_staticTextTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
198
        bSizerTitle->Add( m_staticTextTitle, 0, wxRIGHT|wxLEFT, 5 );
199
199
        
200
200
        wxBoxSizer* bSizer12;
201
201
        bSizer12 = new wxBoxSizer( wxHORIZONTAL );
220
220
        
221
221
        m_staticText13 = new wxStaticText( this, wxID_ANY, _("Company"), wxDefaultPosition, wxDefaultSize, 0 );
222
222
        m_staticText13->Wrap( -1 );
223
 
        bSizerCompany->Add( m_staticText13, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
223
        bSizerCompany->Add( m_staticText13, 0, wxRIGHT|wxLEFT, 5 );
224
224
        
225
225
        wxBoxSizer* bSizer14;
226
226
        bSizer14 = new wxBoxSizer( wxHORIZONTAL );
245
245
        
246
246
        m_staticTextComment1 = new wxStaticText( this, wxID_ANY, _("Comment1"), wxDefaultPosition, wxDefaultSize, 0 );
247
247
        m_staticTextComment1->Wrap( -1 );
248
 
        bSizerComment1->Add( m_staticTextComment1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
248
        bSizerComment1->Add( m_staticTextComment1, 0, wxRIGHT|wxLEFT, 5 );
249
249
        
250
250
        wxBoxSizer* bSizercmt1;
251
251
        bSizercmt1 = new wxBoxSizer( wxHORIZONTAL );
270
270
        
271
271
        m_staticTextComment2 = new wxStaticText( this, wxID_ANY, _("Comment2"), wxDefaultPosition, wxDefaultSize, 0 );
272
272
        m_staticTextComment2->Wrap( -1 );
273
 
        bSizerComment2->Add( m_staticTextComment2, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
273
        bSizerComment2->Add( m_staticTextComment2, 0, wxRIGHT|wxLEFT, 5 );
274
274
        
275
275
        wxBoxSizer* bSizercmt2;
276
276
        bSizercmt2 = new wxBoxSizer( wxHORIZONTAL );
295
295
        
296
296
        m_staticTextComment3 = new wxStaticText( this, wxID_ANY, _("Comment3"), wxDefaultPosition, wxDefaultSize, 0 );
297
297
        m_staticTextComment3->Wrap( -1 );
298
 
        bSizerComment12->Add( m_staticTextComment3, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
298
        bSizerComment12->Add( m_staticTextComment3, 0, wxRIGHT|wxLEFT, 5 );
299
299
        
300
300
        wxBoxSizer* bSizercmt3;
301
301
        bSizercmt3 = new wxBoxSizer( wxHORIZONTAL );
320
320
        
321
321
        m_staticTextComment4 = new wxStaticText( this, wxID_ANY, _("Comment4"), wxDefaultPosition, wxDefaultSize, 0 );
322
322
        m_staticTextComment4->Wrap( -1 );
323
 
        bSizerComment4->Add( m_staticTextComment4, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
 
323
        bSizerComment4->Add( m_staticTextComment4, 0, wxRIGHT|wxLEFT, 5 );
324
324
        
325
325
        wxBoxSizer* bSizercmt4;
326
326
        bSizercmt4 = new wxBoxSizer( wxHORIZONTAL );
340
340
        
341
341
        bSizerRight->Add( bSizerComment4, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
342
342
        
 
343
        wxBoxSizer* bSizerFilename;
 
344
        bSizerFilename = new wxBoxSizer( wxVERTICAL );
 
345
        
 
346
        m_staticTextfilename = new wxStaticText( this, wxID_ANY, _("Page layout file description"), wxDefaultPosition, wxDefaultSize, 0 );
 
347
        m_staticTextfilename->Wrap( -1 );
 
348
        bSizerFilename->Add( m_staticTextfilename, 0, wxRIGHT|wxLEFT, 5 );
 
349
        
 
350
        wxBoxSizer* bSizerfileSelection;
 
351
        bSizerfileSelection = new wxBoxSizer( wxHORIZONTAL );
 
352
        
 
353
        m_filePicker = new wxFilePickerCtrl( this, wxID_ANY, wxEmptyString, _("Select a file"), wxT("*.kicad_wks"), wxDefaultPosition, wxDefaultSize, wxFLP_OPEN|wxFLP_USE_TEXTCTRL );
 
354
        bSizerfileSelection->Add( m_filePicker, 1, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
355
        
 
356
        
 
357
        bSizerFilename->Add( bSizerfileSelection, 1, wxEXPAND, 5 );
 
358
        
 
359
        
 
360
        bSizerRight->Add( bSizerFilename, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
361
        
343
362
        
344
363
        bUpperSizerH->Add( bSizerRight, 1, wxEXPAND, 5 );
345
364
        
360
379
        this->Layout();
361
380
        
362
381
        // Connect Events
363
 
        this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) );
364
382
        m_paperSizeComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this );
365
383
        m_orientationComboBox->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this );
366
384
        m_TextUserSizeY->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeYTextUpdated ), NULL, this );
375
393
        m_TextComment2->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this );
376
394
        m_TextComment3->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this );
377
395
        m_TextComment4->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this );
 
396
        m_filePicker->Connect( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnWksFileSelection ), NULL, this );
378
397
        m_sdbSizer1Cancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this );
379
398
        m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this );
380
399
}
382
401
DIALOG_PAGES_SETTINGS_BASE::~DIALOG_PAGES_SETTINGS_BASE()
383
402
{
384
403
        // Disconnect Events
385
 
        this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCloseWindow ) );
386
404
        m_paperSizeComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPaperSizeChoice ), NULL, this );
387
405
        m_orientationComboBox->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnPageOrientationChoice ), NULL, this );
388
406
        m_TextUserSizeY->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnUserPageSizeYTextUpdated ), NULL, this );
397
415
        m_TextComment2->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment2TextUpdated ), NULL, this );
398
416
        m_TextComment3->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment3TextUpdated ), NULL, this );
399
417
        m_TextComment4->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnComment4TextUpdated ), NULL, this );
 
418
        m_filePicker->Disconnect( wxEVT_COMMAND_FILEPICKER_CHANGED, wxFileDirPickerEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnWksFileSelection ), NULL, this );
400
419
        m_sdbSizer1Cancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnCancelClick ), NULL, this );
401
420
        m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PAGES_SETTINGS_BASE::OnOkClick ), NULL, this );
402
421