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
Added comments to describe functions in frmUpdate
[xestiaab/.git]
/
source
/
frmConflictResolution.cpp
diff --git
a/source/frmConflictResolution.cpp
b/source/frmConflictResolution.cpp
index
33a99fe
..
d5c0a3f
100644
(file)
--- a/
source/frmConflictResolution.cpp
+++ b/
source/frmConflictResolution.cpp
@@
-28,6
+28,9
@@
frmConflictResolutionADT( parent )
void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
{
void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
{
+
+ // Button 'Keep Local' was pressed.
+
ConflictResult = 1;
this->Close();
ConflictResult = 1;
this->Close();
@@
-35,6
+38,9
@@
void frmConflictResolution::KeepLocalData( wxCommandEvent& event )
void frmConflictResolution::KeepServerData( wxCommandEvent& event )
{
void frmConflictResolution::KeepServerData( wxCommandEvent& event )
{
+
+ // Button 'Keep Server' was pressed.
+
ConflictResult = 2;
this->Close();
ConflictResult = 2;
this->Close();
@@
-43,6
+49,8
@@
void frmConflictResolution::KeepServerData( wxCommandEvent& event )
void frmConflictResolution::DecideLater( wxCommandEvent& event )
{
void frmConflictResolution::DecideLater( wxCommandEvent& event )
{
+ // Button 'Decide Later' was pressed.
+
ConflictResult = 0;
this->Close();
ConflictResult = 0;
this->Close();
@@
-50,6
+58,8
@@
void frmConflictResolution::DecideLater( wxCommandEvent& event )
int frmConflictResolution::GetResult(){
int frmConflictResolution::GetResult(){
+ // Get the result of the dialog.
+
return ConflictResult;
}
return ConflictResult;
}
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy