Menu
▾
▴
[swebs-commits] swebswebserver/winui ControlCenter.vbg,NONE,1.1 .cvsignore,1.6,1.7 ChangeLog.txt,1.29,1.30 WinUI.lvw,1.23,1.24 WinUI.vbp,1.68,1.69 WinUI.vbw,1.25,1.26 basExceptionFilter.bas,1.7,1.8 basMain.bas,1.57,1.58 cSysTray.cls,1.5,1.6 credits.rtf,1.21,1.22 frmAbout.frm,1.36,1.37 frmAbout.frx,1.22,1.23 frmEventView.frm,1.10,1.11 frmMain.frm,1.78,1.79 frmNewISAPI.frm,1.1,1.2 frmRegistration.frm,1.16,1.17 frmSplash.frm,1.14,1.15 frmTip.frm,1.16,1.17 frmUpdate.frm,1.15,1.16 lang.xml,1.12,1.13 swebscc.exe,1.65,1.66 cCallStack.cls,1.4,NONE cDebug.cls,1.6,NONE cEventLog.cls,1.8,NONE cHTTP.cls,1.5,NONE cHTTPCGI.cls,1.5,NONE cHTTPCGICol.cls,1.5,NONE cHTTPConfig.cls,1.6,NONE cHTTPIndex.cls,1.3,NONE cHTTPIndexCol.cls,1.4,NONE cHTTPStats.cls,1.3,NONE cHTTPVirtHost.cls,1.3,NONE cHTTPVirtHostCol.cls,1.4,NONE cNet.cls,1.6,NONE cPerfMon.cls,1.1,NONE cPerfMonData.cls,1.1,NONE cRegistration.cls,1.9,NONE cServer.cls,1.3,NONE cUpdate.cls,1.8,NONE cUtil.cls,1.8,NONE cWinUI.cls,1.12,NONE
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv12370/swebswebserver/winui
Modified Files:
.cvsignore ChangeLog.txt WinUI.lvw WinUI.vbp WinUI.vbw
basExceptionFilter.bas basMain.bas cSysTray.cls credits.rtf
frmAbout.frm frmAbout.frx frmEventView.frm frmMain.frm
frmNewISAPI.frm frmRegistration.frm frmSplash.frm frmTip.frm
frmUpdate.frm lang.xml swebscc.exe
Added Files:
ControlCenter.vbg
Removed Files:
cCallStack.cls cDebug.cls cEventLog.cls cHTTP.cls cHTTPCGI.cls
cHTTPCGICol.cls cHTTPConfig.cls cHTTPIndex.cls
cHTTPIndexCol.cls cHTTPStats.cls cHTTPVirtHost.cls
cHTTPVirtHostCol.cls cNet.cls cPerfMon.cls cPerfMonData.cls
cRegistration.cls cServer.cls cUpdate.cls cUtil.cls cWinUI.cls
Log Message:
Ok, now this is a big update, I went ahead with the core/ui split I talked about a while back, this isn't done yet so dont try to use it, just commiting 'just in case'
--- NEW FILE: ControlCenter.vbg ---
VBGROUP 5.0
StartupProject=WinUI.vbp
Project=ccCore\ccCore.vbp
Project=ccHTTP\ccHTTP.vbp
Project=ccUtil\ccUtil.vbp
Project=..\..\swebswebserver\winui\ccTranslator\ccTranslator.vbp
Index: .cvsignore
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- .cvsignore 5 Nov 2003 21:39:20 -0000 1.6
+++ .cvsignore 17 Nov 2003 11:43:07 -0000 1.7
@@ -4,5 +4,4 @@
WinUI.PDM
WinUI.csi
TransExtract.exe
-SWEBS.dll
-
+sHTTP.dll
Index: ChangeLog.txt
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/ChangeLog.txt,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ChangeLog.txt 15 Nov 2003 14:15:01 -0000 1.29
+++ ChangeLog.txt 17 Nov 2003 11:43:07 -0000 1.30
@@ -1,5 +1,5 @@
-ChangeLog for WinUI
--------------------
+ChangeLog for SWEBS - Control Center
+------------------------------------
Legend:
! Bug fix
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
Binary files /tmp/cvsvauRVm and /tmp/cvsOZippz differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- WinUI.vbp 15 Nov 2003 14:15:05 -0000 1.68
+++ WinUI.vbp 17 Nov 2003 11:43:07 -0000 1.69
@@ -1,7 +1,8 @@
Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
-Reference=*\G{101F9C56-A0F3-455C-ABBB-191168ABCF94}#1.0#0#C:\SWS\ChilkatXml.dll#Chilkat Xml 4.0.2
-Reference=*\G{7D521758-175B-48CB-AB02-4973824A3241}#1.0#0#C:\WINDOWS\System32\MSINET.oca#Microsoft Internet Transfer Control 6.0 (SP4)
+Reference=*\G{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#4.0#0#ccCore\ccCore.dll#
+Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#5.0#0#..\..\swebswebserver\winui\ccUtil\ccUtil.dll#
+Reference=*\G{44004330-CB01-44A6-9375-50C0E8281B75}#1.0#0#..\..\swebswebserver\winui\ccTranslator\ccTranslator.dll#
Object={3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0; RICHTX32.OCX
Object={F9043C88-F6F2-101A-A3C9-08002B2F49FB}#1.2#0; COMDLG32.OCX
Module=basMain; basMain.bas
@@ -12,42 +13,23 @@
Form=frmRegistration.frm
Form=frmSplash.frm
Form=frmUpdate.frm
-Class=cWinUI; cWinUI.cls
-Class=cUtil; cUtil.cls
-Class=cUpdate; cUpdate.cls
-Class=cRegistration; cRegistration.cls
-Class=cNet; cNet.cls
-Class=cEventLog; cEventLog.cls
-Class=cDebug; cDebug.cls
-Class=cServer; cServer.cls
-Class=cHTTP; cHTTP.cls
-Class=cHTTPStats; cHTTPStats.cls
-Class=cHTTPConfig; cHTTPConfig.cls
-Class=cHTTPISAPI; cHTTPCGI.cls
-Class=cHTTPISAPICol; cHTTPCGICol.cls
-Class=cHTTPIndex; cHTTPIndex.cls
-Class=cHTTPIndexCol; cHTTPIndexCol.cls
-Class=cHTTPVirtHost; cHTTPVirtHost.cls
-Class=cHTTPVirtHostCol; cHTTPVirtHostCol.cls
Class=cSysTray; cSysTray.cls
Module=basExceptionFilter; basExceptionFilter.bas
-Class=cCallStack; cCallStack.cls
Form=frmNewISAPI.frm
-Class=cPerfMon; cPerfMon.cls
-Class=cPerfMonData; cPerfMonData.cls
IconForm="frmMain"
Startup="Sub Main"
HelpFile=""
Title="WinUI"
ExeName32="swebscc.exe"
+Path32="..\..\swebswebserver\winui"
Command32=""
-Name="SWEBS_WinUI"
+Name="ccUI"
HelpContextID="0"
Description="SWEBS Windows UI"
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=187
+RevisionVer=192
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: WinUI.vbw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- WinUI.vbw 15 Nov 2003 14:15:05 -0000 1.25
+++ WinUI.vbw 17 Nov 2003 11:43:07 -0000 1.26
@@ -1,4 +1,4 @@
-basMain = 89, 133, 1146, 784, C
+basMain = 89, 133, 1146, 784,
frmMain = 117, 303, 1172, 956, , 94, 38, 955, 630, C
frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C
frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C
@@ -6,26 +6,6 @@
frmRegistration = 176, 232, 1178, 956, C, 198, 261, 1200, 985, C
frmSplash = 198, 261, 1200, 985, C, 220, 290, 1222, 1014, C
frmUpdate = 154, 203, 1156, 927, C, 176, 232, 1178, 956, C
-cWinUI = 84, 172, 1086, 896, C
-cUtil = 44, 58, 1046, 782, C
-cUpdate = 44, 58, 1046, 782, C
-cRegistration = 154, 203, 1156, 927, C
-cNet = 22, 29, 1024, 753, C
-cEventLog = 132, 174, 1134, 898, C
-cDebug = 77, 164, 1079, 888, C
-cServer = 0, 0, 1002, 724, C
-cHTTP = 72, 102, 1074, 826, C
-cHTTPStats = 88, 116, 1090, 840, C
-cHTTPConfig = 44, 58, 1046, 782, C
-cHTTPISAPI = 241, 157, 1243, 881, C
-cHTTPISAPICol = 176, 232, 1178, 956, C
-cHTTPIndex = 44, 58, 1046, 782, C
-cHTTPIndexCol = 32, 54, 1034, 778, C
-cHTTPVirtHost = 110, 145, 1112, 869, C
-cHTTPVirtHostCol = 132, 174, 1134, 898, C
cSysTray = 198, 261, 1200, 985, C
basExceptionFilter = 242, 319, 1244, 1043,
-cCallStack = 22, 29, 1024, 753, C
-frmNewISAPI = 0, 0, 0, 0, C, 0, 0, 0, 0, C
-cPerfMon = 183, 286, 1185, 1010, C
-cPerfMonData = 44, 58, 1046, 782, C
+frmNewISAPI = 0, 0, 0, 0, C, 110, 145, 1112, 869, C
Index: basExceptionFilter.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basExceptionFilter.bas,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- basExceptionFilter.bas 18 Oct 2003 15:35:27 -0000 1.7
+++ basExceptionFilter.bas 17 Nov 2003 11:43:07 -0000 1.8
@@ -1,8 +1,8 @@
Attribute VB_Name = "basExceptionFilter"
-'CSEH: WinUI - Custom(No Stack)
+'CSEH: Core - Custom(No Stack)
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -153,69 +153,59 @@
Private Const EXCEPTION_CONTROL_C_EXIT = &HC000013A
Private Function GetExceptionText(ByVal ExceptionCode As Long) As String
- '<EhHeader>
- On Error GoTo GetExceptionText_Err
- '</EhHeader>
- Dim strExceptionString As String
-
-100 Select Case ExceptionCode
- Case EXCEPTION_ACCESS_VIOLATION
-104 strExceptionString = "Access Violation"
-108 Case EXCEPTION_DATATYPE_MISALIGNMENT
-112 strExceptionString = "Data Type Misalignment"
-116 Case EXCEPTION_BREAKPOINT
-120 strExceptionString = "Breakpoint"
-124 Case EXCEPTION_SINGLE_STEP
-128 strExceptionString = "Single Step"
-132 Case EXCEPTION_ARRAY_BOUNDS_EXCEEDED
-136 strExceptionString = "Array Bounds Exceeded"
-140 Case EXCEPTION_FLT_DENORMAL_OPERAND
-144 strExceptionString = "Float Denormal Operand"
-148 Case EXCEPTION_FLT_DIVIDE_BY_ZERO
-152 strExceptionString = "Divide By Zero"
-156 Case EXCEPTION_FLT_INEXACT_RESULT
-160 strExceptionString = "Floating Point Inexact Result"
-164 Case EXCEPTION_FLT_INVALID_OPERATION
-168 strExceptionString = "Invalid Operation"
-172 Case EXCEPTION_FLT_OVERFLOW
-176 strExceptionString = "Float Overflow"
-180 Case EXCEPTION_FLT_STACK_CHECK
-184 strExceptionString = "Float Stack Check"
-188 Case EXCEPTION_FLT_UNDERFLOW
-192 strExceptionString = "Float Underflow"
-196 Case EXCEPTION_INT_DIVIDE_BY_ZERO
-200 strExceptionString = "Integer Divide By Zero"
-204 Case EXCEPTION_INT_OVERFLOW
-208 strExceptionString = "Integer Overflow"
-212 Case EXCEPTION_PRIVILEGED_INSTRUCTION
-216 strExceptionString = "Privileged Instruction"
-220 Case EXCEPTION_IN_PAGE_ERROR
-224 strExceptionString = "In Page Error"
-228 Case EXCEPTION_ILLEGAL_INSTRUCTION
-232 strExceptionString = "Illegal Instruction"
-236 Case EXCEPTION_NONCONTINUABLE_EXCEPTION
-240 strExceptionString = "Non Continuable Exception"
-244 Case EXCEPTION_STACK_OVERFLOW
-248 strExceptionString = "Stack Overflow"
-252 Case EXCEPTION_INVALID_DISPOSITION
-256 strExceptionString = "Invalid Disposition"
-260 Case EXCEPTION_GUARD_PAGE_VIOLATION
-264 strExceptionString = "Guard Page Violation"
-268 Case EXCEPTION_INVALID_HANDLE
-272 strExceptionString = "Invalid Handle"
-276 Case EXCEPTION_CONTROL_C_EXIT
-280 strExceptionString = "Control-C Exit"
-284 Case Else
-288 strExceptionString = "Unknown (&H" & Right$("00000000" & Hex$(ExceptionCode), 8) & ")"
- End Select
-292 GetExceptionText = strExceptionString
- '<EhFooter>
- Exit Function
+Dim strExceptionString As String
-GetExceptionText_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basExceptionFilter.GetExceptionText", Erl, False
- Resume Next
- '</EhFooter>
+ Select Case ExceptionCode
+ Case EXCEPTION_ACCESS_VIOLATION
+ strExceptionString = "Access Violation"
+ Case EXCEPTION_DATATYPE_MISALIGNMENT
+ strExceptionString = "Data Type Misalignment"
+ Case EXCEPTION_BREAKPOINT
+ strExceptionString = "Breakpoint"
+ Case EXCEPTION_SINGLE_STEP
+ strExceptionString = "Single Step"
+ Case EXCEPTION_ARRAY_BOUNDS_EXCEEDED
+ strExceptionString = "Array Bounds Exceeded"
+ Case EXCEPTION_FLT_DENORMAL_OPERAND
+ strExceptionString = "Float Denormal Operand"
+ Case EXCEPTION_FLT_DIVIDE_BY_ZERO
+ strExceptionString = "Divide By Zero"
+ Case EXCEPTION_FLT_INEXACT_RESULT
+ strExceptionString = "Floating Point Inexact Result"
+ Case EXCEPTION_FLT_INVALID_OPERATION
+ strExceptionString = "Invalid Operation"
+ Case EXCEPTION_FLT_OVERFLOW
+ strExceptionString = "Float Overflow"
+ Case EXCEPTION_FLT_STACK_CHECK
+ strExceptionString = "Float Stack Check"
+ Case EXCEPTION_FLT_UNDERFLOW
+ strExceptionString = "Float Underflow"
+ Case EXCEPTION_INT_DIVIDE_BY_ZERO
+ strExceptionString = "Integer Divide By Zero"
+ Case EXCEPTION_INT_OVERFLOW
+ strExceptionString = "Integer Overflow"
+ Case EXCEPTION_PRIVILEGED_INSTRUCTION
+ strExceptionString = "Privileged Instruction"
+ Case EXCEPTION_IN_PAGE_ERROR
+ strExceptionString = "In Page Error"
+ Case EXCEPTION_ILLEGAL_INSTRUCTION
+ strExceptionString = "Illegal Instruction"
+ Case EXCEPTION_NONCONTINUABLE_EXCEPTION
+ strExceptionString = "Non Continuable Exception"
+ Case EXCEPTION_STACK_OVERFLOW
+ strExceptionString = "Stack Overflow"
+ Case EXCEPTION_INVALID_DISPOSITION
+ strExceptionString = "Invalid Disposition"
+ Case EXCEPTION_GUARD_PAGE_VIOLATION
+ strExceptionString = "Guard Page Violation"
+ Case EXCEPTION_INVALID_HANDLE
+ strExceptionString = "Invalid Handle"
+ Case EXCEPTION_CONTROL_C_EXIT
+ strExceptionString = "Control-C Exit"
+ Case Else
+ strExceptionString = "Unknown (&H" & Right$("00000000" & Hex$(ExceptionCode), 8) & ")"
+ End Select
+ GetExceptionText = strExceptionString
End Function
'CSEH: Skip
@@ -232,20 +222,10 @@
End Function
Public Sub SetExceptionFilter(blnEnable As Boolean)
- '<EhHeader>
- On Error GoTo SetExceptionFilter_Err
- '</EhHeader>
-100 If blnEnable = True Then
-104 Call SetUnhandledExceptionFilter(AddressOf ExceptionFilter)
- Else
-108 Call SetUnhandledExceptionFilter(0)
- End If
- '<EhFooter>
- Exit Sub
-
-SetExceptionFilter_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basExceptionFilter.SetExceptionFilter", Erl, False
- Resume Next
- '</EhFooter>
+ If blnEnable = True Then
+ Call SetUnhandledExceptionFilter(AddressOf ExceptionFilter)
+ Else
+ Call SetUnhandledExceptionFilter(0)
+ End If
End Sub
Index: basMain.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basMain.bas,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- basMain.bas 15 Nov 2003 14:15:05 -0000 1.57
+++ basMain.bas 17 Nov 2003 11:43:07 -0000 1.58
@@ -1,8 +1,8 @@
Attribute VB_Name = "basMain"
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -23,7 +23,19 @@
Option Explicit
-Public WinUI As cWinUI
+'FadeForm
+Private Declare Function SetLayeredWindowAttributes Lib "user32" (ByVal hwnd As Long, ByVal crKey As Long, ByVal bAlpha As Byte, ByVal dwFlags As Long) As Long
+Private Declare Function GetWindowLong Lib "user32" Alias "GetWindowLongA" (ByVal hwnd As Long, ByVal nIndex As Long) As Long
+Private Declare Function SetWindowLong Lib "user32" Alias "SetWindowLongA" (ByVal hwnd As Long, ByVal nIndex As Long, ByVal dwNewLong As Long) As Long
+
+'FadeForm
+Private Const GWL_EXSTYLE = (-20)
+Private Const LWA_ALPHA = &H2
+Private Const WS_EX_LAYERED = &H80000
+
+Public Core As cCore
+Public Util As cUtil
+Public Translator As cTranslate
'CLI Option variables
Dim blnNoSplash As Boolean
@@ -35,192 +47,155 @@
Dim blnDebugMode As Boolean
Dim blnPerfMon As Boolean
-'CSEH: WinUI - Custom(No Stack)
+'CSEH: Core - Custom(No Stack)
Public Sub Main()
- '<EhHeader>
- On Error GoTo Main_Err
- '</EhHeader>
-100 SetExceptionFilter True
-104 GetArgs Command$()
-108 Set WinUI = New cWinUI
-112 WinUI.Setup
-116 If blnDebugLang = True Then WinUI.Debuger.DebugLang = True
-120 If blnNoSplash = True Then WinUI.Debuger.DisableSplash = True
-124 If blnNoTips = True Then WinUI.Debuger.DisableTips = True
-128 If blnNoUpdate = True Then WinUI.Debuger.DisableUpdate = True
-132 If blnKillUpdate = True Then WinUI.Debuger.KillUpdate
-136 If blnDebugMode = True Then WinUI.Debuger.DebugMode = True
-140 If blnPerfMon = True Then WinUI.Debuger.PerfMon.Enabled = True
+Dim UIInt As cUIInterface
+
+ SetExceptionFilter True
-144 If WinUI.Debuger.DisableSplash <> True Then
-148 Load frmSplash
-152 WinUI.Util.FormFade frmSplash, False
- End If
-156 If App.PrevInstance = True Then
-160 If WinUI.Util.SetFocusByCaption(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = False Then
-164 MsgBox WinUI.GetTranslatedText("There is already a instance of this application running."), vbApplicationModal + vbCritical
-168 End
- End If
-172 End
+ 'Create a Core from the default instance
+ Set UIInt = New cUIInterface
+ Set Core = UIInt.DefInstance
+ Set UIInt = Nothing
+
+ 'create a instance of the util class
+ Set Util = New cUtil
+
+ 'create a new instance of the translator
+ Set Translator = New cTranslate
+
+ GetArgs Command$()
+ If blnDebugLang = True Then Core.Debuger.DebugLang = True
+ If blnNoUpdate = True Then Core.Debuger.DisableUpdate = True
+ If blnKillUpdate = True Then Core.Debuger.KillUpdate
+ If blnDebugMode = True Then Core.Debuger.DebugMode = True
+ If blnPerfMon = True Then Core.Debuger.PerfMon.Enabled = True
+
+ If blnNoSplash <> True Then
+ Load frmSplash
+ FormFade frmSplash, False
+ End If
+ If App.PrevInstance = True Then
+ If Util.SetFocusByCaption(Translator.GetText("SWEBS Web Server - Control Center")) = False Then
+ MsgBox Translator.GetText("There is already a instance of this application running."), vbApplicationModal + vbCritical
+ End
End If
-176 App.Title = WinUI.GetTranslatedText("SWEBS Web Server - Control Center")
-180 If Dir$(WinUI.Server.HTTP.Config.File) = "" Then
-184 MsgBox WinUI.GetTranslatedText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
-188 End
- End If
-192 SetStatus WinUI.GetTranslatedText("Checking For Registration Data") & "..."
-196 If WinUI.Net.IsOnline = True Then
-200 If WinUI.Registration.IsRegistered = False Then
-204 SetStatus WinUI.GetTranslatedText("Starting Registration") & "..."
-208 WinUI.Registration.Start
- End If
+ End
+ End If
+ App.Title = Translator.GetText("SWEBS Web Server - Control Center")
+ If Dir$(Core.Server.HTTP.Config.File) = "" Then
+ MsgBox Translator.GetText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
+ End
+ End If
+ SetStatus Translator.GetText("Checking For Registration Data") & "..."
+ If Core.Net.IsOnline = True Then
+ If Core.Registration.IsRegistered = False Then
+ SetStatus Translator.GetText("Starting Registration") & "..."
+ Core.Registration.Start '<- This is not UI split
End If
-212 Load frmMain
-216 If WinUI.Debuger.DisableSplash <> True Then
-220 WinUI.Util.FormFade frmSplash, True
-224 Unload frmSplash
-228 DoEvents
- End If
-232 If blnTrayOnly <> True Then
-236 frmMain.Show
- End If
-240 If WinUI.Debuger.DisableTips <> True Then
-244 If LCase$(WinUI.Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "TODEnable")) <> "false" Then
-248 Load frmTip
-252 frmTip.Show vbModal
- End If
+ End If
+ Load frmMain
+ If blnNoSplash <> True Then
+ FormFade frmSplash, True
+ Unload frmSplash
+ DoEvents
+ End If
+ If blnTrayOnly <> True Then
+ frmMain.Show
+ End If
+ If blnNoTips <> True Then
+ If LCase$(Util.GetRegistryString(&H80000002, "SOFTWARE\SWS", "TODEnable")) <> "false" Then
+ Load frmTip
+ frmTip.Show vbModal
End If
- '<EhFooter>
- Exit Sub
-
-Main_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.Main", Erl, False
- Resume Next
- '</EhFooter>
+ End If
End Sub
Public Sub SetStatus(strStatus As String, Optional blnBusy As Boolean = False)
- '<EhHeader>
- On Error GoTo SetStatus_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.basMain.SetStatus")
- '</EhHeader>
-100 If IsLoaded("SWEBS-Splash") = True Then
-104 If frmSplash.lblStatus.Caption <> strStatus Then
-108 frmSplash.lblStatus.Caption = strStatus
-112 frmSplash.Refresh
- End If
-116 ElseIf IsLoaded(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = True Then
-120 If frmMain.lblAppStatus.Caption <> strStatus Then
-124 If blnBusy = True Then
-128 Screen.MousePointer = vbArrowHourglass '13 arrow + hourglass
- Else
-132 Screen.MousePointer = vbNormal '0 default
- End If
-136 frmMain.lblAppStatus.Caption = strStatus
-140 frmMain.Refresh
+ If IsLoaded("SWEBS-Splash") = True Then
+ If frmSplash.lblStatus.Caption <> strStatus Then
+ frmSplash.lblStatus.Caption = strStatus
+ frmSplash.Refresh
+ End If
+ ElseIf IsLoaded(Translator.GetText("SWEBS Web Server - Control Center")) = True Then
+ If frmMain.lblAppStatus.Caption <> strStatus Then
+ If blnBusy = True Then
+ Screen.MousePointer = vbArrowHourglass '13 arrow + hourglass
+ Else
+ Screen.MousePointer = vbNormal '0 default
End If
+ frmMain.lblAppStatus.Caption = strStatus
+ frmMain.Refresh
End If
-144 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.cDialog.SetStatus", "App Status Message: " & strStatus
-148 DoEvents
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-SetStatus_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.SetStatus", Erl, False
- Resume Next
- '</EhFooter>
+ End If
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.cDialog.SetStatus", "App Status Message: " & strStatus
+ DoEvents
End Sub
-'CSEH: WinUI - Custom(No Stack)
+'CSEH: Core - Custom(No Stack)
Private Sub GetArgs(strCommand As String)
- '<EhHeader>
- On Error GoTo GetArgs_Err
- '</EhHeader>
- Dim strArgs() As String
- Dim i As Long
-
-100 strArgs = Split(strCommand, " ")
-104 For i = 0 To UBound(strArgs)
-108 Select Case strArgs(i)
- Case "--nosplash"
-112 blnNoSplash = True
-116 Case "--debuglang"
-120 blnDebugLang = True
-124 Case "--tray"
-128 blnTrayOnly = True
-132 Case "--notips"
-136 blnNoTips = True
-140 Case "--noupdate"
-144 blnNoUpdate = True
-148 Case "--killupdate"
-152 blnKillUpdate = True
-156 Case "--debug"
-160 blnDebugMode = True
-164 Case "--perfmon"
-168 blnPerfMon = True
-172 Case Else
-176 MsgBox "Unknown Argument: " & strArgs(i) & vbCrLf & vbCrLf & "Valid arguments are:" & vbCrLf & "--nosplash" & vbCrLf & "--debuglang" & vbCrLf & "--tray" & vbCrLf & "--notips" & vbCrLf & "--noupdate" & vbCrLf & "--killupdate" & vbCrLf & "--debug" & vbCrLf & "--perfmon", vbApplicationModal + vbCritical
-180 End
- End Select
- Next
- '<EhFooter>
- Exit Sub
+Dim strArgs() As String
+Dim i As Long
-GetArgs_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.GetArgs", Erl, False
- Resume Next
- '</EhFooter>
+ strArgs = Split(strCommand, " ")
+ For i = 0 To UBound(strArgs)
+ Select Case strArgs(i)
+ Case "--nosplash" 'Disables the splash screen
+ blnNoSplash = True
+ Case "--debuglang" 'should set a flag to show a message box is a string is not found
+ blnDebugLang = True
+ Case "--tray" 'shows tray icon only, does not show frmMain
+ blnTrayOnly = True
+ Case "--notips" 'doesn't show the TOD window, also disables the feature for the future.
+ blnNoTips = True
+ Case "--noupdate" 'doesn't run the updated check on start up.
+ blnNoUpdate = True
+ Case "--killupdate" 'permenently disables the update feature
+ blnKillUpdate = True
+ Case "--debug" '???
+ blnDebugMode = True
+ Case "--perfmon" 'enables a speed log for all functions
+ blnPerfMon = True
+ Case Else
+ MsgBox "Unknown Argument: " & strArgs(i) & vbCrLf & vbCrLf & "Valid arguments are:" & vbCrLf & "--nosplash" & vbCrLf & "--debuglang" & vbCrLf & "--tray" & vbCrLf & "--notips" & vbCrLf & "--noupdate" & vbCrLf & "--killupdate" & vbCrLf & "--debug" & vbCrLf & "--perfmon", vbApplicationModal + vbCritical
+ End
+ End Select
+ Next
End Sub
Public Function IsLoaded(strCaption As String) As Boolean
- '<EhHeader>
- On Error GoTo IsLoaded_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.basMain.IsLoaded")
- '</EhHeader>
- Dim i As Long
-
-100 For i = 0 To Forms.Count - 1
-104 If Forms(i).Caption = strCaption Then
-108 IsLoaded = True
- End If
- Next
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Function
+Dim i As Long
-IsLoaded_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.basMain.IsLoaded", Erl, False
- Resume Next
- '</EhFooter>
+ For i = 0 To Forms.Count - 1
+ If Forms(i).Caption = strCaption Then
+ IsLoaded = True
+ End If
+ Next
End Function
'CSEH: ErrResumeNext
Public Sub DisplayErrMsg(strMessage As String, strLocation As String, Optional strLine As String = "(Unknown)", Optional blnFatal As Boolean = False)
- '<EhHeader>
- On Error Resume Next
- '</EhHeader>
Dim strErrMsg As String
Dim strErrReport As String
Dim lngRetVal As Long
If strMessage = "" Then
- strMessage = WinUI.GetTranslatedText("There was an unknown error.")
+ strMessage = Translator.GetText("There was an unknown error.")
End If
- If WinUI Is Nothing Then
+ If Core Is Nothing Then
strErrMsg = "This application has encountered a error:" & vbCrLf & vbCrLf & "Error: '" & strMessage & "'" & vbCrLf & "Location: " & strLocation & " at line: " & strLine & vbCrLf & vbCrLf & "Contact AD...@IM... to report this error." & IIf(blnFatal = True, vbCrLf & vbCrLf & "This error is fatal, this program will now close.", "")
MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, "SWEBS System Error"
Else
- If WinUI.Debuger.DebugMode = True Then
- strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- strErrMsg = WinUI.GetTranslatedText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & WinUI.GetTranslatedText("Location:") & " " & strLocation & " " & WinUI.GetTranslatedText("at line:") & " " & strLine & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & WinUI.GetTranslatedText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport
- MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, WinUI.GetTranslatedText("SWEBS System Error")
+ If Core.Debuger.DebugMode = True Then
+ strErrReport = Core.Debuger.ErrorReport(strMessage, strLine, strLocation)
+ strErrMsg = Translator.GetText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & Translator.GetText("Location:") & " " & strLocation & " " & Translator.GetText("at line:") & " " & strLine & vbCrLf & vbCrLf & Translator.GetText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & Translator.GetText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & Translator.GetText("An error log has been written to:") & vbCrLf & strErrReport
+ MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, Translator.GetText("SWEBS System Error")
Else
- strErrMsg = WinUI.GetTranslatedText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & WinUI.GetTranslatedText("Location:") & " " & strLocation & " " & WinUI.GetTranslatedText("at line:") & " " & strLine & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & WinUI.GetTranslatedText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & WinUI.GetTranslatedText("Would you like to create an error log?")
- lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, WinUI.GetTranslatedText("SWEBS System Error"))
+ strErrMsg = Translator.GetText("This application has encountered a error:\n\nError:") & " '" & strMessage & "'" & vbCrLf & Translator.GetText("Location:") & " " & strLocation & " " & Translator.GetText("at line:") & " " & strLine & vbCrLf & vbCrLf & Translator.GetText("Contact AD...@IM... to report this error.") & IIf(blnFatal = True, vbCrLf & vbCrLf & Translator.GetText("This error is fatal, this program will now close."), "") & vbCrLf & vbCrLf & Translator.GetText("Would you like to create an error log?")
+ lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, Translator.GetText("SWEBS System Error"))
If lngRetVal = vbYes Then
- strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- MsgBox WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport, vbInformation + vbApplicationModal
+ strErrReport = Core.Debuger.ErrorReport(strMessage, strLine, strLocation)
+ MsgBox Translator.GetText("An error log has been written to:") & vbCrLf & strErrReport, vbInformation + vbApplicationModal
End If
End If
End If
@@ -228,3 +203,31 @@
End
End If
End Sub
+
+Public Function FormFade(ByRef frmForm As Form, blnHide As Boolean) As Long
+Dim MSG As Long
+Dim i As Long
+
+ If blnHide = True Then
+ For i = 255 To 0 Step -5
+ 'Set window style to layered
+ MSG = GetWindowLong(frmForm.hwnd, GWL_EXSTYLE)
+ MSG = MSG Or WS_EX_LAYERED
+ SetWindowLong frmForm.hwnd, GWL_EXSTYLE, MSG
+ 'Set the opacity of the layer according the the parameters
+ SetLayeredWindowAttributes frmForm.hwnd, 0, i, LWA_ALPHA
+ frmForm.Refresh
+ Next
+ Else
+ frmForm.Show
+ For i = 0 To 255 Step 5
+ 'Set window style to layered
+ MSG = GetWindowLong(frmForm.hwnd, GWL_EXSTYLE)
+ MSG = MSG Or WS_EX_LAYERED
+ SetWindowLong frmForm.hwnd, GWL_EXSTYLE, MSG
+ 'Set the opacity of the layer according the the parameters
+ SetLayeredWindowAttributes frmForm.hwnd, 0, i, LWA_ALPHA
+ frmForm.Refresh
+ Next
+ End If
+End Function
Index: cSysTray.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cSysTray.cls,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cSysTray.cls 8 Nov 2003 09:01:40 -0000 1.5
+++ cSysTray.cls 17 Nov 2003 11:43:07 -0000 1.6
@@ -13,10 +13,10 @@
Attribute VB_Exposed = False
Attribute VB_Ext_KEY = "SavedWithClassBuilder6" ,"Yes"
Attribute VB_Ext_KEY = "Top_Level" ,"Yes"
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) Martin Richardson.
' Portions Copyright (c) 2003 Adam Caudill.
@@ -72,210 +72,78 @@
Private mvarSourceWindow As Form 'local copy
Public Property Let ToolTip(ByVal vData As String)
- '<EhHeader>
- On Error GoTo ToolTip_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.ToolTip")
- '</EhHeader>
-100 ChangeToolTip vData
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-ToolTip_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.ToolTip", Erl, False
- Resume Next
- '</EhFooter>
+ ChangeToolTip vData
End Property
Public Property Let Icon(ByVal vData As Variant)
- '<EhHeader>
- On Error GoTo Icon_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.Icon")
- '</EhHeader>
-100 ChangeIcon vData
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-Icon_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.Icon", Erl, False
- Resume Next
- '</EhFooter>
+ ChangeIcon vData
End Property
Public Property Get Icon() As Variant
- '<EhHeader>
- On Error GoTo Icon_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.Icon")
- '</EhHeader>
-100 Icon = t.hIcon 'pichook.Picture
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-Icon_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.Icon", Erl, False
- Resume Next
- '</EhFooter>
+ Icon = t.hIcon 'pichook.Picture
End Property
Public Property Set SourceWindow(ByVal vData As Form)
- '<EhHeader>
- On Error GoTo SourceWindow_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.SourceWindow")
- '</EhHeader>
-100 Set mvarSourceWindow = vData
-104 SetPicHook
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Property
-
-SourceWindow_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.SourceWindow", Erl, False
- Resume Next
- '</EhFooter>
+ Set mvarSourceWindow = vData
+ SetPicHook
End Property
Private Sub Class_Initialize()
- '<EhHeader>
- On Error GoTo Class_Initialize_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.Class_Initialize")
- '</EhHeader>
-100 t.cbSize = Len(t)
-104 t.uID = 1&
-108 t.uFlags = NIF_ICON Or NIF_TIP Or NIF_MESSAGE
-112 t.uCallbackMessage = WM_MOUSEMOVE
-116 t.hIcon = Me.Icon
-120 t.szTip = Chr$(0)
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Class_Initialize_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.Class_Initialize", Erl, False
- Resume Next
- '</EhFooter>
+ t.cbSize = Len(t)
+ t.uID = 1&
+ t.uFlags = NIF_ICON Or NIF_TIP Or NIF_MESSAGE
+ t.uCallbackMessage = WM_MOUSEMOVE
+ t.hIcon = Me.Icon
+ t.szTip = Chr$(0)
End Sub
Private Sub pichook_MouseMove(Button As Integer, Shift As Integer, X As Single, Y As Single)
- '<EhHeader>
- On Error GoTo pichook_MouseMove_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.pichook_MouseMove")
- '</EhHeader>
- Static Rec As Boolean, MSG As Long, oldmsg As Long
+Static Rec As Boolean, MSG As Long, oldmsg As Long
-100 oldmsg = MSG
-104 MSG = X / Screen.TwipsPerPixelX
+ oldmsg = MSG
+ MSG = X / Screen.TwipsPerPixelX
-108 If Rec = False Then
-112 Rec = True
-116 Select Case MSG
- Case WM_LBUTTONDBLCLK:
-120 RaiseEvent LButtonDblClk
- Case WM_RBUTTONUP:
-124 RaiseEvent RButtonUp
- End Select
-128 Rec = False
- End If
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-pichook_MouseMove_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.pichook_MouseMove", Erl, False
- Resume Next
- '</EhFooter>
+ If Rec = False Then
+ Rec = True
+ Select Case MSG
+ Case WM_LBUTTONDBLCLK:
+ RaiseEvent LButtonDblClk
+ Case WM_RBUTTONUP:
+ RaiseEvent RButtonUp
+ End Select
+ Rec = False
+ End If
End Sub
Public Sub RemoveFromSysTray()
- '<EhHeader>
- On Error GoTo RemoveFromSysTray_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.RemoveFromSysTray")
- '</EhHeader>
-100 t.cbSize = Len(t)
-104 t.hwnd = pichook.hwnd
-108 t.uID = 1&
-112 Shell_NotifyIcon NIM_DELETE, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-RemoveFromSysTray_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.RemoveFromSysTray", Erl, False
- Resume Next
- '</EhFooter>
+ t.cbSize = Len(t)
+ t.hwnd = pichook.hwnd
+ t.uID = 1&
+ Shell_NotifyIcon NIM_DELETE, t
End Sub
Public Sub IconInSysTray()
- '<EhHeader>
- On Error GoTo IconInSysTray_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.IconInSysTray")
- '</EhHeader>
-100 Shell_NotifyIcon NIM_ADD, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-IconInSysTray_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.IconInSysTray", Erl, False
- Resume Next
- '</EhFooter>
+ Shell_NotifyIcon NIM_ADD, t
End Sub
Private Sub SetPicHook()
- '<EhHeader>
- On Error GoTo SetPicHook_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.SetPicHook")
- '</EhHeader>
-100 Set pichook = mvarSourceWindow.Controls.Add("VB.PictureBox", "pichook")
-
-104 pichook.Visible = False
-108 pichook.Picture = mvarSourceWindow.Icon
-112 t.hwnd = pichook.hwnd
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
+ Set pichook = mvarSourceWindow.Controls.Add("VB.PictureBox", "pichook")
-SetPicHook_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.SetPicHook", Erl, False
- Resume Next
- '</EhFooter>
+ pichook.Visible = False
+ pichook.Picture = mvarSourceWindow.Icon
+ t.hwnd = pichook.hwnd
End Sub
Public Sub ChangeIcon(toNewIcon)
- '<EhHeader>
- On Error GoTo ChangeIcon_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.ChangeIcon")
- '</EhHeader>
-100 Set pichook.Picture = toNewIcon
-104 t.hIcon = pichook.Picture
-108 Shell_NotifyIcon NIM_MODIFY, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-ChangeIcon_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.ChangeIcon", Erl, False
- Resume Next
- '</EhFooter>
+ Set pichook.Picture = toNewIcon
+ t.hIcon = pichook.Picture
+ Shell_NotifyIcon NIM_MODIFY, t
End Sub
Public Sub ChangeToolTip(ByVal cNewTip As String)
- '<EhHeader>
- On Error GoTo ChangeToolTip_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cSysTray.ChangeToolTip")
- '</EhHeader>
-100 mvarToolTip = cNewTip
-104 t.szTip = cNewTip & Chr$(0)
-108 Shell_NotifyIcon NIM_MODIFY, t
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-ChangeToolTip_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.cSysTray.ChangeToolTip", Erl, False
- Resume Next
- '</EhFooter>
+ mvarToolTip = cNewTip
+ t.szTip = cNewTip & Chr$(0)
+ Shell_NotifyIcon NIM_MODIFY, t
End Sub
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
Binary files /tmp/cvsUQvtDu and /tmp/cvs6dsA2O differ
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- frmAbout.frm 15 Nov 2003 14:15:06 -0000 1.36
+++ frmAbout.frm 17 Nov 2003 11:43:07 -0000 1.37
@@ -1,12 +1,14 @@
VERSION 5.00
Object = "{3B7C8863-D78F-101B-B9B5-04021C009402}#1.2#0"; "RICHTX32.OCX"
Begin VB.Form frmAbout
+ BackColor = &H00FFFFFF&
BorderStyle = 3 'Fixed Dialog
Caption = "About SWEBS Web Server"
ClientHeight = 5985
ClientLeft = 45
ClientTop = 435
ClientWidth = 5280
+ ForeColor = &H00000000&
Icon = "frmAbout.frx":0000
LinkTopic = "Form1"
MaxButton = 0 'False
@@ -18,7 +20,7 @@
Begin RichTextLib.RichTextBox rtfCredits
Height = 3735
Left = 120
- TabIndex = 5
+ TabIndex = 4
Top = 1680
Width = 5055
_ExtentX = 8916
@@ -30,16 +32,32 @@
FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
TextRTF = $"frmAbout.frx":0CCA
End
- Begin VB.CommandButton cmdClose
+ Begin VB.Label lblClose
+ Alignment = 2 'Center
+ AutoSize = -1 'True
+ BackStyle = 0 'Transparent
Caption = "&Close"
- Height = 375
- Left = 4080
- TabIndex = 3
- Top = 5520
- Width = 1095
+ BeginProperty Font
+ Name = "Arial"
+ Size = 9
+ Charset = 0
+ Weight = 700
+ Underline = -1 'True
+ Italic = 0 'False
+ Strikethrough = 0 'False
+ EndProperty
+ ForeColor = &H00FF0000&
+ Height = 225
+ Left = 4455
+ MouseIcon = "frmAbout.frx":16CD
+ MousePointer = 99 'Custom
+ TabIndex = 5
+ Top = 5640
+ Width = 495
End
Begin VB.Label lblHomePage
AutoSize = -1 'True
+ BackColor = &H00FFFFFF&
Caption = "swebs.sourceforge.net"
BeginProperty Font
Name = "MS Sans Serif"
@@ -53,9 +71,9 @@
ForeColor = &H00FF0000&
Height = 195
Left = 120
- MouseIcon = "frmAbout.frx":1632
+ MouseIcon = "frmAbout.frx":181F
MousePointer = 99 'Custom
- TabIndex = 4
+ TabIndex = 3
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
Top = 5640
Width = 1605
@@ -63,12 +81,13 @@
Begin VB.Image imgLogo
Height = 480
Left = 600
- Picture = "frmAbout.frx":193C
+ Picture = "frmAbout.frx":1971
Top = 120
Width = 480
End
Begin VB.Label lblUIBuild
Alignment = 2 'Center
+ BackColor = &H00FFFFFF&
Caption = "Control Center Build: XXXX"
BeginProperty Font
Name = "Tahoma"
@@ -87,6 +106,7 @@
End
Begin VB.Label lblSrvVersion
Alignment = 2 'Center
+ BackColor = &H00FFFFFF&
Caption = "Server Version: X.XX.XX"
BeginProperty Font
Name = "Tahoma"
@@ -113,6 +133,7 @@
Begin VB.Label lblTitle
Alignment = 2 'Center
AutoSize = -1 'True
+ BackColor = &H00FFFFFF&
Caption = "SWEBS Web Server"
BeginProperty Font
Name = "Tahoma"
@@ -135,10 +156,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -159,53 +180,17 @@
Option Explicit
-Private Sub cmdClose_Click()
- '<EhHeader>
- On Error GoTo cmdClose_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmAbout.cmdClose_Click")
- '</EhHeader>
-100 Unload Me
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-cmdClose_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmAbout.cmdClose_Click", Erl, False
- Resume Next
- '</EhFooter>
+Private Sub lblClose_Click()
+ Unload Me
End Sub
Private Sub Form_Load()
- '<EhHeader>
- On Error GoTo Form_Load_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmAbout.Form_Load")
- '</EhHeader>
-100 cmdClose.Caption = WinUI.GetTranslatedText("&Close")
-104 lblSrvVersion.Caption = WinUI.GetTranslatedText("Server Version") & ": " & WinUI.Version
-108 lblUIBuild.Caption = WinUI.GetTranslatedText("Control Center Build") & ": " & App.Revision
-112 rtfCredits.TextRTF = Replace(rtfCredits.TextRTF, "Lang-Maintainer", WinUI.GetTranslatedText("Lang-Maintainer"))
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Load_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmAbout.Form_Load", Erl, False
- Resume Next
- '</EhFooter>
+ lblClose.Caption = Translator.GetText("&Close")
+ lblSrvVersion.Caption = Translator.GetText("Server Version") & ": " & Core.Version
+ lblUIBuild.Caption = Translator.GetText("Control Center Build") & ": " & App.Revision
+ rtfCredits.TextRTF = Replace(rtfCredits.TextRTF, "Lang-Maintainer", Translator.GetText("Lang-Maintainer"))
End Sub
Private Sub lblHomePage_Click()
- '<EhHeader>
- On Error GoTo lblHomePage_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmAbout.lblHomePage_Click")
- '</EhHeader>
-100 WinUI.Net.LaunchURL "http://swebs.sourceforge.net/html/index.php"
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-lblHomePage_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmAbout.lblHomePage_Click", Erl, False
- Resume Next
- '</EhFooter>
+ Core.Net.LaunchURL "http://swebs.sourceforge.net/html/index.php"
End Sub
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
Binary files /tmp/cvsqAwkCw and /tmp/cvsGkRIYS differ
Index: frmEventView.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmEventView.frm,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- frmEventView.frm 25 Oct 2003 00:38:57 -0000 1.10
+++ frmEventView.frm 17 Nov 2003 11:43:08 -0000 1.11
@@ -45,10 +45,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -70,62 +70,32 @@
Option Explicit
Private Sub Form_Load()
- '<EhHeader>
- On Error GoTo Form_Load_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmEventView.Form_Load")
- '</EhHeader>
-100 WinUI.EventLog.Enabled = True
-104 WinUI.EventLog.AddEvent "SWEBS_WinUI_Main.frmEventView.Form_Load", "Event Viewer Loaded"
-108 Form_Resize
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Load_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmEventView.Form_Load", Erl, False
- Resume Next
- '</EhFooter>
+ Core.EventLog.Enabled = True
+ Core.EventLog.AddEvent "SWEBS_Core_Main.frmEventView.Form_Load", "Event Viewer Loaded"
+ Form_Resize
End Sub
Private Sub Form_Resize()
- '<EhHeader>
- On Error Resume Next
- '</EhHeader>
txtEvents.Move 0, 0, (Me.ScaleWidth), (Me.ScaleHeight) - 1500
txtCallStack.Move 0, (Me.ScaleHeight - 1400), Me.ScaleWidth, 1400
End Sub
Private Sub Form_Unload(Cancel As Integer)
- '<EhHeader>
- On Error GoTo Form_Unload_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmEventView.Form_Unload")
- '</EhHeader>
-100 WinUI.EventLog.Enabled = False
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Unload_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmEventView.Form_Unload", Erl, False
- Resume Next
- '</EhFooter>
+ Core.EventLog.Enabled = False
End Sub
Private Sub tmrEvents_Timer()
- '<EhHeader>
- On Error Resume Next
- '</EhHeader>
Dim strCallStack As String
Dim i As Long
- If WinUI.EventLog.Changed = True Then
- txtEvents.Text = WinUI.EventLog.Log
+ If Core.EventLog.Changed = True Then
+ txtEvents.Text = Core.EventLog.Log
txtEvents.SelStart = Len(txtEvents.Text)
End If
strCallStack = "Current Call Stack:" & vbCrLf
- If WinUI.Debuger.CallStack.Count >= 1 Then
- For i = 1 To WinUI.Debuger.CallStack.Count
- strCallStack = strCallStack & Chr(9) & WinUI.Debuger.CallStack.Peek(i) & vbCrLf
+ If Core.Debuger.CallStack.Count >= 1 Then
+ For i = 1 To Core.Debuger.CallStack.Count
+ strCallStack = strCallStack & Chr(9) & Core.Debuger.CallStack.Peek(i) & vbCrLf
Next
Else
strCallStack = strCallStack & Chr(9) & "(None)"
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- frmMain.frm 15 Nov 2003 14:15:06 -0000 1.78
+++ frmMain.frm 17 Nov 2003 11:43:08 -0000 1.79
@@ -539,7 +539,6 @@
_ExtentY = 8916
_Version = 393217
BorderStyle = 0
- Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
@@ -1594,7 +1593,7 @@
Height = 255
Left = 2760
TabIndex = 0
[...2331 lines suppressed...]
-104 lblStatsLastRestart.Caption = WinUI.GetTranslatedText("Last Restart") & ": " & WinUI.Server.HTTP.Stats.LastRestart
-108 lblStatsRequestCount.Caption = WinUI.GetTranslatedText("Request Count") & ": " & WinUI.Server.HTTP.Stats.RequestCount
-112 lblStatsBytesSent.Caption = WinUI.GetTranslatedText("Total Bytes Sent") & ": " & Format$(WinUI.Server.HTTP.Stats.TotalBytesSent, "###,###,###,###,##0")
-116 lblCurVersion.Caption = WinUI.GetTranslatedText("Current Version") & ": " & WinUI.Version
-120 lblUpdateVersion.Caption = WinUI.GetTranslatedText("Update Version") & ": " & IIf(WinUI.Update.Version <> "", WinUI.Update.Version, WinUI.Version)
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-UpdateStats_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.UpdateStats", Erl, False
- Resume Next
- '</EhFooter>
+ Core.Server.HTTP.Stats.Reload
+ lblStatsLastRestart.Caption = Translator.GetText("Last Restart") & ": " & Core.Server.HTTP.Stats.LastRestart
+ lblStatsRequestCount.Caption = Translator.GetText("Request Count") & ": " & Core.Server.HTTP.Stats.RequestCount
+ lblStatsBytesSent.Caption = Translator.GetText("Total Bytes Sent") & ": " & Format$(Core.Server.HTTP.Stats.TotalBytesSent, "###,###,###,###,##0")
+ lblCurVersion.Caption = Translator.GetText("Current Version") & ": " & Core.Version
+ lblUpdateVersion.Caption = Translator.GetText("Update Version") & ": " & IIf(Core.Update.Version <> "", Core.Update.Version, Core.Version)
End Sub
Index: frmNewISAPI.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmNewISAPI.frm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- frmNewISAPI.frm 15 Nov 2003 14:15:30 -0000 1.1
+++ frmNewISAPI.frm 17 Nov 2003 11:43:08 -0000 1.2
@@ -173,10 +173,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -198,17 +198,17 @@
Option Explicit
Private Sub Form_Load()
- lblNewISAPITitle.Caption = WinUI.GetTranslatedText("Add a new CGI interpreter:")
- lblNewISAPIInterp.Caption = WinUI.GetTranslatedText("Where is the executable that will interpret this script type?")
- lblNewISAPIIExt.Caption = WinUI.GetTranslatedText("What is the file extension for this file type?")
- lblBrowse.Caption = WinUI.GetTranslatedText("&Browse")
- lblOK.Caption = WinUI.GetTranslatedText("&OK")
- lblCancel.Caption = WinUI.GetTranslatedText("&Cancel")
+ lblNewISAPITitle.Caption = Translator.GetText("Add a new CGI interpreter:")
+ lblNewISAPIInterp.Caption = Translator.GetText("Where is the executable that will interpret this script type?")
+ lblNewISAPIIExt.Caption = Translator.GetText("What is the file extension for this file type?")
+ lblBrowse.Caption = Translator.GetText("&Browse")
+ lblOK.Caption = Translator.GetText("&OK")
+ lblCancel.Caption = Translator.GetText("&Cancel")
End Sub
Private Sub lblBrowse_Click()
- dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
- dlgMain.Filter = WinUI.GetTranslatedText("ISAPI Plgin Files (*.dll)|*.dll|All Files (*.*)|*.*")
+ dlgMain.DialogTitle = Translator.GetText("Please select a file...")
+ dlgMain.Filter = Translator.GetText("ISAPI Plgin Files (*.dll)|*.dll|All Files (*.*)|*.*")
dlgMain.ShowSave
If dlgMain.FileName <> "" Then
txtNewISAPIInterp.Text = dlgMain.FileName
@@ -221,9 +221,9 @@
Private Sub lblOK_Click()
If txtNewISAPIInterp.Text <> "" And txtNewISAPIExt.Text <> "" Then
- WinUI.Server.HTTP.Config.ISAPI.Add txtNewISAPIInterp.Text, txtNewISAPIExt.Text, txtNewISAPIExt.Text
+ Core.Server.HTTP.Config.ISAPI.Add txtNewISAPIInterp.Text, txtNewISAPIExt.Text, txtNewISAPIExt.Text
Unload Me
Else
- MsgBox WinUI.GetTranslatedText("Please fill all fields.")
+ MsgBox Translator.GetText("Please fill all fields.")
End If
End Sub
Index: frmRegistration.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmRegistration.frm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- frmRegistration.frm 18 Oct 2003 15:35:28 -0000 1.16
+++ frmRegistration.frm 17 Nov 2003 11:43:08 -0000 1.17
@@ -131,10 +131,10 @@
Attribute VB_Creatable = False
Attribute VB_PredeclaredId = True
Attribute VB_Exposed = False
-'CSEH: WinUI - Custom
+'CSEH: Core - Custom
'***************************************************************************
'
-' SWEBS/WinUI
+' SWEBS/Core
'
' Copyright (c) 2003 Adam Caudill.
'
@@ -156,73 +156,49 @@
Option Explicit
Private Sub cmdSubmit_Click()
- '<EhHeader>
- On Error GoTo cmdSubmit_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmRegistration.cmdSubmit_Click")
- '</EhHeader>
- Dim strResult As String
- Dim strQuery As String
+Dim strResult As String
+Dim strQuery As String
-100 If txtEmail.Text = "" Then
-104 MsgBox WinUI.GetTranslatedText("You must provide a e-mail address."), vbInformation + vbApplicationModal + vbOKOnly
-108 txtEmail.SetFocus
-112 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "User did not enter email address."
- Exit Sub
- End If
+ If txtEmail.Text = "" Then
+ MsgBox Translator.GetText("You must provide a e-mail address."), vbInformation + vbApplicationModal + vbOKOnly
+ txtEmail.SetFocus
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "User did not enter email address."
+ Exit Sub
+ End If
-116 Me.MousePointer = vbHourglass
-120 cmdSubmit.Enabled = False
-124 txtEmail.Enabled = False
-128 cmbComputers.Enabled = False
-132 cmbWhere.Enabled = False
-136 txtFindUs.Enabled = False
-140 cmbExpiriance.Enabled = False
-144 cmbUse.Enabled = False
+ Me.MousePointer = vbHourglass
+ cmdSubmit.Enabled = False
+ txtEmail.Enabled = False
+ cmbComputers.Enabled = False
+ cmbWhere.Enabled = False
+ txtFindUs.Enabled = False
+ cmbExpiriance.Enabled = False
+ cmbUse.Enabled = False
-148 strQuery = "?email=" & WinUI.Util.UrlEncode(txtEmail.Text) & "&ccount=" & WinUI.Util.UrlEncode(cmbComputers.Text) & "&where=" & WinUI.Util.UrlEncode(cmbWhere.Text) & "&find=" & WinUI.Util.UrlEncode(txtFindUs.Text) & "&exp=" & WinUI.Util.UrlEncode(cmbExpiriance.Text) & "&use=" & WinUI.Util.UrlEncode(cmbUse.Text) & "&ver=" & WinUI.Util.UrlEncode(WinUI.Version)
-152 strResult = WinUI.Net.PageSource("http://swebs.sf.net/register/reginit.php" & strQuery)
+ strQuery = "?email=" & Util.UrlEncode(txtEmail.Text) & "&ccount=" & Util.UrlEncode(cmbComputers.Text) & "&where=" & Util.UrlEncode(cmbWhere.Text) & "&find=" & Util.UrlEncode(txtFindUs.Text) & "&exp=" & Util.UrlEncode(cmbExpiriance.Text) & "&use=" & Util.UrlEncode(cmbUse.Text) & "&ver=" & Util.UrlEncode(Core.Version)
+ strResult = Core.Net.PageSource("http://swebs.sf.net/register/reginit.php" & strQuery)
-156 Me.Hide
-160 Select Case strResult
- Case "Completed"
-164 Call WinUI.Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
-168 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "Registration completed."
-172 Case "Duplicate"
-176 MsgBox WinUI.GetTranslatedText("You have already registered, you only need to register once."), vbApplicationModal + vbInformation + vbOKOnly
-180 Call WinUI.Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
-184 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "Registration duplicate."
-188 Case Else
-192 MsgBox WinUI.GetTranslatedText("There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r") & strResult
-196 WinUI.EventLog.AddEvent "SWEBS_WinUI_DLL.frmRegistration.cmdSubmit_Click", "Registration failed."
- End Select
-200 Unload Me
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-cmdSubmit_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmRegistration.cmdSubmit_Click", Erl, False
- Resume Next
- '</EhFooter>
+ Me.Hide
+ Select Case strResult
+ Case "Completed"
+ Call Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration completed."
+ Case "Duplicate"
+ MsgBox Translator.GetText("You have already registered, you only need to register once."), vbApplicationModal + vbInformation + vbOKOnly
+ Call Util.SaveRegistryString(&H80000002, "SOFTWARE\SWS", "RegID", txtEmail.Text)
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration duplicate."
+ Case Else
+ MsgBox Translator.GetText("There was a unknown error. Registration Failed./r/rThe Registration server returned the following information:\r") & strResult
+ Core.EventLog.AddEvent "SWEBS_Core_DLL.frmRegistration.cmdSubmit_Click", "Registration failed."
+ End Select
+ Unload Me
End Sub
Private Sub Form_Load()
- '<EhHeader>
- On Error GoTo Form_Load_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmRegistration.Form_Load")
- '</EhHeader>
-100 lblEMail.Caption = WinUI.GetTranslatedText("What is your e-mail address? (We will not contact you, this is simply used to track installations).")
-104 lblComputers.Caption = WinUI.GetTranslatedText("How Many Computers Do You Own?")
-108 lblWhere.Caption = WinUI.GetTranslatedText("Where are you using this?")
-112 lblFindUs.Caption = WinUI.GetTranslatedText("How did you find out about us?")
-116 lblExpiriance.Caption = WinUI.GetTranslatedText("How much computer experience do you have?")
-120 lblUse.Caption = WinUI.GetTranslatedText("What will you use this software for?")
- '<EhFooter>
- WinUI.Debuger.CallStack.Pop
- Exit Sub
-
-Form_Load_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmRegistration.Form_Load", Erl, False
- Resume Next
- '</EhFooter>
+ lblEMail.Caption = Translator.GetText("What is your e-mail address? (We will not contact you, this is simply used to track installations).")
+ lblComputers.Caption = Translator.GetText("How Many Computers Do You Own?")
+ lblWhere.Caption = Translator.GetText("Where are you using this?")
+ lblFindUs.Caption = Translator.GetText("How did you find out about us?")
+ lblExpiriance.Caption = Translator.GetText("How much computer experience do you have?")
+ lblUse.Caption = Translator.GetText("What will you use this software for?")
End Sub
Index: frmSplash.frm
=================================...
[truncated message content] |
