[sword-svn] r426 - in trunk: . stage

[scribe at crosswire.org]

Author: scribe
Date: 2006-06-10 17:16:41 -0700 (Sat, 10 Jun 2006)
New Revision: 426

Modified:
   trunk/stage/layout.conf
   trunk/stage/options.conf
   trunk/sword.res
   trunk/swwinlog.cpp
   trunk/swwinlog.h
Log:
updated to use newest swlog extension mechanism.

Modified: trunk/stage/layout.conf
===================================================================
--- trunk/stage/layout.conf	2006-06-01 20:48:47 UTC (rev 425)
+++ trunk/stage/layout.conf	2006-06-11 00:16:41 UTC (rev 426)
@@ -1,23 +1,44 @@
 
 [CommentView]
+JFB=
+Jub=
+Personal=
+RWP=
 
 [History]
-LastComModule=
+LastComModule=JFB
 LastLDKey=5485
-LastLDModule=
+LastLDModule=CBC
 LastParaMod01=
 LastParaMod02=
 LastParaMod03=
-LastTextModule=PARALLEL
-LastVerse=John 1:1
+LastTextModule=ChiNCVs
+LastVerse=James 1:19
 LookupSaveCount=5
+LookupText=James 1:19
 LookupText=John 1:1
 SearchSaveCount=5
 
 [LDView]
+CBC=
+NasbGreek=
+NasbHebrew=
+Robinson=
+SME=
+StrongsGreek=
+StrongsHebrew=
 
 [ModuleOptions]
+Cross-references=On
+Footnotes=Off
+Headings=Off
+Hebrew Cantillation=Off
+Hebrew Vowel Points=On
+Morphological Tags=Off
+Strong's Numbers=Off
+Textual Variants=Primary Reading
 Transliteration=Off
+Words of Christ in Red=Off
 
 [Screen]
 MainHeight=749
@@ -35,5 +56,16 @@
 TextWidth=368
 
 [TextView]
+ASV=
+ChiNCVs=
+ChiNCVt=
+ChiUn=
+ChiUns=
+GerNEU=
+KJV=
+NASB=
 PARALLEL=
+TR=
+WHNU=
+WLC=
 

Modified: trunk/stage/options.conf
===================================================================
--- trunk/stage/options.conf	2006-06-01 20:48:47 UTC (rev 425)
+++ trunk/stage/options.conf	2006-06-11 00:16:41 UTC (rev 426)
@@ -1,14 +1,124 @@
-[CustomRanges]
-New Testament=mat-rev
-Old Testament=gen-mal
-Gospels=Mat-John
-Letters/Epistles=Rom-Jude
-Paul's Epistles=Rom-Phile;Heb
-Moses/Pentateuch/Torah=Gen-Deu
-History=Jos-Est
-Poetry and Wisdom=Job-Song; Lam
-Prophets=Isa-Mal
-
-[System]
-MaxFiles=30
-
+
+[Appearance]
+AutoVSColor=1
+CommentBackColor=16777215
+CommentBkName=
+CommentChHead=
+CommentChHeadSize=
+CommentFontColor=0
+CommentFontName=Times New Roman
+CommentFontSize=10
+CommentParagraph=
+CommentPostFixTag=
+CommentPreFixTag=
+CommentSuperVS=
+CommentVSNum=
+CommentVSNumSize=
+CurrentVSColor=16711680
+DefaultBackColor=
+DefaultBkName=
+DefaultChHead=
+DefaultChHeadSize=
+DefaultFontColor=
+DefaultFontName=
+DefaultFontSize=
+DefaultParagraph=
+DefaultPostFixTag=
+DefaultPreFixTag=
+DefaultSuperVS=
+DefaultVSNum=
+DefaultVSNumSize=
+FieldColor=16776960
+LDBackColor=16777215
+LDBkName=
+LDChHead=
+LDChHeadSize=
+LDFontColor=0
+LDFontName=Times New Roman
+LDFontSize=10
+LDParagraph=
+LDPostFixTag=
+LDPreFixTag=
+LDSuperVS=
+LDVSNum=
+LDVSNumSize=
+MorphColor=60534
+PopupBackColor=16777215
+PopupFontColor=0
+PopupFontName=Times New Roman
+PopupFontSize=10
+SearchBackColor=16777215
+SearchBkName=
+SearchChHead=
+SearchChHeadSize=
+SearchFontColor=0
+SearchFontName=Times New Roman
+SearchFontSize=10
+SearchParagraph=
+SearchPostFixTag=
+SearchPreFixTag=
+SearchSuperVS=
+SearchVSNum=
+SearchVSNumSize=
+StrongsColor=16711935
+TextBackColor=16777215
+TextBkName=
+TextChHead=
+TextChHeadSize=
+TextFontColor=0
+TextFontName=Times New Roman
+TextFontSize=10
+TextParagraph=
+TextPostFixTag=
+TextPreFixTag=
+TextSuperVS=
+TextVSNum=
+TextVSNumSize=
+UIBackColor=16777215
+UIFontColor=0
+UIFontName=MS Sans Serif
+UIFontSize=8
+VSNumberColor=16711680
+VerseNewLine=0
+locale=en_us
+
+[Bookmarks]
+AutoSaveOther=0
+AutoSavePersonal=1
+
+[CustomRanges]
+Gospels=Mat-John
+History=Jos-Est
+Letters/Epistles=Rom-Jude
+Moses/Pentateuch/Torah=Gen-Deu
+New Testament=mat-rev
+Old Testament=gen-mal
+Paul's Epistles=Rom-Phile;Heb
+Poetry and Wisdom=Job-Song; Lam
+Prophets=Isa-Mal
+
+[General]
+DevsAsDicts=false
+GlosAsDicts=true
+TipOfTheDay=
+
+[Hints]
+Hints=true
+Strongs=true
+VLists=true
+Words=false
+
+[Layout]
+AutoSaveLayout=1
+
+[ModDefaults]
+DailyDevotion=SME
+GenDict=CBC
+GreekDef=NasbGreek
+GreekParse=Robinson
+HebrewDef=NasbHebrew
+StrongsNumbers=ChiUn
+
+[System]
+MaxFiles=30
+

