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
Modified the build system to ensure proper cleanout when using distclean.
[xestiaab/.git]
/
source
/
import
/
frmImportResults.cpp
diff --git
a/source/import/frmImportResults.cpp
b/source/import/frmImportResults.cpp
index
3dc09d4
..
3280503
100644
(file)
--- a/
source/import/frmImportResults.cpp
+++ b/
source/import/frmImportResults.cpp
@@
-20,9
+20,11
@@
void frmImportResults::CopyClipboard( wxCommandEvent& event )
wxTextDataObject ResultData;
ResultData.SetText(txtResults->GetValue());
wxTextDataObject ResultData;
ResultData.SetText(txtResults->GetValue());
-
- wxTheClipboard->SetData(&ResultData);
+
+ wxTheClipboard->Clear();
+ wxTheClipboard->AddData(&ResultData);
wxTheClipboard->Close();
wxTheClipboard->Close();
+ wxTheClipboard->Flush();
wxMessageBox(_("The results have been copied to the clipboard."), _("Results copied to clipboard"));
wxMessageBox(_("The results have been copied to the clipboard."), _("Results copied to clipboard"));
@@
-39,7
+41,7
@@
void frmImportResults::CloseWindow( wxCommandEvent& event )
this->Close();
}
this->Close();
}
-void frmImportResults::LoadData(std::map<int,wxString> *ResultDataInc)
+void frmImportResults::LoadData(std::map<int,wxString> *ResultDataInc
, int ImportCount, int ImportErrorCount
)
{
wxString ResultDataText;
{
wxString ResultDataText;
@@
-50,5
+52,11
@@
void frmImportResults::LoadData(std::map<int,wxString> *ResultDataInc)
ResultDataText.Append(iter->second + wxT("\n"));
}
ResultDataText.Append(iter->second + wxT("\n"));
}
+
+ // Display the results in the form.
+
+ txtResults->SetValue(ResultDataText);
+ lblText->SetLabel(wxString::Format(_("%i contacts imported. %i contacts had errors and could not be imported."), ImportCount, ImportErrorCount));
+
+}
-}
\ No newline at end of file
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy