Menu
▾
▴
[swebs-commits] swebswebserver/winui About-1.gif,1.1,1.2 WinUI.vbp,1.70,1.71 basTransparency.bas,1.1,1.2 frmAbout.frm,1.38,1.39 frmAbout.frx,1.24,1.25 frmMain.frm,1.80,1.81 swebscc.exe,1.67,1.68
Update of /cvsroot/swebs/swebswebserver/winui
In directory sc8-pr-cvs1:/tmp/cvs-serv24409/swebswebserver/winui
Modified Files:
About-1.gif WinUI.vbp basTransparency.bas frmAbout.frm
frmAbout.frx frmMain.frm swebscc.exe
Log Message:
Lori thinks this text is easier to read, this is also faster, I've still got some tweaking to do, but it's a whole lot better than it was.
Index: About-1.gif
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/About-1.gif,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
Binary files /tmp/cvsfxx9w5 and /tmp/cvsavMdK0 differ
Index: WinUI.vbp
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/WinUI.vbp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- WinUI.vbp 19 Nov 2003 12:07:10 -0000 1.70
+++ WinUI.vbp 19 Nov 2003 15:55:19 -0000 1.71
@@ -1,7 +1,7 @@
Type=Exe
Reference=*\G{00020430-0000-0000-C000-000000000046}#2.0#0#C:\WINDOWS\System32\stdole2.tlb#OLE Automation
-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{884EA141-7415-4FF3-AFAA-9AAF29671C5B}#5.0#0#ccCore\ccCore.dll#
+Reference=*\G{0C5C47CC-E5CB-4896-A020-0350E9EF2D64}#6.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
@@ -30,7 +30,7 @@
CompatibleMode="0"
MajorVer=1
MinorVer=0
-RevisionVer=195
+RevisionVer=200
AutoIncrementVer=1
ServerSupportFiles=0
VersionCompanyName="SWEBS Development Team"
Index: basTransparency.bas
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/basTransparency.bas,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basTransparency.bas 19 Nov 2003 12:07:24 -0000 1.1
+++ basTransparency.bas 19 Nov 2003 15:55:19 -0000 1.2
@@ -89,10 +89,10 @@
Dim i As Long, ii As Long, lngPicWidth As Long, lngPicHeight As Long, lngTitleHeight As Long
Dim lngBorderWidth As Long, lngPicRegion As Long, lngPixelRegion As Long, lngPixelColor As Long
Dim lngPicDC As Long, lngPicTempBMP As Long, lngPicTransColor As Long, lngOriginalRgn As Long
-Dim lngRetVal As Long
+Dim lngPixelRegionX As Long
- lngPicWidth = frmForm.ScaleX(frmForm.Picture.Width, vbTwips, vbPixels)
- lngPicHeight = frmForm.ScaleY(frmForm.Picture.Height, vbTwips, vbPixels)
+ lngPicWidth = frmForm.ScaleX(frmForm.Picture.Width, vbHimetric, vbPixels)
+ lngPicHeight = frmForm.ScaleY(frmForm.Picture.Height, vbHimetric, vbPixels)
lngPicRegion = CreateRectRgn(0, 0, lngPicWidth, lngPicHeight)
@@ -100,16 +100,33 @@
lngPicTempBMP = SelectObject(lngPicDC, frmForm.Picture.Handle)
lngPicTransColor = GetPixel(lngPicDC, 0, 0)
+
For i = 0 To lngPicHeight
- For ii = 0 To lngPicWidth
- lngPixelColor = GetPixel(lngPicDC, i, ii)
+ ii = 0
+ Do Until ii >= lngPicWidth
+ lngPixelColor = GetPixel(lngPicDC, ii, i)
If lngPixelColor = lngPicTransColor Then
- lngPixelRegion = CreateRectRgn(i, ii, i + 1, ii + 1)
+ lngPixelRegionX = 0
+ lngPixelColor = GetPixel(lngPicDC, ii, i)
+ Do While lngPixelColor = lngPicTransColor
+ lngPixelRegionX = lngPixelRegionX + 1
+ lngPixelColor = GetPixel(lngPicDC, ii + lngPixelRegionX, i)
+ Loop
+ lngPixelRegion = CreateRectRgn(ii, i, ii + lngPixelRegionX, i + 1)
+ ii = ii + lngPixelRegionX - 1
CombineRgn lngPicRegion, lngPicRegion, lngPixelRegion, RGN_XOR
DeleteObject lngPixelRegion
+ Else
+ If ii + 50 < lngPicWidth Then
+ lngPixelColor = GetPixel(lngPicDC, ii + 50, i)
+ If lngPixelColor <> lngPicTransColor Then
+ ii = ii + 50
+ End If
+ End If
End If
- Next ii
- Next i
+ ii = ii + 1
+ Loop
+ Next
SelectObject lngPicDC, lngPicTempBMP
DeleteDC lngPicDC
Index: frmAbout.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frm,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- frmAbout.frm 19 Nov 2003 12:07:10 -0000 1.38
+++ frmAbout.frm 19 Nov 2003 15:55:19 -0000 1.39
@@ -19,8 +19,8 @@
StartUpPosition = 2 'CenterScreen
Begin VB.Timer tmrCreditsScroll
Interval = 50
- Left = 5040
- Top = 240
+ Left = 7560
+ Top = 0
End
Begin VB.PictureBox picCreditsScroll
Appearance = 0 'Flat
@@ -45,10 +45,11 @@
_ExtentY = 13573
_Version = 393217
BorderStyle = 0
+ Enabled = -1 'True
ReadOnly = -1 'True
Appearance = 0
FileName = "D:\MyDocs\Projects\swebs\swebswebserver\winui\credits.rtf"
- TextRTF = $"frmAbout.frx":5EB5
+ TextRTF = $"frmAbout.frx":6960
End
End
Begin VB.Label lblClose
@@ -67,8 +68,8 @@
EndProperty
ForeColor = &H00FF0000&
Height = 225
- Left = 7200
- MouseIcon = "frmAbout.frx":62F9
+ Left = 7225
+ MouseIcon = "frmAbout.frx":6DA4
MousePointer = 99 'Custom
TabIndex = 3
Top = 6120
@@ -90,8 +91,8 @@
EndProperty
ForeColor = &H00FF0000&
Height = 195
- Left = 5160
- MouseIcon = "frmAbout.frx":644B
+ Left = 5140
+ MouseIcon = "frmAbout.frx":6EF6
MousePointer = 99 'Custom
TabIndex = 2
ToolTipText = "Go To URL: http://swebs.sourceforge.net/"
@@ -117,7 +118,7 @@
Left = 960
TabIndex = 1
Top = 1560
- Width = 3615
+ Width = 3735
End
Begin VB.Label lblSrvVersion
Alignment = 2 'Center
@@ -138,7 +139,7 @@
Left = 960
TabIndex = 0
Top = 1320
- Width = 3615
+ Width = 3735
End
End
Attribute VB_Name = "frmAbout"
@@ -196,7 +197,7 @@
End Sub
Private Sub tmrCreditsScroll_Timer()
- rtfCredits.Top = rtfCredits.Top - 5
+ rtfCredits.Top = rtfCredits.Top - 12
If rtfCredits.Top < rtfCredits.Height * -1 Then
rtfCredits.Top = picCreditsScroll.Height + 10
End If
Index: frmAbout.frx
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmAbout.frx,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
Binary files /tmp/cvsDPZNL9 and /tmp/cvsUWgHc9 differ
Index: frmMain.frm
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/frmMain.frm,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- frmMain.frm 19 Nov 2003 12:07:11 -0000 1.80
+++ frmMain.frm 19 Nov 2003 15:55:19 -0000 1.81
@@ -539,7 +539,6 @@
_ExtentY = 8916
_Version = 393217
BorderStyle = 0
- Enabled = -1 'True
ReadOnly = -1 'True
ScrollBars = 3
AutoVerbMenu = -1 'True
@@ -1626,7 +1625,6 @@
End
Begin VB.Menu mnuSysTrayPopupExit
Caption = "E&xit..."
- Enabled = 0 'False
End
End
End
@@ -1659,8 +1657,8 @@
Option Explicit
-Private Declare Function SetForegroundWindow Lib "user32" (ByVal hwnd As Long) As Long
-Private Declare Function PostMessage Lib "user32" Alias "PostMessageA" (ByVal hwnd As Long, ByVal wMsg As Long, ByVal wParam As Long, ByVal lParam As Long) As Long
+Private Declare Function SetForegroundWindow Lib "user32" (ByVal hWnd As Long) As Long
+Private Declare Function PostMessage Lib "user32" Alias "PostMessageA" (ByVal hWnd As Long, ByVal wMsg As Long, ByVal wParam As Long, ByVal lParam As Long) As Long
Private WithEvents SysTray As cSysTray
Attribute SysTray.VB_VarHelpID = -1
@@ -1848,7 +1846,7 @@
Dim i As Long
Me.Hide
- PostMessage Me.hwnd, 0&, 0&, 0&
+ PostMessage Me.hWnd, 0&, 0&, 0&
DoEvents
SysTray.RemoveFromSysTray
Set SysTray = Nothing
@@ -1863,7 +1861,10 @@
End Sub
Private Sub lblAbout_Click()
+ Me.MousePointer = 11
+ DoEvents
Load frmAbout
+ Me.MousePointer = 0
frmAbout.Show
End Sub
@@ -2212,7 +2213,10 @@
End Sub
Private Sub mnuSysTrayPopupAbout_Click()
+ Me.MousePointer = 11
+ DoEvents
Load frmAbout
+ Me.MousePointer = 0
frmAbout.Show
End Sub
@@ -2255,9 +2259,9 @@
End Sub
Private Sub SysTray_RButtonUp()
- SetForegroundWindow Me.hwnd
+ SetForegroundWindow Me.hWnd
PopupMenu mnuSysTrayPopup, , , , mnuSysTrayPopupOpenCC
- PostMessage Me.hwnd, 0&, 0&, 0&
+ PostMessage Me.hWnd, 0&, 0&, 0&
End Sub
Private Sub tmrStats_Timer()
Index: swebscc.exe
===================================================================
RCS file: /cvsroot/swebs/swebswebserver/winui/swebscc.exe,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
Binary files /tmp/cvsXmHKpd and /tmp/cvsYy0NMh differ
|
