[sword-cvs] sword/apps/windoze/CBuilder5/BibleCS RxRichEditX.cpp,1.38,1.39 RxRichEditX.h,1.12,1.13 editentryfrm.cpp,1.10,1.11 editentryfrm.h,1.4,1.5 mainfrm.cpp,1.107,1.108 mainfrm.dfm,1.39,1.40 mainfrm.h,1.42,1.43 optionfrm.cpp,1.31,1.32 optionfrm.dfm,1.49,1.50 optionfrm.h,1.20,1.21 searchfrm.cpp,1.39,1.40 vrslstfrm.cpp,1.12,1.13
sword@www.crosswire.org
sword@www.crosswire.org
Mon, 27 Jan 2003 02:23:09 -0700
Update of /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS
In directory www:/tmp/cvs-serv10716/apps/windoze/CBuilder5/BibleCS
Modified Files:
RxRichEditX.cpp RxRichEditX.h editentryfrm.cpp editentryfrm.h
mainfrm.cpp mainfrm.dfm mainfrm.h optionfrm.cpp optionfrm.dfm
optionfrm.h searchfrm.cpp vrslstfrm.cpp
Log Message:
Updated some forms to use TntUnicode Controls
Added option to change font of 'User Interface' - this is for comboboxes
and edit controls etc
attempt to use TntRichEdit instead of Rx is ifdefd out
Index: RxRichEditX.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** RxRichEditX.cpp 8 Jan 2003 20:46:03 -0000 1.38
--- RxRichEditX.cpp 27 Jan 2003 09:23:06 -0000 1.39
***************
*** 14,18 ****
--- 14,22 ----
char TRxRichEditX::platformID = 0;
+ #ifdef OLDRXRICHEDIT
TRxRichEditX::TRxRichEditX(TWinControl *parent) : TRxRichEdit(parent)
+ #else
+ TRxRichEditX::TRxRichEditX(TWinControl *parent) : TTntRichEdit(parent)
+ #endif
{
OSVERSIONINFO osvi;
***************
*** 52,55 ****
--- 56,60 ----
// clear HTML link tags
+ /*
while (true) {
int start, len, foundAt, endAt;
***************
*** 74,77 ****
--- 79,83 ----
//this->SelAttributes->Link = true;
}
+ */
SelLength = 0;
}
***************
*** 569,572 ****
--- 575,579 ----
// make links
+ /*
while (true) {
int start, len, foundAt, endAt;
***************
*** 591,594 ****
--- 598,602 ----
this->SelAttributes->Link = true;
}
+ */
if (Visible) {
TComponent *owner = this->Owner;
***************
*** 724,728 ****
char chapBuf[1024];
! strcpy(chapBuf, _tr("Chapter"));
filter.ProcessText(chapBuf, 1022, *module, module);
--- 732,736 ----
char chapBuf[1024];
! strcpy(chapBuf, WideStringToUTF8(_tr("Chapter")).c_str());
filter.ProcessText(chapBuf, 1022, *module, module);
Index: RxRichEditX.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/RxRichEditX.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RxRichEditX.h 3 Oct 2002 04:26:46 -0000 1.12
--- RxRichEditX.h 27 Jan 2003 09:23:06 -0000 1.13
***************
*** 6,10 ****
--- 6,14 ----
#include <StdCtrls.hpp>
#include <Forms.hpp>
+ #ifdef OLDRXRICHEDIT
#include <RxRichEdit.hpp>
+ #else
+ #include <TntComCtrls.hpp>
+ #endif
#include <ExtCtrls.hpp>
#include <swmodule.h>
***************
*** 48,52 ****
--- 52,60 ----
*/
+ #ifdef OLDRXRICHEDIT
class TRxRichEditX : public TRxRichEdit {
+ #else
+ class TRxRichEditX : public TTntRichEdit {
+ #endif
private:
AnsiString GetFormattedBible(SWModule* module);
Index: editentryfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/editentryfrm.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** editentryfrm.cpp 14 Sep 2002 20:51:39 -0000 1.10
--- editentryfrm.cpp 27 Jan 2003 09:23:06 -0000 1.11
***************
*** 66,73 ****
--- 66,75 ----
//----------------------------------------------------------------------------
+ #ifdef OLDRXRICHEDIT
TRxTextAttributes *__fastcall TEditEntryForm::CurrText(void)
{
return RichEdit1->SelAttributes;
}
+ #endif
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::CheckFileSave(void)
***************
*** 145,149 ****
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::BoldButtonClick(TObject* /*Sender*/)
! { if ( !FUpdating )
{ if ( BoldButton->Down )
CurrText()->Style = CurrText()->Style << fsBold;
--- 147,153 ----
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::BoldButtonClick(TObject* /*Sender*/)
! {
! #ifdef OLDRXRICHEDIT
! if ( !FUpdating )
{ if ( BoldButton->Down )
CurrText()->Style = CurrText()->Style << fsBold;
***************
*** 151,158 ****
CurrText()->Style = CurrText()->Style >> fsBold;
}
}
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::ItalicButtonClick(TObject* /*Sender*/)
! { if ( !FUpdating )
{
if ( ItalicButton->Down )
--- 155,165 ----
CurrText()->Style = CurrText()->Style >> fsBold;
}
+ #endif
}
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::ItalicButtonClick(TObject* /*Sender*/)
! {
! #ifdef OLDRXRICHEDIT
! if ( !FUpdating )
{
if ( ItalicButton->Down )
***************
*** 161,168 ****
--- 168,177 ----
CurrText()->Style = CurrText()->Style >> fsItalic;
}
+ #endif
}
//----------------------------------------------------------------------------
void __fastcall TEditEntryForm::UnderlineButtonClick(TObject* /*Sender*/)
{
+ #ifdef OLDRXRICHEDIT
if ( !FUpdating ) {
if ( UnderlineButton->Down )
***************
*** 170,173 ****
--- 179,183 ----
else CurrText()->Style = CurrText()->Style >> fsUnderline;
}
+ #endif
}
***************
*** 175,178 ****
--- 185,189 ----
void __fastcall TEditEntryForm::FontSizeChange(TObject* /*Sender*/)
{
+ #ifdef OLDRXRICHEDIT
int fontsize = atoi(FontSize->Text.c_str());
***************
*** 186,191 ****
--- 197,204 ----
FontSize->Text = 1638;
}
+
CurrText()->Size = atoi(FontSize->Text.c_str());
}
+ #endif
}
Index: editentryfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/editentryfrm.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** editentryfrm.h 1 Aug 2002 04:38:33 -0000 1.4
--- editentryfrm.h 27 Jan 2003 09:23:06 -0000 1.5
***************
*** 82,86 ****
--- 82,88 ----
int FDragOfs;
bool FDragging;
+ #ifdef OLDRXRICHEDIT
TRxTextAttributes *__fastcall CurrText(void);
+ #endif
void __fastcall CheckFileSave(void);
void __fastcall SetupRuler(void);
Index: mainfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** mainfrm.cpp 8 Jan 2003 20:46:03 -0000 1.107
--- mainfrm.cpp 27 Jan 2003 09:23:06 -0000 1.108
***************
*** 36,39 ****
--- 36,43 ----
//#pragma link "MOZILLACONTROLLib_OCX"
//#pragma link "SHDocVw_OCX"
+ #pragma link "TntButtons"
+ #pragma link "TntComCtrls"
+ #pragma link "TntExtCtrls"
+ #pragma link "TntMenus"
#pragma resource "*.dfm"
***************
*** 113,117 ****
}
! freeHandLookup->Text = verse;
freeHandLookupoldKeyPress(0, '\r');
--- 117,121 ----
}
! freeHandLookup->Text = UTF8ToWideString(verse);
freeHandLookupoldKeyPress(0, '\r');
***************
*** 406,410 ****
CHBox->Text = DefaultVSKey->Chapter();
VSBox->Text = DefaultVSKey->Verse();
! freeHandLookup->Text = (const char *)*DefaultVSKey;
RefreshActiveSheet(TextPageControl);
logmodstate = false; // only log state once
--- 410,414 ----
CHBox->Text = DefaultVSKey->Chapter();
VSBox->Text = DefaultVSKey->Verse();
! freeHandLookup->Text = UTF8ToWideString((const char *)*DefaultVSKey);
RefreshActiveSheet(TextPageControl);
logmodstate = false; // only log state once
***************
*** 424,428 ****
VSBox->Text = StrToInt(VSBox->Text) + 1;
! (*DefaultVSKey) = (cbBook->Text + " " + CHBox->Text + ":" + VSBox->Text).c_str();
TextKeyChanged();
DefaultVSKey->AutoNormalize(1);
--- 428,432 ----
VSBox->Text = StrToInt(VSBox->Text) + 1;
! (*DefaultVSKey) = WideStringToUTF8((cbBook->Text + " " + CHBox->Text + ":" + VSBox->Text)).c_str();
TextKeyChanged();
DefaultVSKey->AutoNormalize(1);
***************
*** 592,596 ****
}
! DictKeyEdit->Text = lookupKey;
}
--- 596,600 ----
}
! DictKeyEdit->Text = UTF8ToWideString(lookupKey);
}
***************
*** 662,666 ****
AnsiString s1 = (const char *)(*myVk);
s1.SetLength(s1.Length() - 4);
! cbBook->Items->Add(s1);
myVk->Book(myVk->Book() + 1);
}
--- 666,670 ----
AnsiString s1 = (const char *)(*myVk);
s1.SetLength(s1.Length() - 4);
! cbBook->Items->Add(UTF8ToWideString(s1));
myVk->Book(myVk->Book() + 1);
}
***************
*** 678,682 ****
ImageList1->Clear();
! tmp = _tr("BackBtnImage");
if (strcmp("BackBtnImage", tmp)) {
pic->LoadFromFile(tmp);
--- 682,686 ----
ImageList1->Clear();
! tmp = WideStringToUTF8(_tr("BackBtnImage")).c_str();
if (strcmp("BackBtnImage", tmp)) {
pic->LoadFromFile(tmp);
***************
*** 688,692 ****
ImageList1->AddMasked(bitmap, transColor);
! tmp = _tr("SearchBtnImage");
if (strcmp("SearchBtnImage", tmp)) {
pic->LoadFromFile(tmp);
--- 692,696 ----
ImageList1->AddMasked(bitmap, transColor);
! tmp = WideStringToUTF8(_tr("SearchBtnImage")).c_str();
if (strcmp("SearchBtnImage", tmp)) {
pic->LoadFromFile(tmp);
***************
*** 703,707 ****
delete pic;
!
// MainForm
File1->Caption = _tr("&File");
--- 707,715 ----
delete pic;
!
! TFont *UIFont = new TFont();
! UIFont->Name = optionsconf->Sections["Appearance"]["UIFontName"].c_str();
! UIFont->Color = StrToInt(optionsconf->Sections["Appearance"]["UIFontColor"].c_str());
! UIFont->Size = StrToInt(optionsconf->Sections["Appearance"]["UIFontSize"].c_str());
// MainForm
File1->Caption = _tr("&File");
***************
*** 744,747 ****
--- 752,763 ----
CommentaryPageControl->Hint = _tr("Commentaries");
LexDictPageControl->Hint = _tr("Lexicons / Dictionaries");
+
+ cbBook->Font = UIFont;
+ freeHandLookup->Font = UIFont;
+ DictKeyEditOld->Font = UIFont;
+ lbDictKeysOld->Font = UIFont;
+ lbDictKeys->Font = UIFont;
+ DictKeyEdit->Font = UIFont;
+
// AboutBox
AboutBox->Caption = _tr("About The SWORD Project");
***************
*** 912,915 ****
--- 928,933 ----
PreviewForm->btnPrint->Caption = "Print";
PreviewForm->btnClose->Caption = "&Close";
+
+ delete UIFont;
}
***************
*** 1691,1695 ****
{
if (Key == '\r') {
! ListKey tmpVerseList = DefaultVSKey->ParseVerseList(freeHandLookup->Text.c_str(), *DefaultVSKey);
if (tmpVerseList.Count()) {
--- 1709,1713 ----
{
if (Key == '\r') {
! ListKey tmpVerseList = DefaultVSKey->ParseVerseList(WideStringToUTF8(freeHandLookup->Text).c_str(), *DefaultVSKey);
if (tmpVerseList.Count()) {
***************
*** 1758,1762 ****
if (EditEntryForm->ResultBuf) {
if (module)
! // DictKeyEdit->Text = EditEntry->ResultBuf; // for testing purposes
*module << EditEntryForm->ResultBuf;
}
--- 1776,1780 ----
if (EditEntryForm->ResultBuf) {
if (module)
! // DictKeyEdit->Text = UTF8ToWideString(EditEntry->ResultBuf); // for testing purposes
*module << EditEntryForm->ResultBuf;
}
***************
*** 1767,1773 ****
void __fastcall TForm1::DeleteEntry1Click(TObject *Sender)
{
! string message = _tr("Are you sure you wish to delete this entry?");
! string header = _tr("Delete Entry");
! if (MessageBox(Handle, message.c_str(), header.c_str(), MB_YESNO) == IDYES) {
SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
SWModule *module;
--- 1785,1791 ----
void __fastcall TForm1::DeleteEntry1Click(TObject *Sender)
{
! WideString message = _tr("Are you sure you wish to delete this entry?");
! WideString header = _tr("Delete Entry");
! if (MessageBoxW(Handle, message, header, MB_YESNO) == IDYES) {
SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
SWModule *module;
***************
*** 1924,1928 ****
section.erase("LookupText");
for (int loop = 0; ((loop < saveCount) && (loop < freeHandLookup->Items->Count)); loop++)
! section.insert(ConfigEntMap::value_type("LookupText", freeHandLookup->Items->Strings[loop].c_str()));
section["LastVerse"] = (const char *)*DefaultVSKey;
--- 1942,1946 ----
section.erase("LookupText");
for (int loop = 0; ((loop < saveCount) && (loop < freeHandLookup->Items->Count)); loop++)
! section.insert(ConfigEntMap::value_type("LookupText", WideStringToUTF8(freeHandLookup->Items->Strings[loop]).c_str()));
section["LastVerse"] = (const char *)*DefaultVSKey;
Index: mainfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** mainfrm.dfm 11 Dec 2002 07:03:45 -0000 1.39
--- mainfrm.dfm 27 Jan 2003 09:23:06 -0000 1.40
***************
*** 1,5 ****
object Form1: TForm1
! Left = 409
! Top = 115
Width = 635
Height = 475
--- 1,5 ----
object Form1: TForm1
! Left = 505
! Top = 214
Width = 635
Height = 475
***************
*** 57,61 ****
ResizeStyle = rsUpdate
end
! object pnlTextCom: TPanel
Left = 0
Top = 46
--- 57,61 ----
ResizeStyle = rsUpdate
end
! object pnlTextCom: TTntPanel
Left = 0
Top = 46
***************
*** 74,78 ****
ResizeStyle = rsUpdate
end
! object pnlText: TPanel
Left = 0
Top = 0
--- 74,78 ----
ResizeStyle = rsUpdate
end
! object pnlText: TTntPanel
Left = 0
Top = 0
***************
*** 85,89 ****
PopupMenu = PopupMenu4
TabOrder = 0
! object TextPageControl: TPageControl
Left = 0
Top = 0
--- 85,89 ----
PopupMenu = PopupMenu4
TabOrder = 0
! object TextPageControl: TTntPageControl
Left = 0
Top = 0
***************
*** 106,110 ****
end
end
! object pnlComment: TPanel
Left = 373
Top = 0
--- 106,110 ----
end
end
! object pnlComment: TTntPanel
Left = 373
Top = 0
***************
*** 117,121 ****
PopupMenu = PopupMenu4
TabOrder = 1
! object CommentaryPageControl: TPageControl
Left = 0
Top = 0
--- 117,121 ----
PopupMenu = PopupMenu4
TabOrder = 1
! object CommentaryPageControl: TTntPageControl
Left = 0
Top = 0
***************
*** 139,147 ****
end
end
! object pnlDict: TPanel
Left = 0
Top = 246
Width = 627
! Height = 168
Align = alClient
BevelOuter = bvNone
--- 139,147 ----
end
end
! object pnlDict: TTntPanel
Left = 0
Top = 246
Width = 627
! Height = 165
Align = alClient
BevelOuter = bvNone
***************
*** 154,166 ****
Top = 0
Width = 5
! Height = 168
Cursor = crHSplit
Align = alRight
end
! object LexDictPageControl: TPageControl
Left = 0
Top = 0
Width = 437
! Height = 168
Hint = 'Lexicons / Dictionaries'
Align = alClient
--- 154,166 ----
Top = 0
Width = 5
! Height = 165
Cursor = crHSplit
Align = alRight
end
! object LexDictPageControl: TTntPageControl
Left = 0
Top = 0
Width = 437
! Height = 165
Hint = 'Lexicons / Dictionaries'
Align = alClient
***************
*** 178,190 ****
OnChange = LexDictPageControlChange
end
! object Panel2: TPanel
Left = 442
Top = 0
Width = 185
! Height = 168
Align = alRight
Caption = 'Panel2'
TabOrder = 1
! object DictKeyEditOld: TRichEdit
Left = 1
Top = 1
--- 178,190 ----
OnChange = LexDictPageControlChange
end
! object Panel2: TTntPanel
Left = 442
Top = 0
Width = 185
! Height = 165
Align = alRight
Caption = 'Panel2'
TabOrder = 1
! object DictKeyEditOld: TTntRichEdit
Left = 1
Top = 1
***************
*** 193,197 ****
--- 193,203 ----
Align = alTop
Color = clAqua
+ Font.Charset = ANSI_CHARSET
+ Font.Color = clWindowText
+ Font.Height = -11
+ Font.Name = 'Code2000'
+ Font.Style = [fsBold]
MaxLength = 128
+ ParentFont = False
PlainText = True
TabOrder = 0
***************
*** 200,208 ****
OnChange = DictKeyEditOldChange
end
! object lbDictKeysOld: TListBox
Left = 1
Top = 25
Width = 183
! Height = 142
Align = alClient
ItemHeight = 13
--- 206,214 ----
OnChange = DictKeyEditOldChange
end
! object lbDictKeysOld: TTntListBox
Left = 1
Top = 25
Width = 183
! Height = 139
Align = alClient
ItemHeight = 13
***************
*** 214,218 ****
object StatusBar1: TStatusBar
Left = 0
! Top = 414
Width = 627
Height = 15
--- 220,224 ----
object StatusBar1: TStatusBar
Left = 0
! Top = 411
Width = 627
Height = 15
***************
*** 231,235 ****
ImageIndex = -1
MinHeight = 40
! Width = 106
end
item
--- 237,241 ----
ImageIndex = -1
MinHeight = 40
! Width = 126
end
item
***************
*** 238,242 ****
ImageIndex = -1
MinHeight = 42
! Width = 250
end
item
--- 244,248 ----
ImageIndex = -1
MinHeight = 42
! Width = 264
end
item
***************
*** 244,248 ****
Control = ToolBar1
ImageIndex = -1
! Width = 263
end>
object BackBtnImage: TImage
--- 250,254 ----
Control = ToolBar1
ImageIndex = -1
! Width = 229
end>
object BackBtnImage: TImage
***************
*** 321,325 ****
Left = 9
Top = 1
! Width = 93
Height = 40
AutoSize = True
--- 327,331 ----
Left = 9
Top = 1
! Width = 113
Height = 40
AutoSize = True
***************
*** 347,358 ****
end
end
! object Panel1: TPanel
! Left = 117
Top = 0
! Width = 237
Height = 42
BevelOuter = bvNone
TabOrder = 2
! object btnLookup: TSpeedButton
Left = 212
Top = 0
--- 353,364 ----
end
end
! object Panel1: TTntPanel
! Left = 137
Top = 0
! Width = 251
Height = 42
BevelOuter = bvNone
TabOrder = 2
! object btnLookup: TTntSpeedButton
Left = 212
Top = 0
***************
*** 377,381 ****
OnClick = btnLookupClick
end
! object cbBook: TComboBox
Left = 0
Top = 0
--- 383,387 ----
OnClick = btnLookupClick
end
! object cbBookOrig: TComboBox
Left = 0
Top = 0
***************
*** 385,390 ****
Color = clAqua
ItemHeight = 13
! TabOrder = 0
! OnChange = cbBookChange
end
object CHBox: TEdit
--- 391,396 ----
Color = clAqua
ItemHeight = 13
! TabOrder = 1
! Visible = False
end
object CHBox: TEdit
***************
*** 400,404 ****
Font.Style = []
ParentFont = False
! TabOrder = 1
Text = '1'
end
--- 406,410 ----
Font.Style = []
ParentFont = False
! TabOrder = 2
Text = '1'
end
***************
*** 412,416 ****
Max = 200
Position = 1
! TabOrder = 2
Wrap = False
OnClick = UpDown1Click
--- 418,422 ----
Max = 200
Position = 1
! TabOrder = 3
Wrap = False
OnClick = UpDown1Click
***************
*** 428,432 ****
Font.Style = []
ParentFont = False
! TabOrder = 3
Text = '19'
end
--- 434,438 ----
Font.Style = []
ParentFont = False
! TabOrder = 4
Text = '19'
end
***************
*** 440,448 ****
Max = 200
Position = 19
! TabOrder = 4
Wrap = False
OnClick = UpDown1Click
end
! object freeHandLookup: TComboBox
Left = 0
Top = 21
--- 446,454 ----
Max = 200
Position = 19
! TabOrder = 5
Wrap = False
OnClick = UpDown1Click
end
! object freeHandLookupOrig: TComboBox
Left = 0
Top = 21
***************
*** 451,462 ****
Color = clAqua
ItemHeight = 13
! TabOrder = 5
OnKeyPress = freeHandLookupoldKeyPress
end
end
object ToolBar1: TToolBar
! Left = 369
Top = 8
! Width = 250
Height = 25
AutoSize = True
--- 457,502 ----
Color = clAqua
ItemHeight = 13
! TabOrder = 7
! Visible = False
! OnKeyPress = freeHandLookupoldKeyPress
! end
! object cbBook: TTntComboBox
! Left = 0
! Top = 0
! Width = 121
! Height = 22
! Style = csDropDownList
! Color = clAqua
! Font.Charset = ANSI_CHARSET
! Font.Color = clWindowText
! Font.Height = -11
! Font.Name = 'Code2000'
! Font.Style = [fsBold]
! ItemHeight = 14
! ParentFont = False
! TabOrder = 0
! OnChange = cbBookChange
! end
! object freeHandLookup: TTntComboBox
! Left = 0
! Top = 21
! Width = 233
! Height = 22
! Color = clAqua
! Font.Charset = ANSI_CHARSET
! Font.Color = clWindowText
! Font.Height = -11
! Font.Name = 'Code2000'
! Font.Style = [fsBold]
! ItemHeight = 14
! ParentFont = False
! TabOrder = 6
OnKeyPress = freeHandLookupoldKeyPress
end
end
object ToolBar1: TToolBar
! Left = 403
Top = 8
! Width = 216
Height = 25
AutoSize = True
***************
*** 466,470 ****
Images = ImageList2
TabOrder = 3
! object Bookmarkbtn: TSpeedButton
Left = 0
Top = 2
--- 506,510 ----
Images = ImageList2
TabOrder = 3
! object Bookmarkbtn: TTntSpeedButton
Left = 0
Top = 2
***************
*** 524,528 ****
end
end
! object pnlSpeed: TPanel
Left = 12
Top = 0
--- 564,568 ----
end
end
! object pnlSpeed: TTntPanel
Left = 12
Top = 0
***************
*** 534,582 ****
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
--- 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
***************
*** 584,608 ****
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
--- 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
***************
*** 610,626 ****
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
--- 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
***************
*** 643,680 ****
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
--- 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
***************
*** 694,733 ****
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
--- 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
Index: mainfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/mainfrm.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** mainfrm.h 3 Oct 2002 04:26:46 -0000 1.42
--- mainfrm.h 27 Jan 2003 09:23:06 -0000 1.43
***************
*** 38,41 ****
--- 38,45 ----
#include <TntStdCtrls.hpp>
#include <ActnList.hpp>
+ #include "TntButtons.hpp"
+ #include "TntComCtrls.hpp"
+ #include "TntExtCtrls.hpp"
+ #include "TntMenus.hpp"
#ifndef USEOLDRTF
***************
*** 48,52 ****
#include <vector>
! #define _tr(text) LocaleMgr::systemLocaleMgr.translate(text)
#define MONITOR_CENTER 0x0001 // center rect to monitor
#define MONITOR_CLIP 0x0000 // clip rect to monitor
--- 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
***************
*** 186,225 ****
{
__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;
--- 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;
***************
*** 229,273 ****
TToolButton *ToolButton3;
TToolButton *ToolButton4;
! TPanel *pnlSpeed;
! TPanel *Panel1;
! TComboBox *cbBook;
TEdit *CHBox;
TUpDown *UpDown1;
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 *freeHandLookup;
! 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;
void __fastcall TextPageControlChange(TObject *Sender);
void __fastcall btnLookupClick(TObject *Sender);
--- 233,279 ----
TToolButton *ToolButton3;
TToolButton *ToolButton4;
! TTntPanel *pnlSpeed;
! TTntPanel *Panel1;
! TComboBox *cbBookOrig;
TEdit *CHBox;
TUpDown *UpDown1;
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);
Index: optionfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** optionfrm.cpp 26 Sep 2002 07:50:45 -0000 1.31
--- optionfrm.cpp 27 Jan 2003 09:23:06 -0000 1.32
***************
*** 15,18 ****
--- 15,23 ----
//---------------------------------------------------------------------------
+ #pragma link "TntButtons"
+ #pragma link "TntComCtrls"
+ #pragma link "TntExtCtrls"
+ #pragma link "TntMenus"
+ #pragma link "TntStdCtrls"
#pragma resource "*.dfm"
TOptionsfrm *Optionsfrm;
***************
*** 29,32 ****
--- 34,38 ----
FontDialogPopup = new TFontSelFrm(this);
FontDialogSearch = new TFontSelFrm(this);
+ FontDialogUI = new TFontSelFrm(this);
}
//---------------------------------------------------------------------------
***************
*** 78,82 ****
switch (cmbTextSelect->ItemIndex)
{
! case 0:
CopyFontDlg(tempFrm, FontDialogText);
if(FontDialogText->ShowModal() == mrOk){
--- 84,88 ----
switch (cmbTextSelect->ItemIndex)
{
! case 0: // All Windows
CopyFontDlg(tempFrm, FontDialogText);
if(FontDialogText->ShowModal() == mrOk){
***************
*** 84,91 ****
CopyFontDlg(FontDialogLD, FontDialogText);
CopyFontDlg(FontDialogPopup, FontDialogText);
UpdatePreview();
}else CopyFontDlg(FontDialogText, tempFrm);
break;
! case 1:
CopyFontDlg(tempFrm, FontDialogText);
if(FontDialogText->ShowModal() == mrOk)
--- 90,98 ----
CopyFontDlg(FontDialogLD, FontDialogText);
CopyFontDlg(FontDialogPopup, FontDialogText);
+ CopyFontDlg(FontDialogUI, FontDialogText);
UpdatePreview();
}else CopyFontDlg(FontDialogText, tempFrm);
break;
! case 1: // Bible Window
CopyFontDlg(tempFrm, FontDialogText);
if(FontDialogText->ShowModal() == mrOk)
***************
*** 93,97 ****
else CopyFontDlg(FontDialogText, tempFrm);
break;
! case 2:
CopyFontDlg(tempFrm, FontDialogComment);
if(FontDialogComment->ShowModal() == mrOk)
--- 100,104 ----
else CopyFontDlg(FontDialogText, tempFrm);
break;
! case 2: // Commentary Window
CopyFontDlg(tempFrm, FontDialogComment);
if(FontDialogComment->ShowModal() == mrOk)
***************
*** 99,103 ****
else CopyFontDlg(FontDialogComment, tempFrm);
break;
! case 3:
CopyFontDlg(tempFrm, FontDialogLD);
if(FontDialogLD->ShowModal() == mrOk)
--- 106,110 ----
else CopyFontDlg(FontDialogComment, tempFrm);
break;
! case 3: // Lexdict Window
CopyFontDlg(tempFrm, FontDialogLD);
if(FontDialogLD->ShowModal() == mrOk)
***************
*** 105,109 ****
else CopyFontDlg(FontDialogLD, tempFrm);
break;
! case 4:
CopyFontDlg(tempFrm, FontDialogPopup);
if(FontDialogPopup->ShowModal() == mrOk)
--- 112,116 ----
else CopyFontDlg(FontDialogLD, tempFrm);
break;
! case 4: // PopUp Windows
CopyFontDlg(tempFrm, FontDialogPopup);
if(FontDialogPopup->ShowModal() == mrOk)
***************
*** 111,115 ****
else CopyFontDlg(FontDialogPopup, tempFrm);
break;
! case 5:
CopyFontDlg(tempFrm, FontDialogSearch);
if(FontDialogSearch->ShowModal() == mrOk)
--- 118,122 ----
else CopyFontDlg(FontDialogPopup, tempFrm);
break;
! case 5: // Search Results
CopyFontDlg(tempFrm, FontDialogSearch);
if(FontDialogSearch->ShowModal() == mrOk)
***************
*** 117,120 ****
--- 124,133 ----
else CopyFontDlg(FontDialogSearch, tempFrm);
break;
+ case 6: // User Interface
+ CopyFontDlg(tempFrm, FontDialogUI);
+ if(FontDialogUI->ShowModal() == mrOk)
+ UpdatePreview();
+ else CopyFontDlg(FontDialogUI, tempFrm);
+ break;
}
delete tempFrm;
***************
*** 286,289 ****
--- 299,303 ----
emap.erase("PopupBackColor"); emap.insert(ConfigEntMap::value_type("PopupBackColor", IntToStr(FontDialogPopup->BackColor).c_str()));
emap.erase("SearchBackColor"); emap.insert(ConfigEntMap::value_type("SearchBackColor", IntToStr(FontDialogSearch->BackColor).c_str()));
+ emap.erase("UIBackColor"); emap.insert(ConfigEntMap::value_type("UIBackColor", IntToStr(FontDialogUI->BackColor).c_str()));
emap.erase("TextFontName"); emap.insert(ConfigEntMap::value_type("TextFontName", (FontDialogText->Font->Name).c_str()));
***************
*** 292,295 ****
--- 306,310 ----
emap.erase("PopupFontName"); emap.insert(ConfigEntMap::value_type("PopupFontName", (FontDialogPopup->Font->Name).c_str()));
emap.erase("SearchFontName"); emap.insert(ConfigEntMap::value_type("SearchFontName", (FontDialogSearch->Font->Name).c_str()));
+ emap.erase("UIFontName"); emap.insert(ConfigEntMap::value_type("UIFontName", (FontDialogUI->Font->Name).c_str()));
emap.erase("TextFontSize"); emap.insert(ConfigEntMap::value_type("TextFontSize", IntToStr(FontDialogText->Font->Size).c_str()));
***************
*** 298,301 ****
--- 313,317 ----
emap.erase("PopupFontSize"); emap.insert(ConfigEntMap::value_type("PopupFontSize", IntToStr(FontDialogPopup->Font->Size).c_str()));
emap.erase("SearchFontSize"); emap.insert(ConfigEntMap::value_type("SearchFontSize", IntToStr(FontDialogSearch->Font->Size).c_str()));
+ emap.erase("UIFontSize"); emap.insert(ConfigEntMap::value_type("UIFontSize", IntToStr(FontDialogUI->Font->Size).c_str()));
emap.erase("TextFontColor"); emap.insert(ConfigEntMap::value_type("TextFontColor", IntToStr(FontDialogText->Font->Color).c_str()));
***************
*** 304,307 ****
--- 320,324 ----
emap.erase("PopupFontColor"); emap.insert(ConfigEntMap::value_type("PopupFontColor", IntToStr(FontDialogPopup->Font->Color).c_str()));
emap.erase("SearchFontColor"); emap.insert(ConfigEntMap::value_type("SearchFontColor", IntToStr(FontDialogSearch->Font->Color).c_str()));
+ emap.erase("UIFontColor"); emap.insert(ConfigEntMap::value_type("UIFontColor", IntToStr(FontDialogUI->Font->Color).c_str()));
schemeconf.Sections["Appearance"] = emap;
***************
*** 321,328 ****
struct dirent *ent;
string conffile;
! AnsiString strName;
AnsiString strPath = COLOR_DIR;
! TStringList *schemeNames = new TStringList;
cmbSchemeSelect->Clear();
--- 338,345 ----
struct dirent *ent;
string conffile;
! WideString strName;
AnsiString strPath = COLOR_DIR;
! TTntWideStringList *schemeNames = new TTntWideStringList;
cmbSchemeSelect->Clear();
***************
*** 336,340 ****
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());
}
}
--- 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));
}
}
***************
*** 596,599 ****
--- 613,620 ----
else FontDialogSearch->BackColor = clWhite;
+ if((tmpval = config->Sections["Appearance"]["UIBackColor"]) != "")
+ FontDialogUI->BackColor = TColor(atoi(tmpval.c_str()));
+ else FontDialogUI->BackColor = clWhite;
+
//**** Font Face Name ****//
if((tmpval = config->Sections["Appearance"]["TextFontName"]) != "")
***************
*** 616,620 ****
FontDialogSearch->Font->Name = tmpval.c_str();
else FontDialogSearch->Font->Name = "Times New Roman";
!
//**** Font Size ****//
if((tmpval = config->Sections["Appearance"]["TextFontSize"]) != "")
--- 637,645 ----
FontDialogSearch->Font->Name = tmpval.c_str();
else FontDialogSearch->Font->Name = "Times New Roman";
!
! if((tmpval = config->Sections["Appearance"]["UIFontName"]) != "")
! FontDialogUI->Font->Name = tmpval.c_str();
! else FontDialogUI->Font->Name = "MS Sans Serif";
!
//**** Font Size ****//
if((tmpval = config->Sections["Appearance"]["TextFontSize"]) != "")
***************
*** 637,641 ****
FontDialogSearch->Font->Size = atoi(tmpval.c_str());
else FontDialogSearch->Font->Size = 10;
!
//**** Font ForeColor ****//
if((tmpval = config->Sections["Appearance"]["TextFontColor"]) != "")
--- 662,670 ----
FontDialogSearch->Font->Size = atoi(tmpval.c_str());
else FontDialogSearch->Font->Size = 10;
!
! if((tmpval = config->Sections["Appearance"]["UIFontSize"]) != "")
! FontDialogUI->Font->Size = atoi(tmpval.c_str());
! else FontDialogUI->Font->Size = 8;
!
//**** Font ForeColor ****//
if((tmpval = config->Sections["Appearance"]["TextFontColor"]) != "")
***************
*** 658,661 ****
--- 687,694 ----
FontDialogSearch->Font->Color = TColor(atoi(tmpval.c_str()));
else FontDialogSearch->Font->Color = clBlack;
+
+ if((tmpval = config->Sections["Appearance"]["UIFontColor"]) != "")
+ FontDialogUI->Font->Color = TColor(atoi(tmpval.c_str()));
+ else FontDialogUI->Font->Color = clBlack;
}
***************
*** 770,774 ****
emap["PopupBackColor"] = IntToStr(Optionsfrm->FontDialogPopup->BackColor).c_str();
emap["SearchBackColor"] = IntToStr(Optionsfrm->FontDialogSearch->BackColor).c_str();
!
emap["TextFontName"] = (Optionsfrm->FontDialogText->Font->Name).c_str();
emap["CommentFontName"] = (Optionsfrm->FontDialogComment->Font->Name).c_str();
--- 803,808 ----
emap["PopupBackColor"] = IntToStr(Optionsfrm->FontDialogPopup->BackColor).c_str();
emap["SearchBackColor"] = IntToStr(Optionsfrm->FontDialogSearch->BackColor).c_str();
! emap["UIBackColor"] = IntToStr(Optionsfrm->FontDialogUI->BackColor).c_str();
!
emap["TextFontName"] = (Optionsfrm->FontDialogText->Font->Name).c_str();
emap["CommentFontName"] = (Optionsfrm->FontDialogComment->Font->Name).c_str();
***************
*** 776,779 ****
--- 810,814 ----
emap["PopupFontName"] = (Optionsfrm->FontDialogPopup->Font->Name).c_str();
emap["SearchFontName"] = (Optionsfrm->FontDialogSearch->Font->Name).c_str();
+ emap["UIFontName"] = (Optionsfrm->FontDialogUI->Font->Name).c_str();
emap["TextFontSize"] = IntToStr(Optionsfrm->FontDialogText->Font->Size).c_str();
***************
*** 782,786 ****
emap["PopupFontSize"] = IntToStr(Optionsfrm->FontDialogPopup->Font->Size).c_str();
emap["SearchFontSize"] = IntToStr(Optionsfrm->FontDialogSearch->Font->Size).c_str();
!
emap["TextFontColor"] = IntToStr(Optionsfrm->FontDialogText->Font->Color).c_str();
emap["CommentFontColor"] = IntToStr(Optionsfrm->FontDialogComment->Font->Color).c_str();
--- 817,822 ----
emap["PopupFontSize"] = IntToStr(Optionsfrm->FontDialogPopup->Font->Size).c_str();
emap["SearchFontSize"] = IntToStr(Optionsfrm->FontDialogSearch->Font->Size).c_str();
! emap["UIFontSize"] = IntToStr(Optionsfrm->FontDialogUI->Font->Size).c_str();
!
emap["TextFontColor"] = IntToStr(Optionsfrm->FontDialogText->Font->Color).c_str();
emap["CommentFontColor"] = IntToStr(Optionsfrm->FontDialogComment->Font->Color).c_str();
***************
*** 788,791 ****
--- 824,828 ----
emap["PopupFontColor"] = IntToStr(Optionsfrm->FontDialogPopup->Font->Color).c_str();
emap["SearchFontColor"] = IntToStr(Optionsfrm->FontDialogSearch->Font->Color).c_str();
+ emap["UIFontColor"] = IntToStr(Optionsfrm->FontDialogUI->Font->Color).c_str();
emap["locale"] = (const char *)Optionsfrm->localeCB->Items->Objects[Optionsfrm->localeCB->ItemIndex];
Index: optionfrm.dfm
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** optionfrm.dfm 26 Sep 2002 07:50:45 -0000 1.49
--- optionfrm.dfm 27 Jan 2003 09:23:06 -0000 1.50
***************
*** 1,5 ****
object Optionsfrm: TOptionsfrm
! Left = 280
! Top = 99
BorderStyle = bsDialog
Caption = 'Preferences'
--- 1,5 ----
object Optionsfrm: TOptionsfrm
! Left = 509
! Top = 252
BorderStyle = bsDialog
Caption = 'Preferences'
***************
*** 44,48 ****
PixelsPerInch = 96
TextHeight = 13
! object Panel2: TPanel
Left = 0
Top = 284
--- 44,48 ----
PixelsPerInch = 96
TextHeight = 13
! object Panel2: TTntPanel
Left = 0
Top = 284
***************
*** 52,56 ****
BevelOuter = bvNone
TabOrder = 0
! object OkBtn: TBitBtn
Left = 361
Top = 9
--- 52,59 ----
BevelOuter = bvNone
TabOrder = 0
! DesignSize = (
! 554
! 41)
! object OkBtn: TTntBitBtn
Left = 361
Top = 9
***************
*** 61,65 ****
Kind = bkOK
end
! object CancelBtn: TBitBtn
Left = 459
Top = 9
--- 64,68 ----
Kind = bkOK
end
! object CancelBtn: TTntBitBtn
Left = 459
Top = 9
***************
*** 71,85 ****
end
end
! object PageControl1: TPageControl
Left = 0
Top = 0
Width = 554
Height = 284
! ActivePage = TabSheet1
Align = alClient
TabOrder = 1
object TabSheet1: TTabSheet
Caption = 'General'
! object Panel1: TPanel
Left = 0
Top = 0
--- 74,89 ----
end
end
! object PageControl1: TTntPageControl
Left = 0
Top = 0
Width = 554
Height = 284
! ActivePage = TabSheet3
Align = alClient
+ TabIndex = 2
TabOrder = 1
object TabSheet1: TTabSheet
Caption = 'General'
! object Panel1: TTntPanel
Left = 0
Top = 0
***************
*** 89,93 ****
BevelOuter = bvNone
TabOrder = 0
! object gbPersonalize: TGroupBox
Left = 0
Top = 0
--- 93,97 ----
BevelOuter = bvNone
TabOrder = 0
! object gbPersonalize: TTntGroupBox
Left = 0
Top = 0
***************
*** 97,101 ****
Caption = 'Personalize'
TabOrder = 0
! object Label4: TLabel
Left = 7
Top = 103
--- 101,108 ----
Caption = 'Personalize'
TabOrder = 0
! DesignSize = (
! 546
! 163)
! object Label4: TTntLabel
Left = 7
Top = 103
***************
*** 105,109 ****
Caption = 'Language'
end
! object AutoBMPersonal: TCheckBox
Left = 7
Top = 17
--- 112,116 ----
Caption = 'Language'
end
! object AutoBMPersonal: TTntCheckBox
Left = 7
Top = 17
***************
*** 116,120 ****
TabOrder = 0
end
! object AutoBMOther: TCheckBox
Left = 7
Top = 36
--- 123,127 ----
TabOrder = 0
end
! object AutoBMOther: TTntCheckBox
Left = 7
Top = 36
***************
*** 124,128 ****
TabOrder = 1
end
! object HintPopups: TCheckBox
Left = 232
Top = 12
--- 131,135 ----
TabOrder = 1
end
! object HintPopups: TTntCheckBox
Left = 232
Top = 12
***************
*** 136,140 ****
OnClick = HintPopupsClick
end
! object localeCB: TComboBox
Left = 94
Top = 100
--- 143,147 ----
OnClick = HintPopupsClick
end
! object localeCB: TTntComboBox
Left = 94
Top = 100
***************
*** 148,152 ****
TabOrder = 3
end
! object AutoLayout: TCheckBox
Left = 7
Top = 55
--- 155,159 ----
TabOrder = 3
end
! object AutoLayout: TTntCheckBox
Left = 7
Top = 55
***************
*** 158,162 ****
TabOrder = 4
end
! object HintStrongs: TCheckBox
Left = 252
Top = 29
--- 165,169 ----
TabOrder = 4
end
! object HintStrongs: TTntCheckBox
Left = 252
Top = 29
***************
*** 167,171 ****
TabOrder = 5
end
! object HintWords: TCheckBox
Left = 252
Top = 68
--- 174,178 ----
TabOrder = 5
end
! object HintWords: TTntCheckBox
Left = 252
Top = 68
***************
*** 175,179 ****
TabOrder = 6
end
! object HintVLists: TCheckBox
Left = 252
Top = 48
--- 182,186 ----
TabOrder = 6
end
! object HintVLists: TTntCheckBox
Left = 252
Top = 48
***************
*** 189,193 ****
Caption = 'Special Modules'
ImageIndex = 1
! object gbDefModules: TGroupBox
Left = 0
Top = 0
--- 196,200 ----
Caption = 'Special Modules'
ImageIndex = 1
! object gbDefModules: TTntGroupBox
Left = 0
Top = 0
***************
*** 197,201 ****
Caption = 'Original Language Support - Default Modules'
TabOrder = 0
! object Label5: TLabel
Left = 7
Top = 36
--- 204,208 ----
Caption = 'Original Language Support - Default Modules'
TabOrder = 0
! object Label5: TTntLabel
Left = 7
Top = 36
***************
*** 204,208 ****
Caption = 'Greek'
end
! object Label6: TLabel
Left = 7
Top = 59
--- 211,215 ----
Caption = 'Greek'
end
! object Label6: TTntLabel
Left = 7
Top = 59
***************
*** 211,215 ****
Caption = 'Hebrew'
end
! object Label7: TLabel
Left = 75
Top = 16
--- 218,222 ----
Caption = 'Hebrew'
end
! object Label7: TTntLabel
Left = 75
Top = 16
***************
*** 218,222 ****
Caption = 'Definitions'
end
! object Label8: TLabel
Left = 307
Top = 16
--- 225,229 ----
Caption = 'Definitions'
end
! object Label8: TTntLabel
Left = 307
Top = 16
***************
*** 225,229 ****
Caption = 'Parsing'
end
! object Label10: TLabel
Left = 7
Top = 81
--- 232,236 ----
Caption = 'Parsing'
end
! object Label10: TTntLabel
Left = 7
Top = 81
***************
*** 233,237 ****
Caption = 'Strong'#39's Numbered Text'
end
! object hebrewDefCB: TComboBox
Left = 75
Top = 55
--- 240,244 ----
Caption = 'Strong'#39's Numbered Text'
end
! object hebrewDefCB: TTntComboBox
Left = 75
Top = 55
***************
*** 242,246 ****
TabOrder = 0
end
! object greekDefCB: TComboBox
Left = 75
Top = 33
--- 249,253 ----
TabOrder = 0
end
! object greekDefCB: TTntComboBox
Left = 75
Top = 33
***************
*** 251,255 ****
TabOrder = 1
end
! object greekParseCB: TComboBox
Left = 307
Top = 33
--- 258,262 ----
TabOrder = 1
end
! object greekParseCB: TTntComboBox
Left = 307
Top = 33
***************
*** 260,264 ****
TabOrder = 2
end
! object hebrewParseCB: TComboBox
Left = 307
Top = 55
--- 267,271 ----
TabOrder = 2
end
! object hebrewParseCB: TTntComboBox
Left = 307
Top = 55
***************
*** 269,273 ****
TabOrder = 3
end
! object strongsNumsCB: TComboBox
Left = 178
Top = 78
--- 276,280 ----
TabOrder = 3
end
! object strongsNumsCB: TTntComboBox
Left = 178
Top = 78
***************
*** 279,283 ****
end
end
! object gbDevos: TGroupBox
Left = 0
Top = 105
--- 286,290 ----
end
end
! object gbDevos: TTntGroupBox
Left = 0
Top = 105
***************
*** 288,292 ****
Caption = 'Daily Devotionals'
TabOrder = 1
! object Label9: TLabel
Left = 8
Top = 24
--- 295,302 ----
Caption = 'Daily Devotionals'
TabOrder = 1
! DesignSize = (
! 281
! 151)
! object Label9: TTntLabel
Left = 8
Top = 24
***************
*** 296,300 ****
Caption = 'Default Devotional'
end
! object dailyDefaultCB: TComboBox
Left = 8
Top = 42
--- 306,310 ----
Caption = 'Default Devotional'
end
! object dailyDefaultCB: TTntComboBox
Left = 8
Top = 42
***************
*** 305,309 ****
TabOrder = 0
end
! object devSplashCB: TCheckBox
Left = 8
Top = 72
--- 315,319 ----
TabOrder = 0
end
! object devSplashCB: TTntCheckBox
Left = 8
Top = 72
***************
*** 314,318 ****
TabOrder = 1
end
! object devsAsDictsCB: TCheckBox
Left = 8
Top = 88
--- 324,328 ----
TabOrder = 1
end
! object devsAsDictsCB: TTntCheckBox
Left = 8
Top = 88
***************
*** 324,328 ****
end
end
! object gbGloss: TGroupBox
Left = 284
Top = 105
--- 334,338 ----
end
end
! object gbGloss: TTntGroupBox
Left = 284
Top = 105
***************
*** 332,336 ****
Caption = 'Glossaries / General Dictionaries'
TabOrder = 2
! object Label17: TLabel
Left = 8
Top = 24
--- 342,346 ----
Caption = 'Glossaries / General Dictionaries'
TabOrder = 2
! object Label17: TTntLabel
Left = 8
Top = 24
***************
*** 340,344 ****
Caption = 'Default General Dictionary'
end
! object glosAsDictsCB: TCheckBox
Left = 8
Top = 75
--- 350,354 ----
Caption = 'Default General Dictionary'
end
! object glosAsDictsCB: TTntCheckBox
Left = 8
Top = 75
***************
*** 348,352 ****
TabOrder = 0
end
! object genDictCB: TComboBox
Left = 8
Top = 42
--- 358,362 ----
TabOrder = 0
end
! object genDictCB: TTntComboBox
Left = 8
Top = 42
***************
*** 362,366 ****
Caption = 'Display'
ImageIndex = 2
! object Panel3: TPanel
Left = 0
Top = 0
--- 372,376 ----
Caption = 'Display'
ImageIndex = 2
! object Panel3: TTntPanel
Left = 0
Top = 0
***************
*** 372,376 ****
Caption = 'Panel3'
TabOrder = 0
! object gbColors: TGroupBox
Left = 0
Top = 0
--- 382,386 ----
Caption = 'Panel3'
TabOrder = 0
! object gbColors: TTntGroupBox
Left = 0
Top = 0
***************
*** 380,384 ****
Caption = 'Display Colors'
TabOrder = 0
! object Label2: TLabel
Left = 7
Top = 17
--- 390,397 ----
Caption = 'Display Colors'
TabOrder = 0
! DesignSize = (
! 546
! 256)
! object Label2: TTntLabel
Left = 7
Top = 17
***************
*** 387,391 ****
Caption = 'Preview'
end
! object Label3: TLabel
Left = 228
Top = 10
--- 400,404 ----
Caption = 'Preview'
end
! object Label3: TTntLabel
Left = 228
Top = 10
***************
*** 394,398 ****
Caption = 'Window Type'
end
! object Label11: TLabel
Left = 228
Top = 59
--- 407,411 ----
Caption = 'Window Type'
end
! object Label11: TTntLabel
Left = 228
Top = 59
***************
*** 401,405 ****
Caption = 'Text Styles and Colors'
end
! object Label13: TLabel
Left = 228
Top = 87
--- 414,418 ----
Caption = 'Text Styles and Colors'
end
! object Label13: TTntLabel
Left = 228
Top = 87
***************
*** 417,421 ****
OnMouseDown = shpCurrVSClrMouseDown
end
! object Label14: TLabel
Left = 356
Top = 10
--- 430,434 ----
OnMouseDown = shpCurrVSClrMouseDown
end
! object Label14: TTntLabel
Left = 356
Top = 10
***************
*** 424,428 ****
Caption = 'Scheme'
end
! object Label15: TLabel
Left = 228
Top = 145
--- 437,441 ----
Caption = 'Scheme'
end
! object Label15: TTntLabel
Left = 228
Top = 145
***************
*** 431,435 ****
Caption = 'Combo/Edit Fields'
end
! object btnSave: TSpeedButton
Left = 514
Top = 27
--- 444,448 ----
Caption = 'Combo/Edit Fields'
end
! object btnSave: TTntSpeedButton
Left = 514
Top = 27
***************
*** 451,455 ****
OnClick = btnSaveScheme
end
! object Label1: TLabel
Left = 228
Top = 232
--- 464,468 ----
OnClick = btnSaveScheme
end
! object Label1: TTntLabel
Left = 228
Top = 232
***************
*** 458,462 ****
Caption = 'Individual Modules (Font Only)'
end
! object Label12: TLabel
Left = 228
Top = 174
--- 471,475 ----
Caption = 'Individual Modules (Font Only)'
end
! object Label12: TTntLabel
Left = 228
Top = 174
***************
*** 465,469 ****
Caption = 'Strong'#39's Numbers <...>'
end
! object Label16: TLabel
Left = 228
Top = 203
--- 478,482 ----
Caption = 'Strong'#39's Numbers <...>'
end
! object Label16: TTntLabel
Left = 228
Top = 203
***************
*** 508,512 ****
OnMouseDown = shpNumClrMouseDown
end
! object btnCurrVerse: TButton
Left = 444
Top = 111
--- 521,525 ----
OnMouseDown = shpNumClrMouseDown
end
! object btnCurrVerse: TTntButton
Left = 444
Top = 111
***************
*** 519,523 ****
OnClick = btnCurrVerseClick
end
! object RTFPreview: TRichEdit
Left = 7
Top = 38
--- 532,536 ----
OnClick = btnCurrVerseClick
end
! object RTFPreview: TTntRichEdit
Left = 7
Top = 38
***************
*** 529,533 ****
WantReturns = False
end
! object cmbTextSelect: TComboBox
Left = 228
Top = 27
--- 542,546 ----
WantReturns = False
end
! object cmbTextSelect: TTntComboBox
Left = 228
Top = 27
***************
*** 537,541 ****
TabOrder = 1
OnChange = cmbTextSelectChange
! Items.Strings = (
'All Windows'
'Bible Window'
--- 550,554 ----
TabOrder = 1
OnChange = cmbTextSelectChange
! Items.WideStrings = (
'All Windows'
'Bible Window'
***************
*** 543,549 ****
'Lexicon/Dictionary Window'
'Pop-Up Windows'
! 'Search Results')
end
! object btnFont: TButton
Left = 444
Top = 54
--- 556,563 ----
'Lexicon/Dictionary Window'
'Pop-Up Windows'
! 'Search Results'
! 'User Interface')
end
! object btnFont: TTntButton
Left = 444
Top = 54
***************
*** 558,562 ****
OnClick = btnFontClick
end
! object AutoVSColor: TCheckBox
Left = 228
Top = 113
--- 572,576 ----
OnClick = btnFontClick
end
! object AutoVSColor: TTntCheckBox
Left = 228
Top = 113
***************
*** 566,570 ****
TabOrder = 3
end
! object btnNumClr: TButton
Left = 444
Top = 82
--- 580,584 ----
TabOrder = 3
end
! object btnNumClr: TTntButton
Left = 444
Top = 82
***************
*** 577,581 ****
OnClick = btnNumClrClick
end
! object cmbSchemeSelect: TComboBox
Left = 356
Top = 27
--- 591,595 ----
OnClick = btnNumClrClick
end
! object cmbSchemeSelect: TTntComboBox
Left = 356
Top = 27
***************
*** 585,594 ****
TabOrder = 6
OnChange = cmbSchemeSelectChange
! Items.Strings = (
'Default'
'Parchment'
'Midnight')
end
! object btnFieldClr: TButton
Left = 444
Top = 140
--- 599,608 ----
TabOrder = 6
OnChange = cmbSchemeSelectChange
! Items.WideStrings = (
'Default'
'Parchment'
'Midnight')
end
! object btnFieldClr: TTntButton
Left = 444
Top = 140
***************
*** 600,604 ****
OnClick = btnFieldClrClick
end
! object btnModFonts: TButton
Left = 444
Top = 227
--- 614,618 ----
OnClick = btnFieldClrClick
end
! object btnModFonts: TTntButton
Left = 444
Top = 227
***************
*** 610,614 ****
OnClick = btnModFontsClick
end
! object btnStrongClr: TButton
Left = 444
Top = 169
--- 624,628 ----
OnClick = btnModFontsClick
end
! object btnStrongClr: TTntButton
Left = 444
Top = 169
***************
*** 621,625 ****
OnClick = btnStrongClrClick
end
! object btnMorphClr: TButton
Left = 444
Top = 198
--- 635,639 ----
OnClick = btnStrongClrClick
end
! object btnMorphClr: TTntButton
Left = 444
Top = 198
***************
*** 652,671 ****
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
--- 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
Index: optionfrm.h
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/optionfrm.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** optionfrm.h 25 Aug 2002 01:51:24 -0000 1.20
--- optionfrm.h 27 Jan 2003 09:23:06 -0000 1.21
***************
*** 14,17 ****
--- 14,22 ----
#include <Buttons.hpp>
#include <Menus.hpp>
+ #include "TntButtons.hpp"
+ #include "TntComCtrls.hpp"
+ #include "TntExtCtrls.hpp"
+ #include "TntMenus.hpp"
+ #include "TntStdCtrls.hpp"
const AnsiString COLOR_DIR = "colors\\";
***************
*** 23,103 ****
__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);
--- 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);
***************
*** 139,142 ****
--- 144,148 ----
TFontSelFrm* FontDialogPopup;
TFontSelFrm* FontDialogSearch;
+ TFontSelFrm* FontDialogUI;
void LoadDispSettings(SWConfig* config);
void LoadMiscSettings(SWConfig* config);
Index: searchfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** searchfrm.cpp 24 Sep 2002 03:34:08 -0000 1.39
--- searchfrm.cpp 27 Jan 2003 09:23:06 -0000 1.40
***************
*** 118,122 ****
(*key) = resultsLV->Items->Item[row]->Caption.c_str();
if (targetpc == Form1->LexDictPageControl) {
! Form1->DictKeyEdit->Text = resultsLV->Items->Item[row]->Caption.c_str();
}
else {
--- 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 {
Index: vrslstfrm.cpp
===================================================================
RCS file: /usr/local/cvsroot/sword/apps/windoze/CBuilder5/BibleCS/vrslstfrm.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** vrslstfrm.cpp 3 Sep 2002 18:52:28 -0000 1.12
--- vrslstfrm.cpp 27 Jan 2003 09:23:06 -0000 1.13
***************
*** 133,139 ****
if (result) {
if (FileMgr::existsFile(VLSaveDialog->FileName.c_str())) {
! string message = _tr("File exists. Overwrite?");
! string header = _tr("Overwrite File");
! if (MessageBox(Handle, message.c_str(), header.c_str(), MB_YESNO) != IDYES) {
return;
}
--- 133,139 ----
if (result) {
if (FileMgr::existsFile(VLSaveDialog->FileName.c_str())) {
! WideString message = _tr("File exists. Overwrite?");
! WideString header = _tr("Overwrite File");
! if (MessageBoxW(Handle, message, header, MB_YESNO) != IDYES) {
return;
}