X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2Fcontacteditor%2FfrmContactEditorPicture.cpp;h=1600bb081da91d2c472efc4e1e227f97c6d43a1f;hp=d548c9adb7ab54031d4e8db1eecc208b0b9732d8;hb=ada42724cf083b0a311cf22260485d61516c25c8;hpb=da64d37d0a13895554e4ad945c46dd0af6d1c0e6

diff --git a/source/contacteditor/frmContactEditorPicture.cpp b/source/contacteditor/frmContactEditorPicture.cpp
index d548c9a..1600bb0 100644
--- a/source/contacteditor/frmContactEditorPicture.cpp
+++ b/source/contacteditor/frmContactEditorPicture.cpp
@@ -29,30 +29,29 @@
 #include "../common/base64.h"
 #include "../common/mime.h"
 
-
 frmContactEditorPicture::frmContactEditorPicture( wxWindow* parent )
 :
 frmContactEditorPictureADT( 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 frmContactEditorPicture::EnablePriority( wxCommandEvent& event )
-{
-	if (chkUsePref->IsChecked()){
-		sliPriority->Enable();
-	} else {
-		sliPriority->Disable();
-	}
+	
 }
 
 void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 {
+	
+	// Process data.
+	
 	long ListCtrlIndex;
 	
 	if (EditorMode == FALSE){
@@ -162,9 +161,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 		
 		// Setup Organisation Priority.
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			PictureListPrefPtr->insert(std::make_pair(PictureListIndex, sliPriority->GetValue()));
+			PictureListPrefPtr->insert(std::make_pair(PictureListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -186,7 +185,17 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 		
 		coldata.SetId(PictureListIndex);
 		coldata.SetData(PictureListIndex);
-		coldata.SetText(_("Picture"));
+		
+		if (PictureLogo == TRUE){
+		
+			coldata.SetText(_("Picture"));
+		
+		} else {
+
+			coldata.SetText(_("Logo"));
+		
+		}
+		
 		ListCtrlIndex =	PictureListCtrlPtr->InsertItem(coldata);
 		
 		if (strValue == _("Home")) {
@@ -203,9 +212,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 		
 		}		
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			PictureListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			PictureListCtrlPtr->SetItem(ListCtrlIndex, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		}
 		
@@ -238,9 +247,9 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 		
 		PictureListPrefPtr->erase(PictureListIndex);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			PictureListPrefPtr->insert(std::make_pair(PictureListIndex, sliPriority->GetValue()));
+			PictureListPrefPtr->insert(std::make_pair(PictureListIndex, priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -258,12 +267,20 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 			return;
 		}		
 		
-		PictureListCtrlPtr->SetItem(longSelected, 0, wxT("Picture"));
+		if (PictureLogo == TRUE){		
+			PictureListCtrlPtr->SetItem(longSelected, 0, _("Picture"));
+			
+		} else {
+		
+			PictureListCtrlPtr->SetItem(longSelected, 0, _("Logo"));
+		
+		}
+		
 		PictureListCtrlPtr->SetItem(longSelected, 1, strValue);
 		
-		if (chkUsePref->IsChecked()){
+		if (priorityCtrl->IsPriorityChecked()){
 		
-			PictureListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), sliPriority->GetValue()));
+			PictureListCtrlPtr->SetItem(longSelected, 2, wxString::Format(wxT("%i"), priorityCtrl->GetValue()));
 		
 		} else {
 		
@@ -278,11 +295,18 @@ void frmContactEditorPicture::ProcessData( wxCommandEvent& event )
 
 void frmContactEditorPicture::CloseWindow( wxCommandEvent& event )
 {
+	
+	// Close this window.
+	
 	this->Close();
+	
 }
 
 void frmContactEditorPicture::SetEditorMode(bool EditMode)
 {
+	
+	// Set the editor mode.
+	
 	// Set if the editor is adding or editing an address.
 	// FALSE = Add
 	// TRUE = Edit
@@ -308,7 +332,8 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
 		
 		striter = PictureListTypePtr->find(PictureListIndex);
 		 
-		if (striter->first == PictureListIndex){
+		if (striter->first == PictureListIndex &&
+			striter != PictureListTypePtr->end()){
 		
 			strValue = striter->second;
 		
@@ -334,11 +359,11 @@ void frmContactEditorPicture::SetEditorMode(bool EditMode)
 		
 		intiter = PictureListPrefPtr->find(PictureListIndex);
 		
-		if (intiter->first == PictureListIndex && intiter->second > 0){
+		if (intiter->first == PictureListIndex && intiter->second > 0 &&
+			intiter != PictureListPrefPtr->end()){
 		
-			sliPriority->SetValue(intiter->second);
-			sliPriority->Enable();
-			chkUsePref->SetValue(TRUE);
+			priorityCtrl->SetValue(intiter->second);
+			priorityCtrl->EnablePriority(true);
 		
 		}	
 		
@@ -356,9 +381,12 @@ void frmContactEditorPicture::SetupPointers(std::map<int, std::string> *PictureL
 	std::map<int, wxString> *PictureListMediatype,	
 	std::map<int, int> *PictureListPref,
 	wxListCtrl *PictureListCtrl,
-	int PictureIndex )
+	int PictureIndex,
+	bool PictureLogoIn )
 {
 
+	// Setup the pointers.
+	
 	PictureListPtr = PictureList;
 	PictureListAltIDPtr = PictureListAltID;
 	PictureListPIDPtr = PictureListPID;
@@ -370,5 +398,6 @@ void frmContactEditorPicture::SetupPointers(std::map<int, std::string> *PictureL
 	PictureListPrefPtr = PictureListPref;
 	PictureListCtrlPtr = PictureListCtrl;
 	PictureListIndex = PictureIndex;
+	PictureLogo = PictureLogoIn;
 	
 }
\ No newline at end of file