aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm10
-rw-r--r--apps/windoze/CBuilder5/BibleCS/TModuleFonts.cpp47
-rw-r--r--apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm95
-rw-r--r--apps/windoze/CBuilder5/BibleCS/TModuleFonts.h3
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.cpp17
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.dfm12
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.cpp73
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.dfm18
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.h1
-rw-r--r--apps/windoze/CBuilder5/BibleCS/searchfrm.cpp6
-rw-r--r--apps/windoze/CBuilder5/BibleCS/searchfrm.dfm27
-rw-r--r--apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf20
-rw-r--r--apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf338
-rw-r--r--apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf12
-rw-r--r--apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/sl.conf12
15 files changed, 427 insertions, 264 deletions
diff --git a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
index ac688d6..463e72a 100644
--- a/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/DevOfTheDay.dfm
@@ -25,7 +25,7 @@ object DevOfTheDay2: TDevOfTheDay2
Left = 0
Top = 69
Width = 419
- Height = 231
+ Height = 230
Align = alClient
AutoSize = True
BevelOuter = bvNone
@@ -35,7 +35,7 @@ object DevOfTheDay2: TDevOfTheDay2
Left = 0
Top = 0
Width = 419
- Height = 231
+ Height = 230
Align = alClient
BorderStyle = bsNone
PlainText = True
@@ -46,11 +46,15 @@ object DevOfTheDay2: TDevOfTheDay2
end
object Panel3: TPanel
Left = 0
- Top = 300
+ Top = 299
Width = 419
Height = 41
Align = alBottom
+ BevelOuter = bvNone
TabOrder = 1
+ DesignSize = (
+ 419
+ 41)
object ckShowTip: TCheckBox
Left = 8
Top = 12
diff --git a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.cpp b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.cpp
index 03a2e99..182147a 100644
--- a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.cpp
@@ -89,7 +89,7 @@ void __fastcall TModuleFonts::installTreeChange(TObject *Sender,
{
TTreeNode* currNode = installTree->Selected;
BibleCSMGR *manager;
- AnsiString modName, fontName;
+ AnsiString modName, fontName, fontSize;
ModMap::iterator it;
manager = Form1->mainmgr;
@@ -97,7 +97,9 @@ void __fastcall TModuleFonts::installTreeChange(TObject *Sender,
modName = currNode->Text.SubString(2, currNode->Text.Pos("]") - 2);
it = manager->Modules.find(modName.c_str());
fontName = (*it).second->getConfigEntry("Font");
- cmbFontSel->ItemIndex = cmbFontSel->Items->IndexOf(fontName);
+ fontSize = (*it).second->getConfigEntry("FontSize");
+ cmbFontSel->ItemIndex = cmbFontSel->Items->IndexOf(fontName);
+ cmbSizeSel->ItemIndex = cmbSizeSel->Items->IndexOf(fontSize);
}
}
@@ -110,10 +112,11 @@ void __fastcall TModuleFonts::cmbFontSelChange(TObject *Sender)
manager->applyUserPrefs();
AnsiString modName;
ModMap::iterator it;
- if(!currNode->HasChildren){
+ if(currNode && !currNode->HasChildren){
modName = currNode->Text.SubString(2, currNode->Text.Pos("]") - 2);
manager->getUserPrefs()[modName.c_str()]["Font"] = cmbFontSel->Items->Strings[cmbFontSel->ItemIndex].c_str();
- }
+ currNode->Selected = true;
+ }
manager->applyUserPrefs();
}
//---------------------------------------------------------------------------
@@ -121,18 +124,36 @@ void __fastcall TModuleFonts::cmbFontSelChange(TObject *Sender)
void __fastcall TModuleFonts::btnResetClick(TObject *Sender)
{
BibleCSMGR *manager;
- SectionMap::iterator sit;
- ModMap::iterator it;
- manager = Form1->mainmgr;
+ SectionMap::iterator sit;
+ ModMap::iterator it;
+ manager = Form1->mainmgr;
sit = manager->getUserPrefs().Sections.begin();
- while(sit != manager->getUserPrefs().Sections.end())
- {
- (*sit).second.erase("Font");
- sit++;
- }
- manager->applyUserPrefs();
+ while(sit != manager->getUserPrefs().Sections.end())
+ {
+ (*sit).second.erase("Font");
+ (*sit).second.erase("FontSize");
+ sit++;
+ }
+ manager->applyUserPrefs();
}
//---------------------------------------------------------------------------
+void __fastcall TModuleFonts::cmbSizeSelChange(TObject *Sender)
+{
+ TTreeNode* currNode = installTree->Selected;
+ BibleCSMGR *manager = Form1->mainmgr;
+ manager->applyUserPrefs();
+ AnsiString modName;
+ ModMap::iterator it;
+ if(currNode && !currNode->HasChildren){
+ modName = currNode->Text.SubString(2, currNode->Text.Pos("]") - 2);
+ manager->getUserPrefs()[modName.c_str()]["FontSize"] = cmbSizeSel->Items->Strings[cmbSizeSel->ItemIndex].c_str();
+ currNode->Selected = true;
+ }
+ manager->applyUserPrefs();
+ installTree->Focused();
+}
+//---------------------------------------------------------------------------
+
diff --git a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm
index ca772c4..492df1b 100644
--- a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.dfm
@@ -1,10 +1,12 @@
object ModuleFonts: TModuleFonts
Left = 523
Top = 262
- Width = 354
- Height = 462
+ Width = 300
+ Height = 400
Caption = 'Select Module Fonts'
Color = clBtnFace
+ Constraints.MinHeight = 400
+ Constraints.MinWidth = 300
Font.Charset = DEFAULT_CHARSET
Font.Color = clWindowText
Font.Height = -11
@@ -20,14 +22,17 @@ object ModuleFonts: TModuleFonts
TextHeight = 13
object Panel1: TPanel
Left = 0
- Top = 375
- Width = 346
+ Top = 305
+ Width = 292
Height = 41
Align = alBottom
BevelOuter = bvNone
TabOrder = 0
+ DesignSize = (
+ 292
+ 41)
object btnReset: TBitBtn
- Left = 136
+ Left = 82
Top = 8
Width = 102
Height = 29
@@ -52,11 +57,10 @@ object ModuleFonts: TModuleFonts
33FF88F800003333AA222222AA33A3333388FFFFFF8833830000333333AAAAAA
3333333333338888883333330000333333333333333333333333333333333333
0000}
- Margin = 1
NumGlyphs = 2
end
object btnOK: TBitBtn
- Left = 248
+ Left = 194
Top = 8
Width = 94
Height = 29
@@ -68,8 +72,8 @@ object ModuleFonts: TModuleFonts
object Panel2: TPanel
Left = 0
Top = 0
- Width = 346
- Height = 334
+ Width = 292
+ Height = 264
Align = alClient
BevelOuter = bvNone
Caption = 'Panel2'
@@ -83,7 +87,7 @@ object ModuleFonts: TModuleFonts
object Panel4: TPanel
Left = 0
Top = 0
- Width = 346
+ Width = 292
Height = 32
Align = alTop
BevelOuter = bvNone
@@ -99,9 +103,10 @@ object ModuleFonts: TModuleFonts
object installTree: TTreeView
Left = 0
Top = 32
- Width = 346
- Height = 302
+ Width = 292
+ Height = 232
Align = alClient
+ HideSelection = False
Indent = 19
ReadOnly = True
TabOrder = 1
@@ -110,30 +115,84 @@ object ModuleFonts: TModuleFonts
end
object Panel3: TPanel
Left = 0
- Top = 334
- Width = 346
+ Top = 264
+ Width = 292
Height = 41
Align = alBottom
BevelOuter = bvNone
TabOrder = 2
+ DesignSize = (
+ 292
+ 41)
object Label2: TLabel
Left = 7
Top = 8
- Width = 52
+ Width = 66
Height = 13
Anchors = [akLeft, akBottom]
Caption = 'Font Name'
end
+ object Label3: TLabel
+ Left = 192
+ Top = 8
+ Width = 44
+ Height = 13
+ Anchors = [akRight, akBottom]
+ Caption = 'Font Size'
+ end
object pnlFontComboBox: TPanel
- Left = 85
- Top = 4
- Width = 258
+ Left = 80
+ Top = 2
+ Width = 103
Height = 25
Anchors = [akLeft, akTop, akRight]
BevelOuter = bvNone
Caption = 'Font ComboBox'
TabOrder = 0
end
+ object cmbSizeSel: TComboBox
+ Left = 242
+ Top = 4
+ Width = 44
+ Height = 21
+ Anchors = [akRight, akBottom]
+ ItemHeight = 13
+ ItemIndex = 4
+ TabOrder = 1
+ Text = '12'
+ OnChange = cmbSizeSelChange
+ Items.Strings = (
+ '8'
+ '9'
+ '10'
+ '11'
+ '12'
+ '13'
+ '14'
+ '15'
+ '16'
+ '17'
+ '18'
+ '19'
+ '20'
+ '21'
+ '22'
+ '23'
+ '24'
+ '25'
+ '26'
+ '27'
+ '28'
+ '29'
+ '30'
+ '32'
+ '34'
+ '36'
+ '38'
+ '40'
+ '50'
+ '60')
+ end
end
object MainMenu1: TMainMenu
Left = 200
diff --git a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.h b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.h
index 5579f1c..51aa89a 100644
--- a/apps/windoze/CBuilder5/BibleCS/TModuleFonts.h
+++ b/apps/windoze/CBuilder5/BibleCS/TModuleFonts.h
@@ -38,12 +38,15 @@ __published: // IDE-managed Components
TPanel *Panel4;
TTreeView *installTree;
TLabel *Label1;
+ TLabel *Label3;
+ TComboBox *cmbSizeSel;
void __fastcall FormShow(TObject *Sender);
void __fastcall viewAllClick(TObject *Sender);
void __fastcall viewUnicodeClick(TObject *Sender);
void __fastcall installTreeChange(TObject *Sender, TTreeNode *Node);
void __fastcall cmbFontSelChange(TObject *Sender);
void __fastcall btnResetClick(TObject *Sender);
+ void __fastcall cmbSizeSelChange(TObject *Sender);
private:
void FillList();
public: // User declarations
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index fccaaab..efbe6f7 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -526,12 +526,12 @@ WideString TForm1::TrimJunk(WideString src) {
}
for (int i = 1; i <= len; i++) {
if (hasDigit && !hasAlpha) { // number
- if (isdigit(src[i])) retVal += src[i];
+ if (isdigit(src[i])) retVal += (WideString)src[i];
}
else if (hasAlpha) { // alpha
- if (isalpha(src[i]) || (src[i] > 255)) retVal += src[i];
+ if (isalpha(src[i]) || (src[i] > 255)) retVal += (WideString)src[i];
}
- else retVal += src[i];
+ else retVal += (WideString)src[i];
}
return retVal;
}
@@ -770,16 +770,17 @@ void TForm1::i12ize(const char *lang) {
NewBMfrm->CancelBtn->Caption = _tr("Cancel");
// OptionsForm
+ /* TODO 2 -cLocalize : Change Module Type to Window Type here and in the localization files and get it updated by our local guys :) */
Optionsfrm->Caption = _tr("Preferences");
Optionsfrm->TabSheet1->Caption = _tr("General");
Optionsfrm->TabSheet2->Caption = _tr("Special Modules");
Optionsfrm->TabSheet3->Caption = _tr("Display");
Optionsfrm->gbPersonalize->Caption = _tr("Personalize");
- Optionsfrm->AutoBMPersonal->Caption = _tr("Save Personal Bookmarks");
- Optionsfrm->AutoBMOther->Caption = _tr("Save Other Bookmarks");
+ Optionsfrm->AutoBMPersonal->Caption = _tr("Autosave Personal Bookmarks");
+ Optionsfrm->AutoBMOther->Caption = _tr("Autosave Other Bookmarks");
Optionsfrm->HintPopups->Caption = _tr("Show Hint Pop-ups");
Optionsfrm->Label4->Caption = _tr("Language");
- Optionsfrm->AutoLayout->Caption = _tr("Save Screen Layout");
+ Optionsfrm->AutoLayout->Caption = _tr("Autosave Screen Layout");
Optionsfrm->HintStrongs->Caption = _tr("Show Hint Over Strongs Numbers");
Optionsfrm->OkBtn->Caption = _tr("OK");
Optionsfrm->CancelBtn->Caption = _tr("Cancel");
@@ -797,9 +798,9 @@ void TForm1::i12ize(const char *lang) {
Optionsfrm->glosAsDictsCB->Caption = _tr("Show Glossaries as Dictionaries");
Optionsfrm->gbColors->Caption = _tr("Display Colors");
Optionsfrm->Label2->Caption = _tr("Preview");
- Optionsfrm->Label3->Caption = _tr("Module Type");
+ Optionsfrm->Label3->Caption = _tr("Window Type");
Optionsfrm->Label14->Caption = _tr("Scheme");
- Optionsfrm->Label11->Caption = _tr("Text Font");
+ Optionsfrm->Label11->Caption = _tr("Text Styles and Colors");
Optionsfrm->btnFont->Caption = _tr("Select Font...");
Optionsfrm->Label13->Caption = _tr("Verse Number Color");
Optionsfrm->btnNumClr->Caption = _tr("Select Color...");
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
index 0688f42..2f74741 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
@@ -142,7 +142,7 @@ object Form1: TForm1
Left = 0
Top = 287
Width = 678
- Height = 162
+ Height = 154
Align = alClient
BevelOuter = bvNone
Constraints.MinHeight = 10
@@ -153,7 +153,7 @@ object Form1: TForm1
Left = 488
Top = 0
Width = 5
- Height = 162
+ Height = 154
Cursor = crHSplit
Align = alRight
end
@@ -161,7 +161,7 @@ object Form1: TForm1
Left = 0
Top = 0
Width = 488
- Height = 162
+ Height = 154
Hint = 'Lexicons / Dictionaries'
Align = alClient
Font.Charset = ANSI_CHARSET
@@ -181,7 +181,7 @@ object Form1: TForm1
Left = 493
Top = 0
Width = 185
- Height = 162
+ Height = 154
Align = alRight
Caption = 'Panel2'
TabOrder = 1
@@ -203,7 +203,7 @@ object Form1: TForm1
Left = 1
Top = 25
Width = 183
- Height = 136
+ Height = 128
Align = alClient
ItemHeight = 13
TabOrder = 1
@@ -213,7 +213,7 @@ object Form1: TForm1
end
object StatusBar1: TStatusBar
Left = 0
- Top = 449
+ Top = 441
Width = 678
Height = 15
Panels = <>
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
index 2aeec2e..ac5c69d 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
@@ -27,7 +27,8 @@ __fastcall TOptionsfrm::TOptionsfrm(TComponent* Owner)
FontDialogComment = new TFontSelFrm(this);
FontDialogLD = new TFontSelFrm(this);
FontDialogPopup = new TFontSelFrm(this);
-}
+ FontDialogSearch = new TFontSelFrm(this);
+ }
//---------------------------------------------------------------------------
void __fastcall TOptionsfrm::btnCurrVerseClick(TObject *Sender)
{
@@ -37,7 +38,7 @@ void __fastcall TOptionsfrm::btnCurrVerseClick(TObject *Sender)
}
//---------------------------------------------------------------------------
-//TODO 1 -cOptions: add per module font size selection
+//DONE -oDavid 1 -cOptions: add per module font size selection
//TODO 1 -cOptions: add 'general' dictionary besides strongs for lookups of words
//TODO 1 -cOptions: add per module 'general' dictionary
@@ -109,6 +110,12 @@ void __fastcall TOptionsfrm::btnFontClick(TObject *Sender)
UpdatePreview();
else CopyFontDlg(FontDialogPopup, tempFrm);
break;
+ case 5:
+ CopyFontDlg(tempFrm, FontDialogSearch);
+ if(FontDialogSearch->ShowModal() == mrOk)
+ UpdatePreview();
+ else CopyFontDlg(FontDialogSearch, tempFrm);
+ break;
}
delete tempFrm;
}
@@ -139,7 +146,7 @@ void __fastcall TOptionsfrm::btnFieldClrClick(TObject *Sender)
}
//---------------------------------------------------------------------------
-// TODO 2 -cOptions: add new category, Search Results
+// DONE 1 -oDavid -cOptions: add new category, Search Results
void __fastcall TOptionsfrm::cmbTextSelectChange(TObject *Sender)
{
UpdatePreview();
@@ -169,21 +176,35 @@ void TOptionsfrm::UpdatePreview()
switch (cmbTextSelect->ItemIndex)
{
- case 2:
+ case 2: // Commentary Windows
TRxRichEditX::TColorToRGB(FontDialogComment->Font->Color, vsColorRed, vsColorGreen, vsColorBlue);
TRxRichEditX::TColorToRGB(ColorDialogVerseNum->Color, numColorRed, numColorGreen, numColorBlue);
strcpy(font, FontDialogComment->Font->Name.c_str());
fontSize = FontDialogComment->Font->Size;
RTFPreview->Color = FontDialogComment->BackColor;
break;
- case 3:
+ case 3: // Lexicon/Dictionary Windows
TRxRichEditX::TColorToRGB(FontDialogLD->Font->Color, vsColorRed, vsColorGreen, vsColorBlue);
TRxRichEditX::TColorToRGB(ColorDialogVerseNum->Color, numColorRed, numColorGreen, numColorBlue);
strcpy(font, FontDialogLD->Font->Name.c_str());
fontSize = FontDialogLD->Font->Size;
RTFPreview->Color = FontDialogLD->BackColor;
break;
- default:
+ case 4: // Popup Windows
+ TRxRichEditX::TColorToRGB(FontDialogPopup->Font->Color, vsColorRed, vsColorGreen, vsColorBlue);
+ TRxRichEditX::TColorToRGB(ColorDialogVerseNum->Color, numColorRed, numColorGreen, numColorBlue);
+ strcpy(font, FontDialogPopup->Font->Name.c_str());
+ fontSize = FontDialogPopup->Font->Size;
+ RTFPreview->Color = FontDialogPopup->BackColor;
+ break;
+ case 5: // Search Result Windows
+ TRxRichEditX::TColorToRGB(FontDialogSearch->Font->Color, vsColorRed, vsColorGreen, vsColorBlue);
+ TRxRichEditX::TColorToRGB(ColorDialogVerseNum->Color, numColorRed, numColorGreen, numColorBlue);
+ strcpy(font, FontDialogSearch->Font->Name.c_str());
+ fontSize = FontDialogSearch->Font->Size;
+ RTFPreview->Color = FontDialogSearch->BackColor;
+ break;
+ default: // Bible Windows
TRxRichEditX::TColorToRGB(FontDialogText->Font->Color, vsColorRed, vsColorGreen, vsColorBlue);
TRxRichEditX::TColorToRGB(ColorDialogVerseNum->Color, numColorRed, numColorGreen, numColorBlue);
strcpy(font, FontDialogText->Font->Name.c_str());
@@ -263,22 +284,26 @@ void __fastcall TOptionsfrm::SaveSchemeClick(TObject *Sender)
emap.erase("CommentBackColor"); emap.insert(ConfigEntMap::value_type("CommentBackColor", IntToStr(FontDialogComment->BackColor).c_str()));
emap.erase("LDBackColor"); emap.insert(ConfigEntMap::value_type("LDBackColor", IntToStr(FontDialogLD->BackColor).c_str()));
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("TextFontName"); emap.insert(ConfigEntMap::value_type("TextFontName", (FontDialogText->Font->Name).c_str()));
emap.erase("CommentFontName"); emap.insert(ConfigEntMap::value_type("CommentFontName", (FontDialogComment->Font->Name).c_str()));
emap.erase("LDFontName"); emap.insert(ConfigEntMap::value_type("LDFontName", (FontDialogLD->Font->Name).c_str()));
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("TextFontSize"); emap.insert(ConfigEntMap::value_type("TextFontSize", IntToStr(FontDialogText->Font->Size).c_str()));
emap.erase("CommentFontSize"); emap.insert(ConfigEntMap::value_type("CommentFontSize", IntToStr(FontDialogComment->Font->Size).c_str()));
emap.erase("LDFontSize"); emap.insert(ConfigEntMap::value_type("LDFontSize", IntToStr(FontDialogLD->Font->Size).c_str()));
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("TextFontColor"); emap.insert(ConfigEntMap::value_type("TextFontColor", IntToStr(FontDialogText->Font->Color).c_str()));
emap.erase("CommentFontColor"); emap.insert(ConfigEntMap::value_type("CommentFontColor", IntToStr(FontDialogComment->Font->Color).c_str()));
emap.erase("LDFontColor"); emap.insert(ConfigEntMap::value_type("LDFontColor", IntToStr(FontDialogLD->Font->Color).c_str()));
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()));
+
schemeconf.Sections["Appearance"] = emap;
schemeconf.Save();
}else{
@@ -420,9 +445,8 @@ void TOptionsfrm::GetCurrentScheme()
void __fastcall TOptionsfrm::btnModFontsClick(TObject *Sender)
{
TModuleFonts *pDlg = new TModuleFonts(this);
- pDlg->ShowModal();
-
- delete pDlg;
+ pDlg->ShowModal();
+ delete pDlg;
}
//---------------------------------------------------------------------------
@@ -569,10 +593,16 @@ void TOptionsfrm::LoadDispSettings(SWConfig* config) {
FontDialogLD->BackColor = TColor(atoi((*(*sit).second.find("LDBackColor")).second.c_str()));
else
FontDialogLD->BackColor = TColor(clWhite);
+
if ((*sit).second.find("PopupBackColor") != (*sit).second.end())
FontDialogPopup->BackColor = TColor(atoi((*(*sit).second.find("PopupBackColor")).second.c_str()));
else
- FontDialogPopup->BackColor = TColor(14680063); // 13434879 == cream color
+ FontDialogSearch->BackColor = TColor(14680063); // 13434879 == cream color
+
+ if ((*sit).second.find("SearchBackColor") != (*sit).second.end())
+ FontDialogSearch->BackColor = TColor(atoi((*(*sit).second.find("SearchBackColor")).second.c_str()));
+ else
+ FontDialogSearch->BackColor = TColor(clWhite);
//**** Font Face Name ****//
if ((*sit).second.find("TextFontName") != (*sit).second.end())
@@ -593,6 +623,11 @@ void TOptionsfrm::LoadDispSettings(SWConfig* config) {
FontDialogPopup->Font->Name = ((*(*sit).second.find("PopupFontName")).second.c_str());
else
FontDialogPopup->Font->Name = "Times New Roman";
+
+ if ((*sit).second.find("SearchFontName") != (*sit).second.end())
+ FontDialogSearch->Font->Name = ((*(*sit).second.find("SearchFontName")).second.c_str());
+ else
+ FontDialogSearch->Font->Name = "Times New Roman";
//**** Font Size ****//
if ((*sit).second.find("TextFontSize") != (*sit).second.end())
@@ -608,10 +643,16 @@ void TOptionsfrm::LoadDispSettings(SWConfig* config) {
FontDialogLD->Font->Size = (atoi ((*(*sit).second.find("LDFontSize")).second.c_str()));
else
FontDialogLD->Font->Size = 10;
+
if ((*sit).second.find("PopupFontSize") != (*sit).second.end())
FontDialogPopup->Font->Size = (atoi ((*(*sit).second.find("PopupFontSize")).second.c_str()));
else
FontDialogPopup->Font->Size = 10;
+
+ if ((*sit).second.find("SearchFontSize") != (*sit).second.end())
+ FontDialogSearch->Font->Size = (atoi ((*(*sit).second.find("SearchFontSize")).second.c_str()));
+ else
+ FontDialogSearch->Font->Size = 10;
//**** Font ForeColor ****//
if ((*sit).second.find("TextFontColor") != (*sit).second.end())
@@ -628,10 +669,16 @@ void TOptionsfrm::LoadDispSettings(SWConfig* config) {
FontDialogLD->Font->Color = TColor(atoi ((*(*sit).second.find("LDFontColor")).second.c_str()));
else
FontDialogLD->Font->Color = clBlack;
+
if ((*sit).second.find("PopupFontColor") != (*sit).second.end())
FontDialogPopup->Font->Color = TColor(atoi ((*(*sit).second.find("PopupFontColor")).second.c_str()));
else
FontDialogPopup->Font->Color = clBlack;
+
+ if ((*sit).second.find("SearchFontColor") != (*sit).second.end())
+ FontDialogSearch->Font->Color = TColor(atoi ((*(*sit).second.find("SearchFontColor")).second.c_str()));
+ else
+ FontDialogSearch->Font->Color = clBlack;
}
}
@@ -734,21 +781,25 @@ void TOptionsfrm::extractSettings(SWConfig* config) {
emap["CommentBackColor"] = IntToStr(Optionsfrm->FontDialogComment->BackColor).c_str();
emap["LDBackColor"] = IntToStr(Optionsfrm->FontDialogLD->BackColor).c_str();
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();
emap["LDFontName"] = (Optionsfrm->FontDialogLD->Font->Name).c_str();
emap["PopupFontName"] = (Optionsfrm->FontDialogPopup->Font->Name).c_str();
+ emap["SearchFontName"] = (Optionsfrm->FontDialogSearch->Font->Name).c_str();
emap["TextFontSize"] = IntToStr(Optionsfrm->FontDialogText->Font->Size).c_str();
emap["CommentFontSize"] = IntToStr(Optionsfrm->FontDialogComment->Font->Size).c_str();
emap["LDFontSize"] = IntToStr(Optionsfrm->FontDialogLD->Font->Size).c_str();
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();
emap["LDFontColor"] = IntToStr(Optionsfrm->FontDialogLD->Font->Color).c_str();
emap["PopupFontColor"] = IntToStr(Optionsfrm->FontDialogPopup->Font->Color).c_str();
+ emap["SearchFontColor"] = IntToStr(Optionsfrm->FontDialogSearch->Font->Color).c_str();
emap["locale"] = (const char *)Optionsfrm->localeCB->Items->Objects[Optionsfrm->localeCB->ItemIndex];
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
index 3e5a86e..79b8fca 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
@@ -51,6 +51,9 @@ object Optionsfrm: TOptionsfrm
Align = alBottom
BevelOuter = bvNone
TabOrder = 0
+ DesignSize = (
+ 531
+ 41)
object OkBtn: TBitBtn
Left = 338
Top = 9
@@ -75,8 +78,9 @@ object Optionsfrm: TOptionsfrm
Top = 0
Width = 531
Height = 284
- ActivePage = TabSheet3
+ ActivePage = TabSheet1
Align = alClient
+ TabIndex = 0
TabOrder = 1
object TabSheet1: TTabSheet
Caption = 'General'
@@ -96,6 +100,9 @@ object Optionsfrm: TOptionsfrm
Align = alClient
Caption = 'Personalize'
TabOrder = 0
+ DesignSize = (
+ 523
+ 163)
object Label4: TLabel
Left = 7
Top = 79
@@ -270,6 +277,9 @@ object Optionsfrm: TOptionsfrm
Anchors = [akLeft, akTop, akRight, akBottom]
Caption = 'Daily Devotionals'
TabOrder = 1
+ DesignSize = (
+ 301
+ 151)
object Label9: TLabel
Left = 8
Top = 24
@@ -345,6 +355,9 @@ object Optionsfrm: TOptionsfrm
Align = alClient
Caption = 'Display Colors'
TabOrder = 0
+ DesignSize = (
+ 523
+ 256)
object Label2: TLabel
Left = 7
Top = 17
@@ -507,7 +520,8 @@ object Optionsfrm: TOptionsfrm
'Bible Window'
'Commentary Window'
'Lexicon/Dictionary Window'
- 'Pop-Up Windows')
+ 'Pop-Up Windows'
+ 'Search Results')
end
object btnFont: TButton
Left = 421
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.h b/apps/windoze/CBuilder5/BibleCS/optionfrm.h
index 5a43e89..8950722 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.h
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.h
@@ -134,6 +134,7 @@ public:
TFontSelFrm* FontDialogComment;
TFontSelFrm* FontDialogLD;
TFontSelFrm* FontDialogPopup;
+ TFontSelFrm* FontDialogSearch;
void LoadDispSettings(SWConfig* config);
void LoadMiscSettings(SWConfig* config);
void extractSettings(SWConfig* config);
diff --git a/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp b/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp
index a0591d4..da4b957 100644
--- a/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/searchfrm.cpp
@@ -133,7 +133,7 @@ void __fastcall TsearchForm::ListBox1Click(TObject *Sender)
int row = focused->Index;
ListKey verse;
verse << resultsLV->Items->Item[row]->Caption.c_str();
- pvrtf->fillWithVerses(target, &verse, true, false);
+ pvrtf->fillWithVerses(target, &verse, true, false, "Search");
}
}
}
@@ -258,7 +258,7 @@ void __fastcall TsearchForm::resultsLVCustomDrawItem(TCustomListView *Sender, TL
if (!SWDYNAMIC_CAST(VerseKey, key))
filter.ProcessText(buf, 253, *target, target);
- RTFHintForm->searchListDrawer->fillWithRTFString(target, ((String)" \\b " + buf + " ").c_str());
+ 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;
Sender->Canvas->FillRect(rect);
@@ -268,7 +268,7 @@ void __fastcall TsearchForm::resultsLVCustomDrawItem(TCustomListView *Sender, TL
ListKey verse;
verse << Item->Caption.c_str();
- RTFHintForm->searchListDrawer->fillWithVerses(target, &verse, false, false, "Default", true);
+ RTFHintForm->searchListDrawer->fillWithVerses(target, &verse, false, false, "Search", true);
//set color back in case it got changed in fill*
if (resultsLV->Selected == Item) RTFHintForm->searchListDrawer->Color = TColor(0xB4CDBB);
diff --git a/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm b/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm
index c3b607f..26c21c6 100644
--- a/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/searchfrm.dfm
@@ -48,7 +48,7 @@ object searchForm: TsearchForm
Left = 101
Top = 0
Width = 5
- Height = 431
+ Height = 424
Cursor = crHSplit
Visible = False
end
@@ -56,7 +56,7 @@ object searchForm: TsearchForm
Left = 0
Top = 0
Width = 101
- Height = 431
+ Height = 424
Align = alLeft
TabOrder = 0
Visible = False
@@ -80,7 +80,7 @@ object searchForm: TsearchForm
Left = 1
Top = 25
Width = 99
- Height = 405
+ Height = 398
Align = alClient
Indent = 19
TabOrder = 1
@@ -91,7 +91,7 @@ object searchForm: TsearchForm
Left = 106
Top = 0
Width = 380
- Height = 431
+ Height = 424
Align = alClient
BevelOuter = bvNone
Caption = 'Panel7'
@@ -100,12 +100,12 @@ object searchForm: TsearchForm
Left = 0
Top = 204
Width = 380
- Height = 227
+ Height = 220
Align = alClient
TabOrder = 0
object Splitter1: TSplitter
Left = 1
- Top = 108
+ Top = 101
Width = 378
Height = 5
Cursor = crVSplit
@@ -114,7 +114,7 @@ object searchForm: TsearchForm
end
object plPreview: TPanel
Left = 1
- Top = 113
+ Top = 106
Width = 378
Height = 113
Align = alBottom
@@ -124,7 +124,7 @@ object searchForm: TsearchForm
Left = 1
Top = 1
Width = 378
- Height = 107
+ Height = 100
Hint = 'false'
Align = alClient
Columns = <
@@ -175,6 +175,9 @@ object searchForm: TsearchForm
BevelOuter = bvNone
Caption = 'Panel3'
TabOrder = 0
+ DesignSize = (
+ 380
+ 33)
object SearchTextOld: TComboBox
Left = 0
Top = 2
@@ -252,6 +255,9 @@ object searchForm: TsearchForm
Align = alLeft
Caption = 'Search Options'
TabOrder = 1
+ DesignSize = (
+ 132
+ 70)
object caseSensitiveCkBx: TCheckBox
Left = 8
Top = 16
@@ -342,6 +348,9 @@ object searchForm: TsearchForm
BevelOuter = bvNone
Caption = 'Panel11'
TabOrder = 0
+ DesignSize = (
+ 214
+ 27)
object ComboBox1: TComboBox
Left = 4
Top = 4
@@ -377,7 +386,7 @@ object searchForm: TsearchForm
end
object progressBar: TProgressBar
Left = 0
- Top = 431
+ Top = 424
Width = 486
Height = 16
Align = alBottom
diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf
index 722e88d..eaddf0d 100644
--- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf
+++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf
@@ -58,7 +58,7 @@ Install Manager=&Installationsprogramm
Language=Sprache
Link to Comment for Verse...=Mit anderem Vers &verknüpfen
Maintain Custom Ranges=Eigene Bereiche verwalten
-Module Type=Modulart
+Window Type=Modulart
Module=Modul
"Mult Word","Phrase","Regular Expression"="Mehrere Worte","Ausdruck","Regulärer Ausdruck"
&New Search Window=&Neues Suchfenster...
@@ -78,9 +78,9 @@ Reference=Bibelstelle
&Remove=&Entfernen
&Save=&Speichern
S&ave Layout=Anordnung s&peichern
-Save Other Bookmarks=Andere Lesezeichen speichern
-Save Personal Bookmarks=Eigene Lesezeichen speichern
-Save Screen Layout=Bildschirmanordnung speichern
+Autosave Other Bookmarks=Andere Lesezeichen speichern
+Autosave Personal Bookmarks=Eigene Lesezeichen speichern
+Autosave Screen Layout=Bildschirmanordnung speichern
Scheme=Schema
Scope=Bereich
&Search=&Suche
@@ -97,7 +97,7 @@ Show Hint Over Strongs Numbers=Erklärung über Strongs-Nummern anzeigen
Show Hint Pop-ups=Tipps anzeigen
Special Modules=Besondere Module
Strong's Numbered Text=Text mit Strongs-Nummern
-Text Font=Schriftart für den Text
+Text Styles and Colors=Schriftart für den Text
&Tools=&Tools
Type Verse=Vers eintippen
User Verse List=Eigene Versliste
@@ -161,7 +161,7 @@ Postfixed ...(John 1:1 KJV)=Hinten ...(Johannes 1,1 KJV)
Glossaries=Glossare
Show Glossaries as Dictionaries=Glossare als Wörterbücher anzeigen
Default=Standard
-"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules"="Alle Module","Bibelmodule","Kommentarmodule","Lexikon-/Wörterbuchmodule"
+"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Alle Module","Bibelmodule","Kommentarmodule","Lexikon-/Wörterbuchmodule","Pop-Up Windows","Search Results"
&Save Scheme=Schema &speichern
&Delete Scheme=Schema &löschen
&Import Scheme=Schema &importieren
@@ -177,4 +177,10 @@ Lookup Entry=Nach Eintrag suchen
Verse Range or List=Versbereich oder -liste
Page Setup=Seite einrichten
Strong's Numbers <...>=Strongs Nummer <...>
-Strong's Tense (...)=Strongs Zeitform (...) \ No newline at end of file
+Strong's Tense (...)=Strongs Zeitform (...)
+"All Windows"="All Windows"
+"Bible Window"="Bible Window"
+"Commentary Window"="Commentary Window"
+"Lexicon/Dictionary Window"="Lexicon/Dictionary Window"
+"Pop-Up Windows"="Pop-Up Windows"
+"Search Results"="Search Results" \ No newline at end of file
diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf
index 946759d..02dd4d9 100644
--- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf
+++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/hu.conf
@@ -1,172 +1,166 @@
-[Meta]
-Name=hu
-Description=Magyar
-Translator=Mentler Gyula <mentler@sbgk.hu>
-
-[Text]
-BackBtnImage=uilocales.d/en_back.bmp
-SearchBtnImage=uilocales.d/en_search.bmp
-&About=SWORD &névjegye
-About The SWORD Project=SWORD Projektről
-&Add=&Hozzáadás
-&Add Bookmark=&Könyvjelző elhelyezése
-Add New Bookmark File=Új könyvjelzőfile létrehozása
-Bookmark Section Title:=Könyvjelző csoport címe:
-Bookmark=Könyvjelző
-Bookmarks=Könyvjelzők
-Cancel=Mégsem
-Case Sensitive=Kis-/Nagybetű érzékeny
-Chapter=Fejezet
-Check Modules To Show As Tabs=Fülként megjelenő modulok kijelölése
-Combo/Edit Fields=Combo/Edit Fields
-Contents=&Tartalom
-&Copy=&Másolás
-Copy as &B-Greek Transliteration=Másolás &B-Görög átírásban
-&Close=Be&zárás
-Create a New Verse List Window=Új verslista ablak létrehozása
-Create Verse List=Verslista létrehozása
-Current Verse Color=Aktuális vers színe
-Daily Devotionals=Napi csendesség
-Default Devotional=Alapértelmezett napi csendesség
-Define Custom Range=Tartomány megadása
-Definitions=Definíciók
-&Delete Entry=Bejegyzés törlése
-Description=Leírás
-Devotion for Today=Mai csendesség
-Devotional of the Day=&Csendesség
-Dictionary Lookup=Keresés a szótárban
-Display Colors=Képernyő színei
-Display=Képernyő
-&Edit=S&zerkesztés
-&Edit Bookmarks / Tree View...=Könyvjelzők s&zerkesztése / Fa nézet
-Edit Entry=Bejegyzés szerkesztése
-&Edit Entry=Bejegyzés s&zerkesztése
-"Entire Module","Current Results","Custom Range"="Egész modul","Aktuális eredmények","Beállított tartomány"
-E&xit=&Kilépés
-eg. mat-jo;rev4=eg. mat-jo;rev4
-&File=&File
-File Name (without extension):=File neve (kiterjesztés nélkül):
-Font Size:=Betűtípus mérete:
-Found New Module...=Új modultok...
-General=Álltalános
-Greek=Görög
-Hebrew=Héber
-&Help=&Súgó
-Hide / Show Modules=Modulok elrejtése/megjelenítése
-Individual Modules (Font Only)=Egyedi modulok (csak betűtípus)
-Install Manager=&Install manager program
-Language=Nyelv
-Link to Comment for Verse...=Mutató a vershez tartozó kommentárra
-Maintain Custom Ranges=Tartományok beállítása
-Module Type=Modul típus
-Module=Modul
-"Mult Word","Phrase","Regular Expression"="Több szó","Kifejezés","Reguláris kifejezés"
-&New Search Window=Új keresőablak
-OK=OK
-OkBtn=OK
-Options=&Beállítások
-Original Language Support - Default Modules=Eredeti nyelv támogatás - Alapértelmezett modulok
-Parsing=Szintaktikai feldolgozás
-Personalize=Personalize
-Preferences=Testreszabás
-&Preferences...=&Testreszabás...
-Preview...=Preview...
-Preview=Preview
-Range Name=Tartomány neve
-Range Text=Tartomány szövege
-Reference=Hivatkozás
-&Remove=&Eltávolítás
-&Save=&Mentés
-S&ave Layout=Elrendezés &mentése
-Save Other Bookmarks=Egyéb könyvjelzők mentése
-Save Personal Bookmarks=Személyes könyvjelzők mentése
-Save Screen Layout=Képernyőelrendezés mentése
-Scheme=Séma
-Scope=Környezet(Scope)
-&Search=&Keresés
-Search Options=Keresési opciók
-Search Type=Kereséstípus
-Search...=Keresés...
-Search=Keresés
-Select Color...=Szín...
-Select Font...=Betűtípus...
-Show Devotional at Startup=Show Devotional at Startup
-Show Devotional Splash Screen on Startup=Show Devotional Splash Screen on Startup
-Show Devotionals as Dictionaries=Show Devotionals as Dictionaries
-Show Hint Over Strongs Numbers=Magyarázatok megmutatása a Strong számok felett
-Show Hint Pop-ups=Tipp ablalok megmutatása
-Special Modules=Speciális modulok
-Strong's Numbered Text=Strong számokkal ellátott szöveg
-Text Font=Betűtípus a szöveghez
-&Tools=&Eszközök
-Type Verse=Type Verse
-User Verse List=Felhasználói verslista
-Verse List=Verslista
-Verse Number Color=Vers sorszámok színe
-&New Bookmark File=&Új könyvjelzőfile
-P&rint...=&Nyomtatás...
-The SWORD Project=A SWORD Projekt
-&Footnotes=&Lábjegyzetek
-&On=&Be
-O&ff=@Ki
-&Hebrew Cantillation=Héber recitálás
-H&ebrew Vowel Points=Héber magánhangzók pontozása
-&Strong's Numbers=Strong számok
-&Morphological Tags=Morfológiai jelzések
-He&adings=Fejlécek
-&Transliteration=Átírás
-&Latin=Latin betűk
-&Basic Latin=Latin betűk ékezet nélkül
-B&eta=B&eta
-B&Greek=B&Görög
-Print Selection=Kiválasztott rész kinyomtatása
-Print Source=Forrás nyomtatása
-Bible Text=Bibliai szöveg
-Commentary Text=Kommentár szövege
-Lexicon/Dictionary Text=Lexikon/Szótár
-Module Name=Modulnév
-Print Range=Tartomány nyomtatása
-&Print=&Nyomtatás
-P&review=Bemutatás
-Printer&s...=Nyomtatók...
-Margins (Inches)=Margók (inch)
-Top=Fent
-Left=Bal
-Right=Jobb
-Bottom=Lent
-Header/Footer=Fej-/Lábléc
-Print Header=Fejléc nyomtatás
-Header Text=Fejléc szövege
-Print Footer=Lábléc nyomtatása
-Footer Text=Lábléc szövege
-Formatting Options=Formázási opciók
-Font and Size=Metűtípus és méret
-Chapter Heading=Fejezet fejléce
-Body Text=Kenyérszöveg
-Verse Numbers=Versszámozás
-Font=Betűtípus
-Book Name=Könyv neve
-Chapter Headigns=Fejezetek fejlécei
-Paragraph Format=Bekezdés formázás
-Verse Numbers=Versszámozás
-Superscripted=Felső indexbe
-Prefixed (John 1:1 KJV)...=Elé írva (János 1,1 KJV)...
-Postfixed ...(John 1:1 KJV)=Utána írva ...(János 1,1 KJV)
-"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Angol (USA)","Cseh","Dán","Német","Francia","Norvég","Lengyel","Portugál","Szlovák"
-Glossaries=Szójegyzékek
-Show Glossaries as Dictionaries=Szójegyzékek és szótárak megmutatása
-Default=Alapértelmezett
-"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules"="Minden modul","Biblia modulok","Kommentár modulok","Lexikon/szótár modulok"
-&Save Scheme=Séma &mentés
-&Delete Scheme=Séma &törlés
-&Import Scheme=Séma &importálás
-&Export Scheme=Séma &exportálás
-Words To Live By...=Words To Live By...
-Go Back To Previous Location=Vissza az előző helyre
-Bring Up Search Window=Keresőablak megjelenítése
-Biblical Texts=Bibliai szövegek
-Commentaries=Kommentárok
-Lexicons / Dictionaries=Lexikonok/Szótárak
-
-
-
+[Meta] Name=hu
+Description=Magyar
+Translator=Mentler Gyula <mentler@sbgk.hu>
+[Text]
+BackBtnImage=uilocales.d/en_back.bmp
+SearchBtnImage=uilocales.d/en_search.bmp
+&About=SWORD &névjegye
+About The SWORD Project=SWORD Projektről
+&Add=&Hozzáadás
+&Add Bookmark=&Könyvjelző elhelyezése
+Add New Bookmark File=Új könyvjelzőfile létrehozása
+Bookmark Section Title:=Könyvjelző csoport címe:
+Bookmark=Könyvjelző
+Bookmarks=Könyvjelzők
+Cancel=Mégsem
+Case Sensitive=Kis-/Nagybetű érzékeny
+Chapter=Fejezet
+Check Modules To Show As Tabs=Fülként megjelenő modulok kijelölése
+Combo/Edit Fields=Combo/Edit Fields
+Contents=&Tartalom
+&Copy=&Másolás
+Copy as &B-Greek Transliteration=Másolás &B-Görög átírásban
+&Close=Be&zárás
+Create a New Verse List Window=Új verslista ablak létrehozása
+Create Verse List=Verslista létrehozása
+Current Verse Color=Aktuális vers színe
+Daily Devotionals=Napi csendesség
+Default Devotional=Alapértelmezett napi csendesség
+Define Custom Range=Tartomány megadása
+Definitions=Definíciók
+&Delete Entry=Bejegyzés törlése
+Description=Leírás
+Devotion for Today=Mai csendesség
+Devotional of the Day=&Csendesség
+Dictionary Lookup=Keresés a szótárban
+Display Colors=Képernyő színei
+Display=Képernyő
+&Edit=S&zerkesztés
+&Edit Bookmarks / Tree View...=Könyvjelzők s&zerkesztése / Fa nézet
+Edit Entry=Bejegyzés szerkesztése
+&Edit Entry=Bejegyzés s&zerkesztése
+"Entire Module","Current Results","Custom Range"="Egész modul","Aktuális eredmények","Beállított tartomány"
+E&xit=&Kilépés
+eg. mat-jo;rev4=eg. mat-jo;rev4
+&File=&File
+File Name (without extension):=File neve (kiterjesztés nélkül):
+Font Size:=Betűtípus mérete:
+Found New Module...=Új modultok...
+General=Álltalános
+Greek=Görög
+Hebrew=Héber
+&Help=&Súgó
+Hide / Show Modules=Modulok elrejtése/megjelenítése
+Individual Modules (Font Only)=Egyedi modulok (csak betűtípus)
+Install Manager=&Install manager program
+Language=Nyelv
+Link to Comment for Verse...=Mutató a vershez tartozó kommentárra
+Maintain Custom Ranges=Tartományok beállítása
+Window Type=Modul típus
+Module=Modul "Mult Word","Phrase","Regular Expression"="Több szó","Kifejezés","Reguláris kifejezés"
+&New Search Window=Új keresőablak
+OK=OK
+OkBtn=OK
+Options=&Beállítások
+Original Language Support - Default Modules=Eredeti nyelv támogatás - Alapértelmezett modulok
+Parsing=Szintaktikai feldolgozás
+Personalize=Personalize
+Preferences=Testreszabás
+&Preferences...=&Testreszabás...
+Preview...=Preview...
+Preview=Preview
+Range Name=Tartomány neve
+Range Text=Tartomány szövege
+Reference=Hivatkozás
+&Remove=&Eltávolítás
+&Save=&Mentés
+S&ave Layout=Elrendezés &mentése
+Autosave Other Bookmarks=Egyéb könyvjelzők mentése
+Autosave Personal Bookmarks=Személyes könyvjelzők mentése
+Autosave Screen Layout=Képernyőelrendezés mentése
+Scheme=Séma
+Scope=Környezet(Scope)
+&Search=&Keresés
+Search Options=Keresési opciók
+Search Type=Kereséstípus
+Search...=Keresés...
+Search=Keresés
+Select Color...=Szín...
+Select Font...=Betűtípus...
+Show Devotional at Startup=Show Devotional at Startup
+Show Devotional Splash Screen on Startup=Show Devotional Splash Screen on Startup
+Show Devotionals as Dictionaries=Show Devotionals as Dictionaries
+Show Hint Over Strongs Numbers=Magyarázatok megmutatása a Strong számok felett
+Show Hint Pop-ups=Tipp ablalok megmutatása
+Special Modules=Speciális modulok
+Strong's Numbered Text=Strong számokkal ellátott szöveg
+Text Styles and Colors=Betűtípus a szöveghez
+&Tools=&Eszközök
+Type Verse=Type Verse
+User Verse List=Felhasználói verslista
+Verse List=Verslista
+Verse Number Color=Vers sorszámok színe
+&New Bookmark File=&Új könyvjelzőfile
+P&rint...=&Nyomtatás...
+The SWORD Project=A SWORD Projekt
+&Footnotes=&Lábjegyzetek
+&On=&Be
+O&ff=@Ki
+&Hebrew Cantillation=Héber recitálás
+H&ebrew Vowel Points=Héber magánhangzók pontozása
+&Strong's Numbers=Strong számok
+&Morphological Tags=Morfológiai jelzések
+He&adings=Fejlécek
+&Transliteration=Átírás
+&Latin=Latin betűk
+&Basic Latin=Latin betűk ékezet nélkül
+B&eta=B&eta
+B&Greek=B&Görög
+Print Selection=Kiválasztott rész kinyomtatása
+Print Source=Forrás nyomtatása
+Bible Text=Bibliai szöveg
+Commentary Text=Kommentár szövege
+Lexicon/Dictionary Text=Lexikon/Szótár
+Module Name=Modulnév
+Print Range=Tartomány nyomtatása
+&Print=&Nyomtatás
+P&review=Bemutatás
+Printer&s...=Nyomtatók...
+Margins (Inches)=Margók (inch)
+Top=Fent
+Left=Bal
+Right=Jobb
+Bottom=Lent
+Header/Footer=Fej-/Lábléc
+Print Header=Fejléc nyomtatás
+Header Text=Fejléc szövege
+Print Footer=Lábléc nyomtatása
+Footer Text=Lábléc szövege
+Formatting Options=Formázási opciók
+Font and Size=Metűtípus és méret
+Chapter Heading=Fejezet fejléce
+Body Text=Kenyérszöveg
+Verse Numbers=Versszámozás
+Font=Betűtípus
+Book Name=Könyv neve
+Chapter Headigns=Fejezetek fejlécei
+Paragraph Format=Bekezdés formázás
+Verse Numbers=Versszámozás
+Superscripted=Felső indexbe
+Prefixed (John 1:1 KJV)...=Elé írva (János 1,1 KJV)...
+Postfixed ...(John 1:1 KJV)=Utána írva ...(János 1,1 KJV)
+"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Angol (USA)","Cseh","Dán","Német","Francia","Norvég","Lengyel","Portugál","Szlovák"
+Glossaries=Szójegyzékek
+Show Glossaries as Dictionaries=Szójegyzékek és szótárak megmutatása
+Default=Alapértelmezett
+"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Minden modul","Biblia modulok","Kommentár modulok","Lexikon/szótár modulok","Pop-Up Windows","Search Results"
+&Save Scheme=Séma &mentés
+&Delete Scheme=Séma
+&törlés &Import Scheme=Séma &importálás
+&Export Scheme=Séma &exportálás
+Words To Live By...=Words To Live By...
+Go Back To Previous Location=Vissza az előző helyre
+Bring Up Search Window=Keresőablak megjelenítése
+Biblical Texts=Bibliai szövegek
+Commentaries=Kommentárok
+Lexicons / Dictionaries=Lexikonok/Szótárak
diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf
index a0802ef..3415d43 100644
--- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf
+++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/id.conf
@@ -58,7 +58,7 @@ Install Manager=Program Install Manager
Language=Bahasa
Link to Comment for Verse...=Link Ke Catatan/Komentar untuk Ayat...
Maintain Custom Ranges=Mengolah Batasan Khusus
-Module Type=Jenis Modul
+Window Type=Jenis Modul
Module=Modul
"Mult Word","Phrase","Regular Expression"="Multi-Kata","Frasa","Ekspresi/Rumus"
&New Search Window=Jendela Pencarian Baru
@@ -78,9 +78,9 @@ Reference=Referensi
&Remove=Hapus
&Save=Simpan
S&ave Layout=Simpan Susunan/Layout
-Save Other Bookmarks=Simpan Bookmark Lain
-Save Personal Bookmarks=Simpan Bookmark Pribadi
-Save Screen Layout=Simpan Susunan/Layout Layar
+Autosave Other Bookmarks=Simpan Bookmark Lain
+Autosave Personal Bookmarks=Simpan Bookmark Pribadi
+Autosave Screen Layout=Simpan Susunan/Layout Layar
Scheme=Skema
Scope=Ruang Lingkup
&Search=Cari
@@ -97,7 +97,7 @@ Show Hint Over Strongs Numbers=Tampilkan Tip Nomor Strong
Show Hint Pop-ups=Tampilkan Tip Pop-up
Special Modules=Modul Khusus
Strong's Numbered Text=Teks dengan Nomor Strong
-Text Font=Font Teks
+Text Styles and Colors=Font Teks
&Tools=Alat-alat
Type Verse=Ketik Ayat
User Verse List=Daftar Ayat Pengguna
@@ -161,7 +161,7 @@ Postfixed ...(John 1:1 KJV)=Alamat Ayat Setelah ...(Yohanes 1:1 TB)
Glossaries=Daftar Kata - Glossary
Show Glossaries as Dictionaries=Tampil Daftar Kata/Glossary Seperti Kamus
Default=Standar/Default
-"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules"="Semua Modul","Modul Alkitab","Modul Tafsiran/Komentar","Modul Leksikon/Kamus"
+"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Semua Modul","Modul Alkitab","Modul Tafsiran/Komentar","Modul Leksikon/Kamus","Pop-Up Windows","Search Results"
&Save Scheme=Simpan Skema
&Delete Scheme=Hapus Skema
&Import Scheme=Impor Skema
diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/sl.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/sl.conf
index 286d8ff..b536c35 100644
--- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/sl.conf
+++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/sl.conf
@@ -58,7 +58,7 @@ Install Manager=Namestitveni program
Language=Jezik
Link to Comment for Verse...=Povezava s komentarjem vrstice
Maintain Custom Ranges=Vzdrzuj lastne obsege
-Module Type=Tip modula
+Window Type=Tip modula
Module=Modul
"Mult Word","Phrase","Regular Expression"="Vec besed","Fraza","Pravilen izraz"
&New Search Window=&Novo iskalno okno
@@ -78,9 +78,9 @@ Reference=Referenca
&Remove=&Odstrani
&Save=&Shrani
S&ave Layout=S&hrani izgled
-Save Other Bookmarks=Shrani druge zaznamke
-Save Personal Bookmarks=Shrani osebne zaznamke
-Save Screen Layout=Shrani izgled zaslona
+Autosave Other Bookmarks=Shrani druge zaznamke
+Autosave Personal Bookmarks=Shrani osebne zaznamke
+Autosave Screen Layout=Shrani izgled zaslona
Scheme=Shema
Scope=Obseg
&Search=&Iskanje
@@ -97,7 +97,7 @@ Show Hint Over Strongs Numbers=Pokazi namige pri Strong stevilih
Show Hint Pop-ups=Pokazi namige
Special Modules=Posebni moduli
Strong's Numbered Text=Besedilo s Strong stevili
-Text Font=Pisava besedila
+Text Styles and Colors=Pisava besedila
&Tools=&Orodja
Type Verse=Tip vrstice
User Verse List=Uporabnikov seznam vrstic
@@ -160,7 +160,7 @@ Postfixed ...(John 1:1 KJV)=Pripona ...(Janez 1,1 KJV)
Glossaries=Besednjaki
Show Glossaries as Dictionaries=Pokazi besednjake kot slovarje
Default=Privzeto
-"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules"="Vsi moduli","Biblicni moduli","Moduli komentarjev","Moduli leksikonov/slovarjev"
+"All Modules","Bible Modules","Commentary Modules","Lexicon/Dictionary Modules","Pop-Up Windows","Search Results"="Vsi moduli","Biblicni moduli","Moduli komentarjev","Moduli leksikonov/slovarjev","Pop-Up Windows","Search Results"
&Save Scheme=&Shrani shemo
&Delete Scheme=&Izbrisi shemo
&Import Scheme=&Uvozi shemo