X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2Fcontacteditor%2FfrmContactEditorCalAdr.cpp;h=c900b7cadede4ecbaa225961b2b271b9791de10f;hb=134b7476fefe9440a5120b15e3d913afc9c48f04;hp=7865799ed8718a5d3a2d3d6aa11cf32077a87ad0;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git
diff --git a/source/contacteditor/frmContactEditorCalAdr.cpp b/source/contacteditor/frmContactEditorCalAdr.cpp
index 7865799..c900b7c 100644
--- a/source/contacteditor/frmContactEditorCalAdr.cpp
+++ b/source/contacteditor/frmContactEditorCalAdr.cpp
@@ -1,3 +1,21 @@
+// frmContactEditorCalAdr.cpp - frmContactEditorCalAdr form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see
+
#include "frmContactEditorCalAdr.h"
#include
#include "../common/textprocessing.h"
@@ -6,25 +24,25 @@ frmContactEditorCalAdr::frmContactEditorCalAdr( wxWindow* parent )
:
frmContactEditorCalAdrADT( parent )
{
+
+ // Setup the window.
+
EditorMode = FALSE;
- sliPriority->Disable();
+ priorityCtrl = new XABPriorityCtrl(tabGeneral);
+ szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+ szrGeneral->Layout();
cmbType->Append(wxT(""));
cmbType->Append(_("Home"));
- cmbType->Append(_("Work"));
-}
-
-void frmContactEditorCalAdr::EnablePriority( wxCommandEvent& event )
-{
- if (chkUsePref->IsChecked()){
- sliPriority->Enable();
- } else {
- sliPriority->Disable();
- }
+ cmbType->Append(_("Work"));
+
}
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
{
+
+ // Process action.
+
long ListCtrlIndex;
if (EditorMode == FALSE){
@@ -57,9 +75,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
// Setup Calendar Priority.
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, sliPriority->GetValue()));
+ CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, priorityCtrl->GetValue()));
} else {
@@ -78,9 +96,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 1, strValue);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+ CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
}
@@ -117,9 +135,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
CalAdrListPrefPtr->erase(CalAdrListIndex);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, sliPriority->GetValue()));
+ CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex, priorityCtrl->GetValue()));
} else {
@@ -140,9 +158,9 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
CalAdrListCtrlPtr->SetItem(longSelected, 0, txtAddress->GetValue());
CalAdrListCtrlPtr->SetItem(longSelected, 1, strValue);
- if (chkUsePref->IsChecked()){
+ if (priorityCtrl->IsPriorityChecked()){
- CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+ CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
} else {
@@ -153,10 +171,14 @@ void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
this->Close();
}
+
}
void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
{
+
+ // Set the editor mode.
+
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
@@ -195,7 +217,8 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
striter = CalAdrListTypePtr->find(CalAdrListIndex);
- if (striter->first == CalAdrListIndex){
+ if (striter->first == CalAdrListIndex &&
+ striter != CalAdrListTypePtr->end()){
strValue = striter->second;
@@ -219,11 +242,11 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
intiter = CalAdrListPrefPtr->find(CalAdrListIndex);
- if (intiter->first == CalAdrListIndex && intiter->second > 0){
+ if (intiter->first == CalAdrListIndex && intiter->second > 0 &&
+ intiter != CalAdrListPrefPtr->end()){
- sliPriority->SetValue(intiter->second);
- sliPriority->Enable();
- chkUsePref->SetValue(TRUE);
+ priorityCtrl->SetValue(intiter->second);
+ priorityCtrl->EnablePriority(true);
}
@@ -233,7 +256,11 @@ void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
void frmContactEditorCalAdr::CloseWindow( wxCommandEvent& event )
{
+
+ // Close the window.
+
this->Close();
+
}
void frmContactEditorCalAdr::SetupPointers(std::map *CalAdrList,
@@ -246,6 +273,8 @@ void frmContactEditorCalAdr::SetupPointers(std::map *CalAdrList,
int CalAdrIndex )
{
+ // Setup the pointers.
+
CalAdrListPtr = CalAdrList;
CalAdrListAltIDPtr = CalAdrListAltID;
CalAdrListPIDPtr = CalAdrListPID;