[sword-svn] r436 - in trunk/apps/InstallMgr: . installMgr

[scribe at www.crosswire.org]

Author: scribe
Date: 2006-08-09 13:05:58 -0700 (Wed, 09 Aug 2006)
New Revision: 436

Modified:
   trunk/apps/InstallMgr/InstallManager.bpr
   trunk/apps/InstallMgr/InstallManager.res
   trunk/apps/InstallMgr/MainFrm.cpp
   trunk/apps/InstallMgr/MainFrm.h
   trunk/apps/InstallMgr/cipherfrm.cpp
   trunk/apps/InstallMgr/installMgr/installmgr.conf
Log:
Updated to compile against latest SWORD svn
Added confirmation dialog before deleting all modules
Added option (-init) to initialize LocalPath on startup.

Modified: trunk/apps/InstallMgr/InstallManager.bpr
===================================================================
--- trunk/apps/InstallMgr/InstallManager.bpr	2006-07-31 03:46:13 UTC (rev 435)
+++ trunk/apps/InstallMgr/InstallManager.bpr	2006-08-09 20:05:58 UTC (rev 436)
@@ -61,8 +61,8 @@
 AutoIncBuild=0
 MajorVer=1
 MinorVer=5
-Release=7
-Build=100
+Release=8
+Build=0
 Debug=0
 PreRelease=0
 Special=0
@@ -74,13 +74,13 @@
 [Version Info Keys]
 CompanyName=CrossWire Bible Society
 FileDescription=SWORD Installation Manager
-FileVersion=1.5.7.100
+FileVersion=1.5.8.0
 InternalName=InstallMgr
 LegalCopyright=Copyright 2005 by CrossWire Bible Society
 LegalTrademarks=
 OriginalFilename=
 ProductName=The SWORD Project
-ProductVersion=1.5.8pre
+ProductVersion=1.5.8
 Comments=Seek Jesus who exchanges temporary for eternal
 
 [HistoryLists\hlIncludePath]
@@ -136,7 +136,7 @@
 DebugSourceDirs=$(BCB)\source\vcl
 
 [Parameters]
-RunParams=
+RunParams=-init f:\
 HostApplication=
 RemoteHost=
 RemotePath=

Modified: trunk/apps/InstallMgr/InstallManager.res
===================================================================
(Binary files differ)

Modified: trunk/apps/InstallMgr/MainFrm.cpp
===================================================================
--- trunk/apps/InstallMgr/MainFrm.cpp	2006-07-31 03:46:13 UTC (rev 435)
+++ trunk/apps/InstallMgr/MainFrm.cpp	2006-08-09 20:05:58 UTC (rev 436)
@@ -23,6 +23,7 @@
 #include <FileCtrl.hpp>
 #include <installmgr.h>
 #include <filemgr.h>
+#include <swmodule.h>
 
 TMainForm *MainForm;
 
@@ -673,9 +674,19 @@
 void __fastcall TMainForm::FormShow(TObject *Sender) {
 	for (int i=0;i<=ParamCount();i++) {
 		if (LowerCase(ParamStr(i)) == "-uninstall") {
-			deleteAllModules();
+			if (IDYES == MessageBox(this->Handle, "Would you like to remove all SWORD modules?", "Delete All Modules", MB_YESNO))
+				deleteAllModules();
 			Application->Terminate();
 		}
+		if (LowerCase(ParamStr(i)) == "-init") {
+			if (i <ParamCount()) {
+				setLocalDir(ParamStr(i+1).c_str());
+
+				installMgr->installConf->Save();
+				fillSourceTree(localTree);
+				i++;
+			}
+		}
 	}
 	if (defSelected) MessageBox(this->Handle, "Since no books are yet installed, a basic set has been selected as a suggested starting point.  Please review and tailor to your liking.", "Default Module Set Selected", MB_OK);
 	

Modified: trunk/apps/InstallMgr/MainFrm.h
===================================================================
--- trunk/apps/InstallMgr/MainFrm.h	2006-07-31 03:46:13 UTC (rev 435)
+++ trunk/apps/InstallMgr/MainFrm.h	2006-08-09 20:05:58 UTC (rev 436)
@@ -21,6 +21,7 @@
 //#include <Psock.hpp>
 #include <swversion.h>
 #include <installmgr.h>
+#include <ftptrans.h>
 
 using namespace std;
 using namespace sword;

Modified: trunk/apps/InstallMgr/cipherfrm.cpp
===================================================================
--- trunk/apps/InstallMgr/cipherfrm.cpp	2006-07-31 03:46:13 UTC (rev 435)
+++ trunk/apps/InstallMgr/cipherfrm.cpp	2006-08-09 20:05:58 UTC (rev 436)
@@ -5,6 +5,7 @@
 #include "cipherfrm.h"
 #include <swmgr.h>
 #include <swconfig.h>
+#include <swmodule.h>
 
 using namespace std;
 using namespace sword;

Modified: trunk/apps/InstallMgr/installMgr/installmgr.conf
===================================================================
--- trunk/apps/InstallMgr/installMgr/installmgr.conf	2006-07-31 03:46:13 UTC (rev 435)
+++ trunk/apps/InstallMgr/installMgr/installmgr.conf	2006-08-09 20:05:58 UTC (rev 436)
@@ -11,5 +11,5 @@
 FTPSource=crosswire|ftp.crosswire.org|/pub/sword/raw/
 FTPSource=host|192.168.32.123|/pub/sword
 FTPSource=CrossWire Beta|sword.cx|/pub/sword/betaraw/
-LocalPath=D:\
+LocalPath=f:\