...
 
Commits (7)
......@@ -367,7 +367,7 @@ Private Sub SaveSuites()
hSettings = New Settings(Project.Dir &/ ".test")
hSettings.Clear("/TestSuites")
hSettings.Clear("/TestSuites", True)
lvwSuite.MoveFirst
While lvwSuite.Available
......
......@@ -732,7 +732,7 @@ Public Sub tbvField_Data(Row As Integer, Column As Integer)
Case 0
If hCField.Key Then
.Picture = Picture["img/16/key.png"]
.Picture = Picture["icon:/small/key"]
.Alignment = Align.Center
Endif
......
......@@ -68,13 +68,8 @@ End
Static Public Sub GetIcon(sClass As String, sComp As String, Optional iSize As Integer) As Picture
Dim hPict As Picture
Dim hImage As Image
Dim sPath As String
'Dim sText As String
'Dim X, Y As Float
'Dim iInd As Integer
'Dim I As Integer
Dim hClass As CClassInfo
Dim W As Integer
Dim F As Integer
......@@ -88,16 +83,16 @@ Static Public Sub GetIcon(sClass As String, sComp As String, Optional iSize As I
Else
sPath = File.Dir(File.Dir(Component.Path)) &/ "share/gambas" & System.Version &/ "control" &/ sComp &/ LCase(sClass) & ".png"
Endif
Try hPict = Picture.Load(sPath)
If hPict Then Break
Try hImage = Image.Load(sPath)
If hImage Then Break
If hClass.Parent <> sClass Then Break
sComp = hClass.ParentComponent
If Not sComp Then Break
Loop
If Not hPict Then Try hPict = Picture["img/control" &/ LCase(sClass) & ".png"]
If Not hImage Then Try hImage = Image.Load("img/control" &/ LCase(sClass) & ".png")
If Not hPict Then
If Not hImage Then
hImage = New Image(1, 1)
......@@ -130,15 +125,15 @@ Static Public Sub GetIcon(sClass As String, sComp As String, Optional iSize As I
Paint.End
hPict = hImage.Picture
Endif
If iSize Then
If hPict.Width <> iSize Then hPict = hPict.Image.Stretch(iSize, iSize).Picture
If hImage.Width <> iSize Then hImage = hImage.Stretch(iSize, iSize)
Endif
Return hPict
If Application.DarkTheme Then hImage = hImage.Invert(True)
Return hImage.Picture
End
......
......@@ -1284,43 +1284,6 @@
Expand = True
Border = False
}
{ panTreeToolbar Panel
MoveScaled(2,8,22,3)
Visible = False
Ignore = True
Arrangement = Arrange.Horizontal
AutoResize = True
{ btnEdit ToolButton
MoveScaled(0,0,3,3)
Action = "edit-file"
Picture = Picture["icon:/tiny/edit"]
}
{ btnOpenCode ToolButton
MoveScaled(3,0,3,3)
Action = "edit-class"
Picture = Picture["icon:/tiny/text"]
}
{ btnRunThat ToolButton
MoveScaled(6,0,3,3)
Action = "run-that"
Picture = Picture["icon:/tiny/play"]
}
{ btnDoNotTranslate ToolButton
MoveScaled(9,0,3,3)
Action = "do-not-translate"
Picture = Picture["img/16/do-not-translate.png"]
}
{ btnStartup ToolButton
MoveScaled(12,0,3,3)
Action = "startup"
Picture = Picture["icon:/tiny/program"]
}
{ btnInfo ToolButton
MoveScaled(15,0,3,3)
Action = "info"
Picture = Picture["icon:/tiny/info"]
}
}
{ timSearchProject #Timer
#MoveScaled(22,13)
Delay = 500
......@@ -1353,13 +1316,6 @@
MoveScaled(86,8,0,9)
Visible = False
}
{ btnWorkspaceProperty ToolButton
MoveScaled(27,1,4,4)
Visible = False
ToolTip = ("Show properties sheet")
Ignore = True
Picture = Picture["icon:/small/properties"]
}
{ btnWorkspaceProject ToolButton
MoveScaled(22,1,4,4)
Visible = False
......@@ -1367,6 +1323,13 @@
Ignore = True
Picture = Picture["icon:/small/view-tree"]
}
{ btnWorkspaceProperty ToolButton
MoveScaled(27,1,4,4)
Visible = False
ToolTip = ("Show properties sheet")
Ignore = True
Picture = Picture["icon:/small/properties"]
}
}
{ panDebug SidePanel
MoveScaled(3,37,81,14)
......@@ -1421,13 +1384,6 @@
Text = ("Hierarchy")
Index = 0
}
{ btnPropertyHelp ToolButton
MoveScaled(4,0,4,4)
Visible = False
ToolTip = ("Show property help")
Ignore = True
Picture = Picture["icon:/small/help"]
}
{ btnPropertyToolbar ToolButton
MoveScaled(0,0,4,4)
Visible = False
......@@ -1435,6 +1391,13 @@
Ignore = True
Picture = Picture["img/16/control.png"]
}
{ btnPropertyHelp ToolButton
MoveScaled(4,0,4,4)
Visible = False
ToolTip = ("Show property help")
Ignore = True
Picture = Picture["icon:/small/help"]
}
}
{ panTool SidePanel
MoveScaled(5,49,21,37)
......@@ -1558,17 +1521,16 @@
{ Action do-not-translate
Text = "Do not translate"
Shortcut = ""
Picture = "img/16/do-not-translate.png"
Picture = "img/32/do-not-translate.png"
}
{ Action edit-class
Text = "Open code"
Shortcut = ""
Picture = "icon:/tiny/text"
}
{ Action edit-file
Text = "Open"
Shortcut = ""
Picture = "icon:/tiny/edit"
Picture = "icon:/small/edit"
}
{ Action exec
Text = "Executable"
......@@ -1625,7 +1587,7 @@
{ Action info
Text = "Properties"
Shortcut = "Ctrl+Shift+I"
Picture = "icon:/tiny/info"
Picture = "icon:/small/info"
}
{ Action install
Text = "Installation package"
......@@ -1773,7 +1735,7 @@
{ Action run-that
Text = "Run this class"
Shortcut = ""
Picture = "icon:/tiny/play"
Picture = "icon:/small/play"
}
{ Action run-with
Text = "Run with"
......@@ -1810,10 +1772,6 @@
Shortcut = "F5"
Picture = "icon:/small/play"
}
{ Action startup
Text = ""
Picture = "icon:/tiny/program"
}
{ Action startup-class
Text = "Startup class"
Shortcut = "Alt+S"
......
......@@ -41,7 +41,6 @@ Private Sub ShowWaiting(bShow As Boolean)
$hSpinner.Hide
Endif
End
' Public Sub WebView_Error()
......
......@@ -6374,8 +6374,6 @@ Public Sub ShouldTranslate(sPath As String, Optional bRecursive As Boolean) As B
sRelPath = MakeProjectRelativePath(sPath)
If DoNotTranslate.Exist(sRelPath) Then Return
If File.BaseName(sPath) = "CRecentProject" Then Stop
If File.Ext(sPath) = "class" Then
sFormPath = FindForm(File.BaseName(sPath))
If sFormPath Then
......
......@@ -16,7 +16,7 @@
Spacing = True
{ btnUndo Button
MoveScaled(1,0,16,4)
Text = ("Revert")
Text = ("Reset")
Picture = Picture["icon:/small/undo"]
}
{ Spring1 Spring
......@@ -29,7 +29,8 @@
}
{ btnCancel Button
MoveScaled(43,0,16,4)
Text = ("Cancel")
Text = ("Close")
Picture = Picture["icon:/small/close"]
Cancel = True
}
}
......
app/src/gambas3/img/16/average.png

424 Bytes | W: | H:

app/src/gambas3/img/16/average.png

416 Bytes | W: | H:

app/src/gambas3/img/16/average.png
app/src/gambas3/img/16/average.png
app/src/gambas3/img/16/average.png
app/src/gambas3/img/16/average.png
  • 2-up
  • Swipe
  • Onion skin
app/src/gambas3/img/16/checked-lock.png

161 Bytes | W: | H:

app/src/gambas3/img/16/checked-lock.png

157 Bytes | W: | H:

app/src/gambas3/img/16/checked-lock.png
app/src/gambas3/img/16/checked-lock.png
app/src/gambas3/img/16/checked-lock.png
app/src/gambas3/img/16/checked-lock.png
  • 2-up
  • Swipe
  • Onion skin
app/src/gambas3/img/16/checked.png

210 Bytes | W: | H:

app/src/gambas3/img/16/checked.png

190 Bytes | W: | H:

app/src/gambas3/img/16/checked.png
app/src/gambas3/img/16/checked.png
app/src/gambas3/img/16/checked.png
app/src/gambas3/img/16/checked.png
  • 2-up
  • Swipe
  • Onion skin
app/src/gambas3/img/16/percent.png

555 Bytes | W: | H:

app/src/gambas3/img/16/percent.png

547 Bytes | W: | H:

app/src/gambas3/img/16/percent.png
app/src/gambas3/img/16/percent.png
app/src/gambas3/img/16/percent.png
app/src/gambas3/img/16/percent.png
  • 2-up
  • Swipe
  • Onion skin
comp/src/gb.form.stock/gambas/32/harddisk.png

160 Bytes | W: | H:

comp/src/gb.form.stock/gambas/32/harddisk.png

160 Bytes | W: | H:

comp/src/gb.form.stock/gambas/32/harddisk.png
comp/src/gb.form.stock/gambas/32/harddisk.png
comp/src/gb.form.stock/gambas/32/harddisk.png
comp/src/gb.form.stock/gambas/32/harddisk.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -25,12 +25,14 @@ Public WrapMode As Boolean
Public HideCursor As Boolean
Static Private $aDarkColor As Integer[] = [
&H808080, &HC00000, &H00C000, &HC0C000, &H0060C0, &HC000C0, &H00C0C0, &HFFFFFF,
&H000000, &HFF0000, &H00FF00, &HFFFF00, &H0080FF, &HFF00FF, &H00FFFF, &HC0C0C0]
&H404040, &HC00000, &H00C000, &HD0C000, &H005090, &H900090, &H009090, &HC0C0C0,
&HA0A0A0, &HFF0000, &H00FF00, &HFFFF00, &H0080FF, &HFF00FF, &H00FFFF, &HFFFFFF]
'&H808080, &HC00000, &H00C000, &HD0C000, &H0060C0, &H800080, &H008080, &HFFFFFF,
'&H000000, &HFF0000, &H00FF00, &HFFFF00, &H0080FF, &HFF00FF, &H00FFFF, &HC0C0C0]
Static Private $aColor As Integer[] = [
&H000000, &HFF0000, &H00FF00, &HFFFF00, &H0080FF, &HFF00FF, &H00FFFF, &HC0C0C0,
&H808080, &H800000, &H008000, &H808000, &H004080, &H800080, &H008080, &HFFFFFF,
&H000000, &HC00000, &H00C000, &HD0C000, &H0060C0, &H900090, &H009090, &HC0C0C0,
&H808080, &H800000, &H008000, &H606000, &H004080, &H600060, &H006060, &HF0F0F0,
&H000000, &H00005F, &H000087, &H0000AF, &H0000D7, &H0000FF,
&H005F00, &H005F5F, &H005F87, &H005FAF, &H005FD7, &H005FFF,
&H008700, &H00875F, &H008787, &H0087AF, &H0087D7, &H0087FF,
......
......@@ -101,6 +101,7 @@ internet [-breeze*]places/folder-html;categories/applications-int
intersection #
js $(mime)/application-javascript
jump actions/go-jump
key [breeze*]$(mime)/application-pgp-keys;apps/password-manager;apps/keyring-manager;actions/pgp-keys
keyboard preferences/preferences-desktop-keyboard;apps/preferences-desktop-keyboard
lamp actions/help-hint
language [-breeze*]actions/im-google-talk;apps/preferences-desktop-locale
......
......@@ -2,6 +2,18 @@
Public Sub Main()
Dim hSettings As Settings
hSettings = New Settings("~/test.conf")
'hSettings["/TestSuites/Count"] = 10
' For I = 1 To 10
' hSettings["/TestSuites/" & CStr(I) &/ "Name"] = "Name" & CStr(I)
' hSettings["/TestSuites/" & CStr(I) &/ "Tests"] = Rnd
' Next
' hSettings.Save
hSettings.Clear("/TestSuites", True)
hSettings.Save
End
' Private Sub Dump(hSettings As Settings)
......
......@@ -288,11 +288,12 @@ Public Sub _put(Value As Variant, Key As String)
End
Public Sub Clear(Optional ParentKey As String)
Public Sub Clear(Optional ParentKey As String, Recursive As Boolean)
Dim sSlot As String
Dim hSlot As Collection
Dim vVal As Variant
Dim sRemove As String
If Not ParentKey Then
If $cSlot.Count Then
......@@ -300,19 +301,37 @@ Public Sub Clear(Optional ParentKey As String)
$bModify = True
$bModifyAll = True
Endif
Else
Return
Endif
sSlot = GetSlot(ParentKey &/ "g")
If Not Recursive Then
hSlot = $cSlot[sSlot]
If hSlot Then
For Each vVal In hSlot
$cModify[sSlot &/ hSlot.Key] = True
Next
$cSlot.Remove(sSlot)
$bModify = True
sRemove = sSlot
GoSub REMOVE_SLOT
Endif
Else
For Each hSlot In $cSlot
sRemove = $cSlot.Key
If sRemove = sSlot Or If sRemove Begins sSlot & "/" Then
GoSub REMOVE_SLOT
Endif
Next
Endif
'Save()
Return
REMOVE_SLOT:
For Each vVal In hSlot
$cModify[sRemove &/ hSlot.Key] = True
Next
$cSlot.Remove(sRemove)
$bModify = True
Return
End
......