Skip to content

Commit

Permalink
Merge branch 'release/1.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
@ktekinay
ktekinay committed Jan 15, 2015
2 parents 62e8528 + 1b201cb commit b2984e4
Show file tree
Hide file tree
Showing 9 changed files with 134 additions and 50 deletions.
6 changes: 3 additions & 3 deletions Kaju Admin App/Kaju Admin.xojo_project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,12 @@ Class=HTTPSSocket;../Kaju Classes/Kaju/HTTPSSocket.xojo_code;&h5ACDFAEB;&h114003
AppMenuBar=MainMenuBar
MajorVersion=1
MinorVersion=3
SubVersion=1
SubVersion=2
NonRelease=0
Release=3
InfoVersion=Kaju Admin
LongVersion=v.1.3.1
ShortVersion=1.3.1
LongVersion=v.1.3.2
ShortVersion=1.3.2
WinCompanyName=MacTechnologies Consulting
WinInternalName=
WinProductName=
Expand Down
99 changes: 77 additions & 22 deletions Kaju Admin App/WndAdmin.xojo_window
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 12
TabPanelIndex = 0
TabStop = True
Text = "Version:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -336,6 +337,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 2
TabPanelIndex = 1
TabStop = True
Text = "Preview:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -445,6 +447,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 3
TabPanelIndex = 2
TabStop = True
Text = "Hash:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -479,6 +482,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 4
TabPanelIndex = 2
TabStop = True
Text = "URL:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -513,6 +517,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 3
TabPanelIndex = 1
TabStop = True
Text = "Release Notes (HTML):"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -622,6 +627,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 8
TabPanelIndex = 2
TabStop = True
Text = "Hash:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -656,6 +662,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 9
TabPanelIndex = 2
TabStop = True
Text = "URL:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -722,6 +729,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 13
TabPanelIndex = 2
TabStop = True
Text = "Hash:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -756,6 +764,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 14
TabPanelIndex = 2
TabStop = True
Text = "URL:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -833,6 +842,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 1
TabPanelIndex = 3
TabStop = True
Text = "URL:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -964,6 +974,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 16
TabPanelIndex = 2
TabStop = True
Text = "Minimum Required Version:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -1390,6 +1401,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 18
TabPanelIndex = 2
TabStop = True
Text = "Executable:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -1467,6 +1479,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 20
TabPanelIndex = 2
TabStop = True
Text = "Executable:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -1685,7 +1698,7 @@ Begin Window WndAdmin
Visible = False
Width = 80
End
Begin PushButton btnWindowsHashFromURL
Begin PushButton btnLinuxHashFromURL
AutoDeactivate = True
Bold = False
ButtonStyle = "0"
Expand All @@ -1705,18 +1718,18 @@ Begin Window WndAdmin
LockRight = False
LockTop = True
Scope = 2
TabIndex = 22
TabIndex = 23
TabPanelIndex = 2
TabStop = True
TextFont = "SmallSystem"
TextSize = 0.0
TextUnit = 0
Top = 356
Top = 503
Underline = False
Visible = False
Width = 80
End
Begin PushButton btnLinuxHashFromURL
Begin PushButton btnWindowsHashFromURL
AutoDeactivate = True
Bold = False
ButtonStyle = "0"
Expand All @@ -1736,13 +1749,13 @@ Begin Window WndAdmin
LockRight = False
LockTop = True
Scope = 2
TabIndex = 23
TabIndex = 24
TabPanelIndex = 2
TabStop = True
TextFont = "SmallSystem"
TextSize = 0.0
TextUnit = 0
Top = 503
Top = 358
Underline = False
Visible = False
Width = 80
Expand Down Expand Up @@ -1812,6 +1825,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 11
TabPanelIndex = 0
TabStop = True
Text = "App Name:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -1857,7 +1871,8 @@ Begin Window WndAdmin
Width = 180
End
Begin Timer tmrUpdateReleaseNotesPreview
Height = 32
Enabled = True
Height = "32"
Index = -2147483648
InitialParent = ""
Left = 0
Expand All @@ -1867,7 +1882,8 @@ Begin Window WndAdmin
Scope = 2
TabPanelIndex = 0
Top = 0
Width = 32
Visible = True
Width = "32"
End
Begin HTMLViewer hvNewWindow
AutoDeactivate = True
Expand Down Expand Up @@ -1922,7 +1938,8 @@ Begin Window WndAdmin
Width = 186
End
Begin Timer tmrUpdateImagePreview
Height = 32
Enabled = True
Height = "32"
Index = -2147483648
InitialParent = ""
Left = 20
Expand All @@ -1932,7 +1949,8 @@ Begin Window WndAdmin
Scope = 2
TabPanelIndex = 0
Top = 20
Width = 32
Visible = True
Width = "32"
End
Begin Label lblPlatform
AutoDeactivate = True
Expand All @@ -1956,6 +1974,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 6
TabPanelIndex = 0
TabStop = True
Text = "None"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -1990,6 +2009,7 @@ Begin Window WndAdmin
Selectable = False
TabIndex = 13
TabPanelIndex = 0
TabStop = True
Text = "Platforms:"
TextAlign = 0
TextColor = &c00000000
Expand Down Expand Up @@ -2181,6 +2201,10 @@ End

