X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fsearch%2FfrmSearch.cpp;h=8d8530c5312f153a94de7f032c01a745d2d71b5c;hb=ee9b71949005734012f18251774807c38b989ae2;hp=d224764e58ffac2b51eff609853947e071a48850;hpb=11b8db1fa859309f8eae210d1fd6059a6474644b;p=xestiaab%2F.git

diff --git a/source/search/frmSearch.cpp b/source/search/frmSearch.cpp
index d224764..8d8530c 100644
--- a/source/search/frmSearch.cpp
+++ b/source/search/frmSearch.cpp
@@ -1,6 +1,6 @@
 // frmSearch.cpp - Search form.
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2017 Xestia Software Development.
 //
 // This file is part of Xestia Address Book.
 //
@@ -17,14 +17,7 @@
 // with Xestia Address Book. If not, see <http://www.gnu.org/licenses/>
 
 #include "frmSearch.h"
-#include "../frmMain.h"
-#include "../frmContact.h"
-#include "frmSearchAccounts.h"
-#include "../common/preferences.h"
-#include "../common/dirs.h"
-#include "../vcard/vcard.h"
 
-#include <thread>
 
 #define SEARCHSETTINGS_MAX 15
 
@@ -59,6 +52,15 @@ frmSearch::frmSearch( wxWindow* parent )
 frmSearchADT( parent )
 {
 	
+	// Setup the application icon.
+	
+	wxMemoryInputStream istream(bigimgs_searchicon_png, sizeof(bigimgs_searchicon_png));
+	wxImage bigimgs_searchiconi(istream, wxBITMAP_TYPE_PNG);
+	wxBitmap searchiconbmp(bigimgs_searchiconi, -1);    
+	wxIcon searchicon;
+	searchicon.CopyFromBitmap(searchiconbmp);
+	this->SetIcon(searchicon);
+	
 	// Setup the search window.
 	
 	XABSearchPanel *InitPanel = new XABSearchPanel( tabSearch );
@@ -232,6 +234,15 @@ void frmSearch::ResetContacts( wxCommandEvent& event )
 		
 	}
 
+	// Clear the status bar.
+	
+	wxCommandEvent statusResetEvent (SE_SBUPDATE);
+		
+	wxString *statusReset = new wxString(wxT(""));
+	
+	statusResetEvent.SetClientData(statusReset);
+	wxPostEvent(this, statusResetEvent);
+	
 	// Add a search settings with the default things.
 	
 	ScrollGen = 0;
@@ -463,20 +474,24 @@ void frmSearch::CloseWindow( wxCloseEvent& event ){
 	
 	// Close window.
 	
-	WindowData *WData = new WindowData;
+	if (SearchMode == false){
+	
+		WindowData *WData = new WindowData;
 
-	WData->DataType = 2;
-	WData->WindowPointer = this;
-	WData->WindowID = SearchUID;
+		WData->DataType = 2;
+		WData->WindowPointer = this;
+		WData->WindowID = SearchUID;
 
-	wxCommandEvent delevent(WINDOW_CLOSE);
-	delevent.SetClientData(WData);
-	wxPostEvent(GetParent(), delevent);
+		wxCommandEvent delevent(WINDOW_CLOSE);
+		delevent.SetClientData(WData);
+		wxPostEvent(GetParent(), delevent);
 		
-	wxCommandEvent rs(CE_REMOVESEARCH);
-	wxPostEvent(this, rs);
+		wxCommandEvent rs(CE_REMOVESEARCH);
+		wxPostEvent(this, rs);
 	
-	WData = NULL;
+		WData = NULL;
+		
+	}
 	
 	this->Destroy();