X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;ds=inline;f=source%2FfrmConflictResolution.cpp;h=17791619b90e0d3839524d699a5cf9cc636f9e69;hb=b53ab9556e7f6770835292ba1e068184f8e08946;hp=16e0d554761b21bf7dc9c8b414fc9e2dee2786f3;hpb=45729fca56479bd9158486e0cda0c4a94b4dd1dc;p=xestiaab%2F.git
diff --git a/source/frmConflictResolution.cpp b/source/frmConflictResolution.cpp
index 16e0d55..1779161 100644
--- a/source/frmConflictResolution.cpp
+++ b/source/frmConflictResolution.cpp
@@ -1,3 +1,21 @@
+// frmConflictResolution.cpp - Conflict Resolution form.
+//
+// (c) 2012-2015 Xestia Software Development.
+//
+// This file is part of Xestia Address Book.
+//
+// Xestia Address Book is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by the
+// Free Software Foundation, version 3 of the license.
+//
+// Xestia Address Book is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along
+// with Xestia Address Book. If not, see
+
#include "frmConflictResolution.h"
#include "common/getcontactinfo.h"
@@ -10,6 +28,9 @@ frmConflictResolutionADT( parent )
void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
{
+
+ // Button 'Keep Local' was pressed.
+
ConflictResult = 1;
this->Close();
@@ -17,6 +38,9 @@ void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
void frmConflictResolution::KeepServerData( wxCommandEvent& event )
{
+
+ // Button 'Keep Server' was pressed.
+
ConflictResult = 2;
this->Close();
@@ -25,6 +49,8 @@ void frmConflictResolution::KeepServerData( wxCommandEvent& event )
void frmConflictResolution::DecideLater( wxCommandEvent& event )
{
+ // Button 'Decide Later' was pressed.
+
ConflictResult = 0;
this->Close();
@@ -32,11 +58,13 @@ void frmConflictResolution::DecideLater( wxCommandEvent& event )
int frmConflictResolution::GetResult(){
+ // Get the result of the dialog.
+
return ConflictResult;
}
-void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map *MemoryFSList){
+void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::map *MemoryFSList, wxString backgroundColour){
// Load the local data.
@@ -44,11 +72,11 @@ void frmConflictResolution::LoadData(vCard *LocalData, vCard *ServerData, std::m
wxString ServerSID = wxString::Format(wxT("%i"), rand() % 32768);
LoadContactData(LocalData, htmClient, ClientSID,
- wxT(""), MemoryFSList);
+ wxT(""), MemoryFSList, backgroundColour);
// Load the server data.
LoadContactData(ServerData, htmServer, ServerSID,
- wxT(""), MemoryFSList);
+ wxT(""), MemoryFSList, backgroundColour);
}
\ No newline at end of file