[sword-svn] r464 - in branches/BCB5: . TntUnicodeControls.attic/BCB5
chrislit at www.crosswire.org
chrislit at www.crosswire.org
Fri Sep 28 17:32:39 MST 2007
Author: chrislit
Date: 2007-09-28 17:32:38 -0700 (Fri, 28 Sep 2007)
New Revision: 464
Modified:
branches/BCB5/RxRichEditX.cpp
branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
branches/BCB5/mainfrm.cpp
branches/BCB5/mainfrm.dfm
branches/BCB5/mainfrm.h
branches/BCB5/sword.res
branches/BCB5/swordlib.cpp
Log:
removed Greek to BGreek stuff, which appears to be broken in any case
Modified: branches/BCB5/RxRichEditX.cpp
===================================================================
--- branches/BCB5/RxRichEditX.cpp 2007-09-26 23:15:53 UTC (rev 463)
+++ branches/BCB5/RxRichEditX.cpp 2007-09-29 00:32:38 UTC (rev 464)
@@ -281,7 +281,7 @@
delete RTFStream;
makeLinks();
- makeImages();
+ makeImages();
}
@@ -302,12 +302,12 @@
newtext += RTFHeadMargin;
// newtext += "\\pard\\nowidctlpar\\cf7\\f0 ";
- if (module->Direction() == DIRECTION_RTL) {
+ if (module->Direction() == DIRECTION_RTL) {
newtext += "\\qr ";
- }
- if (module->Direction() == DIRECTION_RTL && (platformID == WINNT && (!strnicmp(module->Lang(), "he", 2) || !strnicmp(module->Lang(), "ar", 2) || !strnicmp(module->Lang(), "fa", 2)))) {
+ }
+ if (module->Direction() == DIRECTION_RTL && (platformID == WINNT && (!strnicmp(module->Lang(), "he", 2) || !strnicmp(module->Lang(), "ar", 2) || !strnicmp(module->Lang(), "fa", 2)))) {
newtext += "\\rtlpar ";
- }
+ }
verses->Persist(1);
(*verses) = TOP;
@@ -317,7 +317,6 @@
saveKey = 0;
module->setKey(verses);
-
if (introText) {
newtext += RTFHeadingPre;
newtext += introText;
@@ -744,9 +743,9 @@
void TRxRichEditX::TColorToRGB(const TColor& color, int& red, int& green, int& blue) {
- red = (color & 0xFF);
- green = ((color >> 8) & 0xFF);
- blue =((color >> 16) & 0xFF);
+ red = (color & 0xFF);
+ green = ((color >> 8) & 0xFF);
+ blue =((color >> 16) & 0xFF);
}
void TRxRichEditX::buildRTFHeader() {
@@ -1073,7 +1072,8 @@
SelLength = (endAt - foundAt)+4;
XMLTag tag(this->SelText.c_str());
SelText = "";
- insertImage(tag.getAttribute("src"));
+ insertImage(tag.getAttribute("src"));
+
}
}
@@ -1088,16 +1088,14 @@
int len = strlen(filePath);
if ((len > 4) && (!::stricmp(filePath+(len-4), ".jpg"))) {
// ji->LoadFromFile(filePath);
+ TFileStream* imageFile;
+ imageFile = new TFileStream(filePath,fmOpenRead|fmShareCompat);
+ ji->LoadFromStream(imageFile); // load the jpeg from the disk file stream
+ bitmap->Assign(ji);
+ image->Picture->Assign(bitmap);
+ delete imageFile;
-
- TFileStream* imageFile;
- imageFile = new TFileStream(filePath,fmOpenRead|fmShareCompat);
- ji->LoadFromStream(imageFile); // load the jpeg from the disk file stream
- bitmap->Assign(ji);
- image->Picture->Assign(bitmap);
- delete imageFile;
-
// image->Width = ji->Width;
// image->Height = ji->Height;
image->Canvas->Draw(0, 0, ji);
Modified: branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk
===================================================================
--- branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2007-09-26 23:15:53 UTC (rev 463)
+++ branches/BCB5/TntUnicodeControls.attic/BCB5/TntLibR.bpk 2007-09-29 00:32:38 UTC (rev 464)
@@ -13,6 +13,8 @@
..\TntExtCtrls.obj ..\TntExtDlgs.obj ..\TntGrids.obj ..\TntStdActns.obj
..\Unicode.obj TntLibR.obj"/>
<RESFILES value="TntLibR.res"/>
+ <IDLFILES value=""/>
+ <IDLGENFILES value=""/>
<DEFFILE value=""/>
<RESDEPEN value="$(RESFILES)"/>
<LIBFILES value=""/>
@@ -34,6 +36,7 @@
<WARNINGS value="-w-par"/>
</MACROS>
<OPTIONS>
+ <IDLCFLAGS value="-I..\. -I.. -I$(BCB)\include -I$(BCB)\include\vcl -src_suffix cpp -boa"/>
<CFLAG1 value="-O2 -H=$(BCB)\lib\vcl50.csm -Hc -Vx -Ve -X- -a8 -b- -k- -vi -c -tWM"/>
<PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
<RFLAGS value=""/>
@@ -127,6 +130,11 @@
LinkDebugVcl=0
LinkCGLIB=0
+[CORBA]
+AddServerUnit=1
+AddClientUnit=1
+PrecompiledHeaders=1
+
[Language]
ActiveLang=
ProjectLang=
Modified: branches/BCB5/mainfrm.cpp
===================================================================
--- branches/BCB5/mainfrm.cpp 2007-09-26 23:15:53 UTC (rev 463)
+++ branches/BCB5/mainfrm.cpp 2007-09-29 00:32:38 UTC (rev 464)
@@ -11,7 +11,6 @@
#include "AboutBoxfrm.h"
#include "ModInstForm.h"
#include "biblecsmgr.h"
-#include "Greek2Greek.h"
#include "bookmarkfrm.h"
#include "optionfrm.h"
#include "vrslstfrm.h"
@@ -210,7 +209,7 @@
newrtf->Align = alClient;
newrtf->ScrollBars = ssVertical;
newrtf->ReadOnly = true;
- newrtf->PopupMenu = (strcmp(mod->Name(), "N27U4")) ? PopupMenu2 : PopupMenu1;
+ newrtf->PopupMenu = PopupMenu2;
newrtf->OnMouseDown = RTFMouseDown;
newrtf->OnURLClick = RTFURLClick;
newrtf->Name = String("TextRTF")+mod->Name();
@@ -842,21 +841,17 @@
Print1->Caption = _tr("&Print...");
Exit1->Caption = _tr("E&xit");
Edit1->Caption = _tr("&Edit");
- Copy1->Caption = _tr("&Copy");
Copy2->Caption = _tr("&Copy");
Copy3->Caption = _tr("&Copy");
Copy3_2->Caption = _tr("&Copy");
Copy5->Caption = _tr("&Copy");
- SearchForWord1->Caption = _tr("Search For Word/Phrase");
SearchForWord2->Caption = _tr("Search For Word/Phrase");
SearchForWord3->Caption = _tr("Search For Word/Phrase");
SearchForWord5->Caption = _tr("Search For Word/Phrase");
- DictionaryLookup1->Caption = _tr("Dictionary Lookup");
DictionaryLookup2->Caption = _tr("Dictionary Lookup");
DictionaryLookup3->Caption = _tr("Dictionary Lookup");
DictionaryLookup5->Caption = _tr("Dictionary Lookup");
NewVer1->Caption = _tr("&New Verse List");
- CopyasBGreekTransliteration1->Caption = _tr("Copy as &B-Greek Transliteration");
Options2->Caption = _tr("Options");
Options1->Caption = _tr("&Preferences...");
Search1->Caption = _tr("&Search");
@@ -1506,21 +1501,6 @@
logmodstate = true;
}
//---------------------------------------------------------------------------
-void __fastcall TForm1::CopyasBGreekTransliteration1Click(TObject *Sender)
-{
- char *retbuf;
- int len;
- TClipboard *clip = new TClipboard();
-
- SWDispRTF *rtf = (SWDispRTF *)Screen->ActiveControl;
- len = rtf->SelText.Length() * 2;
- retbuf = new char [ len ];
- if (!Greek2bGreek(retbuf, rtf->SelText.c_str(), len)) {
- clip->SetTextBuf(retbuf);
- }
- delete clip;
-}
-//---------------------------------------------------------------------------
void __fastcall TForm1::Copy1Click(TObject *Sender)
{
int wordstart;
@@ -1805,9 +1785,7 @@
int staticMenuItemsCount = 0;
TMenuItem *newitem;
- if (menu == PopupMenu1)
- staticMenuItemsCount = 4;
- else if (menu == PopupMenu2)
+ if (menu == PopupMenu2)
staticMenuItemsCount = 3;
else if (menu == PopupMenu3)
staticMenuItemsCount = 7;
Modified: branches/BCB5/mainfrm.dfm
===================================================================
(Binary files differ)
Modified: branches/BCB5/mainfrm.h
===================================================================
--- branches/BCB5/mainfrm.h 2007-09-26 23:15:53 UTC (rev 463)
+++ branches/BCB5/mainfrm.h 2007-09-29 00:32:38 UTC (rev 464)
@@ -194,42 +194,38 @@
class TForm1 : public TForm
{
__published: // IDE-managed Components
- TPanel *pnlTextCom;
+ TPanel *pnlTextCom;
TSplitter *Splitter2;
- TPanel *pnlText;
- TPanel *pnlComment;
+ TPanel *pnlText;
+ TPanel *pnlComment;
TSplitter *Splitter1;
- TPanel *pnlDict;
- TPageControl *TextPageControl;
- TPageControl *CommentaryPageControl;
+ TPanel *pnlDict;
+ TPageControl *TextPageControl;
+ TPageControl *CommentaryPageControl;
TStatusBar *StatusBar1;
- TPageControl *LexDictPageControl;
- TMainMenu *MainMenu1;
- TMenuItem *Search1;
- TMenuItem *NewSearchWindow1;
- TMenuItem *Help1;
- TMenuItem *About1;
- TPopupMenu *PopupMenu2;
+ TPageControl *LexDictPageControl;
+ TMainMenu *MainMenu1;
+ TMenuItem *Search1;
+ TMenuItem *NewSearchWindow1;
+ TMenuItem *Help1;
+ TMenuItem *About1;
+ TPopupMenu *PopupMenu2;
TMenuItem *DictionaryLookup2;
- TMenuItem *File1;
- TMenuItem *SaveLayout1;
- TMenuItem *Exit1;
- TMenuItem *N1;
+ TMenuItem *File1;
+ TMenuItem *SaveLayout1;
+ TMenuItem *Exit1;
+ TMenuItem *N1;
TDdeServerItem *Search;
TDdeServerItem *Lookup;
TDdeServerConv *Bible;
- TPopupMenu *PopupMenu1;
- TMenuItem *DictionaryLookup1;
- TMenuItem *Copy1;
- TMenuItem *CopyasBGreekTransliteration1;
- TMenuItem *Copy2;
- TMenuItem *Edit1;
- TMenuItem *Copy3;
- TPopupMenu *BookmarkPopup;
- TMenuItem *AddBookmark1;
- TMenuItem *N2;
- TMenuItem *EditBookmarks1;
- TMenuItem *Options1;
+ TMenuItem *Copy2;
+ TMenuItem *Edit1;
+ TMenuItem *Copy3;
+ TPopupMenu *BookmarkPopup;
+ TMenuItem *AddBookmark1;
+ TMenuItem *N2;
+ TMenuItem *EditBookmarks1;
+ TMenuItem *Options1;
TCoolBar *CoolBar1;
TImageList *ImageList1;
TImage *BackBtnImage;
@@ -237,104 +233,96 @@
TToolBar *ToolBar2;
TToolButton *ToolButton3;
TToolButton *ToolButton4;
- TPanel *pnlSpeed;
- TPanel *Panel1;
- TComboBox *cbBookOrig;
+ TPanel *pnlSpeed;
+ TPanel *Panel1;
+ TComboBox *cbBookOrig;
TEdit *CHBox;
TUpDown *UpDown1;
TEdit *VSBox;
TUpDown *UpDown2;
- TSpeedButton *btnLookup;
+ TSpeedButton *btnLookup;
TToolBar *ToolBar1;
TImageList *ImageList2;
- TSpeedButton *Bookmarkbtn;
- TPopupMenu *PopupMenu3;
+ TSpeedButton *Bookmarkbtn;
+ TPopupMenu *PopupMenu3;
TMenuItem *Copy3_2;
TMenuItem *DictionaryLookup3;
- TMenuItem *N3;
- TMenuItem *EditEntry1;
- TMenuItem *DeleteEntry1;
- TMenuItem *LinktoVerse1;
- TMenuItem *Options2;
- TMenuItem *Contents1;
- TPanel *Panel2;
+ TMenuItem *N3;
+ TMenuItem *EditEntry1;
+ TMenuItem *DeleteEntry1;
+ TMenuItem *LinktoVerse1;
+ TMenuItem *Options2;
+ TMenuItem *Contents1;
+ TPanel *Panel2;
TSplitter *Splitter3;
- TRichEdit *DictKeyEditOld;
- TListBox *lbDictKeysOld;
- TPopupMenu *PopupMenu4;
- TMenuItem *HideShowModules1;
- TMenuItem *DevotionaloftheDay1;
- TMenuItem *Tools1;
- TMenuItem *InstallManager1;
- TMenuItem *SEPERATOR;
+ 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;
+ TMenuItem *Print1;
+ TMenuItem *N5;
+ TMenuItem *SearchForWord2;
+ TMenuItem *SearchForWord3;
TActionList *ActionList1;
TAction *Action1;
- TMenuItem *NewVer1;
+ TMenuItem *NewVer1;
TComboBox *cbBookOld;
TComboBox *freeHandLookupOld;
TPopupMenu *PopupMenu5;
TMenuItem *DictionaryLookup5;
TMenuItem *SearchForWord5;
TMenuItem *N4;
- TImage *BookmarkBtnImage;
- TToolBar *ToolBar3;
- TToolButton *LemmaBtn;
- TToolButton *MorphBtn;
- TToolButton *NotesBtn;
- TToolButton *XRefBtn;
- TImageList *ImageList3;
- TImage *LemmaBtnImage;
- TImage *MorphBtnImage;
- TImage *FootnoteBtnImage;
- TImage *XRefBtnImage;
+ TImage *BookmarkBtnImage;
+ TToolBar *ToolBar3;
+ TToolButton *LemmaBtn;
+ TToolButton *MorphBtn;
+ TToolButton *NotesBtn;
+ TToolButton *XRefBtn;
+ TImageList *ImageList3;
+ TImage *LemmaBtnImage;
+ TImage *MorphBtnImage;
+ TImage *FootnoteBtnImage;
+ TImage *XRefBtnImage;
TMenuItem *Copy5;
void __fastcall TextPageControlChange(TObject *Sender);
void __fastcall btnLookupClick(TObject *Sender);
void __fastcall CommentaryPageControlChange(TObject *Sender);
-
-
-
+
void __fastcall DictKeyEditOldChange(TObject *Sender);
void __fastcall LexDictPageControlChange(TObject *Sender);
void __fastcall NewSearchWindow1Click(TObject *Sender);
-
+
void __fastcall Exit1Click(TObject *Sender);
void __fastcall About1Click(TObject *Sender);
void __fastcall DictionaryLookup2Click(TObject *Sender);
void __fastcall SaveLayout1Click(TObject *Sender);
-
-
+
void __fastcall FormShow(TObject *Sender);
-
+
void __fastcall LookupPokeData(TObject *Sender);
-
+
void __fastcall SearchPokeData(TObject *Sender);
void __fastcall UpDown3Click(TObject *Sender, TUDBtnType Button);
void __fastcall UpDown1Click(TObject *Sender, TUDBtnType Button);
-
-
+
void __fastcall BackbtnClick(TObject *Sender);
- void __fastcall CopyasBGreekTransliteration1Click(TObject *Sender);
void __fastcall Copy1Click(TObject *Sender);
-
-
-
+
void __fastcall AddBookmark1Click(TObject *Sender);
void __fastcall BookmarkItemClick(TObject *Sender);
void __fastcall ParallelMenuItemClick(TObject *Sender);
void __fastcall BookmarkbtnClick(TObject *Sender);
void __fastcall EditBookmarks1Click(TObject *Sender);
-
+
void __fastcall FormKeyDown(TObject *Sender, WORD &Key, TShiftState Shift);
void __fastcall Options1Click(TObject *Sender);
void __fastcall cbBookChange(TObject *Sender);
-
+
void __fastcall FormCreate(TObject *Sender);
void __fastcall PopupMenuPopup(TObject *Sender);
void __fastcall createVerseList(TObject *Sender);
@@ -346,10 +334,9 @@
void __fastcall DeleteEntry1Click(TObject *Sender);
void __fastcall LinktoVerse1Click(TObject *Sender);
void __fastcall BookTOCChange(TObject* Sender, TTreeNode* Node);
-
+
void __fastcall GlobalOptionChange(TObject *Sender);
-
-
+
void __fastcall OptionShowVals(TObject *Sender);
void __fastcall Contents1Click(TObject *Sender);
void __fastcall FormClose(TObject *Sender, TCloseAction &Action);
@@ -371,6 +358,7 @@
void __fastcall NewVer1Click(TObject *Sender);
void __fastcall PopupMenu5Popup(TObject *Sender);
void __fastcall notePopoutClick(TObject *Sender);
+
private: // User declarations
list <SWDisplay *> displays; // so we can delete each display we create
list <ModState *> modstates;
@@ -379,7 +367,7 @@
bool freshdict;
String clickText;
- void syncSpeedButtons();
+ void syncSpeedButtons();
char CreateTextPane(SWModule *mod);
char CreateParallelPane(SWMgr **mgr);
char CreateCommentPane(SWModule *mod);
Modified: branches/BCB5/sword.res
===================================================================
(Binary files differ)
Modified: branches/BCB5/swordlib.cpp
===================================================================
--- branches/BCB5/swordlib.cpp 2007-09-26 23:15:53 UTC (rev 463)
+++ branches/BCB5/swordlib.cpp 2007-09-29 00:32:38 UTC (rev 464)
@@ -25,7 +25,6 @@
USEUNIT("..\..\..\..\src\modules\comments\rawfiles\rawfiles.cpp");
USEUNIT("..\..\..\..\src\utilfuns\utilstr.cpp");
USEUNIT("..\..\..\..\src\utilfuns\utilconf.cpp");
-USEUNIT("..\..\..\..\src\utilfuns\Greek2Greek.cpp");
USEUNIT("..\..\..\..\src\utilfuns\regex.c");
USEUNIT("..\..\..\..\src\frontend\swlog.cpp");
USEUNIT("..\..\..\..\src\frontend\swdisp.cpp");
More information about the sword-cvs
mailing list