aboutsummaryrefslogtreecommitdiffstats
path: root/apps/windoze/CBuilder5
diff options
context:
space:
mode:
Diffstat (limited to 'apps/windoze/CBuilder5')
-rw-r--r--apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm4
-rw-r--r--apps/windoze/CBuilder5/BibleCS/bookmarkfrm.cpp2
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.cpp65
-rw-r--r--apps/windoze/CBuilder5/BibleCS/mainfrm.dfm60
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.cpp2
-rw-r--r--apps/windoze/CBuilder5/BibleCS/optionfrm.dfm2
-rw-r--r--apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf231
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.bpr20
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.cpp9
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.h1
-rw-r--r--apps/windoze/CBuilder5/BibleCS/sword.resbin1968 -> 1968 bytes
-rw-r--r--apps/windoze/CBuilder5/BibleCS/swordlib.bpr16
-rw-r--r--apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr21
13 files changed, 237 insertions, 196 deletions
diff --git a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
index b301641..95f51fc 100644
--- a/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/AboutBoxfrm.dfm
@@ -1,6 +1,6 @@
object AboutBox: TAboutBox
- Left = 290
- Top = 103
+ Left = 296
+ Top = 109
BorderStyle = bsDialog
Caption = 'About The SWORD Project'
ClientHeight = 448
diff --git a/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.cpp b/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.cpp
index 4429c5d..edbbc24 100644
--- a/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/bookmarkfrm.cpp
@@ -164,7 +164,7 @@ void TbookmarkForm::SaveBookmarks()
ConfigEntMap emap;
SectionMap::iterator sit;
char buf[15];
- bool personal, other;
+ bool personal = true, other = false;
list <String *>::iterator it;
string persfile;
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
index d064133..79fcb8a 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.cpp
@@ -73,34 +73,34 @@ void __fastcall TForm1::AppMessage(tagMSG &Msg, bool &Handled)
void TForm1::NavigateVerseURL (char* verStrIN)
{
- unsigned long verSize = strlen(verStrIN) + 1;
- char * verStr = new char[verSize];
- strcpy (verStr, verStrIN);
- char * verStr2 = new char[verSize];
- unsigned long verSize2 = 0;
- if (*(verStr + verSize - 2) == '\"') {
- *(verStr + verSize - 2) = 0;
- }
+ unsigned long verSize = strlen(verStrIN) + 1;
+ char * verStr = new char[verSize];
+ strcpy (verStr, verStrIN);
+ char * verStr2 = new char[verSize];
+ unsigned long verSize2 = 0;
+ if (*(verStr + verSize - 2) == '\"') {
+ *(verStr + verSize - 2) = 0;
+ }
verSize = 0;
- if (strstr(verStr, "libronix")) {
- char* bib = strstr(verStr, "bible:");
- if (bib) {
- verSize = 6 + (unsigned long)(bib - verStr);
- }
+ if (strstr(verStr, "libronix")) {
+ char* bib = strstr(verStr, "bible:");
+ if (bib) {
+ verSize = 6 + (unsigned long)(bib - verStr);
+ }
+ }
+ else if (strstr(verStr, "sword://")) {
+ verSize = 9;
}
- else if (strstr(verStr, "sword://")) {
- verSize = 9;
- }
else if (*verStr == '\"') {
verSize = 1;
}
- while (verStr[verSize] != 0) {
- verStr2[verSize2] = verStr[verSize];
- verSize++;
- verSize2++;
- }
- verStr2[verSize2] = 0;
+ while (verStr[verSize] != 0) {
+ verStr2[verSize2] = verStr[verSize];
+ verSize++;
+ verSize2++;
+ }
+ verStr2[verSize2] = 0;
char * verse = strstr(verStr2, "/");
if (verse) {
@@ -1045,8 +1045,10 @@ void __fastcall TForm1::FormShow(TObject *Sender)
if ((sit = layoutconf->Sections.find("Screen")) != layoutconf->Sections.end()) {
- if ((eit = (*sit).second.find("MainTop")) != (*sit).second.end())
+ if ((eit = (*sit).second.find("MainTop")) != (*sit).second.end()) {
Form1->Top = atoi((*eit).second.c_str());
+// Form1->Position = poDesigned; // because we've set the values
+ }
if ((eit = (*sit).second.find("MainLeft")) != (*sit).second.end())
Form1->Left = atoi((*eit).second.c_str());
if ((eit = (*sit).second.find("MainHeight")) != (*sit).second.end())
@@ -1183,13 +1185,16 @@ void __fastcall TForm1::FormShow(TObject *Sender)
refreshAppearance();
- if (this->Tag) {
- NavigateVerseURL((char*)(this->Tag));
+ if (startVerse.Length()) {
+ NavigateVerseURL(startVerse.c_str());
}
- else if ((eit = (*sit).second.find("LastVerse")) != (*sit).second.end()) {
- freeHandLookup->Text = (*eit).second.c_str();
- char ret = '\r';
- freeHandLookupoldKeyPress(0, ret);
+ else {
+ startVerse = layoutconf->Sections["History"].getWithDefault("LastVerse", "").c_str();
+ if (startVerse.Length()) {
+ freeHandLookup->Text = startVerse.c_str();
+ char ret = '\r';
+ freeHandLookupoldKeyPress(0, ret);
+ }
}
}
@@ -1898,7 +1903,7 @@ void __fastcall TForm1::FormClose(TObject *Sender, TCloseAction &Action)
// NS_TermEmbedding();
- if ((*optionsconf)["Layout"]["AutoSaveLayout"] == "1")
+ if ((*optionsconf)["Layout"].getWithDefault("AutoSaveLayout", "1") == "1")
SaveLayout1Click(this);
}
//---------------------------------------------------------------------------
diff --git a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
index b1cf7a1..defa0e4 100644
--- a/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/mainfrm.dfm
@@ -1,8 +1,8 @@
object Form1: TForm1
- Left = 311
- Top = 144
- Width = 686
- Height = 510
+ Left = 409
+ Top = 115
+ Width = 635
+ Height = 475
Caption = 'The SWORD Project'
Color = clBtnFace
Font.Charset = DEFAULT_CHARSET
@@ -50,7 +50,7 @@ object Form1: TForm1
object Splitter2: TSplitter
Left = 0
Top = 282
- Width = 678
+ Width = 627
Height = 5
Cursor = crVSplit
Align = alTop
@@ -59,7 +59,7 @@ object Form1: TForm1
object pnlTextCom: TPanel
Left = 0
Top = 46
- Width = 678
+ Width = 627
Height = 236
Align = alTop
BevelOuter = bvNone
@@ -108,7 +108,7 @@ object Form1: TForm1
object pnlComment: TPanel
Left = 373
Top = 0
- Width = 305
+ Width = 254
Height = 236
Align = alClient
BevelOuter = bvNone
@@ -119,7 +119,7 @@ object Form1: TForm1
object CommentaryPageControl: TPageControl
Left = 0
Top = 0
- Width = 305
+ Width = 254
Height = 236
Hint = 'Commentaries'
Align = alClient
@@ -141,8 +141,8 @@ object Form1: TForm1
object pnlDict: TPanel
Left = 0
Top = 287
- Width = 678
- Height = 162
+ Width = 627
+ Height = 127
Align = alClient
BevelOuter = bvNone
Constraints.MinHeight = 10
@@ -150,18 +150,18 @@ object Form1: TForm1
PopupMenu = PopupMenu4
TabOrder = 1
object Splitter3: TSplitter
- Left = 488
+ Left = 437
Top = 0
Width = 5
- Height = 162
+ Height = 127
Cursor = crHSplit
Align = alRight
end
object LexDictPageControl: TPageControl
Left = 0
Top = 0
- Width = 488
- Height = 162
+ Width = 437
+ Height = 127
Hint = 'Lexicons / Dictionaries'
Align = alClient
Font.Charset = ANSI_CHARSET
@@ -178,10 +178,10 @@ object Form1: TForm1
OnChange = LexDictPageControlChange
end
object Panel2: TPanel
- Left = 493
+ Left = 442
Top = 0
Width = 185
- Height = 162
+ Height = 127
Align = alRight
Caption = 'Panel2'
TabOrder = 1
@@ -203,7 +203,7 @@ object Form1: TForm1
Left = 1
Top = 25
Width = 183
- Height = 136
+ Height = 101
Align = alClient
ItemHeight = 13
TabOrder = 1
@@ -213,8 +213,8 @@ object Form1: TForm1
end
object StatusBar1: TStatusBar
Left = 0
- Top = 449
- Width = 678
+ Top = 414
+ Width = 627
Height = 15
Panels = <>
SimplePanel = True
@@ -222,7 +222,7 @@ object Form1: TForm1
object CoolBar1: TCoolBar
Left = 0
Top = 0
- Width = 678
+ Width = 627
Height = 46
AutoSize = True
Bands = <
@@ -243,7 +243,7 @@ object Form1: TForm1
Break = False
Control = ToolBar1
ImageIndex = -1
- Width = 314
+ Width = 263
end>
object BackBtnImage: TImage
Left = 16
@@ -457,7 +457,7 @@ object Form1: TForm1
object ToolBar1: TToolBar
Left = 369
Top = 8
- Width = 301
+ Width = 250
Height = 25
AutoSize = True
ButtonHeight = 23
@@ -629,18 +629,18 @@ object Form1: TForm1
object Search: TDdeServerItem
ServerConv = Bible
OnPokeData = SearchPokeData
- Left = 684
- Top = 60
+ Left = 552
+ Top = 56
end
object Lookup: TDdeServerItem
ServerConv = Bible
OnPokeData = LookupPokeData
- Left = 656
- Top = 60
+ Left = 524
+ Top = 56
end
object Bible: TDdeServerConv
- Left = 624
- Top = 60
+ Left = 492
+ Top = 56
end
object PopupMenu1: TPopupMenu
OnPopup = PopupMenuPopup
@@ -740,8 +740,8 @@ object Form1: TForm1
Top = 19
end
object ActionList1: TActionList
- Left = 621
- Top = 118
+ Left = 489
+ Top = 114
object Action1: TAction
Caption = 'Action1'
ShortCut = 16471
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
index d067d1c..ecc858f 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.cpp
@@ -668,6 +668,8 @@ void TOptionsfrm::LoadMiscSettings(SWConfig* config) {
int color;
string tmpval;
+ Optionsfrm->AutoBMPersonal->Checked = true;
+ Optionsfrm->AutoLayout->Checked = true;
if ((sit = config->Sections.find("Bookmarks")) != config->Sections.end()) {
Optionsfrm->AutoBMPersonal->Checked = ((atoi(sit->second["AutoSavePersonal"].c_str()))?true:false);
Optionsfrm->AutoBMOther->Checked = ((atoi(sit->second["AutoSaveOther"].c_str()))?true:false);
diff --git a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
index 95d89fc..920be7e 100644
--- a/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
+++ b/apps/windoze/CBuilder5/BibleCS/optionfrm.dfm
@@ -75,7 +75,7 @@ object Optionsfrm: TOptionsfrm
Top = 0
Width = 554
Height = 284
- ActivePage = TabSheet2
+ ActivePage = TabSheet1
Align = alClient
TabOrder = 1
object TabSheet1: TTabSheet
diff --git a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf
index eaddf0d..cc87eb3 100644
--- a/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf
+++ b/apps/windoze/CBuilder5/BibleCS/stage/uilocales.d/de.conf
@@ -1,186 +1,207 @@
[Meta]
Name=de
-Description=German
+Description=Deutsch
Translator=Christian Renz <crenz@web42.com>
[Text]
BackBtnImage=uilocales.d/de_back.bmp
SearchBtnImage=uilocales.d/de_search.bmp
+"All Windows","Bible Window","Commentary Window","Lexicon/Dictionary Window","Pop-Up Windows","Search Results"="Alle Fenster","Bibelfenster","Kommentarfenster","Lexikon-/Wörterbuchfenster","Pop-up-Fenster","Suchergebnisse"
+"Entire Module","Current Results","Custom Range"="Ganzes Modul","Aktuelle Ergebnisse","Eigener Bereich"
+"Mult Word","Phrase","Regular Expression"="Mehrere Worte","Ausdruck","Regulärer Ausdruck"
&About=&Über SWORD...
-About The SWORD Project=Über das SWORD Projekt
-&Add=&Hinzufügen
&Add Bookmark=Lesezeichen &hinzufügen
+&Add=&Hinzufügen
+&Basic Latin=Lateinische Buchstaben ohne Akzente
+&Close=&Schließen
+&Copy=&Kopieren
+&Delete Entry=Eintrag l&öschen
+&Delete Scheme=Schema &löschen
+&Edit Bookmarks / Tree View...=Lesezeichen &bearbeiten / Baumdarstellung...
+&Edit Entry=Eintrag &bearbeiten
+&Edit=&Bearbeiten
+&Export Scheme=Schema &exportieren
+&File=&Datei
+&Font=Schriftart
+&Footnotes=&Fußnoten
+&Hebrew Cantillation=Hebräische Kantillation
+&Help=&Hilfe
+&Import Scheme=Schema &importieren
+&Latin=Lateinische Buchstaben
+&Morphological Tags=Wortformenanzeige
+&New Bookmark File=&Neue Lesezeichendatei
+&New Search Window=&Neues Suchfenster...
+&New Verse List=Neue Versliste
+&On=&An
+&Preferences...=&Voreinstellungen...
+&Print...=&Drucken...
+&Print=&Drucken
+&Remove=&Entfernen
+&Reset all=Alles &löschen
+&Save Scheme=Schema &speichern
+&Save=&Speichern
+&Search=&Suche
+&Size=Größe
+&Strong's Numbers=Strongs-Nummern
+&Tools=&Tools
+&Transliteration=&Umschrift
+&View=Anzeige
+About The SWORD Project=Über das SWORD Projekt
+Add Current Verse To List=Aktuellen Vers in Liste einfügen
Add New Bookmark File=Neue Lesezeichendatei hinzufügen
+Autosave Other Bookmarks=Andere Lesezeichen automatisch speichern
+Autosave Personal Bookmarks=Eigene Lesezeichen automatisch speichern
+Autosave Screen Layout=Bildschirmanordnung automatisch speichern
+B&eta=B&eta
+B&Greek=B&Greek
+Background=Hintergrund
+Bible Text=Bibeltext
+Biblical Texts=Biblische Texte
+Body Text:=Text:
+Book Name=Buchname
Bookmark Section Title:=Name für diese Gruppe von Lesezeichen:
Bookmark=Lesezeichen
Bookmarks=Lesezeichen
+Bottom:=Unten:
+Bring Up Search Window=Suchfenster anzeigen
Cancel=Abbrechen
Case Sensitive=Groß-/Kleinschreibung
+Chapter Heading:=Kapitelüberschrift:
+Chapter Heading=Kapitelüberschrift
+Chapter Headings=Kapitelüberschriften
Chapter=Kapitel
Check Modules To Show As Tabs=Anzuzeigende Module ankreuzen
+Choose Module=Modul auswählen
Combo/Edit Fields=Kombo-/Eingabefelder
+Commentaries=Kommentare
+Commentary Text=Kommentartext
Contents=&Inhalt
-&Copy=&Kopieren
+Copy All Entries To Clipboard=Alle Einträge in die Zwischenablage kopieren
Copy as &B-Greek Transliteration=Als &B-Greek-Umschrift kopieren
-&Close=&Schließen
Create a New Verse List Window=Neues Verslistenfenster &öffnen
Create Verse List=Neue Versliste erstellen
+Create Verse&List From Result=Ergebnisse als Vers&liste speichern
Current Verse Color=Aktuelle Versfarbe
Daily Devotionals=Tageslese
Default Devotional=Standard-Tagelese
+Default General Dictionary=Standardwörterbuch
+Default=Standard
Define Custom Range=Eigenen Bereich festlegen
Definitions=Definitionen
-&Delete Entry=Eintrag l&öschen
Description=Beschreibung
Devotion for Today=Tageslese für heute
Devotional of the Day=&Tageslese
Dictionary Lookup=Im Wörterbuch nachschlagen
Display Colors=Anzeigefarben
Display=Anzeige
-&Edit=&Bearbeiten
-&Edit Bookmarks / Tree View...=Lesezeichen &bearbeiten / Baumdarstellung...
-Edit Entry=Eintrag bearbeiten
-&Edit Entry=Eintrag &bearbeiten
-"Entire Module","Current Results","Custom Range"="Ganzes Module","Aktuelle Ergebnisse","Eigener Bereich"
E&xit=&Beenden
+Edit Entry=Eintrag bearbeiten
eg. mat-jo;rev4=z.B. mat-jo;rev4
-&File=&Datei
File Name (without extension):=Dateiname (ohne Endung)
+Font and Size=Schriftart und -größe
+Font Name=Schriftart
Font Size:=Schriftgröße
+Font Size=Größe
+Font:=Schriftart:
+Footer Text:=Fußzeilentext:
+Foreground=Vordergrund
+Formatting Options=Formatierung
Found New Module...=Neues Modul gefunden...
General=Allgemein
+Glossaries / General Dictionaries=Glossare / Standardwörterbücher
+Glossaries=Glossare
+Go Back To Previous Location=Zurück
Greek=Griechisch
+H&ebrew Vowel Points=Hebräische Vokalmarkierungen
+He&adings=Ü&berschriften
+Header Text:=Kopfzeilentext:
+Header/Footer=Kopf-/Fußzeile
Hebrew=Hebräisch
-&Help=&Hilfe
Hide / Show Modules=Module anzeigen/verstecken
Individual Modules (Font Only)=Einzelne Module (nur Schriftart)
Install Manager=&Installationsprogramm
+Installed Modules=Installierte Module
Language=Sprache
+Left:=Links:
+Lexicon/Dictionary Text=Lexikon-/Wörterbuchtext
+Lexicons / Dictionaries=Lexika / Wörterbücher
Link to Comment for Verse...=Mit anderem Vers &verknüpfen
+Load Verse List From File=Versliste laden
+Lookup Entry=Nach Eintrag suchen
Maintain Custom Ranges=Eigene Bereiche verwalten
-Window Type=Modulart
+Margins (Inches)=Ränder (Zoll)
+Module Name=Modulname
Module=Modul
-"Mult Word","Phrase","Regular Expression"="Mehrere Worte","Ausdruck","Regulärer Ausdruck"
-&New Search Window=&Neues Suchfenster...
+O&ff=A&us
OK=OK
OkBtn=OK
Options=&Optionen
Original Language Support - Default Modules=Standardmodule für Ursprachenunterstützung
+P&review...=&Vorschau...
+P&review=&Vorschau
+P&rint...=&Drucken...
+Page Setup=Seite einrichten
+Paragraph Format=Absatzformat
Parsing=Syntaxanalyse
+Personal Bookmarks=Eigene Lesezeichen
Personalize=Personalisieren
+Postfixed ...(John 1:1 KJV)=Hinten ...(Johannes 1,1 KJV)
Preferences=Voreinstellungen
-&Preferences...=&Voreinstellungen...
-Preview...=Vorschau...
+Prefixed (John 1:1 KJV)...=Vorne (Johannes 1,1 KJV)...
+Preview...=Vorschau
Preview=Vorschau
+Print All Entries=Alle Einträge drucken
+Print Footer=Fußzeile drucken
+Print Header=Kopfzeile drucken
+Print Range=Druckbereich
+Print Selection=Druckauswahl
+Print Source=Quelle
+Print...=Drucken...
+Print=Drucken
+Printer&s...=D&rucker...
Range Name=Name für diesen Bereich
Range Text=Bibeltext
Reference=Bibelstelle
-&Remove=&Entfernen
-&Save=&Speichern
+Remove Highlighted Entry From List=Ausgewählten Eintrag löschen
+Right:=Rechts:
S&ave Layout=Anordnung s&peichern
-Autosave Other Bookmarks=Andere Lesezeichen speichern
-Autosave Personal Bookmarks=Eigene Lesezeichen speichern
-Autosave Screen Layout=Bildschirmanordnung speichern
+Sample Text=Beispieltext
+Save Verse List To File=Versliste speichern
Scheme=Schema
Scope=Bereich
-&Search=&Suche
Search Options=Sucheinstellungen
Search Type=Suchart
Search...=Suche...
Search=Suche
Select Color...=Farbe...
Select Font...=Schriftart...
+Show &All Installed=&Alle installierten Schriften
+Show &Unicode Only=Nur &Unicode-Schriften
Show Devotional at Startup=Tageslese beim Programmstart anzeigen
Show Devotional Splash Screen on Startup=Tageslese beim Programmstart anzeigen
Show Devotionals as Dictionaries=Tageslese als Wörterbucher anzeigen
+Show Font Faces=Schriftvorschau anzeigen
+Show Glossaries as Dictionaries=Glossare als Wörterbücher anzeigen
+Show Glossary Lookup Over Words (CTRL-W)=Wörter im Wörterbuch nachschlagen (Strg+W)
Show Hint Over Strongs Numbers=Erklärung über Strongs-Nummern anzeigen
-Show Hint Pop-ups=Tipps anzeigen
+Show Hint Pop-ups=Popupfenster anzeigen
+Show Lexicon Lookup Over Strongs Numbers=Strongs-Nummern im Lexikon nachschlagen
+Show Preview Over Verse Lists=Vorschau für Verslisten anzeigen
Special Modules=Besondere Module
Strong's Numbered Text=Text mit Strongs-Nummern
-Text Styles and Colors=Schriftart für den Text
-&Tools=&Tools
+Strong's Numbers <...>=Strongs-Nummer <...>
+Strong's Tense (...)=Strongs-Zeitform (...)
+Superscripted=Hochgestellt
+Text Styles and Colors=Schriftstile und -farben
+The SWORD Project=Das SWORD Projekt
+Top:=Oben:
Type Verse=Vers eintippen
User Verse List=Eigene Versliste
+Versbereich oder -liste:
Verse List=Versliste
Verse Number Color=Farbe für Versnummern
-&New Bookmark File=&Neue Lesezeichendatei
-P&rint...=&Drucken...
-The SWORD Project=Das SWORD Projekt
-&Footnotes=&Fußnoten
-&On=&An
-O&ff=A&us
-&Hebrew Cantillation=Hebräische Kantillation
-H&ebrew Vowel Points=Hebräische Vokalmarkierungen
-&Strong's Numbers=Strongs-Nummern
-&Morphological Tags=Wortformenanzeige
-He&adings=Ü&berschriften
-&Transliteration=&Umschrift
-&Latin=Lateinische Buchstaben
-&Basic Latin=Lateinische Buchstaben ohne Akzente
-B&eta=B&eta
-B&Greek=B&Greek
-Print Selection=Druckauswahl
-Print Source=Quelle
-Bible Text=Bibeltext
-Commentary Text=Kommentartext
-Lexicon/Dictionary Text=Lexikon-/Wörterbuchtext
-Module Name=Modulname
-Print Range=Druckbereich
-Versbereich oder -liste:
-&Print=&Drucken
-Print=Drucken
-Print...=Drucken...
-&Print...=&Drucken...
-P&review=&Vorschau
-P&review...=&Vorschau...
-Printer&s...=D&rucker...
-Margins (Inches)=Ränder (Zoll)
-Top:=Oben:
-Left:=Links:
-Right:=Rechts:
-Bottom:=Unten:
-Header/Footer=Kopf-/Fußzeile
-Print Header=Kopfzeile drucken
-Header Text:=Kopfzeilentext:
-Print Footer=Fußzeile drucken
-Footer Text:=Fußzeilentext:
-Formatting Options=Formatierung
-Font and Size=Schriftart und -größe
-Chapter Heading:=Kapitelüberschrift:
-Body Text:=Text:
Verse Numbers:=Versnummern:
-Font:=Schriftart:
-Book Name=Buchname
-Chapter Headings=Kapitelüberschriften
-Paragraph Format=Absatzformat
Verse Numbers=Versnummern
-Superscripted=Hochgestellt
-Prefixed (John 1:1 KJV)...=Vorne (Johannes 1,1 KJV)...
-Postfixed ...(John 1:1 KJV)=Hinten ...(Johannes 1,1 KJV)
-"English (US)","Czech","Danish","German","French","Norwegian","Polish","Portuguese","Slovak"="Englisch (USA)","Tschechisch","Dänisch","Deutsch","Französisch","Norwegisch","Polnisch","Portugiesisch","Slovakisch"
-Glossaries=Glossare
-Show Glossaries as Dictionaries=Glossare als Wörterbücher anzeigen
-Default=Standard
-"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
-&Export Scheme=Schema &exportieren
-Personal Bookmarks=Eigene Lesezeichen
-Words To Live By...Worte zum Leben...
-Go Back To Previous Location=Zurück
-Bring Up Search Window=Suchfenster anzeigen
-Biblical Texts=Biblische Texte
-Commentaries=Kommentare
-Lexicons / Dictionaries=Lexika / Wörterbücher
-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 (...)
-"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
+Window Type=Fensterart
+Words To Live By...=Worte zum Leben... \ No newline at end of file
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.bpr b/apps/windoze/CBuilder5/BibleCS/sword.bpr
index d9468d8..d801535 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/sword.bpr
@@ -43,7 +43,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="sword.cpp"/>
<INCLUDEPATH value="TntUnicodeControls;..\..;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\include;$(BCB)\include;$(BCB)\include\vcl;rxlib"/>
@@ -73,7 +73,7 @@ AutoIncBuild=1
MajorVer=1
MinorVer=5
Release=4
-Build=121
+Build=125
Debug=0
PreRelease=0
Special=0
@@ -85,7 +85,7 @@ CodePage=1252
[Version Info Keys]
CompanyName=CrossWire Software &amp; Bible Society
FileDescription=Windows 32bit User Interface to The SWORD Project
-FileVersion=1.5.4.121
+FileVersion=1.5.4.125
InternalName=biblecs
LegalCopyright=(c) 2002 CrossWire Bible Society under the terms of the GNU General Public License
LegalTrademarks=
@@ -124,12 +124,14 @@ Count=1
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=5
-Item0=_ICU_;_ICUSWORD_
-Item1=_ICU_;_ICUSWORD_;_DEBUG
-Item2=_ICU_
-Item3=_ICU_;_DEBUG
-Item4=_DEBUG
+Count=7
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
+Item2=_ICU_;_ICUSWORD_;_DEBUG
+Item3=_ICU_;_ICUSWORD_
+Item4=_ICU_
+Item5=_ICU_;_DEBUG
+Item6=_DEBUG
[HistoryLists\hlIntOutputDir]
Count=2
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.cpp b/apps/windoze/CBuilder5/BibleCS/sword.cpp
index 0bdf69a..13a52d3 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.cpp
+++ b/apps/windoze/CBuilder5/BibleCS/sword.cpp
@@ -49,6 +49,9 @@ USE("..\..\..\..\..\icu-sword\as_is\borland\http:\www.crosswire.org\sword\images
USELIB("..\..\..\..\..\icu-sword\as_is\borland\icucommon.lib");
USELIB("..\..\..\..\..\icu-sword\as_is\borland\icui18n.lib");
//---------------------------------------------------------------------------
+
+AnsiString startVerse = "";
+
WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
LONG result;
@@ -93,6 +96,8 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in
delete [] buf;
return 0;
}
+ startVerse = buf;
+
// TODO 5: if we have a cmdline argument, figure we have to change directories. BAD, FIX.
result = Application->ExeName.Length();
@@ -176,7 +181,6 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in
Application->CreateForm(__classid(TPreviewForm), &PreviewForm);
Application->CreateForm(__classid(TPrintForm), &PrintForm);
Application->Run();
- delete SplashPg;
}
catch (Exception &exception) {
Application->ShowException(&exception);
@@ -185,3 +189,6 @@ WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, in
}
//---------------------------------------------------------------------------
+
+
+
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.h b/apps/windoze/CBuilder5/BibleCS/sword.h
index 5bfa702..b4ff149 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.h
+++ b/apps/windoze/CBuilder5/BibleCS/sword.h
@@ -1 +1,2 @@
#define WM_VERSE (WM_APP + 1995)
+extern AnsiString startVerse;
diff --git a/apps/windoze/CBuilder5/BibleCS/sword.res b/apps/windoze/CBuilder5/BibleCS/sword.res
index 935ce20..3e9ab0d 100644
--- a/apps/windoze/CBuilder5/BibleCS/sword.res
+++ b/apps/windoze/CBuilder5/BibleCS/sword.res
Binary files differ
diff --git a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
index c192a31..ece7bec 100644
--- a/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
+++ b/apps/windoze/CBuilder5/BibleCS/swordlib.bpr
@@ -79,7 +79,7 @@
<DEBUGLIBPATH value=""/>
<RELEASELIBPATH value=""/>
<LINKER value="TLib"/>
- <USERDEFINES value="_ICU_;_ICUSWORD_"/>
+ <USERDEFINES value="_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT;_NO_VCL"/>
<MAINSOURCE value="swordlib.cpp"/>
<INCLUDEPATH value="..\InstallMgr\curl\include;..\..;..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook;..\..\..\..\src\modules\lexdict\zld;..\..\..\..\..\icu-sword\source\common;..\..\..\..\..\icu-sword\source\i18n;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..;..\..\..\..\utilfuns;..\..\..\framework;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\include;..\..\..\..\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys;$(BCB)\include;$(BCB)\include\vcl"/>
@@ -163,12 +163,14 @@ Item4=..\..\..\..\src\modules\genbook\rawgenbook;..\..\..\..\src\modules\genbook
Item5=..\..\..\..\src\modules\lexdict\zld;..\..;..\..\..\..\src\utilfuns\zlib;..\..\..\..\src\modules\lexdict\rawld4;..\..\..\..\src\modules\comments\zcom;..\..\..\..\src\modules\texts\ztext;..\..\..\..\src\frontend;..\..\..\..\src\utilfuns;..\..\..\..\src\modules\comments\rawfiles;..\..\..\..\src\modules\comments\hrefcom;..\..\..\..\src\modules;..\..\..\..\src\modules\texts;..\..\..\..\src\modules\texts\rawtext;..\..\..\..\src\modules\texts\rawgbf;..\..\..\..\src\modules\lexdict;..\..\..\..\src\modules\lexdict\rawld;..\..\..\..\src\modules\filters;..\..\..\..\src\modules\common;..\..\..\..\src\modules\comments;..\..\..\..\src\modules\comments\rawcom;..\..\..\..\src\mgr;..\..\..\..\src\keys
[HistoryLists\hlConditionals]
-Count=5
-Item0=_ICU_;_ICUSWORD_
-Item1=_ICU_;_ICUSWORD_;_DEBUG
-Item2=_ICU_
-Item3=_ICU_;_DEBUG
-Item4=_DEBUG
+Count=7
+Item0=_ICU_;_ICUSWORD_;USBINARY
+Item1=_ICU_;_ICUSWORD_;_DEBUG;USBINARY
+Item2=_ICU_;_ICUSWORD_;_DEBUG
+Item3=_ICU_;_ICUSWORD_
+Item4=_ICU_
+Item5=_ICU_;_DEBUG
+Item6=_DEBUG
[HistoryLists\hlIntOutputDir]
Count=2
diff --git a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
index 2eccedd..79d6226 100644
--- a/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
+++ b/apps/windoze/CBuilder5/InstallMgr/InstallMgr.bpr
@@ -28,7 +28,7 @@
<DEBUGLIBPATH value="$(BCB)\lib\debug"/>
<RELEASELIBPATH value="$(BCB)\lib\release"/>
<LINKER value="ilink32"/>
- <USERDEFINES value="VCL"/>
+ <USERDEFINES value="VCL;_ICU_;_ICUSWORD_;USBINARY"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="InstallMgr.cpp"/>
<INCLUDEPATH value="curl\include;..\BibleCS;..\..\..\..\usr\src\sword\apps\windoze\CBuilder4\InstallMgr;$(BCB)\include;$(BCB)\include\vcl;..\..\..\..\include"/>
@@ -102,15 +102,16 @@ Count=1
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=8
-Item0=VCL
-Item1=VCL;_DEBUG
-Item2=VCL;__STDC__ true
-Item3=VCL;__STDC__
-Item4=VCL;_MSC_VER
-Item5=VCL __STDC__
-Item6=_DEBUG;VCL
-Item7=_DEBUG
+Count=9
+Item0=VCL;_ICU_;_ICUSWORD_;USBINARY
+Item1=VCL
+Item2=VCL;_DEBUG
+Item3=VCL;__STDC__ true
+Item4=VCL;__STDC__
+Item5=VCL;_MSC_VER
+Item6=VCL __STDC__
+Item7=_DEBUG;VCL
+Item8=_DEBUG
[HistoryLists\hlRunParameters]
Count=1
generated by cgit (git 2.34.1) at 2024-09-19 16:06:19 +0000