[sword-svn] r470 - branches/BCB5/apps/InstallMgr
chrislit at www.crosswire.org
chrislit at www.crosswire.org
Mon Oct 22 23:08:05 MST 2007
Author: chrislit
Date: 2007-10-22 23:08:05 -0700 (Mon, 22 Oct 2007)
New Revision: 470
Added:
branches/BCB5/apps/InstallMgr/UnsuFrm.cpp
branches/BCB5/apps/InstallMgr/UnsuFrm.dfm
branches/BCB5/apps/InstallMgr/UnsuFrm.h
Modified:
branches/BCB5/apps/InstallMgr/InstallManager.bpr
branches/BCB5/apps/InstallMgr/InstallManager.cpp
branches/BCB5/apps/InstallMgr/InstallManager.res
branches/BCB5/apps/InstallMgr/MainFrm.cpp
branches/BCB5/apps/InstallMgr/MainFrm.dfm
Log:
added Ignore button to the form reporting that the installed version of Sword is unsupported by the requested module
incremented version numbers/copyrights
Modified: branches/BCB5/apps/InstallMgr/InstallManager.bpr
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.bpr 2007-10-23 05:37:59 UTC (rev 469)
+++ branches/BCB5/apps/InstallMgr/InstallManager.bpr 2007-10-23 06:08:05 UTC (rev 470)
@@ -7,13 +7,13 @@
<OBJFILES value="InstallManager.obj MainFrm.obj StatusFrm.obj RemoteMntFrm.obj InfoFrm.obj
cipherfrm.obj UninstallFrm.obj ..\..\swwinlog.obj
..\..\..\sword\src\mgr\installmgr.obj ..\..\..\sword\src\mgr\curlftpt.obj
- ..\..\..\sword\src\mgr\ftptrans.obj"/>
+ ..\..\..\sword\src\mgr\ftptrans.obj UnsuFrm.obj"/>
<RESFILES value="InstallManager.res"/>
<IDLFILES value=""/>
<IDLGENFILES value=""/>
<DEFFILE value=""/>
<RESDEPEN value="$(RESFILES) MainFrm.dfm StatusFrm.dfm RemoteMntFrm.dfm InfoFrm.dfm
- cipherfrm.dfm UninstallFrm.dfm"/>
+ cipherfrm.dfm UninstallFrm.dfm UnsuFrm.dfm"/>
<LIBFILES value="libcurl.lib curl\lib\ws2_32.lib
..\..\..\icu-sword\as_is\borland\icudatab.lib
..\..\..\sword\lib\libsword.lib ..\..\..\icu-sword\as_is\borland\icuuc.lib
@@ -39,10 +39,13 @@
<WARNOPTSTR value=""/>
</MACROS>
<OPTIONS>
- <IDLCFLAGS value="-I..\.. -Icurl\include -I..\BibleCS
- -I..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr
- -I$(BCB)\include -I$(BCB)\include\vcl -I..\..\..\..\include -src_suffix
- cpp -DVCL -boa"/>
+ <IDLCFLAGS value="-Icurl\lib -I..\..\..\sword\src\mgr -I..\..\..sword\src\mgr
+ -I..\..\.sword\src\mgr -I..\..\sword\src\mgr -I..\..\swordsrc\mgr
+ -I..\..\sworsrc\mgr -I..\..\swosrc\mgr -I..\..\swsrc\mgr -I..\..\ssrc\mgr
+ -I..\..\src\mgr -I..\src\mgr -I..\..\..\src\mgr -I..\..\..\mgr -I..\..
+ -Icurl\include -I$(BCB)\include -I$(BCB)\include\vcl
+ -I..\..\..\sword\include -src_suffix cpp -DVCL -D_ICU_ -D_ICUSWORD_
+ -DCURLAVAILABLE -DUSBINARY -boa"/>
<CFLAG1 value="-O2 -H=c:\PROGRA~1\borland\CBUILD~2\lib\vcl50.csm -Hc -Vx -Ve -RT- -X- -a8
-b- -k- -vi -c -tW -tWM"/>
<PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
@@ -61,7 +64,7 @@
AutoIncBuild=0
MajorVer=1
MinorVer=5
-Release=9
+Release=10
Build=0
Debug=0
PreRelease=0
@@ -74,40 +77,42 @@
[Version Info Keys]
CompanyName=CrossWire Bible Society
FileDescription=SWORD Installation Manager
-FileVersion=1.5.9.0
+FileVersion=1.5.10.0
InternalName=InstallMgr
-LegalCopyright=Copyright 2005 by CrossWire Bible Society
+LegalCopyright=Copyright 1990-2007 by CrossWire Bible Society
LegalTrademarks=
OriginalFilename=
ProductName=The SWORD Project
-ProductVersion=1.5.8
+ProductVersion=1.5.10
Comments=Seek Jesus who exchanges temporary for eternal
[HistoryLists\hlIncludePath]
-Count=11
-Item0=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
-Item1=curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
-Item2=..\..\..\mgr;..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item3=..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item4=..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item5=curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item6=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Count=12
+Item0=curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item1=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item2=curl\include;$(BCB)\include;$(BCB)\include\vcl;..\..\..\sword\include
+Item3=..\..\..\mgr;..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item4=..\..\..\..\src\mgr;..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item5=..\..;curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item6=curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
Item7=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
Item8=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
Item9=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
-Item10=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item10=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
+Item11=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include
[HistoryLists\hlLibraryPath]
-Count=9
-Item0=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
-Item1=..\..\..\mgr;..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item2=..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item3=..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item4=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Count=10
+Item0=curl\lib;..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
+Item1=..\..\..\sword\src\mgr;..\..\..sword\src\mgr;..\..\.sword\src\mgr;..\..\sword\src\mgr;..\..\swordsrc\mgr;..\..\sworsrc\mgr;..\..\swosrc\mgr;..\..\swsrc\mgr;..\..\ssrc\mgr;..\..\src\mgr;..\src\mgr;..\..\..\src\mgr;..\..\..\mgr;..\..;..\BibleCS;D:\usr\src\sword\apps\windoze\CBuilder4\InstallMgr\;$(BCB)\lib\obj;$(BCB)\lib
+Item2=..\..\..\mgr;..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item3=..\..\..\..\src\mgr;..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item4=..\..;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
Item5=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
Item6=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
Item7=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
-Item8=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item8=..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
+Item9=..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\lib\obj;$(BCB)\lib
[HistoryLists\hlDebugSourcePath]
Count=1
@@ -152,4 +157,4 @@
ProjectLang=
RootDir=
</IDEOPTIONS>
-</PROJECT>
\ No newline at end of file
+</PROJECT>
Modified: branches/BCB5/apps/InstallMgr/InstallManager.cpp
===================================================================
--- branches/BCB5/apps/InstallMgr/InstallManager.cpp 2007-10-23 05:37:59 UTC (rev 469)
+++ branches/BCB5/apps/InstallMgr/InstallManager.cpp 2007-10-23 06:08:05 UTC (rev 470)
@@ -19,6 +19,7 @@
USEUNIT("..\..\..\sword\src\mgr\curlftpt.cpp");
USEUNIT("..\..\..\sword\src\mgr\ftptrans.cpp");
USELIB("..\..\clucene\clucene.lib");
+USEFORM("UnsuFrm.cpp", UnsuForm);
//---------------------------------------------------------------------------
WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int)
{
@@ -32,6 +33,7 @@
Application->CreateForm(__classid(TInfoForm), &InfoForm);
Application->CreateForm(__classid(TCipherForm), &CipherForm);
Application->CreateForm(__classid(TUninstallForm), &UninstallForm);
+ Application->CreateForm(__classid(TUnsuForm), &UnsuForm);
Application->Run();
}
catch (Exception &exception)
Modified: branches/BCB5/apps/InstallMgr/InstallManager.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/apps/InstallMgr/MainFrm.cpp
===================================================================
--- branches/BCB5/apps/InstallMgr/MainFrm.cpp 2007-10-23 05:37:59 UTC (rev 469)
+++ branches/BCB5/apps/InstallMgr/MainFrm.cpp 2007-10-23 06:08:05 UTC (rev 470)
@@ -7,6 +7,7 @@
#include "StatusFrm.h"
#include "RemoteMntFrm.h"
#include "InfoFrm.h"
+#include "UnsuFrm.h"
#include "cipherfrm.h"
#include "UninstallFrm.h"
//---------------------------------------------------------------------------
@@ -376,16 +377,17 @@
SWMgr *mgr = (tree == localTree) ? manager : ((InstallSourceTab *) PageControl1->ActivePage->Controls[0])->is->getMgr();
SWBuf minVer = (*mgr->config)[(const char *)node->Data]["MinimumVersion"];
- InfoForm->Caption = "Need To Upgrade";
- InfoForm->info = "\\qc {\\b \\fs20 Newer Software Version Required.}\\par\\par\\pard ";
- InfoForm->info += "This module requires a newer version of the SWORD software engine. \\par\\par ";
- InfoForm->info += "Your Current Version: ";
- InfoForm->info += (const char *)SWVersion::currentVersion;
- InfoForm->info += "\\par Required Version: ";
- InfoForm->info += minVer.c_str();
- InfoForm->info += "\\par\\par\\b\\qc Please visit http://www.crosswire.org to upgrade.";
- InfoForm->ShowModal();
- return;
+ UnsuForm->Caption = "Need To Upgrade";
+ UnsuForm->info = "\\qc {\\b \\fs20 Newer Software Version Required.}\\par\\par\\pard ";
+ UnsuForm->info += "This module requires a newer version of the SWORD software engine. \\par\\par ";
+ UnsuForm->info += "Your Current Version: ";
+ UnsuForm->info += (const char *)SWVersion::currentVersion;
+ UnsuForm->info += "\\par Required Version: ";
+ UnsuForm->info += minVer.c_str();
+ UnsuForm->info += "\\par\\par\\b\\qc Please visit http://www.crosswire.org to upgrade.";
+ if (UnsuForm->ShowModal() == mrOk) {
+ return;
+ }
}
if (node->StateIndex == 1)
Modified: branches/BCB5/apps/InstallMgr/MainFrm.dfm
===================================================================
(Binary files differ)
Added: branches/BCB5/apps/InstallMgr/UnsuFrm.cpp
===================================================================
--- branches/BCB5/apps/InstallMgr/UnsuFrm.cpp (rev 0)
+++ branches/BCB5/apps/InstallMgr/UnsuFrm.cpp 2007-10-23 06:08:05 UTC (rev 470)
@@ -0,0 +1,39 @@
+//---------------------------------------------------------------------------
+#include <vcl.h>
+#pragma hdrstop
+
+#include "UnsuFrm.h"
+//---------------------------------------------------------------------------
+#pragma package(smart_init)
+#pragma resource "*.dfm"
+TUnsuForm *UnsuForm;
+//---------------------------------------------------------------------------
+__fastcall TUnsuForm::TUnsuForm(TComponent* Owner)
+ : TForm(Owner)
+{
+}
+//---------------------------------------------------------------------------
+void __fastcall TUnsuForm::FormShow(TObject *Sender)
+{
+ AnsiString abouttext = "";
+ TMemoryStream *RTFStream = new TMemoryStream();
+
+ abouttext = abouttext + "{\\fs20\\cf0 " + info.c_str() + " }";
+ RTFStream->Clear();
+ RTFStream->WriteBuffer(abouttext.c_str(), abouttext.Length());
+ RTFStream->Position = 0;
+ InfoText->Lines->LoadFromStream(RTFStream);
+ delete RTFStream;
+}
+//---------------------------------------------------------------------------
+void __fastcall TUnsuForm::SpeedButton1Click(TObject *Sender)
+{
+ ModalResult = mrOk;
+}
+//---------------------------------------------------------------------------
+void __fastcall TUnsuForm::SpeedButton2Click(TObject *Sender)
+{
+ ModalResult = mrIgnore;
+}
+//---------------------------------------------------------------------------
+
Added: branches/BCB5/apps/InstallMgr/UnsuFrm.dfm
===================================================================
--- branches/BCB5/apps/InstallMgr/UnsuFrm.dfm (rev 0)
+++ branches/BCB5/apps/InstallMgr/UnsuFrm.dfm 2007-10-23 06:08:05 UTC (rev 470)
@@ -0,0 +1,78 @@
+object UnsuForm: TUnsuForm
+ Left = 537
+ Top = 356
+ BorderStyle = bsDialog
+ Caption = 'Unsupported Module'
+ ClientHeight = 277
+ ClientWidth = 481
+ Color = clBtnFace
+ Font.Charset = DEFAULT_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'MS Sans Serif'
+ Font.Style = []
+ OldCreateOrder = False
+ Position = poScreenCenter
+ Scaled = False
+ OnShow = FormShow
+ PixelsPerInch = 96
+ TextHeight = 13
+ object Panel1: TPanel
+ Left = 0
+ Top = 248
+ Width = 481
+ Height = 29
+ Align = alBottom
+ TabOrder = 0
+ object SpeedButton1: TSpeedButton
+ Left = 140
+ Top = 4
+ Width = 97
+ Height = 22
+ Caption = 'OK'
+ Flat = True
+ Glyph.Data = {
+ 76010000424D7601000000000000760000002800000020000000100000000100
+ 0400000000000001000000000000000000001000000010000000000000000000
+ 8000008000000080800080000000800080008080000080808000C0C0C0000000
+ FF0000FF000000FFFF00FF000000FF00FF00FFFF0000FFFFFF00555555555555
+ 555555555555555555555555555555555555555555FF55555555555553055555
+ 55555555577FF5555555555533305555555555557777F5555555555533305555
+ 555555557777FF5555555553333305555555555777777F555555553333330555
+ 5555557777777FF5555557330533305555555777757777F55555730555533055
+ 55557775555777FF5555555555533305555555555557777F5555555555553305
+ 555555555555777FF5555555555553305555555555555777FF55555555555573
+ 05555555555555777FF5555555555557305555555555555777FF555555555555
+ 5330555555555555577755555555555555555555555555555555}
+ NumGlyphs = 2
+ OnClick = SpeedButton1Click
+ end
+ object SpeedButton2: TSpeedButton
+ Left = 244
+ Top = 4
+ Width = 97
+ Height = 22
+ Caption = 'Ignore'
+ Flat = True
+ OnClick = SpeedButton2Click
+ end
+ end
+ object Panel2: TPanel
+ Left = 0
+ Top = 0
+ Width = 481
+ Height = 248
+ Align = alClient
+ TabOrder = 1
+ object InfoText: TRichEdit
+ Left = 1
+ Top = 1
+ Width = 479
+ Height = 246
+ Align = alClient
+ ReadOnly = True
+ ScrollBars = ssVertical
+ TabOrder = 0
+ end
+ end
+end
Added: branches/BCB5/apps/InstallMgr/UnsuFrm.h
===================================================================
--- branches/BCB5/apps/InstallMgr/UnsuFrm.h (rev 0)
+++ branches/BCB5/apps/InstallMgr/UnsuFrm.h 2007-10-23 06:08:05 UTC (rev 470)
@@ -0,0 +1,34 @@
+//---------------------------------------------------------------------------
+#ifndef UnsuFrmH
+#define UnsuFrmH
+//---------------------------------------------------------------------------
+#include <Classes.hpp>
+#include <Controls.hpp>
+#include <StdCtrls.hpp>
+#include <Forms.hpp>
+#include <Buttons.hpp>
+#include <ComCtrls.hpp>
+#include <ExtCtrls.hpp>
+#include <swbuf.h>
+
+//---------------------------------------------------------------------------
+class TUnsuForm : public TForm
+{
+__published: // IDE-managed Components
+ TPanel *Panel1;
+ TPanel *Panel2;
+ TRichEdit *InfoText;
+ TSpeedButton *SpeedButton1;
+ TSpeedButton *SpeedButton2;
+ void __fastcall FormShow(TObject *Sender);
+ void __fastcall SpeedButton1Click(TObject *Sender);
+ void __fastcall SpeedButton2Click(TObject *Sender);
+private: // User declarations
+public: // User declarations
+ sword::SWBuf info;
+ __fastcall TUnsuForm(TComponent* Owner);
+};
+//---------------------------------------------------------------------------
+extern PACKAGE TUnsuForm *UnsuForm;
+//---------------------------------------------------------------------------
+#endif
More information about the sword-cvs
mailing list