X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fmain.cpp;h=c9009272c2c58dc35b7ebea393a063ef531be4d6;hb=8f9ee6da0f290bb201962732d7567257e6f6f072;hp=386e30d92c17570c05249529568fa7034edeb9d0;hpb=fb95962b20989702f8d689875a977d150c087660;p=xestiaab%2F.git

diff --git a/source/main.cpp b/source/main.cpp
index 386e30d..c900927 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -13,6 +13,7 @@
 #include "bitmaps.h"
 #include "version.h"
 #include "frmActivityMgr.h"
+#include "frmSearch.h"
 #include "common/timers.h"
 #include "common/defaults.h"
 
@@ -49,9 +50,9 @@ bool XestiaABApp::OnInit()
          { wxCMD_LINE_SWITCH, wxT_2("h"), wxT_2("help"), wxTRANSLATE("Displays help on command line parameters"),
              wxCMD_LINE_VAL_NONE, wxCMD_LINE_OPTION_HELP },
          /*{ wxCMD_LINE_OPTION, wxT_2("e"), wxT_2("edit"), wxTRANSLATE("Edit a vCard 4.0 formatted contact"),
-             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL }, 
+             wxCMD_LINE_VAL_STRING, wxCMD_LINE_PARAM_OPTIONAL },*/
          { wxCMD_LINE_SWITCH, wxT_2("s"), wxT_2("search"), wxTRANSLATE("Display the search window instead of starting normally"),
-             wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },*/
+             wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
          { wxCMD_LINE_SWITCH, wxT_2("v"), wxT_2("version"), wxTRANSLATE("Displays version number"),
              wxCMD_LINE_VAL_NONE, wxCMD_LINE_PARAM_OPTIONAL },
          { wxCMD_LINE_NONE }
@@ -69,14 +70,26 @@ bool XestiaABApp::OnInit()
     
     if (XABArgs.Found(wxT("v"))){
     
+	wxPuts(XSDAB_VERSION);
 	exit(0);
     
     }
     
     wxInitAllImageHandlers();
     
-    /*if (XABArgs.Found(wxT("e"), &wxSContactFilename)){
+    if (XABArgs.Found(wxT("s"))){
+    
+	// Open up the search window.
 	
+	frmSearch *frmSearchPtr = new frmSearch( NULL );
+	frmSearchPtr->Show(true);
+	frmSearchPtr->SetSearchMode(true);
+	return true;
+    
+    }
+    
+    /*if (XABArgs.Found(wxT("e"), &wxSContactFilename)){
+	Xestia Gelforn Project Repositories - xestiaab/.git/tree - source/vcard/
 	// Check if the filename exists.
 	
 	//wxImage::AddHandler(new wxPNGHandler);