[DEVELOPMENT ENVIRONMENT]
* BUG: Fix ArchLinux package creation when a vendor prefix is used. * BUG: Fix Slackware package creation too. * NEW: Use SHIFT+DEL as project file remove shortcut. [OLD WIKI CGI SCRIPT] * NEW: Add a deprecation message in all wiki pages. [GB.FORM] * BUG: Balloon: Don't save the balloon image in the home directory anymore. This was for debugging purpose. * NEW: TableView editor background is used by its container now. [GB.FORM.MDI] * NEW: Shortcut editor: Use the standard background for the shortcut TableView editor. git-svn-id: svn://localhost/gambas/trunk@6487 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
parent
35005c14cf
commit
af991b1e8d
10 changed files with 27 additions and 23 deletions
|
@ -4,6 +4,7 @@ Title=Gambas documentation CGI script
|
|||
Startup=Main
|
||||
Icon=help.png
|
||||
Version=3.5.90
|
||||
VersionFile=1
|
||||
Component=gb.db
|
||||
Component=gb.eval
|
||||
TabSize=2
|
||||
|
|
|
@ -1931,6 +1931,8 @@ Private Sub MakeHeader(Optional sTitle As String, Optional sWarn As String)
|
|||
|
||||
Print
|
||||
|
||||
Print "<div><div style=\"display:inline-table;color:white;background:red;padding:8px;font-size:150%;font-weight:bold;margin:8px 0;\">THIS WIKI IS DEPRECATED AND IS READ-ONLY. THE NEW WIKI IS <a href=\"http://gambaswiki.org\">THERE</a>.</div></div>"
|
||||
|
||||
If Not $bShow And ($bHelp Or $bHistory) Then
|
||||
|
||||
Print "<table class=\"tabheader frame\" cellpadding=\"0\" cellspacing=\"0\" width=\"100%\"><tr>"
|
||||
|
|
|
@ -565,7 +565,7 @@
|
|||
Action = ".delete"
|
||||
Text = Shortcut(("Delete"), "D") & "..."
|
||||
Picture = Picture["icon:/small/delete"]
|
||||
Shortcut = "Del"
|
||||
Shortcut = "Shift+Del"
|
||||
}
|
||||
{ mnuCopyPathSep Menu
|
||||
}
|
||||
|
@ -643,7 +643,7 @@
|
|||
Name = "mnuKillConnection"
|
||||
Text = Shortcut(("Remove"), "R")
|
||||
Picture = Picture["icon:/small/delete"]
|
||||
Shortcut = "Del"
|
||||
Shortcut = "Shift+Del"
|
||||
}
|
||||
{ Menu25 Menu
|
||||
}
|
||||
|
@ -1339,7 +1339,7 @@
|
|||
}
|
||||
{ Action delete
|
||||
Text = "Delete"
|
||||
Shortcut = "Del"
|
||||
Shortcut = "Shift+Del"
|
||||
Picture = "icon:/small/delete"
|
||||
}
|
||||
{ Action exec
|
||||
|
|
|
@ -34,12 +34,12 @@
|
|||
MoveScaled(1,10,70,4)
|
||||
Spacing = True
|
||||
{ chkPrefix CheckBox
|
||||
MoveScaled(0,0,39,4)
|
||||
MoveScaled(0,0,41,4)
|
||||
AutoResize = True
|
||||
Text = ("Prefix package name with the vendor name")
|
||||
}
|
||||
{ Label8 Label
|
||||
MoveScaled(41,0,15,4)
|
||||
MoveScaled(43,0,16,4)
|
||||
Expand = True
|
||||
AutoResize = True
|
||||
Text = ("Package version")
|
||||
|
|
|
@ -2016,7 +2016,7 @@ Private Function MakeArchPackage(sSys As String)
|
|||
Print #hFile, "# Maintainer : " & Project.Maintainer & " <" & Project.Address & ">"
|
||||
Print #hFile, ""
|
||||
Print #hFile, "pkgname="; $sPackageName
|
||||
Print #hFile, "_realname="; $sPackageName
|
||||
Print #hFile, "_realname="; $sName
|
||||
Print #hFile, "pkgdesc=\"" & sPkgDesc & "\""
|
||||
Print #hFile, "pkgver=" & $sVersion
|
||||
Print #hFile, "pkgrel=1"
|
||||
|
@ -2104,7 +2104,7 @@ Private Function MakeArchPackage(sSys As String)
|
|||
RunCommand(sCmd, sBuildDir)
|
||||
Next
|
||||
|
||||
RunCommand("cp " & String.LCase$($sName) & "-" & $sVersion & "-1*.tar.* " & Shell$(Path) &/ "", sBuildDir)
|
||||
RunCommand("cp " & $sPackageName & "-" & $sVersion & "-1*.tar.* " & Shell$(Path) &/ "", sBuildDir)
|
||||
|
||||
' Remove build dir
|
||||
Shell "rm -rf " & Shell(sBuildDir) Wait
|
||||
|
|
|
@ -385,6 +385,7 @@ Private Sub LastOpenedFiles()
|
|||
Inc Application.Busy
|
||||
RestoringFiles = True
|
||||
Workspace.Lock
|
||||
CPosition.Disable
|
||||
|
||||
nOpen = Config["/OpenFile/Count", 0]
|
||||
iActive = Config["/OpenFile/Active", 0]
|
||||
|
@ -412,6 +413,7 @@ Private Sub LastOpenedFiles()
|
|||
Activate(hActive)
|
||||
Workspace.ActiveWindow = hActive
|
||||
Endif
|
||||
CPosition.Enable
|
||||
|
||||
Finally
|
||||
|
||||
|
@ -2970,7 +2972,6 @@ Public Function MakeExecutable(Optional bDoNotIncVersion As Boolean, Optional bS
|
|||
DisableRefresh
|
||||
|
||||
sExecPath = GetExecPath()
|
||||
If Not Exist(File.Dir(sExecPath)) Then sExecPath = Project.Dir &/ File.Name(sExecPath)
|
||||
|
||||
If Not bSilent Then
|
||||
|
||||
|
@ -3602,12 +3603,14 @@ Public Sub GetExecPath() As String
|
|||
If Not sExecPath Then sExecPath = OldExecPath
|
||||
If Not sExecPath Then sExecPath = Project.Name & ".gambas"
|
||||
|
||||
If Left(sExecPath) = "/" Then
|
||||
Return sExecPath
|
||||
Else
|
||||
Return Project.Dir &/ sExecPath
|
||||
If Left(sExecPath) <> "/" Then
|
||||
sExecPath = Project.Dir &/ sExecPath
|
||||
Endif
|
||||
|
||||
If Not Exist(File.Dir(sExecPath)) Then sExecPath = Project.Dir &/ File.Name(sExecPath)
|
||||
|
||||
Return sExecPath
|
||||
|
||||
End
|
||||
|
||||
Public Sub MakeShortcut(Optional bForce As Boolean)
|
||||
|
|
|
@ -93,8 +93,8 @@ Private Function BadShortcut_Read() As Boolean
|
|||
|
||||
End
|
||||
|
||||
Public Sub Form_Open()
|
||||
|
||||
panSpace.Width = 2
|
||||
|
||||
End
|
||||
' Public Sub Form_Open()
|
||||
'
|
||||
' panSpace.Width = 2
|
||||
'
|
||||
' End
|
||||
|
|
|
@ -2,16 +2,13 @@
|
|||
|
||||
{ Form Form
|
||||
MoveScaled(0,0,29,9)
|
||||
Background = Color.TextBackground
|
||||
Arrangement = Arrange.Fill
|
||||
{ Panel1 Panel
|
||||
MoveScaled(1,1,26,6)
|
||||
Background = Color.LightBackground
|
||||
Background = Color.TextBackground
|
||||
Arrangement = Arrange.Horizontal
|
||||
Padding = 2
|
||||
{ panSpace Panel
|
||||
MoveScaled(1,1,1,4)
|
||||
Background = Color.TextBackground
|
||||
}
|
||||
{ lblShortcut Label
|
||||
MoveScaled(3,1,17,4)
|
||||
Background = Color.TextBackground
|
||||
|
|
|
@ -228,7 +228,7 @@ Private Sub MakeBorder(Optional W As Integer, H As Integer)
|
|||
|
||||
Paint.End
|
||||
|
||||
hImage.Save("~/balloon.png")
|
||||
'hImage.Save("~/balloon.png")
|
||||
'hImage.Erase(Color.White)
|
||||
|
||||
Me.Picture = hImage.Picture
|
||||
|
|
|
@ -153,6 +153,7 @@ Private Sub MoveEditor()
|
|||
|
||||
$hPanel.Move(X, Y, W, H)
|
||||
$hEditor.Move(P, 0, W - P * 2, H)
|
||||
$hPanel.Background = Style.BackgroundOf($hEditor)
|
||||
|
||||
$hEditor.Font = Me.Font
|
||||
$hEditor.Show
|
||||
|
|
Loading…
Reference in a new issue