#tag Method, Flags = &h21
Private Sub AdjustControls()
if self.Loading then
return
end if

dim trueValue as boolean = lbVersions.ListIndex <> -1

dim lastIndex as integer = ControlCount - 1
Expand Down Expand Up @@ -2215,7 +2239,7 @@ End
btnBreak.Enabled = trueValue

//
// GetFromHash buttons
// HashFromURL buttons
//
if cbMacBinary.Enabled and cbMacBinary.Value and fldMacBinaryURL.Text.Trim <> "" then
btnMacHashFromURL.Enabled = trueValue
Expand All @@ -2232,7 +2256,7 @@ End
if cbLinuxBinary.Enabled and cbLinuxBinary.Value and fldLinuxBinaryURL.Text.Trim <> "" then
btnLinuxHashFromURL.Enabled = trueValue
else
btnWindowsHashFromURL.Enabled = false
btnLinuxHashFromURL.Enabled = false
end if

//
Expand Down Expand Up @@ -2537,7 +2561,7 @@ End
url = http.GetRedirectAddress( url, 5 )

dim file as FolderItem = GetTemporaryFolderItem
dim r as boolean = http.Get( url, file, 5 )
dim r as boolean = http.Get( url, file, 30 )
if not r or http.LastErrorCode <> 0 then

MsgBox "Could not get the executable from that url: " + str( http.LastErrorCode )
Expand Down Expand Up @@ -2601,6 +2625,8 @@ End

ClearFields()

self.Loading = true

dim lastIndex as integer = ControlCount - 1
for i as integer = 0 to lastIndex
dim c as Control = self.Control( i )
Expand Down Expand Up @@ -2639,6 +2665,8 @@ End
fldLinuxBinaryURL.Text = binary.URL
end if

self.Loading = false

AdjustControls()
self.ContentsChanged = savedDirty
End Sub
Expand Down Expand Up @@ -2836,12 +2864,34 @@ End
Private LastVersionRow As Integer = -1
#tag EndProperty

#tag ComputedProperty, Flags = &h0
#tag Getter
Get
return mLoading > 0
End Get
#tag EndGetter
#tag Setter
Set
if value then
mLoading = mLoading + 1
else
mLoading = mLoading - 1
if mLoading < 0 then
mLoading = 0
end if
end if

End Set
#tag EndSetter
Loading As Boolean
#tag EndComputedProperty

#tag Property, Flags = &h21
Private Loading As Boolean
Private mDocument As FolderItemAlias
#tag EndProperty

#tag Property, Flags = &h21
Private mDocument As FolderItemAlias
Private mLoading As Integer
#tag EndProperty

#tag Property, Flags = &h21
Expand Down Expand Up @@ -2956,7 +3006,7 @@ End
#tag Events fldMacBinaryURL
#tag Event
Sub TextChange()
btnMacHashFromURL.Enabled = me.Text.Trim <> ""
AdjustControls()
End Sub
#tag EndEvent
#tag EndEvents
Expand All @@ -2978,7 +3028,7 @@ End
#tag Events fldWindowsBinaryURL
#tag Event
Sub TextChange()
btnWindowsHashFromURL.Enabled = me.Text.Trim <> ""
AdjustControls()
End Sub
#tag EndEvent
#tag EndEvents
Expand Down Expand Up @@ -3073,7 +3123,7 @@ End
#tag Events fldLinuxBinaryURL
#tag Event
Sub TextChange()
btnLinuxHashFromURL.Enabled = me.Text.Trim <> ""
AdjustControls()
End Sub
#tag EndEvent
#tag EndEvents
Expand Down Expand Up @@ -3111,17 +3161,17 @@ End
End Sub
#tag EndEvent
#tag EndEvents
#tag Events btnWindowsHashFromURL
#tag Events btnLinuxHashFromURL
#tag Event
Sub Action()
HashFromURL( fldWindowsBinaryURL.Text, fldWindowsBinaryHash )
HashFromURL( fldLinuxBinaryURL.Text, fldLinuxBinaryHash )
End Sub
#tag EndEvent
#tag EndEvents
#tag Events btnLinuxHashFromURL
#tag Events btnWindowsHashFromURL
#tag Event
Sub Action()
HashFromURL( fldLinuxBinaryURL.Text, fldLinuxBinaryHash )
HashFromURL( fldWindowsBinaryURL.Text, fldWindowsBinaryHash )
End Sub
#tag EndEvent
#tag EndEvents
Expand Down Expand Up @@ -3341,6 +3391,11 @@ End
Type="Boolean"
EditorType="Boolean"
#tag EndViewProperty
#tag ViewProperty
Name="Loading"
Group="Behavior"
Type="Boolean"
#tag EndViewProperty
#tag ViewProperty
Name="MacProcID"
Visible=true
Expand Down
Loading

0 comments on commit b2984e4

Please sign in to comment.