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 4e873f1..28f3aeb 100644 (file)
--- a/source/contacteditor/frmContactEditorSound.cpp
+++ b/source/contacteditor/frmContactEditorSound.cpp
@@ -18,37 +18,29 @@
 
 #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 )
 {
+       
+       // 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 frmContactEditorSound::EnablePriority( wxCommandEvent& event )
-{
-       if (chkUsePref->IsChecked()){
-               sliPriority->Enable();
-       } else {
-               sliPriority->Disable();
-       }
+       
 }
 
 void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 {
+       
+       // Process audio data.
+       
        long ListCtrlIndex;
        
        if (EditorMode == FALSE){
@@ -65,44 +57,11 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
                
                wxSAudioFilename = fipSound->GetPath();
 
-/*             
-#if wxABI_VERSION < 20900
-               if (AudioFile.Open(wxSAudioFilename.c_str(), wxT("rb"))){
-#else
-               if (AudioFile.Open(wxSAudioFilename, wxT("rb"))){
-#endif
-
-*/
                if (AudioFile.Open(wxSAudioFilename, wxFile::read)){
-            ssize_t flen;
+                       
                        len = AudioFile.Length();
                        
                        unsigned char* AudioFileData = new unsigned char[len];
-                       flen = AudioFile.Read(AudioFileData, (size_t)len);
-
-                       // Get MIME Type.
-                       
-                       /*const char *MIMEType;
-                       magic_t MagicCookie = magic_open(MAGIC_MIME);                   
-                       magic_setflags(MagicCookie, MAGIC_MIME_TYPE);
-                       
-                       if (!MagicCookie){
-
-                               wxMessageBox(_("An error occured with the support library for getting the picture type."), _("Error opening picture file"), wxICON_ERROR);                      
-                               return;
-                               
-                       }
-                       
-                       if (magic_load(MagicCookie, NULL) != 0) {
-                       
-                               wxMessageBox(_("An error occured whilst determining the picture type."), _("Error opening picture file"), wxICON_ERROR);
-                               return;
-                       
-                       }
-                       
-                       MIMEType = magic_file(MagicCookie, wxSAudioFilename.mb_str());
-                       wxSAudioMIMEType = wxString::FromUTF8(MIMEType);
-                       magic_close(MagicCookie);*/
                        
                        wxSAudioMIMEType = GetMIME(wxSAudioFilename);
 
@@ -157,9 +116,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
                
                // Setup Organisation Priority.
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       SoundListPrefPtr->insert(std::make_pair(SoundListIndex, sliPriority->GetValue()));
+                       SoundListPrefPtr->insert(std::make_pair(SoundListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -198,9 +157,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
                
                }               
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       SoundListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       SoundListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                }
                
@@ -211,8 +170,6 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
                // Do not touch the audio file but update the settings
                // associated with the audio file.
        
-               
-       
                long longSelected = -1;
                wxString strValue;      
                
@@ -235,9 +192,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
                
                SoundListPrefPtr->erase(SoundListIndex);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       SoundListPrefPtr->insert(std::make_pair(SoundListIndex, sliPriority->GetValue()));
+                       SoundListPrefPtr->insert(std::make_pair(SoundListIndex, priorityCtrl->GetValue()));
                
                } else {
                
@@ -258,9 +215,9 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
                SoundListCtrlPtr->SetItem(longSelected, 0, wxT("Sound"));
                SoundListCtrlPtr->SetItem(longSelected, 1, strValue);
                
-               if (chkUsePref->IsChecked()){
+               if (priorityCtrl->IsPriorityChecked()){
                
-                       SoundListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+                       SoundListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
                
                } else {
                
@@ -275,11 +232,18 @@ void frmContactEditorSound::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorSound::CloseWindow( wxCommandEvent& event )
 {
+       
+       // Close this window.
+       
        this->Close();
+       
 }
 
 void frmContactEditorSound::SetEditorMode(bool EditMode)
 {
+       
+       // Set the editor mode.
+       
        // Set if the editor is adding or editing an address.
        // FALSE = Add
        // TRUE = Edit
@@ -324,18 +288,16 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
                        cmbType->SetSelection(0);
                
                }
-               
-               //strValue.Clear();
-               
+
                // Get the website priority.
                
                intiter = SoundListPrefPtr->find(SoundListIndex);
                
-               if (intiter->first == SoundListIndex && intiter->second > 0){
-               
-                       sliPriority->SetValue(intiter->second);
-                       sliPriority->Enable();
-                       chkUsePref->SetValue(TRUE);
+               if (intiter->first == SoundListIndex && intiter->second > 0 &&
+                       intiter != SoundListPrefPtr->end()){
+
+                       priorityCtrl->SetValue(intiter->second);
+                       priorityCtrl->EnablePriority(true);
                
                }       
                
@@ -357,6 +319,8 @@ void frmContactEditorSound::SetupPointers(std::map<int, std::string> *SoundList,
        wxListCtrl *SoundListCtrl,
        int SoundIndex )
 {
+       
+       // Setup the pointers.
 
        SoundListPtr = SoundList;
        SoundListAltIDPtr = SoundListAltID;