Menu
▾
▴
[swebs-commits] swebswebserver/winui MenuAbout.gif,NONE,1.1 MenuExit.gif,NONE,1.1 MenuExport.gif,NONE,1.1 MenuForum.gif,NONE,1.1 MenuRegister.gif,NONE,1.1 MenuSave.gif,NONE,1.1 MenuUpdate.gif,NONE,1.1 MenuWebsite.gif,NONE,1.1 WinUI.lvw,1.20,1.21 WinUI.vbp,1.64,1.65 WinUI.vbw,1.22,1.23 basMain.bas,1.55,1.56 cDebug.cls,1.4,1.5 cHTTP.cls,1.4,1.5 cSysTray.cls,1.4,1.5 cUtil.cls,1.6,1.7 credits.rtf,1.19,1.20 frmMain.frm,1.75,1.76 frmMain.frx,1.20,1.21 lang.xml,1.10,1.11 swebscc.exe,1.61,1.62
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv22776/swebswebserver/winui
Modified Files:
WinUI.lvw WinUI.vbp WinUI.vbw basMain.bas cDebug.cls cHTTP.cls
cSysTray.cls cUtil.cls credits.rtf frmMain.frm frmMain.frx
lang.xml swebscc.exe
Added Files:
MenuAbout.gif MenuExit.gif MenuExport.gif MenuForum.gif
MenuRegister.gif MenuSave.gif MenuUpdate.gif MenuWebsite.gif
Log Message:
New icons & other cool stuff...
--- NEW FILE: MenuAbout.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuExit.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuExport.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuForum.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuRegister.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuSave.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuUpdate.gif ---
(This appears to be a binary file; contents omitted.)
--- NEW FILE: MenuWebsite.gif ---
(This appears to be a binary file; contents omitted.)
Index: WinUI.lvw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.lvw,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvsPzUNVE and /tmp/cvsYyLlt9 differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- WinUI.vbp 5 Nov 2003 21:39:21 -0000 1.64
+++ WinUI.vbp 8 Nov 2003 09:01:39 -0000 1.65
@@ -52,7 +52,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=176
+RevisionVer=183
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: WinUI.vbw
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbw,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- WinUI.vbw 25 Oct 2003 00:38:57 -0000 1.22
+++ WinUI.vbw 8 Nov 2003 09:01:39 -0000 1.23
@@ -1,23 +1,23 @@
basMain = 89, 133, 1146, 784, C
-frmMain = 109, 271, 1164, 924, , 24, 19, 746, 443, C
+frmMain = 109, 271, 1164, 924, C, 24, 19, 746, 443, C
frmTip = 213, 202, 1226, 926, C, 198, 261, 650, 670, C
frmEventView = 66, 81, 1079, 805, C, 22, 29, 550, 446, C
frmAbout = 66, 87, 1068, 811, C, 88, 116, 506, 650, C
frmRegistration = 176, 232, 1178, 956, C, 198, 261, 1200, 985, C
frmSplash = 0, 0, 0, 0, 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
+cWinUI = 84, 172, 1086, 896,
+cUtil = 44, 58, 1046, 782,
+cUpdate = 44, 58, 1046, 782,
+cRegistration = 154, 203, 1156, 927,
cNet = 22, 29, 1024, 753, C
cEventLog = 132, 174, 1134, 898, C
cDebug = 122, 268, 1124, 992, C
-cServer = 0, 0, 1002, 724, C
-cHTTP = 109, 185, 1111, 909,
+cServer = 0, 0, 1002, 724,
+cHTTP = 109, 185, 1111, 909, C
cHTTPStats = 88, 116, 1090, 840, C
cHTTPConfig = 44, 58, 1046, 782, C
-cHTTPCGI = 242, 319, 1244, 1043, C
+cHTTPCGI = 241, 157, 1243, 881, C
cHTTPCGICol = 176, 232, 1178, 956, C
cHTTPIndex = 44, 58, 1046, 782, C
cHTTPIndexCol = 154, 203, 1156, 927, C
Index: basMain.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basMain.bas,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- basMain.bas 18 Oct 2003 15:35:27 -0000 1.55
+++ basMain.bas 8 Nov 2003 09:01:39 -0000 1.56
@@ -60,20 +60,20 @@
End If
152 If App.PrevInstance = True Then
156 If WinUI.Util.SetFocusByCaption(WinUI.GetTranslatedText("SWEBS Web Server - Control Center")) = False Then
-160 MsgBox "There is already a instance of this application running.", vbApplicationModal + vbCritical
+160 MsgBox WinUI.GetTranslatedText("There is already a instance of this application running."), vbApplicationModal + vbCritical
164 End
End If
168 End
End If
172 App.Title = WinUI.GetTranslatedText("SWEBS Web Server - Control Center")
176 If Dir$(WinUI.Server.HTTP.Config.File) = "" Then
-180 MsgBox "Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.", vbApplicationModal + vbCritical
+180 MsgBox WinUI.GetTranslatedText("Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file."), vbApplicationModal + vbCritical
184 End
End If
-188 SetStatus "Checking For Registration Data..."
+188 SetStatus WinUI.GetTranslatedText("Checking For Registration Data") & "..."
192 If WinUI.Net.IsOnline = True Then
196 If WinUI.Registration.IsRegistered = False Then
-200 SetStatus "Starting Registration..."
+200 SetStatus WinUI.GetTranslatedText("Starting Registration") & "..."
204 WinUI.Registration.Start
End If
End If
@@ -111,7 +111,7 @@
108 frmSplash.lblStatus.Caption = strStatus
112 frmSplash.Refresh
End If
-116 ElseIf IsLoaded("SWEBS Web Server - Control Center") = True Then
+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
@@ -205,22 +205,22 @@
Dim lngRetVal As Long
If strMessage = "" Then
- strMessage = "There was an unknown error."
+ strMessage = WinUI.GetTranslatedText("There was an unknown error.")
End If
If WinUI 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.", "")
+ 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 = "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.", "") & vbCrLf & vbCrLf & "An error log has been written to:" & vbCrLf & strErrReport
- MsgBox strErrMsg, vbApplicationModal + vbCritical + vbOKOnly, "SWEBS System Error"
+ 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")
Else
- 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.", "") & vbCrLf & vbCrLf & "Would you like to create an error log?"
- lngRetVal = MsgBox(strErrMsg, vbApplicationModal + vbCritical + vbYesNo, "SWEBS System Error")
+ 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"))
If lngRetVal = vbYes Then
strErrReport = WinUI.Debuger.ErrorReport(strMessage, strLine, strLocation)
- MsgBox "An error log has been written to:" & vbCrLf & strErrReport, vbInformation + vbApplicationModal
+ MsgBox WinUI.GetTranslatedText("An error log has been written to:") & vbCrLf & strErrReport, vbInformation + vbApplicationModal
End If
End If
End If
Index: cDebug.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cDebug.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cDebug.cls 18 Oct 2003 15:35:27 -0000 1.4
+++ cDebug.cls 8 Nov 2003 09:01:40 -0000 1.5
@@ -57,14 +57,14 @@
Dim i As Long
100 strMessage = String(30, "*") & vbCrLf
-104 strMessage = strMessage & "WinUI Bug Report - Version: " & WinUI.Version & vbCrLf & vbCrLf
-108 strMessage = strMessage & "Time: (" & Now & ") Location: (" & strLocation & ") Line: (" & strLine & ")" & vbCrLf
-112 strMessage = strMessage & "Message: (" & strErrMsg & ")" & vbCrLf
-116 strMessage = strMessage & "Call Stack:" & vbCrLf
+104 strMessage = strMessage & WinUI.GetTranslatedText("WinUI Bug Report - Version:") & " " & WinUI.Version & vbCrLf & vbCrLf
+108 strMessage = strMessage & WinUI.GetTranslatedText("Time:") & " (" & Now & ") " & WinUI.GetTranslatedText("Location:") & " (" & strLocation & ") " & WinUI.GetTranslatedText("Line:") & " (" & strLine & ")" & vbCrLf
+112 strMessage = strMessage & WinUI.GetTranslatedText("Message:") & " (" & strErrMsg & ")" & vbCrLf
+116 strMessage = strMessage & WinUI.GetTranslatedText("Call Stack:") & vbCrLf
120 For i = 1 To CallStack.Count
124 strMessage = strMessage & Chr(9) & CallStack.Peek(i) & vbCrLf
Next
-128 strMessage = strMessage & vbCrLf & "Please see http://swebs.sf.net for information on this error." & vbCrLf
+128 strMessage = strMessage & vbCrLf & WinUI.GetTranslatedText("Please see http://swebs.sf.net for information on this error.") & vbCrLf
132 strMessage = strMessage & String(30, "*") & vbCrLf
136 Open WinUI.Path & "WinUI_ErrLog.log" For Append As 1
140 Print #1, strMessage
Index: cHTTP.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cHTTP.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cHTTP.cls 25 Oct 2003 00:38:57 -0000 1.4
+++ cHTTP.cls 8 Nov 2003 09:01:40 -0000 1.5
@@ -61,8 +61,7 @@
Dim lngRetVal As Long
100 lngRetVal = WebStop
-104 MsgBox "WebStop RetVal: " & lngRetVal
-108 blnRunning = False
+104 blnRunning = False
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Function
Index: cSysTray.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cSysTray.cls,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- cSysTray.cls 25 Oct 2003 00:38:57 -0000 1.4
+++ cSysTray.cls 8 Nov 2003 09:01:40 -0000 1.5
@@ -19,7 +19,7 @@
' SWEBS/WinUI
'
' Copyright (c) Martin Richardson.
-' Copyright (c) 2003 Adam Caudill.
+' Portions Copyright (c) 2003 Adam Caudill.
'
' This program is free software; you can redistribute it and/or modify
' it under the terms of the GNU General Public License as published by
Index: cUtil.cls
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/cUtil.cls,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- cUtil.cls 18 Oct 2003 15:35:27 -0000 1.6
+++ cUtil.cls 8 Nov 2003 09:01:40 -0000 1.7
@@ -145,7 +145,7 @@
Public Function BrowseForFolder(Optional ByRef psTitle As String = "Select A Directory", Optional ByVal flAllowNewFolder As Boolean = False, Optional psStartDir As String = "C:\") As String
''this has a bug, I know, i'll fix it some day, just not today.
- ''***this needs to get replaces for the upgrade...
+ ''***this needs to get replaced for the upgrade...
'<EhHeader>
On Error GoTo BrowseForFolder_Err
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.cUtil.BrowseForFolder")
Index: credits.rtf
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/credits.rtf,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
Binary files /tmp/cvsyU67Ws and /tmp/cvsq0mM1N differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- frmMain.frm 5 Nov 2003 21:39:21 -0000 1.75
+++ frmMain.frm 8 Nov 2003 09:01:41 -0000 1.76
@@ -15,6 +15,61 @@
ScaleHeight = 4290
ScaleWidth = 9555
StartUpPosition = 2 'CenterScreen
+ Begin SWEBS_WinUI.ctxHookMenu ctxXPMenu
+ Left = 5280
+ Top = 3960
+ _ExtentX = 900
+ _ExtentY = 900
+ BmpCount = 13
+ Bmp:1 = "frmMain.frx":0CCA
+ Mask:1 = 12632256
+ Key:1 = "#mnuFileSave"
+ Bmp:2 = "frmMain.frx":0DDC
+ Mask:2 = 12632256
+ Key:2 = "#mnuHelpRegister"
+ Bmp:3 = "frmMain.frx":0EEE
+ Mask:3 = 12632256
+ Key:3 = "#mnuHelpUpdate"
+ Bmp:4 = "frmMain.frx":1000
+ Mask:4 = 12632256
+ Key:4 = "#mnuFileExit"
+ Bmp:5 = "frmMain.frx":1112
+ Mask:5 = 12632256
+ Key:5 = "#mnuHelpForum"
+ Bmp:6 = "frmMain.frx":1224
+ Mask:6 = 13355979
+ Key:6 = "#mnuHelpHomePage"
+ Bmp:7 = "frmMain.frx":1776
+ Mask:7 = 13553358
+ Key:7 = "#mnuHelpAbout"
+ Bmp:8 = "frmMain.frx":1CC8
+ Mask:8 = 13355979
+ Key:8 = "#mnuFileExport"
+ Bmp:9 = "frmMain.frx":221A
+ Mask:9 = 12632256
+ Key:9 = "#mnuSysTrayPopupExit"
+ Bmp:10 = "frmMain.frx":232C
+ Mask:10 = 13553358
+ Key:10 = "#mnuSysTrayPopupAbout"
+ Bmp:11 = "frmMain.frx":287E
+ Mask:11 = 12632256
+ Key:11 = "#mnuSysTrayPopupUpdate"
+ Bmp:12 = "frmMain.frx":2990
+ Mask:12 = 12632256
+ Key:12 = "#mnuSysTrayPopupForum"
+ Bmp:13 = "frmMain.frx":2AA2
+ Mask:13 = 13355979
+ Key:13 = "#mnuSysTrayPopupHomePage"
+ BeginProperty Font {0BE35203-8F91-11CE-9DE3-00AA004BB851}
+ Name = "Tahoma"
+ Size = 8.25
+ Charset = 0
+ Weight = 400
+ Underline = 0 'False
+ Italic = 0 'False
+ Strikethrough = 0 'False
+ EndProperty
+ End
Begin VB.Frame fraStatus
BorderStyle = 0 'None
Height = 3735
@@ -87,7 +142,7 @@
ForeColor = &H00FF0000&
Height = 195
Left = 660
- MouseIcon = "frmMain.frx":0CCA
+ MouseIcon = "frmMain.frx":2FF4
MousePointer = 99 'Custom
TabIndex = 89
ToolTipText = "Click here for details."
@@ -179,7 +234,7 @@
Begin VB.Image imgLogo
Height = 480
Left = 3360
- Picture = "frmMain.frx":0FD4
+ Picture = "frmMain.frx":32FE
Top = 3120
Width = 480
End
@@ -201,22 +256,6 @@
Width = 2895
End
End
- Begin SWEBS_WinUI.ctxHookMenu ctxXPMenu
- Left = 5400
- Top = 3960
- _ExtentX = 900
- _ExtentY = 900
- BmpCount = 0
- BeginProperty Font {0BE35203-8F91-11CE-9DE3-00AA004BB851}
- Name = "Tahoma"
- Size = 8.25
- Charset = 0
- Weight = 400
- Underline = 0 'False
- Italic = 0 'False
- Strikethrough = 0 'False
- EndProperty
- End
Begin MSComDlg.CommonDialog dlgMain
Left = 5040
Top = 3960
@@ -241,16 +280,17 @@
_ExtentY = 5741
_Version = 393217
BorderStyle = 0
+ Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
- TextRTF = $"frmMain.frx":1C9E
+ TextRTF = $"frmMain.frx":3FC8
End
Begin VB.ComboBox cmbViewLogFiles
Height = 315
- ItemData = "frmMain.frx":1D20
+ ItemData = "frmMain.frx":404A
Left = 120
- List = "frmMain.frx":1D22
+ List = "frmMain.frx":404C
Style = 2 'Dropdown List
TabIndex = 41
Top = 120
@@ -323,9 +363,9 @@
End
Begin VB.ListBox lstvHosts
Height = 3375
- ItemData = "frmMain.frx":1D24
+ ItemData = "frmMain.frx":404E
Left = 120
- List = "frmMain.frx":1D26
+ List = "frmMain.frx":4050
TabIndex = 29
Top = 240
Width = 1815
@@ -516,7 +556,7 @@
Width = 2415
End
Begin VB.Label lblWebroot
- Caption = $"frmMain.frx":1D28
+ Caption = $"frmMain.frx":4052
Height = 495
Left = 120
TabIndex = 12
@@ -602,7 +642,7 @@
Width = 3255
End
Begin VB.Label lblIndexFiles
- Caption = $"frmMain.frx":1DCC
+ Caption = $"frmMain.frx":40F6
Height = 495
Left = 120
TabIndex = 22
@@ -647,9 +687,8 @@
Left = 5280
Top = 3840
End
- Begin VB.CommandButton cmdCancel
- Cancel = -1 'True
- Caption = "&Cancel"
+ Begin VB.CommandButton cmdExit
+ Caption = "E&xit"
Height = 375
Left = 8400
TabIndex = 3
@@ -952,9 +991,9 @@
End
Begin VB.ListBox lstCGI
Height = 3375
- ItemData = "frmMain.frx":1E7A
+ ItemData = "frmMain.frx":41A4
Left = 120
- List = "frmMain.frx":1E7C
+ List = "frmMain.frx":41A6
TabIndex = 37
Top = 240
Width = 1815
@@ -1178,8 +1217,8 @@
'</EhHeader>
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Executable Files (*.exe)|*.exe|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, (InStrRev(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, 1, (Len(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter) - InStrRev(WinUI.Server.HTTP.Config.CGI(lstCGI.ListIndex + 1).Interpreter, "\")))
@@ -1205,8 +1244,8 @@
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.ErrorLog, (InStrRev(WinUI.Server.HTTP.Config.ErrorLog, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = WinUI.Path
@@ -1250,8 +1289,8 @@
On Error GoTo cmdBrowseNewCGIInterp_Click_Err
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseNewCGIInterp_Click")
'</EhHeader>
-100 dlgMain.DialogTitle = "Please select a file..."
-104 dlgMain.Filter = "Executable Files (*.exe)|*.log|All Files (*.*)|*.*"
+100 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+104 dlgMain.Filter = WinUI.GetTranslatedText("Executable Files (*.exe)|*.log|All Files (*.*)|*.*")
108 dlgMain.ShowSave
112 If dlgMain.FileName <> "" Then
116 txtNewCGIInterp.Text = dlgMain.FileName
@@ -1272,8 +1311,8 @@
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdBrowseNewvHostLogs_Click")
'</EhHeader>
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 dlgMain.InitDir = WinUI.Path
116 dlgMain.ShowSave
120 txtvHostLog.Text = dlgMain.FileName
@@ -1336,8 +1375,8 @@
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, (InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, 1, (Len(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log) - InStrRev(WinUI.Server.HTTP.Config.VirtHost(lstvHosts.ListIndex + 1).Log, "\")))
@@ -1383,8 +1422,8 @@
Dim strDefaultFile As String
100 blnDirty = True
-104 dlgMain.DialogTitle = "Please select a file..."
-108 dlgMain.Filter = "Log Files (*.log)|*.log|All Files (*.*)|*.*"
+104 dlgMain.DialogTitle = WinUI.GetTranslatedText("Please select a file...")
+108 dlgMain.Filter = WinUI.GetTranslatedText("Log Files (*.log)|*.log|All Files (*.*)|*.*")
112 strDefaultFile = Mid$(WinUI.Server.HTTP.Config.LogFile, (InStrRev(WinUI.Server.HTTP.Config.LogFile, "\") + 1))
116 dlgMain.FileName = strDefaultFile
120 dlgMain.InitDir = Mid$(WinUI.Server.HTTP.Config.LogFile, 1, (Len(WinUI.Server.HTTP.Config.LogFile) - InStrRev(WinUI.Server.HTTP.Config.LogFile, "\")))
@@ -1402,18 +1441,18 @@
'</EhFooter>
End Sub
-Private Sub cmdCancel_Click()
+Private Sub cmdExit_Click()
'<EhHeader>
- On Error GoTo cmdCancel_Click_Err
- WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdCancel_Click")
+ On Error GoTo cmdExit_Click_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdExit_Click")
'</EhHeader>
100 Unload Me
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
-cmdCancel_Click_Err:
- DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdCancel_Click", Erl, False
+cmdExit_Click_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.cmdExit_Click", Erl, False
Resume Next
'</EhFooter>
End Sub
@@ -1593,7 +1632,21 @@
On Error GoTo cmdOK_Click_Err
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.cmdOK_Click")
'</EhHeader>
-100 Unload Me
+100 If blnDirty <> False Then
+104 If WinUI.Server.HTTP.Config.Save(WinUI.Server.HTTP.Config.File) = False Then
+108 MsgBox WinUI.GetTranslatedText("Data was not saved, no idea why...")
+ Else
+112 blnDirty = False
+116 WinUI.Server.HTTP.StopServer
+120 DoEvents
+124 WinUI.Server.HTTP.StartServer
+128 UpdateStats
+132 Me.Hide
+ End If
+ Else
+136 Me.WindowState = vbMinimized
+140 Me.Hide
+ End If
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1614,7 +1667,7 @@
108 DoEvents
112 WinUI.Server.HTTP.StartServer
116 UpdateStats
-120 SetStatus "Ready..."
+120 SetStatus WinUI.GetTranslatedText("Ready") & "..."
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1732,7 +1785,7 @@
Dim RetVal As Long
Dim cBar As cExplorerBar
Dim cItem As cExplorerBarItem
-
+
'setup the translated strings...
100 SetStatus "Loading Translated Strings..."
@@ -1748,7 +1801,7 @@
140 mnuHelpAbout.Caption = WinUI.GetTranslatedText("&About") & "..."
144 cmdOK.Caption = WinUI.GetTranslatedText("&OK")
148 cmdApply.Caption = WinUI.GetTranslatedText("&Apply")
-152 cmdCancel.Caption = WinUI.GetTranslatedText("&Cancel")
+152 cmdExit.Caption = WinUI.GetTranslatedText("E&xit")
156 fraSrvStatus.Caption = WinUI.GetTranslatedText("Current Service Status:")
160 lblSrvStatus.Caption = WinUI.GetTranslatedText("Status:")
164 cmdSrvStart.Caption = WinUI.GetTranslatedText("S&tart")
@@ -1824,13 +1877,13 @@
404 Set SysTray = New cSysTray
408 Set SysTray.SourceWindow = Me
412 SysTray.IconInSysTray
-416 SysTray.ToolTip = "SWEBS Web Server " & WinUI.Version
+416 SysTray.ToolTip = WinUI.GetTranslatedText("SWEBS Web Server") & " " & WinUI.Version
420 SysTray.Icon = Me.Icon
424 fraStatus.ZOrder 0
428 vbaSideBar.ZOrder 0
432 tmrStatus_Timer
-436 SetStatus "Ready..."
+436 SetStatus WinUI.GetTranslatedText("Ready") & "..."
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1847,28 +1900,22 @@
WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.Form_QueryUnload")
'</EhHeader>
Dim lngRetVal As Long
- Dim i As Long
-100 If blnDirty = True Then
-104 lngRetVal = MsgBox(WinUI.GetTranslatedText("Do you want to save your settings before closing?"), vbYesNo + vbQuestion + vbApplicationModal)
-108 If lngRetVal = vbYes Then
-112 If WinUI.Server.HTTP.Config.Save(WinUI.Server.HTTP.Config.File) = False Then
-116 MsgBox WinUI.GetTranslatedText("Data was not saved, no idea why...")
+100 If UnloadMode <> vbFormControlMenu Then
+104 If blnDirty = True Then
+108 lngRetVal = MsgBox(WinUI.GetTranslatedText("Do you want to save your settings before closing?"), vbYesNo + vbQuestion + vbApplicationModal)
+112 If lngRetVal = vbYes Then
+116 If WinUI.Server.HTTP.Config.Save(WinUI.Server.HTTP.Config.File) = False Then
+120 MsgBox WinUI.GetTranslatedText("Data was not saved, no idea why...")
+124 Cancel = True
+ End If
End If
End If
+ Else
+128 Cancel = True
+132 Me.WindowState = vbMinimized
+136 Me.Hide
End If
-
-120 SysTray.RemoveFromSysTray
-124 Set SysTray = Nothing
-128 DoEvents
-132 Me.Hide
-136 For i = Forms.Count - 1 To 0 Step -1
-140 Unload Forms(i)
- Next
-144 WinUI.Util.LoadUser32 False
-148 Set WinUI = Nothing
-152 SetExceptionFilter False
-156 End
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
@@ -1888,6 +1935,36 @@
End If
End Sub
+Private Sub Form_Unload(Cancel As Integer)
+ '<EhHeader>
+ On Error GoTo Form_Unload_Err
+ WinUI.Debuger.CallStack.Push ("SWEBS_WinUI.frmMain.Form_Unload")
+ '</EhHeader>
+ Dim i As Long
+
+100 Me.Hide
+104 PostMessage Me.hwnd, 0&, 0&, 0&
+108 DoEvents
+112 SysTray.RemoveFromSysTray
+116 Set SysTray = Nothing
+120 DoEvents
+124 For i = Forms.Count - 1 To 0 Step -1
+128 Unload Forms(i)
+ Next
+132 WinUI.Util.LoadUser32 False
+136 Set WinUI = Nothing
+140 SetExceptionFilter False
+144 End
+ '<EhFooter>
+ WinUI.Debuger.CallStack.Pop
+ Exit Sub
+
+Form_Unload_Err:
+ DisplayErrMsg Err.Description, "SWEBS_WinUI.frmMain.Form_Unload", Erl, False
+ Resume Next
+ '</EhFooter>
+End Sub
+
Private Sub lblUpdateStatus_Click()
'<EhHeader>
On Error GoTo lblUpdateStatus_Click_Err
@@ -2256,7 +2333,7 @@
Else
136 MsgBox WinUI.GetTranslatedText("You have the most current version available."), vbOKOnly + vbInformation
End If
-140 SetStatus "Ready..."
+140 SetStatus WinUI.GetTranslatedText("Ready") & "..."
'<EhFooter>
WinUI.Debuger.CallStack.Pop
Exit Sub
Index: frmMain.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frx,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
Binary files /tmp/cvs1rY9JJ and /tmp/cvswOUxcj differ
Index: lang.xml
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/lang.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- lang.xml 5 Nov 2003 21:39:22 -0000 1.10
+++ lang.xml 8 Nov 2003 09:01:43 -0000 1.11
@@ -40,6 +40,24 @@
<lang base="You data has been saved.\r\rYou will need to restart the SWEBS Service before these setting will take effect.">
You data has been saved.\r\rYou will need to restart the SWEBS Service before these setting will take effect.
</lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
+ <lang base="Please select a file...">
+ Please select a file...
+ </lang>
<lang base="Are you sure you want to delete this item?\r\rThis can not be undone.">
Are you sure you want to delete this item?\r\rThis can not be undone.
</lang>
@@ -49,9 +67,15 @@
<lang base="Please fill all fields.">
Please fill all fields.
</lang>
+ <lang base="Data was not saved, no idea why...">
+ Data was not saved, no idea why...
+ </lang>
<lang base="Restarting Service">
Restarting Service
</lang>
+ <lang base="Ready">
+ Ready
+ </lang>
<lang base="Starting Service">
Starting Service
</lang>
@@ -97,8 +121,8 @@
<lang base="&Apply">
&Apply
</lang>
- <lang base="&Cancel">
- &Cancel
+ <lang base="E&xit">
+ E&xit
</lang>
<lang base="Current Service Status:">
Current Service Status:
@@ -253,6 +277,12 @@
<lang base="View Logs">
View Logs
</lang>
+ <lang base="SWEBS Web Server">
+ SWEBS Web Server
+ </lang>
+ <lang base="Ready">
+ Ready
+ </lang>
<lang base="Do you want to save your settings before closing?">
Do you want to save your settings before closing?
</lang>
@@ -295,6 +325,9 @@
<lang base="You have the most current version available.">
You have the most current version available.
</lang>
+ <lang base="Ready">
+ Ready
+ </lang>
<lang base="Stopped">
Stopped
</lang>
@@ -389,6 +422,23 @@
File Size
</lang>
</lang-obj>
+ <lang-obj name="cDebug">
+ <lang base="WinUI Bug Report - Version:">
+ WinUI Bug Report - Version:
+ </lang>
+ <lang base="Time:">
+ Time:
+ </lang>
+ <lang base="Message:">
+ Message:
+ </lang>
+ <lang base="Call Stack:">
+ Call Stack:
+ </lang>
+ <lang base="Please see http://swebs.sf.net for information on this error.">
+ Please see http://swebs.sf.net for information on this error.
+ </lang>
+ </lang-obj>
<lang-obj name="cHTTPConfig">
<lang base="Date">
Date
@@ -430,10 +480,42 @@
<lang base="SWEBS Web Server - Control Center">
SWEBS Web Server - Control Center
</lang>
+ <lang base="There is already a instance of this application running.">
+ There is already a instance of this application running.
+ </lang>
+ <lang base="SWEBS Web Server - Control Center">
+ SWEBS Web Server - Control Center
+ </lang>
+ <lang base="Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.">
+ Your configuration file could not be found. Please re-install the SWEBS Web Server to replace your configuration file.
+ </lang>
+ <lang base="Checking For Registration Data">
+ Checking For Registration Data
+ </lang>
+ <lang base="Starting Registration">
+ Starting Registration
+ </lang>
<lang base="SWEBS Web Server - Control Center">
SWEBS Web Server - Control Center
</lang>
+ <lang base="There was an unknown error.">
+ There was an unknown error.
+ </lang>
+ <lang base="This application has encountered a error:\n\nError:">
+ This application has encountered a error:\n\nError:
+ </lang>
+ <lang base="SWEBS System Error">
+ SWEBS System Error
+ </lang>
+ <lang base="This application has encountered a error:\n\nError:">
+ This application has encountered a error:\n\nError:
+ </lang>
+ <lang base="SWEBS System Error">
+ SWEBS System Error
+ </lang>
+ <lang base="An error log has been written to:">
+ An error log has been written to:
+ </lang>
</lang-obj>
-
</lang-code>
</SWEBS-WinUI-Lang>
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
Binary files /tmp/cvsy7DUuT and /tmp/cvs4UQhyK differ
|
