X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2Fmain.cpp;h=77f7fbf32de5d547223539e6be0baf0679547c2e;hb=b00724231971de7bc52e5cd7f11f0d4669e9aafd;hp=6b6b35cb2807254d3e937ebcf6686f383641f2cf;hpb=c3ebfba9967c49c62abe48c29efeae490f1b482f;p=xestiacalendar%2F.git

diff --git a/source/main.cpp b/source/main.cpp
index 6b6b35c..77f7fbf 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -1,20 +1,20 @@
 // main.cpp - Main subroutine (application start).
 //
-// (c) 2012-2015 Xestia Software Development.
+// (c) 2012-2017 Xestia Software Development.
 //
 // This file is part of Xestia Calendar.
 //
-// Xestia Address Book is free software: you can redistribute it and/or modify
+// Xestia Calendar is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by the
 // Free Software Foundation, version 3 of the license.
 //
-// Xestia Address Book is distributed in the hope that it will be useful,
+// Xestia Calendar is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 // GNU General Public License for more details.
 //
 // You should have received a copy of the GNU General Public License along
-// with Xestia Address Book. If not, see <http://www.gnu.org/licenses/> 
+// with Xestia Calendar. If not, see <http://www.gnu.org/licenses/> 
 
 #include <stdlib.h>
 
@@ -27,7 +27,9 @@
 #include <curl/curl.h>
 
 #include "version.h"
+#include "bitmaps.h"
 #include "forms/main/frmMain.h"
+#include "defaults.h"
 
 class XestiaCALApp: public wxApp
 {
@@ -39,6 +41,8 @@ IMPLEMENT_APP(XestiaCALApp);
 bool XestiaCALApp::OnInit()
 {
 
+	wxInitAllImageHandlers();
+	
 	static const wxCmdLineEntryDesc g_cmdLineDesc [] =
 	{
 		{ wxCMD_LINE_SWITCH, "h", "help", "Displays help on command line parameters",
@@ -56,6 +60,14 @@ bool XestiaCALApp::OnInit()
 	wxCmdLineParser XCALArgs (g_cmdLineDesc, argc, argv);
 	XCALArgs.Parse();
 	
+	if (XCALArgs.Found(wxT("h"))){
+    
+		// Print out the list of help commands.
+    
+		return false;
+    
+	}
+	
 	if (XCALArgs.Found(wxT("v"))){
     
 		// Print out the version number.    
@@ -65,14 +77,25 @@ bool XestiaCALApp::OnInit()
     
 	}
 	
-	frmMain *frame = new frmMain( NULL );
-	frame->Show(true);
-	//frmActivityMgr *frameActMgr = new frmActivityMgr ( frame );
-	//frame->SetupPointers(frameActMgr);
-	//frame->SetupForm();
-	//frame->SetIcon(appicon);
+	// Setup the default accounts.
+	
+	SetupDirectories();
+	SetupDefaultSettings();
+	SetupDefaultCalendar();
+	
+	frmMain *frameMain = new frmMain( NULL );
+	
+	wxMemoryInputStream istream(bigimgs_appicon48_png, sizeof(bigimgs_appicon48_png));
+	wxImage bigimgs_appicon48i(istream, wxBITMAP_TYPE_PNG);
+	wxBitmap appIconBMP(bigimgs_appicon48i, -1);    
+	wxIcon appIcon;
+    
+	appIcon.CopyFromBitmap(appIconBMP);
+	
+	frameMain->SetIcon(appIcon);
+	frameMain->Show(true);
 	
-	SetTopWindow(frame);
+	SetTopWindow(frameMain);
 	
 	return true;