nbkOrganisation = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
tabGeneral = new wxPanel( nbkOrganisation, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxFlexGridSizer* fgSizer6;
- fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
- fgSizer6->AddGrowableCol( 1 );
- fgSizer6->SetFlexibleDirection( wxBOTH );
- fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+ szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+ szrGeneral->AddGrowableCol( 1 );
+ szrGeneral->SetFlexibleDirection( wxBOTH );
+ szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
lblOrganisation = new wxStaticText( tabGeneral, wxID_ANY, wxT("Organisation:"), wxDefaultPosition, wxDefaultSize, 0 );
lblOrganisation->Wrap( -1 );
- fgSizer6->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ szrGeneral->Add( lblOrganisation, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
txtOrganisation = new wxTextCtrl( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
- fgSizer6->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 );
+ szrGeneral->Add( txtOrganisation, 0, wxALL|wxEXPAND, 5 );
lblSortAs = new wxStaticText( tabGeneral, wxID_ANY, wxT("Sort As:"), wxDefaultPosition, wxDefaultSize, 0 );
lblSortAs->Wrap( -1 );
- fgSizer6->Add( lblSortAs, 0, wxALL, 5 );
+ szrGeneral->Add( lblSortAs, 0, wxALL, 5 );
cmbSortAs = new wxComboBox( tabGeneral, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0, NULL, 0 );
- fgSizer6->Add( cmbSortAs, 1, wxALL, 5 );
+ szrGeneral->Add( cmbSortAs, 1, wxALL, 5 );
lblPriority = new wxStaticText( tabGeneral, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
lblPriority->Wrap( -1 );
- fgSizer6->Add( lblPriority, 0, wxALL, 5 );
-
- wxBoxSizer* bSizer260;
- bSizer260 = new wxBoxSizer( wxHORIZONTAL );
-
- chkUsePref = new wxCheckBox( tabGeneral, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer260->Add( chkUsePref, 0, wxALL, 5 );
-
- wxBoxSizer* bSizer254;
- bSizer254 = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* bSizer256;
- bSizer256 = new wxBoxSizer( wxHORIZONTAL );
-
- sliPriority = new wxSlider( tabGeneral, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
- bSizer256->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-
-
- bSizer254->Add( bSizer256, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizer255;
- bSizer255 = new wxBoxSizer( wxHORIZONTAL );
-
- lblHigh = new wxStaticText( tabGeneral, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
- lblHigh->Wrap( -1 );
- bSizer255->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-
-
- bSizer255->Add( 0, 0, 1, wxEXPAND, 5 );
-
- lblLow = new wxStaticText( tabGeneral, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
- lblLow->Wrap( -1 );
- bSizer255->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-
-
- bSizer254->Add( bSizer255, 1, wxEXPAND, 0 );
-
-
- bSizer260->Add( bSizer254, 1, wxEXPAND, 5 );
-
-
- fgSizer6->Add( bSizer260, 1, wxEXPAND, 5 );
-
-
- fgSizer6->Add( 0, 0, 1, wxEXPAND, 5 );
+ szrGeneral->Add( lblPriority, 0, wxALL, 5 );
- tabGeneral->SetSizer( fgSizer6 );
+ tabGeneral->SetSizer( szrGeneral );
tabGeneral->Layout();
- fgSizer6->Fit( tabGeneral );
+ szrGeneral->Fit( tabGeneral );
nbkOrganisation->AddPage( tabGeneral, wxT("General"), false );
bSizer251->Add( nbkOrganisation, 1, wxEXPAND | wxALL, 5 );
// Connect Events
txtOrganisation->Connect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmContactEditorOrganisationsADT::UpdateSortAs ), NULL, this );
- chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::EnablePriority ), NULL, this );
btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::ProcessAction ), NULL, this );
btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::CloseWindow ), NULL, this );
}
{
// Disconnect Events
txtOrganisation->Disconnect( wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler( frmContactEditorOrganisationsADT::UpdateSortAs ), NULL, this );
- chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::EnablePriority ), NULL, this );
btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::ProcessAction ), NULL, this );
btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorOrganisationsADT::CloseWindow ), NULL, this );
tabGeneral->SetSizer( bSizer353 );
tabGeneral->Layout();
bSizer353->Fit( tabGeneral );
- nbkNotes->AddPage( tabGeneral, wxT("General"), true );
+ nbkNotes->AddPage( tabGeneral, wxT("General"), false );
tabPriority = new wxPanel( nbkNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxFlexGridSizer* fgSizer61;
- fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );
- fgSizer61->AddGrowableCol( 1 );
- fgSizer61->SetFlexibleDirection( wxVERTICAL );
- fgSizer61->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-
- lblPriority = new wxStaticText( tabPriority, wxID_ANY, wxT("Priority:"), wxDefaultPosition, wxDefaultSize, 0 );
- lblPriority->Wrap( -1 );
- fgSizer61->Add( lblPriority, 0, wxALL, 5 );
-
- wxBoxSizer* bSizer2601;
- bSizer2601 = new wxBoxSizer( wxHORIZONTAL );
-
- chkUsePref = new wxCheckBox( tabPriority, wxID_ANY, wxT("Use"), wxDefaultPosition, wxDefaultSize, 0 );
- bSizer2601->Add( chkUsePref, 0, wxALL, 5 );
-
- wxBoxSizer* bSizer2541;
- bSizer2541 = new wxBoxSizer( wxVERTICAL );
-
- wxBoxSizer* bSizer2561;
- bSizer2561 = new wxBoxSizer( wxHORIZONTAL );
-
- sliPriority = new wxSlider( tabPriority, wxID_ANY, 0, 1, 100, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS );
- bSizer2561->Add( sliPriority, 1, wxALL|wxEXPAND, 5 );
-
-
- bSizer2541->Add( bSizer2561, 1, wxEXPAND, 5 );
-
- wxBoxSizer* bSizer2551;
- bSizer2551 = new wxBoxSizer( wxHORIZONTAL );
-
- lblHigh = new wxStaticText( tabPriority, wxID_ANY, wxT("High"), wxDefaultPosition, wxDefaultSize, 0 );
- lblHigh->Wrap( -1 );
- bSizer2551->Add( lblHigh, 0, wxALIGN_LEFT|wxALL, 5 );
-
-
- bSizer2551->Add( 0, 0, 1, wxEXPAND, 5 );
-
- lblLow = new wxStaticText( tabPriority, wxID_ANY, wxT("Low"), wxDefaultPosition, wxDefaultSize, 0 );
- lblLow->Wrap( -1 );
- bSizer2551->Add( lblLow, 0, wxALIGN_RIGHT|wxALL, 5 );
-
-
- bSizer2541->Add( bSizer2551, 1, wxEXPAND, 0 );
-
-
- bSizer2601->Add( bSizer2541, 1, wxEXPAND, 5 );
-
-
- fgSizer61->Add( bSizer2601, 1, wxEXPAND, 5 );
-
-
- fgSizer61->Add( 0, 0, 1, wxEXPAND, 5 );
+ szrPriority = new wxFlexGridSizer( 1, 1, 0, 0 );
+ szrPriority->SetFlexibleDirection( wxBOTH );
+ szrPriority->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
- tabPriority->SetSizer( fgSizer61 );
+ tabPriority->SetSizer( szrPriority );
tabPriority->Layout();
- fgSizer61->Fit( tabPriority );
- nbkNotes->AddPage( tabPriority, wxT("Priority"), false );
+ szrPriority->Fit( tabPriority );
+ nbkNotes->AddPage( tabPriority, wxT("Priority"), true );
tabLanguage = new wxPanel( nbkNotes, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxFlexGridSizer* fgSizer611;
fgSizer611 = new wxFlexGridSizer( 0, 2, 0, 0 );
this->Centre( wxBOTH );
// Connect Events
- chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::EnablePriority ), NULL, this );
btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::ProcessAction ), NULL, this );
btnClose->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::CloseWindow ), NULL, this );
}
frmContactEditorNotesADT::~frmContactEditorNotesADT()
{
// Disconnect Events
- chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::EnablePriority ), NULL, this );
btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::ProcessAction ), NULL, this );
btnClose->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorNotesADT::CloseWindow ), NULL, this );