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
Removed references of CardDAV and delete ConnectionObject when finished
[xestiaab/.git]
/
source
/
search
/
frmSearch.cpp
diff --git
a/source/search/frmSearch.cpp
b/source/search/frmSearch.cpp
index
46d7d1e
..
d224764
100644
(file)
--- a/
source/search/frmSearch.cpp
+++ b/
source/search/frmSearch.cpp
@@
-59,6
+59,8
@@
frmSearch::frmSearch( wxWindow* parent )
frmSearchADT( parent )
{
frmSearchADT( parent )
{
+ // Setup the search window.
+
XABSearchPanel *InitPanel = new XABSearchPanel( tabSearch );
InitPanel->EnableButtons(TRUE, FALSE);
InitPanel->SetupPointers(this);
XABSearchPanel *InitPanel = new XABSearchPanel( tabSearch );
InitPanel->EnableButtons(TRUE, FALSE);
InitPanel->SetupPointers(this);
@@
-255,7
+257,6
@@
void frmSearch::AddSearchSetting( wxCommandEvent& event )
NewPanel->SetupPointers(this);
NewPanel->SetupInteger(ScrollGen);
szrSearch->Add(NewPanel, 1, wxEXPAND|wxGROW, 5);
NewPanel->SetupPointers(this);
NewPanel->SetupInteger(ScrollGen);
szrSearch->Add(NewPanel, 1, wxEXPAND|wxGROW, 5);
- //szrSearch->Fit(tabSearch);
szrSearch->FitInside(tabSearch);
szrSearch->Layout();
szrSearch->RecalcSizes();
szrSearch->FitInside(tabSearch);
szrSearch->Layout();
szrSearch->RecalcSizes();
@@
-302,13
+303,13
@@
void frmSearch::AddSearchSetting( wxCommandEvent& event )
void frmSearch::RemoveSearchSetting( wxCommandEvent& event )
{
void frmSearch::RemoveSearchSetting( wxCommandEvent& event )
{
+ // Remove a search setting frame from the list.
+
// Get the integer from the event.
std::map<int,void*>::iterator iter;
iter = SearchFrames.find(event.GetInt());
// Get the integer from the event.
std::map<int,void*>::iterator iter;
iter = SearchFrames.find(event.GetInt());
- // Remove a search setting frame from the list.
-
XABSearchPanel *XABSPPtr;
XABSPPtr = static_cast<XABSearchPanel*>(iter->second);
XABSearchPanel *XABSPPtr;
XABSPPtr = static_cast<XABSearchPanel*>(iter->second);
@@
-321,8
+322,6
@@
void frmSearch::RemoveSearchSetting( wxCommandEvent& event )
delete XABSPPtr;
XABSPPtr = NULL;
delete XABSPPtr;
XABSPPtr = NULL;
- //szrSearch->Fit(tabSearch);
-
if (SearchFrames.size() < SEARCHSETTINGS_MAX && SearchFrames.size() > 1){
for (std::map<int,void*>::iterator iter = SearchFrames.begin();
if (SearchFrames.size() < SEARCHSETTINGS_MAX && SearchFrames.size() > 1){
for (std::map<int,void*>::iterator iter = SearchFrames.begin();
@@
-361,7
+360,9
@@
void frmSearch::ReloadAccountList( wxCommandEvent& event ){
}
void frmSearch::SearchBarUpdate( wxCommandEvent& event ){
}
void frmSearch::SearchBarUpdate( wxCommandEvent& event ){
-
+
+ // Update the status bar.
+
wxString *SBData = (wxString*)event.GetClientData();
stbBottom->SetStatusText(*SBData, 0);
wxString *SBData = (wxString*)event.GetClientData();
stbBottom->SetStatusText(*SBData, 0);
@@
-373,6
+374,9
@@
void frmSearch::SearchBarUpdate( wxCommandEvent& event ){
void frmSearch::SearchFinished( wxCommandEvent& event ){
void frmSearch::SearchFinished( wxCommandEvent& event ){
+ // Reset the search button and unlock the search
+ // panel buttons.
+
StopMode = FALSE;
btnSearch->SetLabel(_("Search"));
DisableAllSearchSettings(FALSE);
StopMode = FALSE;
btnSearch->SetLabel(_("Search"));
DisableAllSearchSettings(FALSE);
@@
-480,18
+484,24
@@
void frmSearch::CloseWindow( wxCloseEvent& event ){
void frmSearch::CloseWindow( wxCommandEvent& event ){
void frmSearch::CloseWindow( wxCommandEvent& event ){
+ // Close this window.
+
this->Close();
}
void frmSearch::SetUID(int UID){
this->Close();
}
void frmSearch::SetUID(int UID){
+ // Set the UID of the search window.
+
SearchUID = UID;
}
void frmSearch::SetSearchMode(bool SearchModeIn){
SearchUID = UID;
}
void frmSearch::SetSearchMode(bool SearchModeIn){
+ // Set the search mode of the window.
+
SearchMode = SearchModeIn;
if (SearchMode == TRUE){
SearchMode = SearchModeIn;
if (SearchMode == TRUE){
Yn Maystri
© 2006 - 2019 Xestia Software Development
Software
Xestia Address Book
Xestia Calendar
Development
Xestia Gelforn
Everything else
About
News
Privacy Policy