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
frmContactEditor(*): Call Layout on szrGeneral after adding priorty control
[xestiaab/.git]
/
source
/
contacteditor
/
frmContactEditorSound.cpp
diff --git
a/source/contacteditor/frmContactEditorSound.cpp
b/source/contacteditor/frmContactEditorSound.cpp
index
bf3d21d
..
28f3aeb
100644
(file)
--- a/
source/contacteditor/frmContactEditorSound.cpp
+++ b/
source/contacteditor/frmContactEditorSound.cpp
@@
-18,14
+18,6
@@
#include "frmContactEditorSound.h"
#include "frmContactEditorSound.h"
-#include <wx/tokenzr.h>
-#include <wx/file.h>
-#include <SFML/Audio.hpp>
-
-#include "../common/textprocessing.h"
-#include "../common/base64.h"
-#include "../common/mime.h"
-
frmContactEditorSound::frmContactEditorSound( wxWindow* parent )
:
frmContactEditorSoundADT( parent )
frmContactEditorSound::frmContactEditorSound( wxWindow* parent )
:
frmContactEditorSoundADT( parent )
@@
-34,7
+26,9
@@
frmContactEditorSoundADT( 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();
cmbType->Append(wxT(""));
cmbType->Append(_("Home"));
cmbType->Append(wxT(""));
cmbType->Append(_("Home"));
@@
-42,19
+36,6
@@
frmContactEditorSoundADT( parent )
}
}
-void frmContactEditorSound::EnablePriority( wxCommandEvent& event )
-{
-
- // Enable/disable the priority setting.
-
- if (chkUsePref->IsChecked()){
- sliPriority->Enable();
- } else {
- sliPriority->Disable();
- }
-
-}
-
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
{
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
{
@@
-81,7
+62,6
@@
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
len = AudioFile.Length();
unsigned char* AudioFileData = new unsigned char[len];
len = AudioFile.Length();
unsigned char* AudioFileData = new unsigned char[len];
- flen = AudioFile.Read(AudioFileData, (size_t)len);
wxSAudioMIMEType = GetMIME(wxSAudioFilename);
wxSAudioMIMEType = GetMIME(wxSAudioFilename);
@@
-136,9
+116,9
@@
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
// Setup Organisation Priority.
// Setup Organisation Priority.
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- SoundListPrefPtr->insert(std::make_pair(SoundListIndex,
sliPriority
->GetValue()));
+ SoundListPrefPtr->insert(std::make_pair(SoundListIndex,
priorityCtrl
->GetValue()));
} else {
} else {
@@
-177,9
+157,9
@@
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
}
}
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- SoundListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"),
sliPriority
->GetValue()));
+ SoundListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"),
priorityCtrl
->GetValue()));
}
}
@@
-212,9
+192,9
@@
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
SoundListPrefPtr->erase(SoundListIndex);
SoundListPrefPtr->erase(SoundListIndex);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- SoundListPrefPtr->insert(std::make_pair(SoundListIndex,
sliPriority
->GetValue()));
+ SoundListPrefPtr->insert(std::make_pair(SoundListIndex,
priorityCtrl
->GetValue()));
} else {
} else {
@@
-235,9
+215,9
@@
void frmContactEditorSound::ProcessData( wxCommandEvent& event )
SoundListCtrlPtr->SetItem(longSelected, 0, wxT("Sound"));
SoundListCtrlPtr->SetItem(longSelected, 1, strValue);
SoundListCtrlPtr->SetItem(longSelected, 0, wxT("Sound"));
SoundListCtrlPtr->SetItem(longSelected, 1, strValue);
- if (
chkUsePref->Is
Checked()){
+ if (
priorityCtrl->IsPriority
Checked()){
- SoundListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"),
sliPriority
->GetValue()));
+ SoundListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"),
priorityCtrl
->GetValue()));
} else {
} else {
@@
-316,9
+296,8
@@
void frmContactEditorSound::SetEditorMode(bool EditMode)
if (intiter->first == SoundListIndex && intiter->second > 0 &&
intiter != SoundListPrefPtr->end()){
if (intiter->first == SoundListIndex && intiter->second > 0 &&
intiter != SoundListPrefPtr->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