frmContactEditor(*): Call Layout on szrGeneral after adding priorty control

[xestiaab/.git] / source / contacteditor / frmContactEditorNickname.cpp

diff --git a/source/contacteditor/frmContactEditorNickname.cpp b/source/contacteditor/frmContactEditorNickname.cpp
index 9c909a9..6af836b 100644 (file)
--- a/source/contacteditor/frmContactEditorNickname.cpp
+++ b/source/contacteditor/frmContactEditorNickname.cpp
@@ -17,13 +17,28 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include "frmContactEditorNickname.h"
-#include "../common/textprocessing.h"
 
 frmContactEditorNickname::frmContactEditorNickname( wxWindow* parent )
 :
 frmContactEditorNicknameADT( parent )
 {
 
+       std::vector<std::string> LanguageCodeList = GetLanguageCodeList();
+       
+       wxArrayString LanguageList;
+       
+       for (auto LanguageItem : LanguageCodeList){
+               
+               LanguageList.Add((wxString)LanguageItem, 1);
+               
+       }
+       
+       cmbLanguage->Append(LanguageList);
+       
+       priorityCtrl = new XABPriorityCtrl(tabGeneral);
+       szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+       szrGeneral->Layout();
+       
 }
 
 void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
@@ -31,19 +46,6 @@ void frmContactEditorNickname::InitAddressEditor( wxInitDialogEvent& event )
        // Do nothing with this subroutine for the time being.
 }
 
-void frmContactEditorNickname::EnablePriority( wxCommandEvent& event )
-{
-       
-       // Enable/disable the priority.
-       
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
-       
-}
-
 void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
 {
        
@@ -83,15 +85,15 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
                
                // Add nickname priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, sliPriority->GetValue()));
+                       NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, priorityCtrl->GetValue()));
                
                } else {
                
                        NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, 0));            
                
-               }               
+               }
                
                // Add the data to the form.
                
@@ -102,9 +104,9 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
                coldata.SetText(txtNickname->GetValue());
                ListCtrlIndex = NicknamesListCtrlPtr->InsertItem(coldata);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NicknamesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       NicknamesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }
                
@@ -123,9 +125,9 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
                
                NicknamesListPrefPtr->erase(NicknamesListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, sliPriority->GetValue()));
+                       NicknamesListPrefPtr->insert(std::make_pair(NicknamesListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -146,15 +148,15 @@ void frmContactEditorNickname::ProcessData( wxCommandEvent& event )
                
                NicknamesListCtrlPtr->SetItem(longSelected, 0, txtNickname->GetValue());
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       NicknamesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       NicknamesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
                        NicknamesListCtrlPtr->SetItem(longSelected, 1, wxT(""));
                
-               }       
+               }
                        
                this->Close();
        
@@ -227,9 +229,8 @@ void frmContactEditorNickname::SetEditorMode(bool EditMode, SectionType SectType
                if (intiter->first == NicknamesListIndex && intiter->second > 0 &&
                        intiter != NicknamesListPrefPtr->end()){
                
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }