X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2Fcontacteditor%2FfrmContactEditorNotes.cpp;h=ee8693c5573d374e9d411d30cd4f0e51b3127a0a;hb=76214fdd5e820c60a468a62fa586749102310f21;hp=0dbfb7863b59c59aa3e8de1abf6bfda3aeba0896;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6;p=xestiaab%2F.git
diff --git a/source/contacteditor/frmContactEditorNotes.cpp b/source/contacteditor/frmContactEditorNotes.cpp
index 0dbfb78..ee8693c 100644
--- a/source/contacteditor/frmContactEditorNotes.cpp
+++ b/source/contacteditor/frmContactEditorNotes.cpp
@@ -17,28 +17,40 @@
// with Xestia Address Book. If not, see
#include "frmContactEditorNotes.h"
-#include "../common/textprocessing.h"
-#include
frmContactEditorNotes::frmContactEditorNotes( wxWindow* parent )
:
frmContactEditorNotesADT( parent )
{
+
+ // Setup the editor window.
+
EditorMode = FALSE;
- sliPriority->Disable();
-}
-
-void frmContactEditorNotes::EnablePriority( wxCommandEvent& event )
-{
- if (chkUsePref->IsChecked()){
- sliPriority->Enable();
- } else {
- sliPriority->Disable();
+ priorityCtrl = new XABPriorityCtrl(tabPriority);
+ szrPriority->Add(priorityCtrl, 1, wxEXPAND, 5);
+ szrPriority->Layout();
+
+ // Setup the language combo box.
+
+ std::vector LanguageCodeList = GetLanguageCodeList();
+
+ wxArrayString LanguageList;
+
+ for (auto LanguageItem : LanguageCodeList){
+
+ LanguageList.Add((wxString)LanguageItem, 1);
+
}
+
+ cmbLanguage->Append(LanguageList);
+
}
void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
{
+
+ // Process action.
+
long ListCtrlIndex;
if (EditorMode == FALSE){
@@ -70,9 +82,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
// Add note priority.
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NotesListPrefPtr->insert(std::make_pair(NotesListIndex, sliPriority->GetValue()));
+ NotesListPrefPtr->insert(std::make_pair(NotesListIndex, priorityCtrl->GetValue()));
} else {
@@ -103,9 +115,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
coldata.SetText(txtNote->GetValue());
ListCtrlIndex = NotesListCtrlPtr->InsertItem(coldata);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NotesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+ NotesListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
}
@@ -128,9 +140,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
NotesListPrefPtr->erase(NotesListIndex);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NotesListPrefPtr->insert(std::make_pair(NotesListIndex, sliPriority->GetValue()));
+ NotesListPrefPtr->insert(std::make_pair(NotesListIndex, priorityCtrl->GetValue()));
} else {
@@ -166,9 +178,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
NotesListCtrlPtr->SetItem(longSelected, 0, txtNote->GetValue());
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- NotesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+ NotesListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
} else {
@@ -184,6 +196,9 @@ void frmContactEditorNotes::ProcessAction( wxCommandEvent& event )
void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
{
+
+ // Set the editor mode.
+
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
@@ -220,7 +235,10 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
striter = NotesListLangPtr->find(NotesListIndex);
- if (striter->first == NotesListIndex){
+ strValue.clear();
+
+ if (striter->first == NotesListIndex &&
+ striter != NotesListLangPtr->end()){
strValue = striter->second;
@@ -232,11 +250,11 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
intiter = NotesListPrefPtr->find(NotesListIndex);
- if (intiter->first == NotesListIndex && intiter->second > 0){
+ if (intiter->first == NotesListIndex && intiter->second > 0 &&
+ intiter != NotesListPrefPtr->end()){
- sliPriority->SetValue(intiter->second);
- sliPriority->Enable();
- chkUsePref->SetValue(TRUE);
+ priorityCtrl->SetValue(intiter->second);
+ priorityCtrl->EnablePriority(true);
}
@@ -248,7 +266,11 @@ void frmContactEditorNotes::SetEditorMode(bool EditMode, SectionType SectType)
void frmContactEditorNotes::CloseWindow( wxCommandEvent& event )
{
+
+ // Close the window.
+
this->Close();
+
}
@@ -263,6 +285,8 @@ void frmContactEditorNotes::SetupPointers(std::map *NotesList,
int NotesIndex )
{
+ // Setup the pointers.
+
NotesListPtr = NotesList;
NotesListLangPtr = NotesListLang;
NotesListAltIDPtr = NotesListAltID;