[sword-svn] r439 - in trunk: . apps/InstallMgr apps/InstallMgr/installMgr stage
scribe at www.crosswire.org
scribe at www.crosswire.org
Wed Aug 23 11:28:33 MST 2006
Author: scribe
Date: 2006-08-23 11:28:22 -0700 (Wed, 23 Aug 2006)
New Revision: 439
Modified:
trunk/AboutBoxfrm.dfm
trunk/apps/InstallMgr/InstallManager.bpr
trunk/apps/InstallMgr/MainFrm.cpp
trunk/apps/InstallMgr/installMgr/installmgr.conf
trunk/apps/InstallMgr/libcurl.bpr
trunk/entryprvfrm.cpp
trunk/entryprvfrm.dfm
trunk/entryprvfrm.h
trunk/mainfrm.cpp
trunk/mainfrm.h
trunk/stage/layout.conf
trunk/stage/options.conf
trunk/swdisprtfchap.cpp
trunk/sword.bpr
trunk/sword.res
Log:
Added support for module preference in entryPreview form.
Added a call to RenderText on headers and removed the more specialized call to unicodeRTF
Fixed bug on -uninstall
improved logic for Local Path selection.
Modified: trunk/AboutBoxfrm.dfm
===================================================================
(Binary files differ)
Modified: trunk/apps/InstallMgr/InstallManager.bpr
===================================================================
--- trunk/apps/InstallMgr/InstallManager.bpr 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/apps/InstallMgr/InstallManager.bpr 2006-08-23 18:28:22 UTC (rev 439)
@@ -136,7 +136,7 @@
DebugSourceDirs=$(BCB)\source\vcl
[Parameters]
-RunParams=-init f:\
+RunParams=
HostApplication=
RemoteHost=
RemotePath=
Modified: trunk/apps/InstallMgr/MainFrm.cpp
===================================================================
--- trunk/apps/InstallMgr/MainFrm.cpp 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/apps/InstallMgr/MainFrm.cpp 2006-08-23 18:28:22 UTC (rev 439)
@@ -185,15 +185,14 @@
//---------------------------------------------------------------------------
void __fastcall TMainForm::LocalPath1Click(TObject *Sender) {
- AnsiString Dir = "C:";
- WideString Root = getLocalDir();
- SelectDirectory("Select Local Path", Root , Dir);
-
- setLocalDir(Dir.c_str());
-
- installMgr->installConf->Save();
- fillSourceTree(localTree);
- 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);
+ AnsiString Dir = getLocalDir();
+// if (SelectDirectory(Dir, TSelectDirOpts(), 0)) {
+ if (SelectDirectory("Select Local Path", WideString(""), Dir)) {
+ setLocalDir(Dir.c_str());
+ installMgr->installConf->Save();
+ fillSourceTree(localTree);
+ 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);
+ }
}
//---------------------------------------------------------------------------
@@ -654,7 +653,7 @@
UninstallForm->ProgressBar1->Position = 0;
ModMap::iterator it;
- for (it = mgr->Modules.begin(); it != mgr->Modules.end(); it++) {
+ for (it = mgr->Modules.begin(); it != mgr->Modules.end(); it = mgr->Modules.begin()) {
SWBuf label = "Uninstalling: [";
label += it->second->Name();
label += "] ";
Modified: trunk/apps/InstallMgr/installMgr/installmgr.conf
===================================================================
--- trunk/apps/InstallMgr/installMgr/installmgr.conf 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/apps/InstallMgr/installMgr/installmgr.conf 2006-08-23 18:28:22 UTC (rev 439)
@@ -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=f:\
+LocalPath=F:\
Modified: trunk/apps/InstallMgr/libcurl.bpr
===================================================================
--- trunk/apps/InstallMgr/libcurl.bpr 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/apps/InstallMgr/libcurl.bpr 2006-08-23 18:28:22 UTC (rev 439)
@@ -42,7 +42,7 @@
<CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tW -tWM"/>
<PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<AFLAGS value="/mx /w2 /zn"/>
- <LFLAGS value=""/>
+ <LFLAGS value="/P32"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="$(OBJFILES)"/>
@@ -97,6 +97,12 @@
Count=1
Item0=_DEBUG
+[HistoryLists\hlTlibPageSize]
+Count=3
+Item0=0x0020
+Item1=32
+Item2=0x0010
+
[Debugging]
DebugSourceDirs=$(BCB)\source\vcl
Modified: trunk/entryprvfrm.cpp
===================================================================
--- trunk/entryprvfrm.cpp 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/entryprvfrm.cpp 2006-08-23 18:28:22 UTC (rev 439)
@@ -21,10 +21,12 @@
}
//---------------------------------------------------------------------------
-void TentryPreviewForm::setEntryText(const char *buf) {
- pvrtf->fillWithRTFString(0, buf);
- }
-void __fastcall TentryPreviewForm::BitBtn1Click(TObject *Sender)
+void TentryPreviewForm::setEntryText(const char *buf, SWModule *modForFormatting) {
+ pvrtf->fillWithRTFString(modForFormatting, buf);
+}
+
+
+void __fastcall TentryPreviewForm::focusNoteContextBtnClick(TObject *Sender)
{
Form1->RestoreState(&modState);
}
Modified: trunk/entryprvfrm.dfm
===================================================================
--- trunk/entryprvfrm.dfm 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/entryprvfrm.dfm 2006-08-23 18:28:22 UTC (rev 439)
@@ -1,9 +1,9 @@
object entryPreviewForm: TentryPreviewForm
- Left = 878
- Top = 108
+ Left = 845
+ Top = 110
Width = 521
Height = 406
- Caption = 'entryPreviewForm'
+ Caption = 'Note Popout'
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
@@ -32,14 +32,14 @@
Height = 37
Align = alTop
TabOrder = 1
- object BitBtn1: TBitBtn
+ object focusNoteContextBtn: TBitBtn
Left = 4
Top = 4
Width = 161
Height = 29
Caption = 'Focus Note Context'
TabOrder = 0
- OnClick = BitBtn1Click
+ OnClick = focusNoteContextBtnClick
Glyph.Data = {
76010000424D7601000000000000760000002800000020000000100000000100
04000000000000010000130B0000130B00001000000000000000000000000000
Modified: trunk/entryprvfrm.h
===================================================================
--- trunk/entryprvfrm.h 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/entryprvfrm.h 2006-08-23 18:28:22 UTC (rev 439)
@@ -17,14 +17,14 @@
__published: // IDE-managed Components
TPanel *previewPanel;
TPanel *Panel1;
- TBitBtn *BitBtn1;
- void __fastcall BitBtn1Click(TObject *Sender);
+ TBitBtn *focusNoteContextBtn;
+ void __fastcall focusNoteContextBtnClick(TObject *Sender);
private: // User declarations
TRxRichEditX *pvrtf;
ModState modState;
public: // User declarations
__fastcall TentryPreviewForm(TComponent* Owner);
- void setEntryText(const char *buf);
+ void setEntryText(const char *buf, SWModule *modForFormatting = 0);
void setModState(const ModState &modState) { this->modState = modState; }
};
//---------------------------------------------------------------------------
Modified: trunk/mainfrm.cpp
===================================================================
--- trunk/mainfrm.cpp 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/mainfrm.cpp 2006-08-23 18:28:22 UTC (rev 439)
@@ -1056,8 +1056,8 @@
PrintForm->btnClose->Caption = _tr("&Close");
// Print Preview Form
- PreviewForm->btnPrint->Caption = "Print";
- PreviewForm->btnClose->Caption = "&Close";
+ PreviewForm->btnPrint->Caption = _tr("Print");
+ PreviewForm->btnClose->Caption = _tr("&Close");
delete UIFont;
@@ -1805,9 +1805,11 @@
void __fastcall TForm1::notePopoutClick(TObject *Sender) {
TentryPreviewForm *tmpForm = new TentryPreviewForm(this);
- tmpForm->setEntryText(tmpPreviewText.c_str());
+ tmpForm->setEntryText(tmpPreviewText.c_str(), tmpModule);
tmpForm->setModState(tmpModState);
tmpForm->Caption = UTF8ToWideString(tmpCaption);
+ tmpForm->focusNoteContextBtn->Caption = _tr("Focus Note Context");
+
tmpForm->Show();
}
@@ -1917,6 +1919,7 @@
String cap = String(WideStringToUTF8(_tr("Note from"))) + " " + target->Name() + ": " + tmpVerseList.getText() + ": " + clickText;
tmpCaption = cap;
tmpModState = ModState((TPageControl*)rtf->Parent->Parent, ((TPageControl*)rtf->Parent->Parent)->ActivePage, tmpVerseList);
+ tmpModule = target;
}
}
else {
Modified: trunk/mainfrm.h
===================================================================
--- trunk/mainfrm.h 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/mainfrm.h 2006-08-23 18:28:22 UTC (rev 439)
@@ -424,6 +424,7 @@
String tmpCaption;
String tmpPreviewText;
ModState tmpModState;
+ SWModule *tmpModule;
//---------------------------
bool renderingHint;
bool closing;
Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/stage/layout.conf 2006-08-23 18:28:22 UTC (rev 439)
@@ -1,25 +1,56 @@
[CommentView]
+ABS_Essay_GoodSam_SWB=
+Abbott=
+Barnes=
+Clarke=
+DTN=
+DutKant=
+Family=
+Finney=
+Geneva=
+GerAugustinus=
+GerLutherpredigten=
+Heretics=
+Institutes=
JFB=
+Josephus=
Jub=
+Lightfoot=
+Luther=
+MAK=
+MHC=
+MHCC=
+NeeNormal=
+Orthodoxy=
+PNT=
Personal=
+Pilgrim=
+Practice=
RWP=
+Rieger=
+Scofield=
+Spurious=
+TDavid=
+TFG=
+TSK=
+Wesley=
[History]
-LastComModule=
-LastLDKey=n17.4
-LastLDModule=
+LastComModule=Personal
+LastLDKey=04210
+LastLDModule=2BabDict
LastParaMod01=
LastParaMod02=
LastParaMod03=
LastTextModule=ESV
-LastVerse=James 1:2
+LastVerse=James 1:3
LookupSaveCount=5
-LookupText=James 1:2
-LookupText=James 1:19
-LookupText=마태복음 19:25
-LookupText=마태복음 19:11
-LookupText=마태복음 19:9
+LookupText=James 1:3
+LookupText=jas 1.19
+LookupText=Psalms 3:2
+LookupText=Psalms 3:1
+LookupText=ps 3
SearchSaveCount=5
SearchText=God love +world
SearchText=God love world
@@ -28,13 +59,134 @@
SearchText=<H03068>
[LDView]
+2BabDict=
+AmTract=
CBC=
+ERaf_en=
+ERang_en=
+ERca_en=
+ERcy_en=
+ERda_en=
+ERde_en=
+ERen_af=
+ERen_ang=
+ERen_bs=
+ERen_ca=
+ERen_cs=
+ERen_da=
+ERen_de=
+ERen_el=
+ERen_es=
+ERen_fi=
+ERen_fr=
+ERen_fy=
+ERen_ga=
+ERen_gd=
+ERen_grc=
+ERen_haw=
+ERen_he=
+ERen_id=
+ERen_is=
+ERen_it=
+ERen_ja=
+ERen_ku=
+ERen_la=
+ERen_mi=
+ERen_ms=
+ERen_mt=
+ERen_nl=
+ERen_no=
+ERen_pap=
+ERen_po=
+ERen_pt=
+ERen_ro=
+ERen_ru=
+ERen_sk=
+ERen_sq=
+ERen_sv=
+ERen_sw=
+ERen_tl=
+ERen_tn=
+ERen_ty=
+ERen_xEBAR=
+ERen_xEITZ=
+ERen_xELMO=
+ERen_xESRN=
+ERen_yo=
+ERen_zh=
+ERen_zu=
+EReo_en=
+ERes_en=
+ERfi_en=
+ERfr_en=
+ERfy_en=
+ERga_en=
+ERgd_en=
+ERhu_en=
+ERid_en=
+ERis_en=
+ERit_en=
+ERja_en=
+ERku_en=
+ERla_en=
+ERms_en=
+ERnl_en=
+ERno_en=
+ERpap_en=
+ERpo_en=
+ERpt_en=
+ERro_en=
+ERru_en=
+ERsq_en=
+ERsv_en=
+ERsw_en=
+ERtl_en=
+ERtr_en=
+ERty_en=
+ERyo_en=
+ERzu_en=
+Easton=
+FDaf_en=
+FDda_en=
+FDen_af=
+FDen_da=
+FDen_de=
+FDen_es=
+FDen_fi=
+FDen_fr=
+FDen_it=
+FDen_nl=
+FDen_no=
+FDen_pt=
+FDen_sv=
+FDfi_en=
+FDla_en=
+FDpt_en=
+FDsv_en=
+GreekHebrew=
+HebrewGreek=
+Hitchcock=
+ISBE=
+KJVD=
NasbGreek=
NasbHebrew=
+Nave=
+Packard=
Robinson=
+SAOA=
SME=
+Smith=
StrongsGreek=
StrongsHebrew=
+TCR=
+Torrey=
+WebstersDict=
+ZhEnglish=
+ZhHanzi=
+ZhPinyin=
+br_en=
+en_eu=
+la_en=
[ModuleOptions]
Cross-references=On
@@ -42,8 +194,8 @@
Headings=On
Hebrew Cantillation=Off
Hebrew Vowel Points=On
-Morphological Tags=Off
-Strong's Numbers=Off
+Morphological Tags=On
+Strong's Numbers=On
Textual Variants=Primary Reading
Transliteration=Off
Words of Christ in Red=On
@@ -60,23 +212,123 @@
SearchResCol0Width=175
SearchTop=51
SearchWidth=759
-TextComHeight=511
+TextComHeight=421
TextWidth=563
[TextView]
+AB=
+ACV=
+AKJV=
+ALT=
ASV=true
+Afr1953=
+Alb=
+Aleppo=
+AraSVD=
+BBE=
+BWE=
+Bulgarian=
+Byz=
ChiNCVs=true
ChiNCVt=true
ChiUn=true
ChiUns=true
+Common=
+Cro=
+CzeBKR=
+CzeCEP=
+CzeKMS=
+CzeNKB=
+DRA=
+DRC=
+Dan=
+Darby=
+Diaglott=
+DutSVV=
+EMTV=
ESV=
+Esperanto=
+Est=
+FinBiblia=
+FinPR=
+FinPR92=
+FreCrl=
+FreLSG=
+GerElb=
+GerElb1871=
+GerLut=
+GerLut1545=
GerNEU=true
+GerSch=
+GodsWord=
+GothicA=
+GothicB=
+HNV=
+HebModern=
+HunKar=
+ISV=
+Icelandic=
+ItaDio=
+ItaRive=
+JPS=
+JST=
Jub=
+Jubilee2000=
KJV=true
KJVraw=true
+KLV=
+Kekchi=
+Korean=
+LITV=
+LO=
+LXX=
+Latvian=
+Lithuanian=
+MKJV=
+ManxGaelic=
+Maori=
+Montgomery=
+Murdock=
NASB=true
+Norsk=
+OrthJBC=
PARALLEL=true
+Peshitta=
+PorAA=
+RKJNT=
+RNKJV=
+RST=
+RWebster=
+RomCor=
+Rotherham=
+RusMakarij=
+RusVZh=
+ScotsGaelic=
+SpaRV=
+SpaSEV=
+SpaVNT=
+Swahili=
+Swe1917=
TR=true
+Tagalog=
+ThaiKJV=
+Tisch=
+Turkish=
+Twenty=
+Tyndale=
+UMGreek=
+Ukrainian=
+Uma=
+Viet=
+Vulgate=
+Vulgate_HebPs=
+WEB=
WHNU=true
WLC=true
+Webster=
+Weymouth=
+Wulfila=
+Wycliffe=
+Xhosa=
+YLT=
Modified: trunk/stage/options.conf
===================================================================
--- trunk/stage/options.conf 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/stage/options.conf 2006-08-23 18:28:22 UTC (rev 439)
@@ -89,7 +89,7 @@
UIFontSize=14
VSNumberColor=16711680
VerseNewLine=0
-locale=ko
+locale=en_us
[Bookmarks]
AutoSaveOther=0
@@ -123,9 +123,9 @@
[ModDefaults]
DailyDevotion=SME
GenDict=CBC
-GreekDef=NasbGreek
+GreekDef=StrongsGreek
GreekParse=Robinson
-HebrewDef=NasbHebrew
+HebrewDef=StrongsHebrew
StrongsNumbers=ChiUn
[PrintedPage]
Modified: trunk/swdisprtfchap.cpp
===================================================================
--- trunk/swdisprtfchap.cpp 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/swdisprtfchap.cpp 2006-08-23 18:28:22 UTC (rev 439)
@@ -58,7 +58,6 @@
System::AnsiString newtext, tmptext, tmptext2;
VerseKey *key = (VerseKey *)(SWKey *)Module;
key->Headings(1);
- UnicodeRTF uToRTF;
testmt = key->Testament();
book = key->Book();
chap = key->Chapter();
@@ -112,7 +111,7 @@
do {
sprintf(buf, "%i", pvHeading++);
SWBuf preverseHeading = module->getEntryAttributes()["Heading"]["Preverse"][buf].c_str();
- uToRTF.processText(preverseHeading);
+ preverseHeading = Module.RenderText(preverseHeading);
if (preverseHeading.length()) {
newtext += ((AnsiString)"\\par\\par {\\i1\\b1 ") + preverseHeading.c_str() + "\\par}";
}
Modified: trunk/sword.bpr
===================================================================
--- trunk/sword.bpr 2006-08-22 00:26:24 UTC (rev 438)
+++ trunk/sword.bpr 2006-08-23 18:28:22 UTC (rev 439)
@@ -44,7 +44,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="..\sword\src\modules\filters;D:\;TntUnicodeControls;..\icu-sword\source\common;..\icu-sword\source\i18n;..\sword\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -58,11 +58,11 @@
-I$(BCB)\include -I$(BCB)\include\vcl -Irxlib -src_suffix cpp -D_ICU_
-D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE
-D_CL_DISABLE_MULTITHREADING"/>
- <CFLAG1 value="-Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-N2obj -N0obj -$Y+ -$W -$O- -v -M -JPHNE"/>
+ <CFLAG1 value="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-N2obj -N0obj -$Y- -$L- -$D- -v -M -JPHNE"/>
<RFLAGS value=""/>
- <AFLAGS value="/mx /w2 /zi"/>
- <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn -v"/>
+ <AFLAGS value="/mx /w2 /zn"/>
+ <LFLAGS value="-Iobj -D"" -aa -Tpe -GD -s -Gn"/>
</OPTIONS>
<LINKER>
<ALLOBJ value="c0w32.obj $(OBJFILES)"/>
@@ -76,7 +76,7 @@
MajorVer=1
MinorVer=5
Release=8
-Build=13
+Build=17
Debug=0
PreRelease=0
Special=0
@@ -88,13 +88,13 @@
[Version Info Keys]
CompanyName=CrossWire Software & Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.8.13
+FileVersion=1.5.8.17
InternalName=biblecs
-LegalCopyright=(c) 1990-2005 CrossWire Bible Society under the terms of the GNU General Public License
+LegalCopyright=(c) 1990-2006 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
OriginalFilename=
ProductName=The SWORD Project
-ProductVersion=1.5.8rc6
+ProductVersion=1.5.8rcF3
Comments=Seek Him and you will find Him
[HistoryLists\hlIncludePath]
@@ -142,8 +142,8 @@
[HistoryLists\hlConditionals]
Count=16
-Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item0=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING
+Item1=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_CL_DISABLE_MULTITHREADING;_DEBUG
Item2=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE
Item3=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_DEBUG
Item4=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
Modified: trunk/sword.res
===================================================================
(Binary files differ)
More information about the sword-cvs
mailing list