X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorSound.cpp;h=28f3aeb9018dc972d695e1c706bab96352ce3be8;hp=c903008968aaf4417824640a511f031a2ed6560a;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=a76a2dec8f9610d14b284bd5488a4cccc3297dbf

diff --git a/source/contacteditor/frmContactEditorSound.cpp b/source/contacteditor/frmContactEditorSound.cpp
index c903008..28f3aeb 100644
--- a/source/contacteditor/frmContactEditorSound.cpp
+++ b/source/contacteditor/frmContactEditorSound.cpp
@@ -18,14 +18,6 @@
 
 #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 )
@@ -34,7 +26,9 @@ 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"));
@@ -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 )
 {
 	
@@ -76,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);
 
@@ -168,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 {
 		
@@ -209,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()));
 		
 		}
 		
@@ -222,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;	
 		
@@ -246,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 {
 		
@@ -269,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 {
 		
@@ -342,9 +288,7 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
 			cmbType->SetSelection(0);
 		
 		}
-		
-		//strValue.Clear();
-		
+
 		// Get the website priority.
 		
 		intiter = SoundListPrefPtr->find(SoundListIndex);
@@ -352,9 +296,8 @@ void frmContactEditorSound::SetEditorMode(bool EditMode)
 		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);
 		
 		}