Modified: trunk/sword.res
===================================================================
(Binary files differ)

Modified: trunk/swwinlog.cpp
===================================================================
--- trunk/swwinlog.cpp	2006-06-01 20:48:47 UTC (rev 425)
+++ trunk/swwinlog.cpp	2006-06-11 00:16:41 UTC (rev 426)
@@ -1,12 +1,7 @@
-//---------------------------------------------------------------------------
 #include <vcl\vcl.h>
 #pragma hdrstop
 
 #include "swwinlog.h"
-#include <stdio.h>
-#include <conio.h>
-#include <stdarg.h>
-//---------------------------------------------------------------------------
 
 
 SWORD_NAMESPACE_START
@@ -16,64 +11,10 @@
 }
 
  
-void SWWinLog::LogWarning(char *fmt, ...)
-{
-	char msg[2048];
-	va_list argptr;
-
-	if (logLevel >= 2) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(NULL, msg, "Warning", MB_OK);
-	}
+void SWWinLog::logMessage(const char *message, int level) const {
+	static const char *levels[] = { "Off", "Error", "Warning", "Information", "Information...", "Log", "Log" };
+	MessageBox(NULL, message, levels[level], MB_OK);
 }
 
 
-void SWWinLog::LogError(char *fmt, ...)
-{
-	char msg[2048];
-	va_list argptr;
-
-	if (logLevel) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(NULL, msg, "Error", MB_OK);
-	}
-}
-
-
-void SWWinLog::LogTimedInformation(char *fmt, ...)
-{
-	char msg[2048];
-	va_list argptr;
-
-	if (logLevel >= 4) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(NULL, msg, "Information...", MB_OK);
-
-	}
-}
-
-
-void SWWinLog::LogInformation(char *fmt, ...)
-{
-	char msg[2048];
-	va_list argptr;
-
-	if (logLevel >= 3) {
-		va_start(argptr, fmt);
-		vsprintf(msg, fmt, argptr);
-		va_end(argptr);
-
-		MessageBox(NULL, msg, "Information", MB_OK);
-	}
-}
-
 SWORD_NAMESPACE_END

Modified: trunk/swwinlog.h
===================================================================
--- trunk/swwinlog.h	2006-06-01 20:48:47 UTC (rev 425)
+++ trunk/swwinlog.h	2006-06-11 00:16:41 UTC (rev 426)
@@ -29,15 +29,11 @@
 
 SWORD_NAMESPACE_START
 
-class SWWinLog:public SWLog
-{
-  HWND parent;
+class SWWinLog : public SWLog {
+	HWND parent;
 public:
-    SWWinLog (HWND iparent);
-  virtual void LogWarning (char *fmt, ...);
-  virtual void LogError (char *fmt, ...);
-  virtual void LogTimedInformation (char *fmt, ...);
-  virtual void LogInformation (char *fmt, ...);
+	SWWinLog (HWND iparent);
+	virtual void logMessage(const char *message, int level) const;
 };
 
 SWORD_NAMESPACE_END