Commit 95dc78d4 authored by Bruce Steers's avatar Bruce Steers
Browse files

fix branch commits url

adding (non working) component selector
parent 89f8357f
......@@ -2,7 +2,7 @@
Title=Gambas Latest Updater
Startup=FMain
Icon=icon.png
Version=1.1.4
Version=1.1.6
Component=gb.image
Component=gb.gui
Component=gb.form
......@@ -14,9 +14,9 @@ Component=gb.term
Component=gb.net
Component=gb.net.curl
Component=gb.markdown
Description="Download or update then Compile and install latest Gambas3."
Description="Download or update then Compile and install latest Gambas3.\nUses git to clone/pull latest gambas source/updates.\nInstalls packages needed to compile gambas3.\nSupports all distros in the gambas gitlab-ci file."
Authors="Bruce Steers"
Environment="GB_GUI=gb.qt5\nGB_PCODE_VERSION=3.8"
Environment="GB_PCODE_VERSION=3.8"
TabSize=2
Translate=1
Language=en_GB
......
......@@ -38,8 +38,10 @@ For Each s In dirs
With $hComp = New NCheckBox($hBox) As "CBX"
.TextPosition = Align.Right
.TextAlign = Align.Left
.Picture = Picture["icon:/16/add"]
.Text = s
.Value = True
.Tag = File.Ext(s)
.Value = IIf(InStr(Distro.sConf, "--disable-" & .Tag), False, True)
' .TotalAlign = Align.Center
.Expand = True
.AutoResize = True
......
# Gambas Form File 3.0
{ Form Form
MoveScaled(0,0,76,64)
MoveScaled(0,0,82,73)
Arrangement = Arrange.Vertical
Spacing = True
Margin = True
......@@ -23,6 +23,7 @@
MoveScaled(7,14,61,44)
Expand = True
Arrangement = Arrange.Column
Margin = True
}
{ HBox1 HBox
MoveScaled(9,59,54,4)
......
......@@ -593,7 +593,7 @@ End
Public Sub ComboGotoGitlab_Click()
If ComboGotoGitlab.Index = 0 Then Return
Dim sUrls As String[] = ["", "https://gitlab.com/gambas/gambas", "https://gitlab.com/gambas/gambas/-/commits/master", "https://gitlab.com/gambas/gambas/-/commits/stable", Source.GitURL, Source.GitURL & "/-/commits/" & Source.GitBranch]
Dim sUrls As String[] = ["", "https://gitlab.com/gambas/gambas", "https://gitlab.com/gambas/gambas/-/commits/master", "https://gitlab.com/gambas/gambas/-/commits/stable", Source.GitURL, Left(Source.GitURL, -4) & "/-/commits/" & Source.GitBranch]
Desktop.Open(sUrls[ComboGotoGitlab.Index])
......
......@@ -105,6 +105,7 @@
TextFont = Font["Sans,+2"]
ShowIndex = True
ShowButton = False
Border = False
Index = 0
Text = ("Version info + Download/Update source folder")
Picture = Picture[".public/icon-small.png"]
......@@ -157,6 +158,7 @@
MoveScaled(1,8,111,50)
Expand = True
Arrangement = Arrange.Horizontal
Spacing = True
{ PanelDeps VBox
MoveScaled(0,0,29,49)
Visible = False
......@@ -197,104 +199,93 @@
Picture = Picture[".public/12008-thumbs-up-icon.png"]
}
}
{ Separator3 Separator
MoveScaled(29,5,2,44)
}
{ Panel2 Panel
MoveScaled(30,1,80,48)
MoveScaled(31,1,79,48)
Background = &HC3E0C3&
Expand = True
Arrangement = Arrange.Vertical
Spacing = True
{ HBox1 HBox
MoveScaled(1,1,78,19)
AutoResize = True
{ Panel3 HBox
MoveScaled(0,1,78,6)
Spacing = True
{ Panel3 Panel
MoveScaled(1,1,40,18)
Expand = True
Arrangement = Arrange.Vertical
Spacing = True
Margin = True
Padding = 5
Indent = True
Border = Border.Etched
{ HBox12 HBox
MoveScaled(1,0,37,4)
{ TextLabel1 TextLabel
MoveScaled(0,0,34,4)
Background = Color.Gray
Foreground = Color.White
Expand = True
Text = ("<u><b>Local Gambas Versions.</b></u>")
Alignment = Align.Center
}
}
{ LabelVer_Ins Label
MoveScaled(1,4,38,5)
ToolTip = ("Version installed on this system")
AutoResize = True
Alignment = Align.Center
Text = ("Installed:\nV 0.00.0")
}
{ LabelVer_Src Label
MoveScaled(1,11,37,5)
ToolTip = ("Version in your local source directory.")
AutoResize = True
Margin = True
Padding = 5
Indent = True
{ HBox12 HBox
MoveScaled(1,0,30,6)
AutoResize = True
{ TextLabel1 TextLabel
MoveScaled(2,0,26,6)
Background = Color.Gray
Foreground = Color.White
Text = ("<u><b>Local Gambas Versions.</b></u>")
Alignment = Align.Center
Text = ("Source Folder:\nV 0.00.0")
Wrap = False
}
}
{ Separator4 Separator
MoveScaled(41,3,1,10)
{ Separator9 Separator
MoveScaled(32,1,1,5)
}
{ PanelGL Panel
MoveScaled(42,1,35,18)
{ LabelVer_Ins Label
MoveScaled(34,1,20,5)
ToolTip = ("Version installed on this system")
Expand = True
Arrangement = Arrange.Vertical
AutoResize = True
Alignment = Align.Center
Text = ("Installed:\nV 0.00.0")
}
{ Separator10 Separator
MoveScaled(55,1,1,4)
}
{ LabelVer_Src Label
MoveScaled(59,1,18,5)
ToolTip = ("Version in your local source directory.")
Expand = True
AutoResize = True
Alignment = Align.Center
Text = ("Source Folder:\nV 0.00.0")
}
}
{ Separator3 Separator
MoveScaled(20,7,35,1)
}
{ PanelGL HBox
MoveScaled(0,8,78,6)
Spacing = True
Margin = True
{ HBoxGL HBox
MoveScaled(0,1,33,4)
Spacing = True
Margin = True
Border = Border.Raised
{ HBox2 HBox
MoveScaled(1,1,33,4)
{ Label11 Label
MoveScaled(3,0,11,4)
AutoResize = True
Text = ("Gitlab: ")
}
{ ComboGotoGitlab ComboBox
MoveScaled(16,0,17,4)
Expand = True
ReadOnly = True
List = [("Open a Webpage"), ("Goto Gambas lab"), ("Goto Gambas master commits"), ("Goto Gambas stable commits"), ("Goto branch lab"), ("Goto branch commits")]
}
}
{ HBoxGL HBox
MoveScaled(1,7,33,4)
Spacing = True
{ btnCheckGitlab FlashButton
MoveScaled(1,0,13,3)
ToolTip = ("Reads the gitlab commits web page and extracts info\nabout the latest commit so you can compare to \nyour installed version.\n\n(does not require git)")
AutoResize = True
Text = ("Check GitLab")
}
{ cbCheckOnStart NCheckBox
MoveScaled(15,0,21,4)
ToolTip = ("Auto-read gitlab commits page on program launch")
Text = ("Check on start")
Picture = Picture[".public/12008-thumbs-up-icon.png"]
}
{ btnCheckGitlab FlashButton
MoveScaled(1,0,13,3)
ToolTip = ("Reads the gitlab commits web page and extracts info\nabout the latest commit so you can compare to \nyour installed version.\n\n(does not require git)")
AutoResize = True
Text = ("Check GitLab")
}
{ LabelGLMaster Label
MoveScaled(2,12,33,5)
Expand = True
{ cbCheckOnStart NCheckBox
MoveScaled(15,0,16,4)
ToolTip = ("Auto-read gitlab commits page on program launch")
AutoResize = True
Text = ("master branch:\nV 0.00.0")
Text = ("Check on start")
Picture = Picture[".public/12008-thumbs-up-icon.png"]
}
}
{ LabelGLMaster Label
MoveScaled(35,0,15,5)
Expand = True
AutoResize = True
Text = ("master branch:\nV 0.00.0")
}
{ ComboGotoGitlab ComboBox
MoveScaled(55,1,22,4)
ReadOnly = True
List = [("Open a Webpage"), ("Goto Gambas lab"), ("Goto Gambas master commits"), ("Goto Gambas stable commits"), ("Goto branch lab"), ("Goto branch commits")]
}
}
{ Separator1 Separator
MoveScaled(23,14,35,1)
}
{ HBoxGIT HBox
MoveScaled(4,21,75,4)
MoveScaled(2,15,75,4)
Spacing = True
{ Label12 Label
MoveScaled(2,0,9,4)
......@@ -302,7 +293,7 @@
Text = ("Use Git: ")
}
{ cbD1 NCheckBox
MoveScaled(12,0,18,4)
MoveScaled(12,0,14,3)
ToolTip = ("Only clone the the top level commit not\nall the changes in the history.\n\nThis stops using 'git pull' to update\nand deletes the source folder after install.\n\nNOTE:\nThis feature is experimental ant not well tested.\ni reccomend not to use it and clone the whole gambas repository.")
AutoResize = True
Text = ("--depth=1")
......@@ -315,7 +306,7 @@
Text = ("git pull")
}
{ Separator6 Separator
MoveScaled(43,0,2,3)
MoveScaled(44,0,2,3)
}
{ btnGPUpstream Button
MoveScaled(47,0,18,3)
......@@ -324,11 +315,11 @@
Text = ("upstream master")
}
}
{ Separator1 Separator
MoveScaled(22,25,35,1)
{ Separator4 Separator
MoveScaled(23,20,35,1)
}
{ HSplit1 HSplit
MoveScaled(1,26,77,16)
MoveScaled(1,22,77,20)
Expand = True
Spacing = True
{ PanelPrevCommit Panel
......@@ -354,11 +345,9 @@
}
}
{ Panel9 Panel
MoveScaled(42,1,34,11)
MoveScaled(38,1,38,19)
Expand = True
Arrangement = Arrange.Vertical
Spacing = True
Margin = True
{ Label5 Label
MoveScaled(4,0,24,3)
AutoResize = True
......@@ -366,7 +355,7 @@
Text = ("Status / messages")
}
{ taLatest TextArea
MoveScaled(2,4,31,7)
MoveScaled(2,4,35,13)
Expand = True
ReadOnly = True
Wrap = True
......@@ -376,6 +365,7 @@
}
{ HBox3 HBox
MoveScaled(7,43,71,4)
Visible = False
{ cbShowLast NCheckBox
MoveScaled(0,0,37,4)
Text = ("Show previously downloaded commit")
......
<center>
# <u>A Gambas3 Compile/Install Utility</u>\
Version "1.1.4"
Version "1.1.6"
<img src="http://bws.org.uk/images/GambasUpdatelogo.png">
......
<h1 align=center><u>Gambas Compiler/Installer</u></h1>
Version "1.1.4"
Version "1.1.6"
### Sorry just brief help for now...
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment