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
CommonFunctions Unit Tests: Split ConvertToHTML tests
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditorOrganisations.cpp
diff --git
a/source/contacteditor/frmContactEditorOrganisations.cpp
b/source/contacteditor/frmContactEditorOrganisations.cpp
index
fa0ca45
..
2f67cb4
100644
(file)
--- a/
source/contacteditor/frmContactEditorOrganisations.cpp
+++ b/
source/contacteditor/frmContactEditorOrganisations.cpp
@@
-28,7
+28,9
@@
frmContactEditorOrganisationsADT( parent )
// Setup the window.
EditorMode = FALSE;
// Setup the window.
EditorMode = FALSE;
- sliPriority->Disable();
+ priorityCtrl = new XABPriorityCtrl(tabGeneral);
+ szrGeneral->Add(priorityCtrl, 1, wxEXPAND, 5);
+ szrGeneral->Layout();
}
}
@@
-73,19
+75,6
@@
void frmContactEditorOrganisations::UpdateSortAs( wxCommandEvent& event )
}
}
-void frmContactEditorOrganisations::EnablePriority( wxCommandEvent& event )
-{
-
- // Enable/disable the priority setting.
-
- if (chkUsePref->IsChecked()){
- sliPriority->Enable();
- } else {
- sliPriority->Disable();
- }
-
-}
-
void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
{
void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
{
@@
-124,9
+113,9
@@
void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
// Setup Organisation Priority.
// Setup Organisation Priority.
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex,
sliPriority
->GetValue()));
+ OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex,
priorityCtrl
->GetValue()));
} else {
} else {
@@
-143,9
+132,9
@@
void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
coldata.SetText(txtOrganisation->GetValue());
ListCtrlIndex = OrganisationListCtrlPtr->InsertItem(coldata);
coldata.SetText(txtOrganisation->GetValue());
ListCtrlIndex = OrganisationListCtrlPtr->InsertItem(coldata);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- OrganisationListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"),
sliPriority
->GetValue()));
+ OrganisationListCtrlPtr->SetItem(ListCtrlIndex, 1, wxString::Format(wxT("%i"),
priorityCtrl
->GetValue()));
}
}
@@
-171,9
+160,9
@@
void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
OrganisationListPrefPtr->erase(OrganisationListIndex);
OrganisationListPrefPtr->erase(OrganisationListIndex);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex,
sliPriority
->GetValue()));
+ OrganisationListPrefPtr->insert(std::make_pair(OrganisationListIndex,
priorityCtrl
->GetValue()));
} else {
} else {
@@
-193,9
+182,9
@@
void frmContactEditorOrganisations::ProcessAction( wxCommandEvent& event )
OrganisationListCtrlPtr->SetItem(longSelected, 0, txtOrganisation->GetValue());
OrganisationListCtrlPtr->SetItem(longSelected, 0, txtOrganisation->GetValue());
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- OrganisationListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"),
sliPriority
->GetValue()));
+ OrganisationListCtrlPtr->SetItem(longSelected, 1, wxString::Format(wxT("%i"),
priorityCtrl
->GetValue()));
} else {
} else {
@@
-270,9
+259,8
@@
void frmContactEditorOrganisations::SetEditorMode(bool EditMode, SectionType Sec
if (intiter->first == OrganisationListIndex && intiter->second > 0 &&
intiter != OrganisationListPrefPtr->end()){
if (intiter->first == OrganisationListIndex && intiter->second > 0 &&
intiter != OrganisationListPrefPtr->end()){
- sliPriority->SetValue(intiter->second);
- sliPriority->Enable();
- chkUsePref->SetValue(TRUE);
+ priorityCtrl->SetValue(intiter->second);
+ priorityCtrl->EnablePriority(true);
}
}
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy