nbkWebsite = new wxNotebook( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
tabGeneral = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
- wxFlexGridSizer* fgSizer6;
- fgSizer6 = new wxFlexGridSizer( 0, 2, 0, 0 );
- fgSizer6->AddGrowableCol( 1 );
- fgSizer6->SetFlexibleDirection( wxVERTICAL );
- fgSizer6->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+ szrGeneral = new wxFlexGridSizer( 3, 2, 0, 0 );
+ szrGeneral->AddGrowableCol( 1 );
+ szrGeneral->SetFlexibleDirection( wxBOTH );
+ szrGeneral->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
lblKeyType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Key Type:"), wxDefaultPosition, wxDefaultSize, 0 );
lblKeyType->Wrap( -1 );
- fgSizer6->Add( lblKeyType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+ szrGeneral->Add( lblKeyType, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
wxArrayString cmbKeyMainTypeChoices;
cmbKeyMainType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbKeyMainTypeChoices, 0 );
cmbKeyMainType->SetSelection( 0 );
- fgSizer6->Add( cmbKeyMainType, 0, wxALL, 5 );
+ szrGeneral->Add( cmbKeyMainType, 0, wxALL, 5 );
lblType = new wxStaticText( tabGeneral, wxID_ANY, wxT("Type:"), wxDefaultPosition, wxDefaultSize, 0 );
lblType->Wrap( -1 );
- fgSizer6->Add( lblType, 0, wxALL, 5 );
+ szrGeneral->Add( lblType, 0, wxALL, 5 );
wxArrayString cmbTypeChoices;
cmbType = new wxChoice( tabGeneral, wxID_ANY, wxDefaultPosition, wxDefaultSize, cmbTypeChoices, 0 );
cmbType->SetSelection( 0 );
- fgSizer6->Add( cmbType, 0, wxALL, 5 );
+ szrGeneral->Add( cmbType, 0, 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 );
- nbkWebsite->AddPage( tabGeneral, wxT("General"), false );
+ szrGeneral->Fit( tabGeneral );
+ nbkWebsite->AddPage( tabGeneral, wxT("General"), true );
tabURL = new wxPanel( nbkWebsite, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
wxFlexGridSizer* fgSizer61;
fgSizer61 = new wxFlexGridSizer( 0, 2, 0, 0 );
tabKey->SetSizer( fgSizer62 );
tabKey->Layout();
fgSizer62->Fit( tabKey );
- nbkWebsite->AddPage( tabKey, wxT("Key"), true );
+ nbkWebsite->AddPage( tabKey, wxT("Key"), false );
bSizer251->Add( nbkWebsite, 1, wxEXPAND | wxALL, 5 );
// Connect Events
cmbKeyMainType->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessKeyType ), NULL, this );
- chkUsePref->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::EnablePriority ), NULL, this );
cmbURL->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertURLType ), NULL, this );
cmbKeyType->Connect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertKeyType ), NULL, this );
btnAction->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessAction ), NULL, this );
{
// Disconnect Events
cmbKeyMainType->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessKeyType ), NULL, this );
- chkUsePref->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::EnablePriority ), NULL, this );
cmbURL->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertURLType ), NULL, this );
cmbKeyType->Disconnect( wxEVT_COMMAND_COMBOBOX_SELECTED, wxCommandEventHandler( frmContactEditorKeyADT::ConvertKeyType ), NULL, this );
btnAction->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( frmContactEditorKeyADT::ProcessAction ), NULL, this );