ButtonBox: Add the Placeholder property. Add 'added', 'modified' and 'conflict' icons.

[GB.FORM]
* NEW: ButtonBox: Add the Placeholder property.
* NEW: Add 'added', 'modified' and 'conflict' icons.
* NEW: Document the Spinner control.
This commit is contained in:
gambas 2021-10-14 02:17:11 +02:00
parent 8a692b1883
commit c897a81d8b
3 changed files with 39 additions and 2 deletions

View file

@ -4,7 +4,7 @@ Export
Inherits UserControl Inherits UserControl
Public Const _Properties As String = "*,Action,Text,Alignment{Align.Normal;Left;Center;Right}=Normal,Picture,ReadOnly,Border=True,Button=True,ClearButton,Filter,FilterMenu{Menu}" Public Const _Properties As String = "*,Action,Text,Alignment{Align.Normal;Left;Center;Right}=Normal,Picture,ReadOnly,Placeholder,Border=True,Button=True,ClearButton,Filter,FilterMenu{Menu}"
Public Const _DefaultEvent As String = "Click" Public Const _DefaultEvent As String = "Click"
Public Const _DefaultSize As String = "24,4" Public Const _DefaultSize As String = "24,4"
Public Const _Similar As String = "TextBox" Public Const _Similar As String = "TextBox"
@ -28,6 +28,7 @@ Property Alignment As Integer
Property ClearButton As Boolean Property ClearButton As Boolean
Property Filter As Boolean Property Filter As Boolean
Property FilterMenu As String Property FilterMenu As String
Property Placeholder As String
'Private $hPanel As Panel 'Private $hPanel As Panel
Private $hBackground As DrawingArea Private $hBackground As DrawingArea
@ -401,3 +402,15 @@ Public Sub FilterNow()
FilterTimer_Timer FilterTimer_Timer
End End
Private Function Placeholder_Read() As String
Return $hTextBox.Placeholder
End
Private Sub Placeholder_Write(Value As String)
$hTextBox.Placeholder = Value
End

View file

@ -7,14 +7,35 @@ Inherits UserControl
Public Const _Properties As String = "*,Border,Label,Padding{Range:0;63},Margin=False,Type={Spinner.*}" Public Const _Properties As String = "*,Border,Label,Padding{Range:0;63},Margin=False,Type={Spinner.*}"
Public Const _DefaultSize As String = "8,8" Public Const _DefaultSize As String = "8,8"
Public Enum {Line}, Dot, Circle '' Spinner type drawing lines.
Public Const {Line} As Integer = 0
'' Spinner type drawing dots.
Public Const Dot As Integer = 1
'' Spinner type drawing a ring.
Public Const Circle As Integer = 2
Property Border As Boolean Property Border As Boolean
Property Label As Boolean Property Label As Boolean
Property Value As Float Property Value As Float
Property Enabled As Boolean Property Enabled As Boolean
Property Padding As Integer Property Padding As Integer
'' @{since 3.16}
''
'' Return or set if there is an inner margin between the spinner and the control border.
Property Margin As Boolean Property Margin As Boolean
'' @{since 3.16}
''
'' Return or set the Spinner type.
''
'' The following types are implemented: [../line], [../dot], [../circle].
''
'' The default type is [../line].
Property Type As Integer Property Type As Integer
Private $fStartTime As Float Private $fStartTime As Float

View file

@ -1,5 +1,6 @@
access preferences/preferences-desktop-accessibility;apps/preferences-desktop-accessibility access preferences/preferences-desktop-accessibility;apps/preferences-desktop-accessibility
add actions/list-add add actions/list-add
added emblems/vcs-added;emblem/added
agenda apps/agenda;actions/view-calendar-agenda agenda apps/agenda;actions/view-calendar-agenda
align-bottom actions/align-vertical-bottom align-bottom actions/align-vertical-bottom
align-center actions/align-horizontal-center align-center actions/align-horizontal-center
@ -48,6 +49,7 @@ color [-breeze*]actions/color-picker-grey;[breeze*]apps/prefer
color-picker actions/color-picker color-picker actions/color-picker
component categories/applications-utilities;apps/nepomuk component categories/applications-utilities;apps/nepomuk
computer devices/computer computer devices/computer
conflict emblems/vcs-conflicting;emblems/emblem-cvs-conflict
connect actions/network-connect connect actions/network-connect
contrast # contrast #
copy actions/edit-copy copy actions/edit-copy
@ -166,6 +168,7 @@ md $(mime)/text-x-markdown
media-player devices/multimedia-player media-player devices/multimedia-player
menu apps/alacarte;apps/kmenuedit;actions/application-menu menu apps/alacarte;apps/kmenuedit;actions/application-menu
microphone devices/audio-input-microphone microphone devices/audio-input-microphone
modified emblems/vcs-locally-modified;emblems/emblem-csv-modified
monitor apps/utilities-system-monitor monitor apps/utilities-system-monitor
mouse devices/input-mouse mouse devices/input-mouse
mount actions/media-mount mount actions/media-mount