Not Logged In
|
Login
|
Register
Home
|
News
|
Projects
|
Releases
Bugs
|
RFE
|
Repositories
|
Help
projects
/
xestiaab
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Capitalise Bitmaps and Tools directories
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditorCalAdr.cpp
diff --git
a/source/contacteditor/frmContactEditorCalAdr.cpp
b/source/contacteditor/frmContactEditorCalAdr.cpp
index
f690811
..
c900b7c
100644
(file)
--- a/
source/contacteditor/frmContactEditorCalAdr.cpp
+++ b/
source/contacteditor/frmContactEditorCalAdr.cpp
@@
-24,25
+24,25
@@
frmContactEditorCalAdr::frmContactEditorCalAdr( wxWindow* parent )
:
frmContactEditorCalAdrADT( parent )
{
:
frmContactEditorCalAdrADT( parent )
{
+
+ // Setup the window.
+
EditorMode = FALSE;
EditorMode = FALSE;
- sliPriority->Disable();
+ priorityCtrl = new XABPriorityCtrl(tabGeneral);
+ szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+ szrGeneral->Layout();
cmbType->Append(wxT(""));
cmbType->Append(_("Home"));
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 )
{
}
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
{
+
+ // Process action.
+
long ListCtrlIndex;
if (EditorMode == FALSE){
long ListCtrlIndex;
if (EditorMode == FALSE){
@@
-75,9
+75,9
@@
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
// Setup Calendar Priority.
// Setup Calendar Priority.
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex,
sliPriority
->GetValue()));
+ CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex,
priorityCtrl
->GetValue()));
} else {
} else {
@@
-96,9
+96,9
@@
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 1, strValue);
CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 1, strValue);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"),
sliPriority
->GetValue()));
+ CalAdrListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"),
priorityCtrl
->GetValue()));
}
}
@@
-135,9
+135,9
@@
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
CalAdrListPrefPtr->erase(CalAdrListIndex);
CalAdrListPrefPtr->erase(CalAdrListIndex);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex,
sliPriority
->GetValue()));
+ CalAdrListPrefPtr->insert(std::make_pair(CalAdrListIndex,
priorityCtrl
->GetValue()));
} else {
} else {
@@
-158,9
+158,9
@@
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
CalAdrListCtrlPtr->SetItem(longSelected, 0, txtAddress->GetValue());
CalAdrListCtrlPtr->SetItem(longSelected, 1, strValue);
CalAdrListCtrlPtr->SetItem(longSelected, 0, txtAddress->GetValue());
CalAdrListCtrlPtr->SetItem(longSelected, 1, strValue);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"),
sliPriority
->GetValue()));
+ CalAdrListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"),
priorityCtrl
->GetValue()));
} else {
} else {
@@
-171,10
+171,14
@@
void frmContactEditorCalAdr::ProcessAction( wxCommandEvent& event )
this->Close();
}
this->Close();
}
+
}
void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
{
}
void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
{
+
+ // Set the editor mode.
+
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
// Set if the editor is adding or editing an address.
// FALSE = Add
// TRUE = Edit
@@
-213,7
+217,8
@@
void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
striter = CalAdrListTypePtr->find(CalAdrListIndex);
striter = CalAdrListTypePtr->find(CalAdrListIndex);
- if (striter->first == CalAdrListIndex){
+ if (striter->first == CalAdrListIndex &&
+ striter != CalAdrListTypePtr->end()){
strValue = striter->second;
strValue = striter->second;
@@
-237,11
+242,11
@@
void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
intiter = CalAdrListPrefPtr->find(CalAdrListIndex);
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);
}
}
@@
-251,7
+256,11
@@
void frmContactEditorCalAdr::SetEditorMode(bool EditMode)
void frmContactEditorCalAdr::CloseWindow( wxCommandEvent& event )
{
void frmContactEditorCalAdr::CloseWindow( wxCommandEvent& event )
{
+
+ // Close the window.
+
this->Close();
this->Close();
+
}
void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
}
void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
@@
-264,6
+273,8
@@
void frmContactEditorCalAdr::SetupPointers(std::map<int, wxString> *CalAdrList,
int CalAdrIndex )
{
int CalAdrIndex )
{
+ // Setup the pointers.
+
CalAdrListPtr = CalAdrList;
CalAdrListAltIDPtr = CalAdrListAltID;
CalAdrListPIDPtr = CalAdrListPID;
CalAdrListPtr = CalAdrList;
CalAdrListAltIDPtr = CalAdrListAltID;
CalAdrListPIDPtr = CalAdrListPID;
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy