[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS RxRichEditX.cpp,1.40,1.41 RxRichEditX.h,1.14,1.15 editentryfrm.cpp,1.11,1.12 editentryfrm.dfm,1.9,1.10 editentryfrm.h,1.5,1.6 mainfrm.cpp,1.109,1.110 mainfrm.dfm,1.40,1.41 mainfrm.h,1.43,1.44 optionfrm.cpp,1.33,1.34 optionfrm.dfm,1.50,1.51 optionfrm.h,1.21,1.22 searchfrm.cpp,1.40,1.41
sword@www.crosswire.org
sword@www.crosswire.org
Wed, 26 Mar 2003 15:07:14 -0700
Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv23146/apps/windoze/CBuilder5/BibleCS
Modified Files:
RxRichEditX.cpp RxRichEditX.h editentryfrm.cpp
editentryfrm.dfm editentryfrm.h mainfrm.cpp mainfrm.dfm
mainfrm.h optionfrm.cpp optionfrm.dfm optionfrm.h
searchfrm.cpp
Log Message:
daniel: revert the tnt components (3rd party design components are against policy)
try to fix it to use SWBuf - it compiles but unicode is borked
Index: RxRichEditX.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** RxRichEditX.cpp 27 Jan 2003 23:12:39 -0000 1.40
--- RxRichEditX.cpp 26 Mar 2003 22:07:12 -0000 1.41
***************
*** 15,23 ****
char TRxRichEditX::platformID = 0;
- #ifdef OLDRXRICHEDIT
TRxRichEditX::TRxRichEditX(TWinControl *parent) : TRxRichEdit(parent)
- #else
- TRxRichEditX::TRxRichEditX(TWinControl *parent) : TTntRichEdit(parent)
- #endif
{
OSVERSIONINFO osvi;
--- 15,19 ----
***************
*** 289,293 ****
System::AnsiString newtext, tmptext;
static UnicodeRTF filter;
! char buf[255];
this->module = module;
--- 285,289 ----
System::AnsiString newtext, tmptext;
static UnicodeRTF filter;
! SWBuf buf;
this->module = module;
***************
*** 336,345 ****
toupperstr_utf8(buf2);
module->getRawEntry();
! strcpy(buf, module->KeyText());
! toupperstr_utf8(buf);
int i;
! char *start1 = buf;
char *start2 = buf2;
! int len = strlen(buf);
for (i = 0; i < len; i++) {
if (*start1 == '0') {
--- 332,342 ----
toupperstr_utf8(buf2);
module->getRawEntry();
! char *buf3 = 0;
! stdstr(&buf3, (const char *)module->KeyText());
! toupperstr_utf8(buf3);
int i;
! char *start1 = buf3;
char *start2 = buf2;
! int len = strlen(buf3);
for (i = 0; i < len; i++) {
if (*start1 == '0') {
***************
*** 360,376 ****
if (!i || i < (strlen(start1)/2)) {
delete [] buf2;
verses->Remove();
continue;
}
delete [] buf2;
if (!first)
newtext += "{\\par\\par}";
newtext += RTFHeadingPre;
! strcpy(buf, module->KeyText());
// VerseKey locales are not yet UTF8, so don't try to convert them.
if (!SWDYNAMIC_CAST(VerseKey, testKey))
! filter.ProcessText(buf, 253, *module, module);
! newtext = newtext + RTFHeadingPre + buf + RTFHeadingPost + ":\\par ";
newtext += RTFHeadingPost;
--- 357,375 ----
if (!i || i < (strlen(start1)/2)) {
delete [] buf2;
+ delete [] buf3;
verses->Remove();
continue;
}
delete [] buf2;
+ delete [] buf3;
if (!first)
newtext += "{\\par\\par}";
newtext += RTFHeadingPre;
! buf = module->KeyText();
// VerseKey locales are not yet UTF8, so don't try to convert them.
if (!SWDYNAMIC_CAST(VerseKey, testKey))
! filter.processText(buf, *module, module);
! newtext = newtext + RTFHeadingPre + buf.c_str() + RTFHeadingPost + ":\\par ";
newtext += RTFHeadingPost;
***************
*** 674,684 ****
RTFTrailer = buf;
! char chapBuf[1024];
! strcpy(chapBuf, WideStringToUTF8(_tr("Chapter")).c_str());
! filter.ProcessText(chapBuf, 1022, *module, module);
!
! sprintf(buf,
! "\\pard \\qc\\nowidctlpar{\\f1\\cf7\\fs%d\\b %s ",
! (int)(fontBase * 10), chapBuf);
RTFChapterMarkPre = buf;
--- 673,684 ----
RTFTrailer = buf;
! SWBuf chapBuf;
! //chapBuf = WideStringToUTF8(_tr("Chapter")).c_str();
! chapBuf = _tr("Chapter");
! filter.processText(chapBuf, *module, module);
!
! sprintf(buf,
! "\\pard \\qc\\nowidctlpar{\\f1\\cf7\\fs%d\\b %s ",
! (int)(fontBase * 10), chapBuf.c_str());
RTFChapterMarkPre = buf;
Index: RxRichEditX.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** RxRichEditX.h 27 Jan 2003 23:12:39 -0000 1.14
--- RxRichEditX.h 26 Mar 2003 22:07:12 -0000 1.15
***************
*** 6,14 ****
#include <StdCtrls.hpp>
#include <Forms.hpp>
- #ifdef OLDRXRICHEDIT
#include <RxRichEdit.hpp>
- #else
- #include <TntComCtrls.hpp>
- #endif
#include <ExtCtrls.hpp>
#include <swmodule.h>
--- 6,10 ----
***************
*** 65,73 ****
*/
- #ifdef OLDRXRICHEDIT
class TRxRichEditX : public TRxRichEdit {
- #else
- class TRxRichEditX : public TTntRichEdit {
- #endif
private:
AnsiString GetFormattedText(SWModule* module);
--- 61,65 ----
Index: editentryfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/editentryfrm.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** editentryfrm.cpp 27 Jan 2003 09:23:06 -0000 1.11
--- editentryfrm.cpp 26 Mar 2003 22:07:12 -0000 1.12
***************
*** 66,75 ****
//----------------------------------------------------------------------------
- #ifdef OLDRXRICHEDIT
TRxTextAttributes *__fastcall TEditEntryForm::CurrText(void)
{
return RichEdit1->SelAttributes;
}
- #endif
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::CheckFileSave(void)
--- 66,73 ----
***************
*** 148,152 ****
void __fastcall TEditEntryForm::BoldButtonClick(TObject* /*Sender*/)
{
- #ifdef OLDRXRICHEDIT
if ( !FUpdating )
{ if ( BoldButton->Down )
--- 146,149 ----
***************
*** 155,164 ****
CurrText()->Style = CurrText()->Style >> fsBold;
}
- #endif
}
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::ItalicButtonClick(TObject* /*Sender*/)
{
- #ifdef OLDRXRICHEDIT
if ( !FUpdating )
{
--- 152,159 ----
***************
*** 168,177 ****
CurrText()->Style = CurrText()->Style >> fsItalic;
}
- #endif
}
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::UnderlineButtonClick(TObject* /*Sender*/)
{
- #ifdef OLDRXRICHEDIT
if ( !FUpdating ) {
if ( UnderlineButton->Down )
--- 163,170 ----
***************
*** 179,183 ****
else CurrText()->Style = CurrText()->Style >> fsUnderline;
}
- #endif
}
--- 172,175 ----
***************
*** 185,189 ****
void __fastcall TEditEntryForm::FontSizeChange(TObject* /*Sender*/)
{
- #ifdef OLDRXRICHEDIT
int fontsize = atoi(FontSize->Text.c_str());
--- 177,180 ----
***************
*** 200,204 ****
CurrText()->Size = atoi(FontSize->Text.c_str());
}
- #endif
}
--- 191,194 ----
Index: editentryfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/editentryfrm.dfm,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** editentryfrm.dfm 1 Aug 2002 04:38:33 -0000 1.9
--- editentryfrm.dfm 26 Mar 2003 22:07:12 -0000 1.10
***************
*** 818,822 ****
Height = 9
AutoSize = False
! Caption = 'ê'
DragCursor = crArrow
Font.Charset = DEFAULT_CHARSET
--- 818,822 ----
Height = 9
AutoSize = False
! Caption = #234
DragCursor = crArrow
Font.Charset = DEFAULT_CHARSET
***************
*** 836,840 ****
Height = 11
AutoSize = False
! Caption = 'é'
DragCursor = crArrow
Font.Charset = DEFAULT_CHARSET
--- 836,840 ----
Height = 11
AutoSize = False
! Caption = #233
DragCursor = crArrow
Font.Charset = DEFAULT_CHARSET
***************
*** 860,864 ****
Width = 10
Height = 14
! Caption = 'ñ'
DragCursor = crArrow
Font.Charset = DEFAULT_CHARSET
--- 860,864 ----
Width = 10
Height = 14
! Caption = #241
DragCursor = crArrow
Font.Charset = DEFAULT_CHARSET
***************
*** 875,879 ****
object StatusBar: TStatusBar
Left = 0
! Top = 362
Width = 533
Height = 18
--- 875,879 ----
object StatusBar: TStatusBar
Left = 0
! Top = 360
Width = 533
Height = 18
***************
*** 885,889 ****
Top = 58
Width = 533
! Height = 304
Align = alClient
Caption = 'pnlRichEdit'
--- 885,889 ----
Top = 58
Width = 533
! Height = 302
Align = alClient
Caption = 'pnlRichEdit'
Index: editentryfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/editentryfrm.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** editentryfrm.h 27 Jan 2003 09:23:06 -0000 1.5
--- editentryfrm.h 26 Mar 2003 22:07:12 -0000 1.6
***************
*** 82,88 ****
int FDragOfs;
bool FDragging;
- #ifdef OLDRXRICHEDIT
TRxTextAttributes *__fastcall CurrText(void);
- #endif
void __fastcall CheckFileSave(void);
void __fastcall SetupRuler(void);
--- 82,86 ----
Index: mainfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** mainfrm.cpp 27 Jan 2003 23:12:39 -0000 1.109
--- mainfrm.cpp 26 Mar 2003 22:07:12 -0000 1.110
***************
*** 117,121 ****
}
! freeHandLookup->Text = UTF8ToWideString(verse);
freeHandLookupoldKeyPress(0, '\r');
--- 117,122 ----
}
! //freeHandLookup->Text = UTF8ToWideString(verse);
! freeHandLookup->Text = verse;
freeHandLookupoldKeyPress(0, '\r');
***************
*** 410,414 ****
CHBox->Text = DefaultVSKey->Chapter();
VSBox->Text = DefaultVSKey->Verse();
! freeHandLookup->Text = UTF8ToWideString((const char *)*DefaultVSKey);
RefreshActiveSheet(TextPageControl);
logmodstate = false; // only log state once
--- 411,416 ----
CHBox->Text = DefaultVSKey->Chapter();
VSBox->Text = DefaultVSKey->Verse();
! //freeHandLookup->Text = UTF8ToWideString((const char *)*DefaultVSKey);
! freeHandLookup->Text = (const char *)*DefaultVSKey;
RefreshActiveSheet(TextPageControl);
logmodstate = false; // only log state once
***************
*** 428,432 ****
VSBox->Text = StrToInt(VSBox->Text) + 1;
! (*DefaultVSKey) = WideStringToUTF8((cbBook->Text + " " + CHBox->Text + ":" + VSBox->Text)).c_str();
TextKeyChanged();
DefaultVSKey->AutoNormalize(1);
--- 430,435 ----
VSBox->Text = StrToInt(VSBox->Text) + 1;
! //(*DefaultVSKey) = WideStringToUTF8((cbBook->Text + " " + CHBox->Text + ":" + VSBox->Text)).c_str();
! (*DefaultVSKey) = (cbBook->Text + " " + CHBox->Text + ":" + VSBox->Text).c_str();
TextKeyChanged();
DefaultVSKey->AutoNormalize(1);
***************
*** 484,488 ****
module->Error();
for (;!module->Error() && count;count--,(*module)++) {
! lbDictKeys->Items->Add(UTF8ToWideString(module->KeyText()));
if (saveKey == module->Key())
index = lbDictKeys->Items->Count-1;
--- 487,492 ----
module->Error();
for (;!module->Error() && count;count--,(*module)++) {
! //lbDictKeys->Items->Add(UTF8ToWideString(module->KeyText()));
! lbDictKeys->Items->Add(module->KeyText());
if (saveKey == module->Key())
index = lbDictKeys->Items->Count-1;
***************
*** 596,600 ****
}
! DictKeyEdit->Text = UTF8ToWideString(lookupKey);
}
--- 600,605 ----
}
! //DictKeyEdit->Text = UTF8ToWideString(lookupKey);
! DictKeyEdit->Text = lookupKey;
}
***************
*** 666,670 ****
AnsiString s1 = (const char *)(*myVk);
s1.SetLength(s1.Length() - 4);
! cbBook->Items->Add(UTF8ToWideString(s1));
myVk->Book(myVk->Book() + 1);
}
--- 671,676 ----
AnsiString s1 = (const char *)(*myVk);
s1.SetLength(s1.Length() - 4);
! //cbBook->Items->Add(UTF8ToWideString(s1));
! cbBook->Items->Add(s1);
myVk->Book(myVk->Book() + 1);
}
***************
*** 1166,1170 ****
eitend = (*sit).second.upper_bound("SearchText");
for (eit = (*sit).second.lower_bound("SearchText"); eit != eitend; eit++)
! searchForm->SearchText->Items->Add(UTF8ToWideString(eit->second.c_str()));
eitend = (*sit).second.upper_bound("LookupText");
--- 1172,1177 ----
eitend = (*sit).second.upper_bound("SearchText");
for (eit = (*sit).second.lower_bound("SearchText"); eit != eitend; eit++)
! //searchForm->SearchText->Items->Add(UTF8ToWideString(eit->second.c_str()));
! searchForm->SearchText->Items->Add(eit->second.c_str());
eitend = (*sit).second.upper_bound("LookupText");
***************
*** 1198,1202 ****
}
if ((eit = (*sit).second.find("LastLDKey")) != (*sit).second.end()) {
! DictKeyEdit->Text = UTF8ToWideString((*eit).second.c_str());
}
--- 1205,1210 ----
}
if ((eit = (*sit).second.find("LastLDKey")) != (*sit).second.end()) {
! //DictKeyEdit->Text = UTF8ToWideString((*eit).second.c_str());
! DictKeyEdit->Text = (*eit).second.c_str();
}
***************
*** 1318,1322 ****
(*((*it).second))++;
else (*((*it).second))--;
! DictKeyEdit->Text = UTF8ToWideString(((*it).second)->KeyText());
}
}
--- 1326,1331 ----
(*((*it).second))++;
else (*((*it).second))--;
! //DictKeyEdit->Text = UTF8ToWideString(((*it).second)->KeyText());
! DictKeyEdit->Text = ((*it).second)->KeyText();
}
}
***************
*** 1349,1353 ****
}
if (state->pc == LexDictPageControl) {
! DictKeyEdit->Text = UTF8ToWideString((const char *)state->key);
}
if (state->pc->ActivePage->ControlCount){
--- 1358,1363 ----
}
if (state->pc == LexDictPageControl) {
! //DictKeyEdit->Text = UTF8ToWideString((const char *)state->key);
! DictKeyEdit->Text = ((const char *)state->key);
}
if (state->pc->ActivePage->ControlCount){
Index: mainfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** mainfrm.dfm 27 Jan 2003 09:23:06 -0000 1.40
--- mainfrm.dfm 26 Mar 2003 22:07:12 -0000 1.41
***************
*** 57,61 ****
ResizeStyle = rsUpdate
end
! object pnlTextCom: TTntPanel
Left = 0
Top = 46
--- 57,61 ----
ResizeStyle = rsUpdate
end
! object pnlTextCom: TPanel
Left = 0
Top = 46
***************
*** 74,78 ****
ResizeStyle = rsUpdate
end
! object pnlText: TTntPanel
Left = 0
Top = 0
--- 74,78 ----
ResizeStyle = rsUpdate
end
! object pnlText: TPanel
Left = 0
Top = 0
***************
*** 85,89 ****
PopupMenu = PopupMenu4
TabOrder = 0
! object TextPageControl: TTntPageControl
Left = 0
Top = 0
--- 85,89 ----
PopupMenu = PopupMenu4
TabOrder = 0
! object TextPageControl: TPageControl
Left = 0
Top = 0
***************
*** 106,110 ****
end
end
! object pnlComment: TTntPanel
Left = 373
Top = 0
--- 106,110 ----
end
end
! object pnlComment: TPanel
Left = 373
Top = 0
***************
*** 117,121 ****
PopupMenu = PopupMenu4
TabOrder = 1
! object CommentaryPageControl: TTntPageControl
Left = 0
Top = 0
--- 117,121 ----
PopupMenu = PopupMenu4
TabOrder = 1
! object CommentaryPageControl: TPageControl
Left = 0
Top = 0
***************
*** 139,143 ****
end
end
! object pnlDict: TTntPanel
Left = 0
Top = 246
--- 139,143 ----
end
end
! object pnlDict: TPanel
Left = 0
Top = 246
***************
*** 158,162 ****
Align = alRight
end
! object LexDictPageControl: TTntPageControl
Left = 0
Top = 0
--- 158,162 ----
Align = alRight
end
! object LexDictPageControl: TPageControl
Left = 0
Top = 0
***************
*** 178,182 ****
OnChange = LexDictPageControlChange
end
! object Panel2: TTntPanel
Left = 442
Top = 0
--- 178,182 ----
OnChange = LexDictPageControlChange
end
! object Panel2: TPanel
Left = 442
Top = 0
***************
*** 186,190 ****
Caption = 'Panel2'
TabOrder = 1
! object DictKeyEditOld: TTntRichEdit
Left = 1
Top = 1
--- 186,190 ----
Caption = 'Panel2'
TabOrder = 1
! object DictKeyEditOld: TRichEdit
Left = 1
Top = 1
***************
*** 206,210 ****
OnChange = DictKeyEditOldChange
end
! object lbDictKeysOld: TTntListBox
Left = 1
Top = 25
--- 206,210 ----
OnChange = DictKeyEditOldChange
end
! object lbDictKeysOld: TListBox
Left = 1
Top = 25
***************
*** 353,357 ****
end
end
! object Panel1: TTntPanel
Left = 137
Top = 0
--- 353,357 ----
end
end
! object Panel1: TPanel
Left = 137
Top = 0
***************
*** 360,364 ****
BevelOuter = bvNone
TabOrder = 2
! object btnLookup: TTntSpeedButton
Left = 212
Top = 0
--- 360,364 ----
BevelOuter = bvNone
TabOrder = 2
! object btnLookup: TSpeedButton
Left = 212
Top = 0
***************
*** 461,465 ****
OnKeyPress = freeHandLookupoldKeyPress
end
! object cbBook: TTntComboBox
Left = 0
Top = 0
--- 461,465 ----
OnKeyPress = freeHandLookupoldKeyPress
end
! object cbBook: TComboBox
Left = 0
Top = 0
***************
*** 478,482 ****
OnChange = cbBookChange
end
! object freeHandLookup: TTntComboBox
Left = 0
Top = 21
--- 478,482 ----
OnChange = cbBookChange
end
! object freeHandLookup: TComboBox
Left = 0
Top = 21
***************
*** 506,510 ****
Images = ImageList2
TabOrder = 3
! object Bookmarkbtn: TTntSpeedButton
Left = 0
Top = 2
--- 506,510 ----
Images = ImageList2
TabOrder = 3
! object Bookmarkbtn: TSpeedButton
Left = 0
Top = 2
***************
*** 564,568 ****
end
end
! object pnlSpeed: TTntPanel
Left = 12
Top = 0
--- 564,568 ----
end
end
! object pnlSpeed: TPanel
Left = 12
Top = 0
***************
*** 574,622 ****
end
end
! object MainMenu1: TTntMainMenu
Left = 572
Top = 4
! object File1: TTntMenuItem
Caption = '&File'
! object NewVer1: TTntMenuItem
Caption = '&New Verse List'
OnClick = NewVer1Click
end
! object SaveLayout1: TTntMenuItem
Caption = 'S&ave Layout'
OnClick = SaveLayout1Click
end
! object N5: TTntMenuItem
Caption = '-'
end
! object Print1: TTntMenuItem
Caption = '&Print...'
OnClick = Print1Click
end
! object N1: TTntMenuItem
Caption = '-'
end
! object Exit1: TTntMenuItem
Caption = 'E&xit'
OnClick = Exit1Click
end
end
! object Edit1: TTntMenuItem
Caption = '&Edit'
! object Copy3: TTntMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
end
! object Options2: TTntMenuItem
Caption = 'Options'
! object Options1: TTntMenuItem
Caption = '&Preferences...'
OnClick = Options1Click
end
end
! object Search1: TTntMenuItem
Caption = '&Search'
! object NewSearchWindow1: TTntMenuItem
Caption = '&New Search Window'
ShortCut = 114
--- 574,622 ----
end
end
! object MainMenu1: TMainMenu
Left = 572
Top = 4
! object File1: TMenuItem
Caption = '&File'
! object NewVer1: TMenuItem
Caption = '&New Verse List'
OnClick = NewVer1Click
end
! object SaveLayout1: TMenuItem
Caption = 'S&ave Layout'
OnClick = SaveLayout1Click
end
! object N5: TMenuItem
Caption = '-'
end
! object Print1: TMenuItem
Caption = '&Print...'
OnClick = Print1Click
end
! object N1: TMenuItem
Caption = '-'
end
! object Exit1: TMenuItem
Caption = 'E&xit'
OnClick = Exit1Click
end
end
! object Edit1: TMenuItem
Caption = '&Edit'
! object Copy3: TMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
end
! object Options2: TMenuItem
Caption = 'Options'
! object Options1: TMenuItem
Caption = '&Preferences...'
OnClick = Options1Click
end
end
! object Search1: TMenuItem
Caption = '&Search'
! object NewSearchWindow1: TMenuItem
Caption = '&New Search Window'
ShortCut = 114
***************
*** 624,648 ****
end
end
! object Tools1: TTntMenuItem
Caption = '&Tools'
! object InstallManager1: TTntMenuItem
Caption = 'Install Manager'
OnClick = InstallManager1Click
end
end
! object Help1: TTntMenuItem
Caption = '&Help'
! object Contents1: TTntMenuItem
Caption = 'Contents'
OnClick = Contents1Click
end
! object DevotionaloftheDay1: TTntMenuItem
Caption = 'Devotional of the Day'
OnClick = DevotionaloftheDay1Click
end
! object SEPERATOR: TTntMenuItem
Caption = '-'
end
! object About1: TTntMenuItem
Caption = '&About'
OnClick = About1Click
--- 624,648 ----
end
end
! object Tools1: TMenuItem
Caption = '&Tools'
! object InstallManager1: TMenuItem
Caption = 'Install Manager'
OnClick = InstallManager1Click
end
end
! object Help1: TMenuItem
Caption = '&Help'
! object Contents1: TMenuItem
Caption = 'Contents'
OnClick = Contents1Click
end
! object DevotionaloftheDay1: TMenuItem
Caption = 'Devotional of the Day'
OnClick = DevotionaloftheDay1Click
end
! object SEPERATOR: TMenuItem
Caption = '-'
end
! object About1: TMenuItem
Caption = '&About'
OnClick = About1Click
***************
*** 650,666 ****
end
end
! object PopupMenu2: TTntPopupMenu
OnPopup = PopupMenuPopup
Left = 273
Top = 246
! object Copy2: TTntMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
! object DictionaryLookup1: TTntMenuItem
Caption = 'Dictionary Lookup'
OnClick = DictionaryLookup1Click
end
! object SearchForWord2: TTntMenuItem
Caption = 'Search For Word'
OnClick = SearchForWord1Click
--- 650,666 ----
end
end
! object PopupMenu2: TPopupMenu
OnPopup = PopupMenuPopup
Left = 273
Top = 246
! object Copy2: TMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
! object DictionaryLookup1: TMenuItem
Caption = 'Dictionary Lookup'
OnClick = DictionaryLookup1Click
end
! object SearchForWord2: TMenuItem
Caption = 'Search For Word'
OnClick = SearchForWord1Click
***************
*** 683,720 ****
Top = 56
end
! object PopupMenu1: TTntPopupMenu
OnPopup = PopupMenuPopup
Left = 245
Top = 246
! object Copy1: TTntMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
! object CopyasBGreekTransliteration1: TTntMenuItem
Caption = 'Copy as &B-Greek Transliteration'
OnClick = CopyasBGreekTransliteration1Click
end
! object MenuItem1: TTntMenuItem
Caption = 'Dictionary Lookup'
OnClick = DictionaryLookup1Click
end
! object SearchForWord1: TTntMenuItem
Caption = 'Search For Word'
OnClick = SearchForWord1Click
end
end
! object BookmarkPopup: TTntPopupMenu
Left = 600
! object AddBookmark1: TTntMenuItem
Caption = '&Add Bookmark'
Hint = 'Add Current Verse to Personal Bookmarks'
OnClick = AddBookmark1Click
end
! object EditBookmarks1: TTntMenuItem
Caption = '&Edit Bookmarks / Tree View...'
Hint = 'Edit Bookmarks / View Bookmarks in a Tree View'
OnClick = EditBookmarks1Click
end
! object N2: TTntMenuItem
Caption = '-'
end
--- 683,720 ----
Top = 56
end
! object PopupMenu1: TPopupMenu
OnPopup = PopupMenuPopup
Left = 245
Top = 246
! object Copy1: TMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
! object CopyasBGreekTransliteration1: TMenuItem
Caption = 'Copy as &B-Greek Transliteration'
OnClick = CopyasBGreekTransliteration1Click
end
! object MenuItem1: TMenuItem
Caption = 'Dictionary Lookup'
OnClick = DictionaryLookup1Click
end
! object SearchForWord1: TMenuItem
Caption = 'Search For Word'
OnClick = SearchForWord1Click
end
end
! object BookmarkPopup: TPopupMenu
Left = 600
! object AddBookmark1: TMenuItem
Caption = '&Add Bookmark'
Hint = 'Add Current Verse to Personal Bookmarks'
OnClick = AddBookmark1Click
end
! object EditBookmarks1: TMenuItem
Caption = '&Edit Bookmarks / Tree View...'
Hint = 'Edit Bookmarks / View Bookmarks in a Tree View'
OnClick = EditBookmarks1Click
end
! object N2: TMenuItem
Caption = '-'
end
***************
*** 734,773 ****
Top = 2
end
! object PopupMenu3: TTntPopupMenu
OnPopup = PopupMenuPopup
Left = 301
Top = 246
! object EditEntry1: TTntMenuItem
Caption = '&Edit Entry'
OnClick = EditEntry1Click
end
! object DeleteEntry1: TTntMenuItem
Caption = '&Delete Entry'
OnClick = DeleteEntry1Click
end
! object LinktoVerse1: TTntMenuItem
Caption = 'Link to Comment for Verse...'
OnClick = LinktoVerse1Click
end
! object N3: TTntMenuItem
Caption = '-'
end
! object Copy4: TTntMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
! object DictionaryLookup2: TTntMenuItem
Caption = 'Dictionary Lookup'
OnClick = DictionaryLookup1Click
end
! object SearchForWord3: TTntMenuItem
Caption = 'Search For Word'
OnClick = SearchForWord1Click
end
end
! object PopupMenu4: TTntPopupMenu
Left = 328
Top = 58
! object HideShowModules1: TTntMenuItem
Caption = 'Hide / Show Modules'
OnClick = HideShowModules1Click
--- 734,773 ----
Top = 2
end
! object PopupMenu3: TPopupMenu
OnPopup = PopupMenuPopup
Left = 301
Top = 246
! object EditEntry1: TMenuItem
Caption = '&Edit Entry'
OnClick = EditEntry1Click
end
! object DeleteEntry1: TMenuItem
Caption = '&Delete Entry'
OnClick = DeleteEntry1Click
end
! object LinktoVerse1: TMenuItem
Caption = 'Link to Comment for Verse...'
OnClick = LinktoVerse1Click
end
! object N3: TMenuItem
Caption = '-'
end
! object Copy4: TMenuItem
Caption = '&Copy'
OnClick = Copy1Click
end
! object DictionaryLookup2: TMenuItem
Caption = 'Dictionary Lookup'
OnClick = DictionaryLookup1Click
end
! object SearchForWord3: TMenuItem
Caption = 'Search For Word'
OnClick = SearchForWord1Click
end
end
! object PopupMenu4: TPopupMenu
Left = 328
Top = 58
! object HideShowModules1: TMenuItem
Caption = 'Hide / Show Modules'
OnClick = HideShowModules1Click
Index: mainfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** mainfrm.h 27 Jan 2003 09:23:06 -0000 1.43
--- mainfrm.h 26 Mar 2003 22:07:12 -0000 1.44
***************
*** 52,56 ****
#include <vector>
! #define _tr(text) UTF8ToWideString(LocaleMgr::systemLocaleMgr.translate(text))
#define MONITOR_CENTER 0x0001 // center rect to monitor
#define MONITOR_CLIP 0x0000 // clip rect to monitor
--- 52,57 ----
#include <vector>
! //#define _tr(text) UTF8ToWideString(LocaleMgr::systemLocaleMgr.translate(text))
! #define _tr(text) LocaleMgr::systemLocaleMgr.translate(text)
#define MONITOR_CENTER 0x0001 // center rect to monitor
#define MONITOR_CLIP 0x0000 // clip rect to monitor
***************
*** 190,229 ****
{
__published: // IDE-managed Components
! TTntPanel *pnlTextCom;
TSplitter *Splitter2;
! TTntPanel *pnlText;
! TTntPanel *pnlComment;
TSplitter *Splitter1;
! TTntPanel *pnlDict;
! TTntPageControl *TextPageControl;
! TTntPageControl *CommentaryPageControl;
TStatusBar *StatusBar1;
! TTntPageControl *LexDictPageControl;
! TTntMainMenu *MainMenu1;
! TTntMenuItem *Search1;
! TTntMenuItem *NewSearchWindow1;
! TTntMenuItem *Help1;
! TTntMenuItem *About1;
! TTntPopupMenu *PopupMenu2;
! TTntMenuItem *DictionaryLookup1;
! TTntMenuItem *File1;
! TTntMenuItem *SaveLayout1;
! TTntMenuItem *Exit1;
! TTntMenuItem *N1;
TDdeServerItem *Search;
TDdeServerItem *Lookup;
TDdeServerConv *Bible;
! TTntPopupMenu *PopupMenu1;
! TTntMenuItem *MenuItem1;
! TTntMenuItem *Copy1;
! TTntMenuItem *CopyasBGreekTransliteration1;
! TTntMenuItem *Copy2;
! TTntMenuItem *Edit1;
! TTntMenuItem *Copy3;
! TTntPopupMenu *BookmarkPopup;
! TTntMenuItem *AddBookmark1;
! TTntMenuItem *N2;
! TTntMenuItem *EditBookmarks1;
! TTntMenuItem *Options1;
TCoolBar *CoolBar1;
TImageList *ImageList1;
--- 191,230 ----
{
__published: // IDE-managed Components
! TPanel *pnlTextCom;
TSplitter *Splitter2;
! TPanel *pnlText;
! TPanel *pnlComment;
TSplitter *Splitter1;
! TPanel *pnlDict;
! TPageControl *TextPageControl;
! TPageControl *CommentaryPageControl;
TStatusBar *StatusBar1;
! TPageControl *LexDictPageControl;
! TMainMenu *MainMenu1;
! TMenuItem *Search1;
! TMenuItem *NewSearchWindow1;
! TMenuItem *Help1;
! TMenuItem *About1;
! TPopupMenu *PopupMenu2;
! TMenuItem *DictionaryLookup1;
! TMenuItem *File1;
! TMenuItem *SaveLayout1;
! TMenuItem *Exit1;
! TMenuItem *N1;
TDdeServerItem *Search;
TDdeServerItem *Lookup;
TDdeServerConv *Bible;
! TPopupMenu *PopupMenu1;
! TMenuItem *MenuItem1;
! TMenuItem *Copy1;
! TMenuItem *CopyasBGreekTransliteration1;
! TMenuItem *Copy2;
! TMenuItem *Edit1;
! TMenuItem *Copy3;
! TPopupMenu *BookmarkPopup;
! TMenuItem *AddBookmark1;
! TMenuItem *N2;
! TMenuItem *EditBookmarks1;
! TMenuItem *Options1;
TCoolBar *CoolBar1;
TImageList *ImageList1;
***************
*** 233,238 ****
TToolButton *ToolButton3;
TToolButton *ToolButton4;
! TTntPanel *pnlSpeed;
! TTntPanel *Panel1;
TComboBox *cbBookOrig;
TEdit *CHBox;
--- 234,239 ----
TToolButton *ToolButton3;
TToolButton *ToolButton4;
! TPanel *pnlSpeed;
! TPanel *Panel1;
TComboBox *cbBookOrig;
TEdit *CHBox;
***************
*** 240,279 ****
TEdit *VSBox;
TUpDown *UpDown2;
! TTntSpeedButton *btnLookup;
TToolBar *ToolBar1;
TImageList *ImageList2;
TImage *BookmarkBtnImage;
! TTntSpeedButton *Bookmarkbtn;
! TTntPopupMenu *PopupMenu3;
! TTntMenuItem *Copy4;
! TTntMenuItem *DictionaryLookup2;
! TTntMenuItem *N3;
! TTntMenuItem *EditEntry1;
! TTntMenuItem *DeleteEntry1;
! TTntMenuItem *LinktoVerse1;
! TTntMenuItem *Options2;
! TTntMenuItem *Contents1;
TComboBox *freeHandLookupOrig;
! TTntPanel *Panel2;
TSplitter *Splitter3;
! TTntRichEdit *DictKeyEditOld;
! TTntListBox *lbDictKeysOld;
! TTntPopupMenu *PopupMenu4;
! TTntMenuItem *HideShowModules1;
! TTntMenuItem *DevotionaloftheDay1;
! TTntMenuItem *Tools1;
! TTntMenuItem *InstallManager1;
! TTntMenuItem *SEPERATOR;
TApplicationEvents *ApplicationEvents1;
! TTntMenuItem *Print1;
! TTntMenuItem *N5;
! TTntMenuItem *SearchForWord1;
! TTntMenuItem *SearchForWord2;
! TTntMenuItem *SearchForWord3;
TActionList *ActionList1;
TAction *Action1;
! TTntMenuItem *NewVer1;
! TTntComboBox *cbBook;
! TTntComboBox *freeHandLookup;
void __fastcall TextPageControlChange(TObject *Sender);
void __fastcall btnLookupClick(TObject *Sender);
--- 241,280 ----
TEdit *VSBox;
TUpDown *UpDown2;
! TSpeedButton *btnLookup;
TToolBar *ToolBar1;
TImageList *ImageList2;
TImage *BookmarkBtnImage;
! TSpeedButton *Bookmarkbtn;
! TPopupMenu *PopupMenu3;
! TMenuItem *Copy4;
! TMenuItem *DictionaryLookup2;
! TMenuItem *N3;
! TMenuItem *EditEntry1;
! TMenuItem *DeleteEntry1;
! TMenuItem *LinktoVerse1;
! TMenuItem *Options2;
! TMenuItem *Contents1;
TComboBox *freeHandLookupOrig;
! TPanel *Panel2;
TSplitter *Splitter3;
! TRichEdit *DictKeyEditOld;
! TListBox *lbDictKeysOld;
! TPopupMenu *PopupMenu4;
! TMenuItem *HideShowModules1;
! TMenuItem *DevotionaloftheDay1;
! TMenuItem *Tools1;
! TMenuItem *InstallManager1;
! TMenuItem *SEPERATOR;
TApplicationEvents *ApplicationEvents1;
! TMenuItem *Print1;
! TMenuItem *N5;
! TMenuItem *SearchForWord1;
! TMenuItem *SearchForWord2;
! TMenuItem *SearchForWord3;
TActionList *ActionList1;
TAction *Action1;
! TMenuItem *NewVer1;
! TComboBox *cbBook;
! TComboBox *freeHandLookup;
void __fastcall TextPageControlChange(TObject *Sender);
void __fastcall btnLookupClick(TObject *Sender);
Index: optionfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** optionfrm.cpp 27 Jan 2003 23:12:39 -0000 1.33
--- optionfrm.cpp 26 Mar 2003 22:07:12 -0000 1.34
***************
*** 338,345 ****
struct dirent *ent;
string conffile;
! WideString strName;
AnsiString strPath = COLOR_DIR;
! TTntWideStringList *schemeNames = new TTntWideStringList;
cmbSchemeSelect->Clear();
--- 338,345 ----
struct dirent *ent;
string conffile;
! AnsiString strName;
AnsiString strPath = COLOR_DIR;
! TStringList *schemeNames = new TStringList;
cmbSchemeSelect->Clear();
***************
*** 353,357 ****
if ((strcmp(ent->d_name, "."))&& (strcmp(ent->d_name, "..")) && !strcmp(ExtractFileExt(ent->d_name).c_str(), COLOR_EXT.c_str())) {
strName = ent->d_name;
! schemeNames->Add(strName.SubString(1, strName.Length() - 4));
}
}
--- 353,357 ----
if ((strcmp(ent->d_name, "."))&& (strcmp(ent->d_name, "..")) && !strcmp(ExtractFileExt(ent->d_name).c_str(), COLOR_EXT.c_str())) {
strName = ent->d_name;
! schemeNames->Add(strName.SubString(1, strName.Length() - 4).c_str());
}
}
Index: optionfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** optionfrm.dfm 27 Jan 2003 09:23:06 -0000 1.50
--- optionfrm.dfm 26 Mar 2003 22:07:12 -0000 1.51
***************
*** 44,48 ****
PixelsPerInch = 96
TextHeight = 13
! object Panel2: TTntPanel
Left = 0
Top = 284
--- 44,48 ----
PixelsPerInch = 96
TextHeight = 13
! object Panel2: TPanel
Left = 0
Top = 284
***************
*** 55,59 ****
554
41)
! object OkBtn: TTntBitBtn
Left = 361
Top = 9
--- 55,59 ----
554
41)
! object OkBtn: TBitBtn
Left = 361
Top = 9
***************
*** 64,68 ****
Kind = bkOK
end
! object CancelBtn: TTntBitBtn
Left = 459
Top = 9
--- 64,68 ----
Kind = bkOK
end
! object CancelBtn: TBitBtn
Left = 459
Top = 9
***************
*** 74,78 ****
end
end
! object PageControl1: TTntPageControl
Left = 0
Top = 0
--- 74,78 ----
end
end
! object PageControl1: TPageControl
Left = 0
Top = 0
***************
*** 85,89 ****
object TabSheet1: TTabSheet
Caption = 'General'
! object Panel1: TTntPanel
Left = 0
Top = 0
--- 85,89 ----
object TabSheet1: TTabSheet
Caption = 'General'
! object Panel1: TPanel
Left = 0
Top = 0
***************
*** 93,97 ****
BevelOuter = bvNone
TabOrder = 0
! object gbPersonalize: TTntGroupBox
Left = 0
Top = 0
--- 93,97 ----
BevelOuter = bvNone
TabOrder = 0
! object gbPersonalize: TGroupBox
Left = 0
Top = 0
***************
*** 104,108 ****
546
163)
! object Label4: TTntLabel
Left = 7
Top = 103
--- 104,108 ----
546
163)
! object Label4: TLabel
Left = 7
Top = 103
***************
*** 112,116 ****
Caption = 'Language'
end
! object AutoBMPersonal: TTntCheckBox
Left = 7
Top = 17
--- 112,116 ----
Caption = 'Language'
end
! object AutoBMPersonal: TCheckBox
Left = 7
Top = 17
***************
*** 123,127 ****
TabOrder = 0
end
! object AutoBMOther: TTntCheckBox
Left = 7
Top = 36
--- 123,127 ----
TabOrder = 0
end
! object AutoBMOther: TCheckBox
Left = 7
Top = 36
***************
*** 131,135 ****
TabOrder = 1
end
! object HintPopups: TTntCheckBox
Left = 232
Top = 12
--- 131,135 ----
TabOrder = 1
end
! object HintPopups: TCheckBox
Left = 232
Top = 12
***************
*** 143,147 ****
OnClick = HintPopupsClick
end
! object localeCB: TTntComboBox
Left = 94
Top = 100
--- 143,147 ----
OnClick = HintPopupsClick
end
! object localeCB: TComboBox
Left = 94
Top = 100
***************
*** 152,159 ****
'es'#13#10'of the bible not the interface.'
Style = csDropDownList
! ItemHeight = 13
TabOrder = 3
end
! object AutoLayout: TTntCheckBox
Left = 7
Top = 55
--- 152,159 ----
'es'#13#10'of the bible not the interface.'
Style = csDropDownList
! ItemHeight = 0
TabOrder = 3
end
! object AutoLayout: TCheckBox
Left = 7
Top = 55
***************
*** 165,169 ****
TabOrder = 4
end
! object HintStrongs: TTntCheckBox
Left = 252
Top = 29
--- 165,169 ----
TabOrder = 4
end
! object HintStrongs: TCheckBox
Left = 252
Top = 29
***************
*** 174,178 ****
TabOrder = 5
end
! object HintWords: TTntCheckBox
Left = 252
Top = 68
--- 174,178 ----
TabOrder = 5
end
! object HintWords: TCheckBox
Left = 252
Top = 68
***************
*** 182,186 ****
TabOrder = 6
end
! object HintVLists: TTntCheckBox
Left = 252
Top = 48
--- 182,186 ----
TabOrder = 6
end
! object HintVLists: TCheckBox
Left = 252
Top = 48
***************
*** 196,200 ****
Caption = 'Special Modules'
ImageIndex = 1
! object gbDefModules: TTntGroupBox
Left = 0
Top = 0
--- 196,200 ----
Caption = 'Special Modules'
ImageIndex = 1
! object gbDefModules: TGroupBox
Left = 0
Top = 0
***************
*** 204,208 ****
Caption = 'Original Language Support - Default Modules'
TabOrder = 0
! object Label5: TTntLabel
Left = 7
Top = 36
--- 204,208 ----
Caption = 'Original Language Support - Default Modules'
TabOrder = 0
! object Label5: TLabel
Left = 7
Top = 36
***************
*** 211,215 ****
Caption = 'Greek'
end
! object Label6: TTntLabel
Left = 7
Top = 59
--- 211,215 ----
Caption = 'Greek'
end
! object Label6: TLabel
Left = 7
Top = 59
***************
*** 218,222 ****
Caption = 'Hebrew'
end
! object Label7: TTntLabel
Left = 75
Top = 16
--- 218,222 ----
Caption = 'Hebrew'
end
! object Label7: TLabel
Left = 75
Top = 16
***************
*** 225,229 ****
Caption = 'Definitions'
end
! object Label8: TTntLabel
Left = 307
Top = 16
--- 225,229 ----
Caption = 'Definitions'
end
! object Label8: TLabel
Left = 307
Top = 16
***************
*** 232,236 ****
Caption = 'Parsing'
end
! object Label10: TTntLabel
Left = 7
Top = 81
--- 232,236 ----
Caption = 'Parsing'
end
! object Label10: TLabel
Left = 7
Top = 81
***************
*** 240,244 ****
Caption = 'Strong'#39's Numbered Text'
end
! object hebrewDefCB: TTntComboBox
Left = 75
Top = 55
--- 240,244 ----
Caption = 'Strong'#39's Numbered Text'
end
! object hebrewDefCB: TComboBox
Left = 75
Top = 55
***************
*** 246,253 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 0
end
! object greekDefCB: TTntComboBox
Left = 75
Top = 33
--- 246,253 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 0
end
! object greekDefCB: TComboBox
Left = 75
Top = 33
***************
*** 255,262 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 1
end
! object greekParseCB: TTntComboBox
Left = 307
Top = 33
--- 255,262 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 1
end
! object greekParseCB: TComboBox
Left = 307
Top = 33
***************
*** 264,271 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 2
end
! object hebrewParseCB: TTntComboBox
Left = 307
Top = 55
--- 264,271 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 2
end
! object hebrewParseCB: TComboBox
Left = 307
Top = 55
***************
*** 273,280 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 3
end
! object strongsNumsCB: TTntComboBox
Left = 178
Top = 78
--- 273,280 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 3
end
! object strongsNumsCB: TComboBox
Left = 178
Top = 78
***************
*** 282,290 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 4
end
end
! object gbDevos: TTntGroupBox
Left = 0
Top = 105
--- 282,290 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 4
end
end
! object gbDevos: TGroupBox
Left = 0
Top = 105
***************
*** 298,302 ****
281
151)
! object Label9: TTntLabel
Left = 8
Top = 24
--- 298,302 ----
281
151)
! object Label9: TLabel
Left = 8
Top = 24
***************
*** 306,310 ****
Caption = 'Default Devotional'
end
! object dailyDefaultCB: TTntComboBox
Left = 8
Top = 42
--- 306,310 ----
Caption = 'Default Devotional'
end
! object dailyDefaultCB: TComboBox
Left = 8
Top = 42
***************
*** 312,319 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 0
end
! object devSplashCB: TTntCheckBox
Left = 8
Top = 72
--- 312,319 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 0
end
! object devSplashCB: TCheckBox
Left = 8
Top = 72
***************
*** 324,328 ****
TabOrder = 1
end
! object devsAsDictsCB: TTntCheckBox
Left = 8
Top = 88
--- 324,328 ----
TabOrder = 1
end
! object devsAsDictsCB: TCheckBox
Left = 8
Top = 88
***************
*** 334,338 ****
end
end
! object gbGloss: TTntGroupBox
Left = 284
Top = 105
--- 334,338 ----
end
end
! object gbGloss: TGroupBox
Left = 284
Top = 105
***************
*** 342,346 ****
Caption = 'Glossaries / General Dictionaries'
TabOrder = 2
! object Label17: TTntLabel
Left = 8
Top = 24
--- 342,346 ----
Caption = 'Glossaries / General Dictionaries'
TabOrder = 2
! object Label17: TLabel
Left = 8
Top = 24
***************
*** 350,354 ****
Caption = 'Default General Dictionary'
end
! object glosAsDictsCB: TTntCheckBox
Left = 8
Top = 75
--- 350,354 ----
Caption = 'Default General Dictionary'
end
! object glosAsDictsCB: TCheckBox
Left = 8
Top = 75
***************
*** 358,362 ****
TabOrder = 0
end
! object genDictCB: TTntComboBox
Left = 8
Top = 42
--- 358,362 ----
TabOrder = 0
end
! object genDictCB: TComboBox
Left = 8
Top = 42
***************
*** 364,368 ****
Height = 21
Style = csDropDownList
! ItemHeight = 13
TabOrder = 1
end
--- 364,368 ----
Height = 21
Style = csDropDownList
! ItemHeight = 0
TabOrder = 1
end
***************
*** 372,376 ****
Caption = 'Display'
ImageIndex = 2
! object Panel3: TTntPanel
Left = 0
Top = 0
--- 372,376 ----
Caption = 'Display'
ImageIndex = 2
! object Panel3: TPanel
Left = 0
Top = 0
***************
*** 382,386 ****
Caption = 'Panel3'
TabOrder = 0
! object gbColors: TTntGroupBox
Left = 0
Top = 0
--- 382,386 ----
Caption = 'Panel3'
TabOrder = 0
! object gbColors: TGroupBox
Left = 0
Top = 0
***************
*** 393,397 ****
546
256)
! object Label2: TTntLabel
Left = 7
Top = 17
--- 393,397 ----
546
256)
! object Label2: TLabel
Left = 7
Top = 17
***************
*** 400,404 ****
Caption = 'Preview'
end
! object Label3: TTntLabel
Left = 228
Top = 10
--- 400,404 ----
Caption = 'Preview'
end
! object Label3: TLabel
Left = 228
Top = 10
***************
*** 407,411 ****
Caption = 'Window Type'
end
! object Label11: TTntLabel
Left = 228
Top = 59
--- 407,411 ----
Caption = 'Window Type'
end
! object Label11: TLabel
Left = 228
Top = 59
***************
*** 414,418 ****
Caption = 'Text Styles and Colors'
end
! object Label13: TTntLabel
Left = 228
Top = 87
--- 414,418 ----
Caption = 'Text Styles and Colors'
end
! object Label13: TLabel
Left = 228
Top = 87
***************
*** 430,434 ****
OnMouseDown = shpCurrVSClrMouseDown
end
! object Label14: TTntLabel
Left = 356
Top = 10
--- 430,434 ----
OnMouseDown = shpCurrVSClrMouseDown
end
! object Label14: TLabel
Left = 356
Top = 10
***************
*** 437,441 ****
Caption = 'Scheme'
end
! object Label15: TTntLabel
Left = 228
Top = 145
--- 437,441 ----
Caption = 'Scheme'
end
! object Label15: TLabel
Left = 228
Top = 145
***************
*** 444,448 ****
Caption = 'Combo/Edit Fields'
end
! object btnSave: TTntSpeedButton
Left = 514
Top = 27
--- 444,448 ----
Caption = 'Combo/Edit Fields'
end
! object btnSave: TSpeedButton
Left = 514
Top = 27
***************
*** 464,468 ****
OnClick = btnSaveScheme
end
! object Label1: TTntLabel
Left = 228
Top = 232
--- 464,468 ----
OnClick = btnSaveScheme
end
! object Label1: TLabel
Left = 228
Top = 232
***************
*** 471,475 ****
Caption = 'Individual Modules (Font Only)'
end
! object Label12: TTntLabel
Left = 228
Top = 174
--- 471,475 ----
Caption = 'Individual Modules (Font Only)'
end
! object Label12: TLabel
Left = 228
Top = 174
***************
*** 478,482 ****
Caption = 'Strong'#39's Numbers <...>'
end
! object Label16: TTntLabel
Left = 228
Top = 203
--- 478,482 ----
Caption = 'Strong'#39's Numbers <...>'
end
! object Label16: TLabel
Left = 228
Top = 203
***************
*** 521,525 ****
OnMouseDown = shpNumClrMouseDown
end
! object btnCurrVerse: TTntButton
Left = 444
Top = 111
--- 521,525 ----
OnMouseDown = shpNumClrMouseDown
end
! object btnCurrVerse: TButton
Left = 444
Top = 111
***************
*** 532,536 ****
OnClick = btnCurrVerseClick
end
! object RTFPreview: TTntRichEdit
Left = 7
Top = 38
--- 532,536 ----
OnClick = btnCurrVerseClick
end
! object RTFPreview: TRichEdit
Left = 7
Top = 38
***************
*** 542,546 ****
WantReturns = False
end
! object cmbTextSelect: TTntComboBox
Left = 228
Top = 27
--- 542,546 ----
WantReturns = False
end
! object cmbTextSelect: TComboBox
Left = 228
Top = 27
***************
*** 550,554 ****
TabOrder = 1
OnChange = cmbTextSelectChange
! Items.WideStrings = (
'All Windows'
'Bible Window'
--- 550,554 ----
TabOrder = 1
OnChange = cmbTextSelectChange
! Items.Strings = (
'All Windows'
'Bible Window'
***************
*** 559,563 ****
'User Interface')
end
! object btnFont: TTntButton
Left = 444
Top = 54
--- 559,563 ----
'User Interface')
end
! object btnFont: TButton
Left = 444
Top = 54
***************
*** 572,576 ****
OnClick = btnFontClick
end
! object AutoVSColor: TTntCheckBox
Left = 228
Top = 113
--- 572,576 ----
OnClick = btnFontClick
end
! object AutoVSColor: TCheckBox
Left = 228
Top = 113
***************
*** 580,584 ****
TabOrder = 3
end
! object btnNumClr: TTntButton
Left = 444
Top = 82
--- 580,584 ----
TabOrder = 3
end
! object btnNumClr: TButton
Left = 444
Top = 82
***************
*** 591,595 ****
OnClick = btnNumClrClick
end
! object cmbSchemeSelect: TTntComboBox
Left = 356
Top = 27
--- 591,595 ----
OnClick = btnNumClrClick
end
! object cmbSchemeSelect: TComboBox
Left = 356
Top = 27
***************
*** 599,608 ****
TabOrder = 6
OnChange = cmbSchemeSelectChange
! Items.WideStrings = (
'Default'
'Parchment'
'Midnight')
end
! object btnFieldClr: TTntButton
Left = 444
Top = 140
--- 599,608 ----
TabOrder = 6
OnChange = cmbSchemeSelectChange
! Items.Strings = (
'Default'
'Parchment'
'Midnight')
end
! object btnFieldClr: TButton
Left = 444
Top = 140
***************
*** 614,618 ****
OnClick = btnFieldClrClick
end
! object btnModFonts: TTntButton
Left = 444
Top = 227
--- 614,618 ----
OnClick = btnFieldClrClick
end
! object btnModFonts: TButton
Left = 444
Top = 227
***************
*** 624,628 ****
OnClick = btnModFontsClick
end
! object btnStrongClr: TTntButton
Left = 444
Top = 169
--- 624,628 ----
OnClick = btnModFontsClick
end
! object btnStrongClr: TButton
Left = 444
Top = 169
***************
*** 635,639 ****
OnClick = btnStrongClrClick
end
! object btnMorphClr: TTntButton
Left = 444
Top = 198
--- 635,639 ----
OnClick = btnStrongClrClick
end
! object btnMorphClr: TButton
Left = 444
Top = 198
***************
*** 666,685 ****
Top = 65528
end
! object SavePopup: TTntPopupMenu
Left = 268
Top = 65528
! object SaveScheme: TTntMenuItem
Caption = '&Save Scheme'
OnClick = SaveSchemeClick
end
! object DeleteScheme1: TTntMenuItem
Caption = '&Delete Scheme'
OnClick = DeleteClick
end
! object Import: TTntMenuItem
Caption = 'Import Scheme...'
OnClick = ImportClick
end
! object Export: TTntMenuItem
Caption = 'E&xport Scheme...'
OnClick = ExportClick
--- 666,685 ----
Top = 65528
end
! object SavePopup: TPopupMenu
Left = 268
Top = 65528
! object SaveScheme: TMenuItem
Caption = '&Save Scheme'
OnClick = SaveSchemeClick
end
! object DeleteScheme1: TMenuItem
Caption = '&Delete Scheme'
OnClick = DeleteClick
end
! object Import: TMenuItem
Caption = 'Import Scheme...'
OnClick = ImportClick
end
! object Export: TMenuItem
Caption = 'E&xport Scheme...'
OnClick = ExportClick
Index: optionfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** optionfrm.h 27 Jan 2003 09:23:06 -0000 1.21
--- optionfrm.h 26 Mar 2003 22:07:12 -0000 1.22
***************
*** 28,108 ****
__published: // IDE-managed Components
TColorDialog *ColorDialogVS;
! TTntPanel *Panel2;
! TTntPageControl *PageControl1;
TTabSheet *TabSheet1;
TTabSheet *TabSheet2;
! TTntPanel *Panel1;
! TTntGroupBox *gbPersonalize;
! TTntCheckBox *AutoBMPersonal;
! TTntCheckBox *AutoBMOther;
! TTntGroupBox *gbDefModules;
! TTntComboBox *hebrewDefCB;
! TTntComboBox *greekDefCB;
! TTntComboBox *greekParseCB;
! TTntComboBox *hebrewParseCB;
! TTntLabel *Label5;
! TTntLabel *Label6;
! TTntLabel *Label7;
! TTntLabel *Label8;
! TTntGroupBox *gbDevos;
! TTntLabel *Label9;
! TTntComboBox *dailyDefaultCB;
! TTntCheckBox *devSplashCB;
! TTntCheckBox *devsAsDictsCB;
! TTntLabel *Label10;
! TTntComboBox *strongsNumsCB;
TTabSheet *TabSheet3;
! TTntCheckBox *HintPopups;
! TTntLabel *Label4;
! TTntComboBox *localeCB;
! TTntPanel *Panel3;
! TTntGroupBox *gbColors;
! TTntLabel *Label2;
! TTntLabel *Label3;
! TTntRichEdit *RTFPreview;
! TTntComboBox *cmbTextSelect;
! TTntButton *btnFont;
! TTntCheckBox *AutoVSColor;
! TTntButton *btnCurrVerse;
! TTntButton *btnNumClr;
! TTntLabel *Label11;
! TTntLabel *Label13;
TShape *shpCurrVSClr;
! TTntLabel *Label14;
! TTntComboBox *cmbSchemeSelect;
! TTntButton *btnFieldClr;
! TTntLabel *Label15;
TColorDialog *ColorDialogField;
TColorDialog *ColorDialogVerseNum;
! TTntPopupMenu *SavePopup;
! TTntMenuItem *SaveScheme;
! TTntMenuItem *Export;
! TTntMenuItem *Import;
! TTntSpeedButton *btnSave;
TOpenDialog *OpenSchDlg;
TSaveDialog *SaveSchDlg;
! TTntMenuItem *DeleteScheme1;
! TTntCheckBox *AutoLayout;
! TTntGroupBox *gbGloss;
! TTntCheckBox *glosAsDictsCB;
! TTntButton *btnModFonts;
! TTntLabel *Label1;
! TTntBitBtn *OkBtn;
! TTntBitBtn *CancelBtn;
! TTntCheckBox *HintStrongs;
! TTntLabel *Label12;
! TTntLabel *Label16;
TShape *shpStrongClr;
! TTntButton *btnStrongClr;
TShape *shpMorphClr;
! TTntButton *btnMorphClr;
TShape *shpFieldClr;
TColorDialog *ColorDialogStrongs;
TColorDialog *ColorDialogMorph;
TShape *shpNumClr;
! TTntCheckBox *HintWords;
! TTntComboBox *genDictCB;
! TTntLabel *Label17;
! TTntCheckBox *HintVLists;
void __fastcall btnCurrVerseClick(TObject *Sender);
void __fastcall FormCreate(TObject *Sender);
--- 28,108 ----
__published: // IDE-managed Components
TColorDialog *ColorDialogVS;
! TPanel *Panel2;
! TPageControl *PageControl1;
TTabSheet *TabSheet1;
TTabSheet *TabSheet2;
! TPanel *Panel1;
! TGroupBox *gbPersonalize;
! TCheckBox *AutoBMPersonal;
! TCheckBox *AutoBMOther;
! TGroupBox *gbDefModules;
! TComboBox *hebrewDefCB;
! TComboBox *greekDefCB;
! TComboBox *greekParseCB;
! TComboBox *hebrewParseCB;
! TLabel *Label5;
! TLabel *Label6;
! TLabel *Label7;
! TLabel *Label8;
! TGroupBox *gbDevos;
! TLabel *Label9;
! TComboBox *dailyDefaultCB;
! TCheckBox *devSplashCB;
! TCheckBox *devsAsDictsCB;
! TLabel *Label10;
! TComboBox *strongsNumsCB;
TTabSheet *TabSheet3;
! TCheckBox *HintPopups;
! TLabel *Label4;
! TComboBox *localeCB;
! TPanel *Panel3;
! TGroupBox *gbColors;
! TLabel *Label2;
! TLabel *Label3;
! TRichEdit *RTFPreview;
! TComboBox *cmbTextSelect;
! TButton *btnFont;
! TCheckBox *AutoVSColor;
! TButton *btnCurrVerse;
! TButton *btnNumClr;
! TLabel *Label11;
! TLabel *Label13;
TShape *shpCurrVSClr;
! TLabel *Label14;
! TComboBox *cmbSchemeSelect;
! TButton *btnFieldClr;
! TLabel *Label15;
TColorDialog *ColorDialogField;
TColorDialog *ColorDialogVerseNum;
! TPopupMenu *SavePopup;
! TMenuItem *SaveScheme;
! TMenuItem *Export;
! TMenuItem *Import;
! TSpeedButton *btnSave;
TOpenDialog *OpenSchDlg;
TSaveDialog *SaveSchDlg;
! TMenuItem *DeleteScheme1;
! TCheckBox *AutoLayout;
! TGroupBox *gbGloss;
! TCheckBox *glosAsDictsCB;
! TButton *btnModFonts;
! TLabel *Label1;
! TBitBtn *OkBtn;
! TBitBtn *CancelBtn;
! TCheckBox *HintStrongs;
! TLabel *Label12;
! TLabel *Label16;
TShape *shpStrongClr;
! TButton *btnStrongClr;
TShape *shpMorphClr;
! TButton *btnMorphClr;
TShape *shpFieldClr;
TColorDialog *ColorDialogStrongs;
TColorDialog *ColorDialogMorph;
TShape *shpNumClr;
! TCheckBox *HintWords;
! TComboBox *genDictCB;
! TLabel *Label17;
! TCheckBox *HintVLists;
void __fastcall btnCurrVerseClick(TObject *Sender);
void __fastcall FormCreate(TObject *Sender);
Index: searchfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** searchfrm.cpp 27 Jan 2003 09:23:06 -0000 1.40
--- searchfrm.cpp 26 Mar 2003 22:07:12 -0000 1.41
***************
*** 118,122 ****
(*key) = resultsLV->Items->Item[row]->Caption.c_str();
if (targetpc == Form1->LexDictPageControl) {
! Form1->DictKeyEdit->Text = UTF8ToWideString(resultsLV->Items->Item[row]->Caption.c_str());
}
else {
--- 118,123 ----
(*key) = resultsLV->Items->Item[row]->Caption.c_str();
if (targetpc == Form1->LexDictPageControl) {
! //Form1->DictKeyEdit->Text = UTF8ToWideString(resultsLV->Items->Item[row]->Caption.c_str());
! Form1->DictKeyEdit->Text = resultsLV->Items->Item[row]->Caption.c_str();
}
else {
***************
*** 266,277 ****
TRect rect = Item->DisplayRect(drSelectBounds);
static UnicodeRTF filter;
! char buf[255];
! strcpy(buf, Item->Caption.c_str());
SWKey *key = *target;
if (!SWDYNAMIC_CAST(VerseKey, key))
! filter.ProcessText(buf, 253, *target, target);
! RTFHintForm->searchListDrawer->fillWithRTFString(target, ((String)" \\b " + buf + " ").c_str(), "Search");
if (resultsLV->Selected == Item) RTFHintForm->searchListDrawer->Color = TColor(0xB4CDBB);
Sender->Canvas->Brush->Color = RTFHintForm->searchListDrawer->Color;
--- 267,278 ----
TRect rect = Item->DisplayRect(drSelectBounds);
static UnicodeRTF filter;
! SWBuf buf;
! buf = Item->Caption.c_str();
SWKey *key = *target;
if (!SWDYNAMIC_CAST(VerseKey, key))
! filter.processText(buf, *target, target);
! RTFHintForm->searchListDrawer->fillWithRTFString(target, ((String)" \\b " + buf.c_str() + " ").c_str(), "Search");
if (resultsLV->Selected == Item) RTFHintForm->searchListDrawer->Color = TColor(0xB4CDBB);
Sender->Canvas->Brush->Color = RTFHintForm->searchListDrawer->Color;