Toolbar: Don't use a specific dark theme background pattern for toolbars in configuration mode
[GB.FORM.MDI] * NEW: Toolbar: Don't use a specific dark theme background pattern for toolbars in configuration mode
This commit is contained in:
gambas
parent
a7ac437296
commit
fdcab401a7
4 changed files with 13 additions and 521 deletions
|
|
@ -1,6 +1,6 @@
|
|||
# Gambas Project File 3.0
|
||||
Title=Multiple document interface management
|
||||
Startup=FTestBackground
|
||||
Startup=Form1
|
||||
Icon=.hidden/control/workspace.png
|
||||
Version=3.15.90
|
||||
VersionFile=1
|
||||
|
|
@ -9,7 +9,7 @@ Component=gb.gui
|
|||
Component=gb.form
|
||||
Component=gb.settings
|
||||
Authors="Benoît Minisini"
|
||||
Environment="GB_GUI=gb.gtk3\nGTK_DEBUG=interactive"
|
||||
Environment="GB_GUI=gb.qt5\nGTK_DEBUG=interactive"
|
||||
TabSize=2
|
||||
Translate=1
|
||||
Language=en
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
' Gambas class file
|
||||
|
||||
|
|
@ -1,507 +0,0 @@
|
|||
# Gambas Form File 3.0
|
||||
|
||||
{ Form Form
|
||||
MoveScaled(0,0,119,93)
|
||||
Arrangement = Arrange.Vertical
|
||||
Margin = True
|
||||
{ panToolBar ToolBar
|
||||
MoveScaled(1,1,116,4)
|
||||
Key = "connection"
|
||||
Text = ("Connection editor")
|
||||
Separator = True
|
||||
{ btnTitle ToolButton
|
||||
MoveScaled(0,0,4,4)
|
||||
Action = ".database"
|
||||
Picture = Picture["icon:/small/server"]
|
||||
}
|
||||
{ btnShowSystem ToolButton
|
||||
MoveScaled(4,0,4,4)
|
||||
ToolTip = ("Show system tables")
|
||||
Action = ".show-system"
|
||||
Toggle = True
|
||||
}
|
||||
{ Separator3 Separator
|
||||
MoveScaled(8,0,0,4)
|
||||
}
|
||||
{ btnNewTable ToolButton
|
||||
MoveScaled(9,0,8,4)
|
||||
ToolTip = ("New table")
|
||||
Action = ".new-table"
|
||||
AutoResize = True
|
||||
Text = ("New table") & "..."
|
||||
Picture = Picture["icon:/small/new"]
|
||||
}
|
||||
{ btnSave ToolButton mnuSave
|
||||
Name = "btnSave"
|
||||
MoveScaled(17,0,4,4)
|
||||
ToolTip = ("Save")
|
||||
Action = ".save"
|
||||
Picture = Picture["icon:/small/save"]
|
||||
}
|
||||
{ btnReload ToolButton mnuReload
|
||||
Name = "btnReload"
|
||||
MoveScaled(21,0,4,4)
|
||||
ToolTip = ("Reload")
|
||||
Action = ".reload"
|
||||
Picture = Picture["icon:/small/refresh"]
|
||||
}
|
||||
{ Separator4 Separator
|
||||
MoveScaled(26,0,0,4)
|
||||
}
|
||||
{ btnKill ToolButton
|
||||
MoveScaled(27,0,11,4)
|
||||
ToolTip = ("Delete table")
|
||||
Action = ".remove-table"
|
||||
AutoResize = True
|
||||
Text = ("Remove")
|
||||
Picture = Picture["icon:/small/delete"]
|
||||
}
|
||||
{ btnRename ToolButton
|
||||
MoveScaled(39,0,11,4)
|
||||
ToolTip = ("Rename table")
|
||||
Action = ".rename-table"
|
||||
AutoResize = True
|
||||
Text = ("Rename") & "..."
|
||||
Picture = Picture["icon:/small/edit"]
|
||||
}
|
||||
{ btnCopyTable ToolButton
|
||||
MoveScaled(51,0,6,4)
|
||||
ToolTip = ("Copy table")
|
||||
Action = ".copy-table"
|
||||
AutoResize = True
|
||||
Text = ("Copy")
|
||||
Picture = Picture["icon:/small/copy"]
|
||||
}
|
||||
{ btnPasteTable ToolButton
|
||||
MoveScaled(58,0,4,4)
|
||||
ToolTip = ("Paste table")
|
||||
Action = ".paste-table"
|
||||
AutoResize = True
|
||||
Text = ("Paste") & "..."
|
||||
Picture = Picture["icon:/small/paste"]
|
||||
}
|
||||
{ btnImport ToolButton
|
||||
MoveScaled(64,0,12,4)
|
||||
ToolTip = ("Import text file")
|
||||
Action = ".import-table"
|
||||
AutoResize = True
|
||||
Text = ("Import") & "..."
|
||||
Picture = Picture["icon:/small/open"]
|
||||
}
|
||||
}
|
||||
{ HBox1 HBox
|
||||
MoveScaled(2,12,148,79)
|
||||
Expand = True
|
||||
{ spnTable SidePanel
|
||||
MoveScaled(1,1,28,73)
|
||||
Arrangement = Arrange.Vertical
|
||||
Orientation = Align.Left
|
||||
Separator = True
|
||||
{ lvwTable TreeView
|
||||
MoveScaled(2,18,22,26)
|
||||
Expand = True
|
||||
Border = False
|
||||
}
|
||||
}
|
||||
{ VBox1 VBox
|
||||
MoveScaled(32,1,108,77)
|
||||
Expand = True
|
||||
{ splTable VSplit
|
||||
MoveScaled(1,1,106,72)
|
||||
Expand = True
|
||||
{ panTable Panel
|
||||
MoveScaled(2,2,89,35)
|
||||
Arrangement = Arrange.Fill
|
||||
Spacing = True
|
||||
{ tabTable TabPanel
|
||||
MoveScaled(1,5,68,26)
|
||||
Expand = True
|
||||
Arrangement = Arrange.Vertical
|
||||
Border = False
|
||||
Count = 2
|
||||
Index = 0
|
||||
Text = ("Fields")
|
||||
{ tlbField ToolBar
|
||||
MoveScaled(1,1,65,4)
|
||||
{ btnSaveTable ToolButton
|
||||
MoveScaled(0,0,9,4)
|
||||
Visible = False
|
||||
AutoResize = True
|
||||
Text = ("Save")
|
||||
Picture = Picture["icon:/small/save"]
|
||||
}
|
||||
{ btnNewField ToolButton
|
||||
MoveScaled(9,0,8,4)
|
||||
AutoResize = True
|
||||
Text = ("Add")
|
||||
Picture = Picture["icon:/small/add"]
|
||||
}
|
||||
{ btnKillField ToolButton
|
||||
MoveScaled(17,0,12,4)
|
||||
AutoResize = True
|
||||
Text = ("Remove")
|
||||
Picture = Picture["icon:/small/remove"]
|
||||
}
|
||||
{ btnDownField ToolButton
|
||||
MoveScaled(28,0,9,4)
|
||||
AutoResize = True
|
||||
Text = ("Down")
|
||||
Picture = Picture["icon:/small/down"]
|
||||
}
|
||||
{ btnUpField ToolButton
|
||||
MoveScaled(37,0,7,4)
|
||||
AutoResize = True
|
||||
Text = ("Up")
|
||||
Picture = Picture["icon:/small/up"]
|
||||
}
|
||||
{ btnCopyFieldList ToolButton
|
||||
MoveScaled(44,0,18,4)
|
||||
ToolTip = ("Copy")
|
||||
AutoResize = True
|
||||
Text = ("Copy field list")
|
||||
Picture = Picture["icon:/small/copy"]
|
||||
}
|
||||
}
|
||||
{ Separator1 Separator
|
||||
MoveScaled(19,6,8,0)
|
||||
}
|
||||
{ tbvField TableView
|
||||
MoveScaled(1,7,55,13)
|
||||
Expand = True
|
||||
Border = False
|
||||
Mode = Select.Single
|
||||
Padding = 4
|
||||
Header = GridView.Horizontal
|
||||
}
|
||||
Index = 1
|
||||
Text = ("Indexes")
|
||||
{ tlbIndex ToolBar
|
||||
MoveScaled(1,1,63,4)
|
||||
{ btnSaveTable2 ToolButton btnSaveTable
|
||||
Name = "btnSaveTable2"
|
||||
MoveScaled(0,0,9,4)
|
||||
Visible = False
|
||||
AutoResize = True
|
||||
Text = ("Save")
|
||||
Picture = Picture["icon:/small/save"]
|
||||
}
|
||||
{ btnNewIndex ToolButton
|
||||
MoveScaled(9,0,14,4)
|
||||
AutoResize = True
|
||||
Text = ("New index")
|
||||
Picture = Picture["icon:/small/new"]
|
||||
}
|
||||
{ btnNewIndexField ToolButton
|
||||
MoveScaled(23,0,8,4)
|
||||
AutoResize = True
|
||||
Text = ("Add")
|
||||
Picture = Picture["icon:/small/add"]
|
||||
}
|
||||
{ btnKillIndex ToolButton
|
||||
MoveScaled(31,0,12,4)
|
||||
AutoResize = True
|
||||
Text = ("Remove")
|
||||
Picture = Picture["icon:/small/remove"]
|
||||
}
|
||||
{ btnDownIndex ToolButton
|
||||
MoveScaled(42,0,10,4)
|
||||
AutoResize = True
|
||||
Text = ("Down")
|
||||
Picture = Picture["icon:/small/down"]
|
||||
}
|
||||
{ btnUpIndex ToolButton
|
||||
MoveScaled(51,0,8,4)
|
||||
AutoResize = True
|
||||
Text = ("Up")
|
||||
Picture = Picture["icon:/small/up"]
|
||||
}
|
||||
}
|
||||
{ Separator2 Separator
|
||||
MoveScaled(25,6,11,0)
|
||||
}
|
||||
{ tbvIndex TableView
|
||||
MoveScaled(1,7,61,14)
|
||||
Expand = True
|
||||
Border = False
|
||||
Mode = Select.Single
|
||||
Padding = 4
|
||||
Header = GridView.Horizontal
|
||||
}
|
||||
Index = 0
|
||||
}
|
||||
{ panRequest VBox
|
||||
MoveScaled(7,13,80,24)
|
||||
Visible = False
|
||||
Background = Color.Background
|
||||
{ tlbData2 ToolBar
|
||||
MoveScaled(0,0,75,4)
|
||||
Separator = True
|
||||
{ btnRunQuery ToolButton
|
||||
MoveScaled(0,0,12,4)
|
||||
AutoResize = True
|
||||
Text = ("Run query")
|
||||
Picture = Picture["icon:/small/play"]
|
||||
}
|
||||
{ btnAddQuery ToolButton
|
||||
MoveScaled(12,0,8,4)
|
||||
ToolTip = ("New query")
|
||||
AutoResize = True
|
||||
Text = ("New")
|
||||
Picture = Picture["icon:/small/new"]
|
||||
}
|
||||
{ btnRemoveQuery ToolButton
|
||||
MoveScaled(20,0,11,4)
|
||||
ToolTip = ("Remove query")
|
||||
AutoResize = True
|
||||
Text = ("Remove")
|
||||
Picture = Picture["icon:/small/remove"]
|
||||
}
|
||||
{ btnClear ToolButton
|
||||
MoveScaled(32,0,4,4)
|
||||
ToolTip = ("Clear")
|
||||
Picture = Picture["icon:/small/clear"]
|
||||
}
|
||||
{ btnCut ToolButton mnuCut
|
||||
Name = "btnCut"
|
||||
MoveScaled(36,0,4,4)
|
||||
ToolTip = ("Cut")
|
||||
Picture = Picture["icon:/small/cut"]
|
||||
}
|
||||
{ btnCopy ToolButton mnuCopy
|
||||
Name = "btnCopy"
|
||||
MoveScaled(40,0,4,4)
|
||||
ToolTip = ("Copy")
|
||||
Picture = Picture["icon:/small/copy"]
|
||||
}
|
||||
{ btnPaste ToolButton mnuPaste
|
||||
Name = "btnPaste"
|
||||
MoveScaled(44,0,4,4)
|
||||
ToolTip = ("Paste")
|
||||
Picture = Picture["icon:/small/paste"]
|
||||
}
|
||||
{ btnUndo ToolButton mnuUndo
|
||||
Name = "btnUndo"
|
||||
MoveScaled(48,0,4,4)
|
||||
ToolTip = ("Undo")
|
||||
Picture = Picture["icon:/small/undo"]
|
||||
}
|
||||
{ btnRedo ToolButton mnuRedo
|
||||
Name = "btnRedo"
|
||||
MoveScaled(52,0,4,4)
|
||||
ToolTip = ("Redo")
|
||||
Picture = Picture["icon:/small/redo"]
|
||||
}
|
||||
{ Spring1 Spring
|
||||
MoveScaled(58,1,5,2)
|
||||
}
|
||||
}
|
||||
{ tabRequest TabPanel
|
||||
MoveScaled(3,5,33,7)
|
||||
Border = False
|
||||
Index = 0
|
||||
Text = ("")
|
||||
Index = 0
|
||||
}
|
||||
{ edtRequest DrawingArea
|
||||
MoveScaled(16,12,40,7)
|
||||
Expand = True
|
||||
}
|
||||
}
|
||||
}
|
||||
{ panData Panel
|
||||
MoveScaled(2,39,103,31)
|
||||
Arrangement = Arrange.Fill
|
||||
{ datData DrawingArea
|
||||
MoveScaled(1,1,101,20)
|
||||
Arrangement = Arrange.Vertical
|
||||
{ tlbData ToolBar
|
||||
MoveScaled(2,2,97,4)
|
||||
Key = "connection-data"
|
||||
Separator = True
|
||||
{ btnEditData ToolButton
|
||||
MoveScaled(0,0,7,4)
|
||||
Action = ".edit-data"
|
||||
AutoResize = True
|
||||
Text = ("Edit")
|
||||
Picture = Picture["icon:/small/edit"]
|
||||
Toggle = True
|
||||
}
|
||||
{ btnExportData ToolButton
|
||||
MoveScaled(8,0,11,4)
|
||||
ToolTip = ("Export to CSV file")
|
||||
Action = ".export-data"
|
||||
AutoResize = True
|
||||
Text = ("Export") & "..."
|
||||
Picture = Picture["icon:/small/save-as"]
|
||||
}
|
||||
{ btnSaveData ToolButton
|
||||
MoveScaled(19,0,9,4)
|
||||
Enabled = False
|
||||
Action = ".save-data"
|
||||
AutoResize = True
|
||||
Text = ("Save")
|
||||
Picture = Picture["icon:/small/save"]
|
||||
}
|
||||
{ btnAddData ToolButton
|
||||
MoveScaled(28,0,8,4)
|
||||
Enabled = False
|
||||
Action = ".add-data"
|
||||
AutoResize = True
|
||||
Text = ("Add")
|
||||
Picture = Picture["icon:/small/add"]
|
||||
}
|
||||
{ btnRemoveData ToolButton
|
||||
MoveScaled(36,0,10,4)
|
||||
Enabled = False
|
||||
Action = ".delete-data"
|
||||
AutoResize = True
|
||||
Text = ("Delete")
|
||||
Picture = Picture["icon:/small/remove"]
|
||||
}
|
||||
{ btnSelectAll ToolButton
|
||||
MoveScaled(47,0,12,4)
|
||||
Action = ".select-all-data"
|
||||
AutoResize = True
|
||||
Text = ("Select all")
|
||||
Picture = Picture["icon:/small/select-all"]
|
||||
}
|
||||
{ btnUnselectAll ToolButton
|
||||
MoveScaled(59,0,12,4)
|
||||
Action = ".unselect-all-data"
|
||||
AutoResize = True
|
||||
Text = ("Unselect all")
|
||||
Picture = Picture["icon:/small/undo"]
|
||||
}
|
||||
{ lblCount Label
|
||||
MoveScaled(84,0,10,4)
|
||||
Expand = True
|
||||
Alignment = Align.Right
|
||||
}
|
||||
}
|
||||
{ dvwData DrawingArea
|
||||
MoveScaled(6,8,46,11)
|
||||
Expand = True
|
||||
}
|
||||
}
|
||||
{ datRequest DrawingArea
|
||||
MoveScaled(2,22,66,26)
|
||||
Visible = False
|
||||
Arrangement = Arrange.Vertical
|
||||
{ tlbData3 ToolBar
|
||||
MoveScaled(2,1,61,4)
|
||||
Key = "connection-export"
|
||||
Separator = True
|
||||
{ btnExportRequest ToolButton
|
||||
MoveScaled(0,0,12,4)
|
||||
ToolTip = ("Export to CSV file")
|
||||
Action = ".export-request"
|
||||
AutoResize = True
|
||||
Text = ("Export") & "..."
|
||||
Picture = Picture["icon:/small/save-as"]
|
||||
}
|
||||
}
|
||||
{ dvwRequest DrawingArea
|
||||
MoveScaled(2,7,46,17)
|
||||
Expand = True
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Gambas Action File 3.0
|
||||
|
||||
{ Actions
|
||||
{ Action add-data
|
||||
Text = "Add"
|
||||
Picture = "icon:/small/add"
|
||||
}
|
||||
{ Action copy-table
|
||||
Text = "Copy"
|
||||
Picture = "icon:/small/copy"
|
||||
}
|
||||
{ Action database
|
||||
Text = ""
|
||||
Picture = "icon:/small/server"
|
||||
}
|
||||
{ Action delete-data
|
||||
Text = "Delete"
|
||||
Picture = "icon:/small/remove"
|
||||
}
|
||||
{ Action edit-data
|
||||
Text = "Edit"
|
||||
Picture = "icon:/small/edit"
|
||||
}
|
||||
{ Action export-data
|
||||
Text = "Export"
|
||||
Picture = "icon:/small/save-as"
|
||||
}
|
||||
{ Action export-request
|
||||
Text = "Export"
|
||||
Picture = "icon:/small/save-as"
|
||||
}
|
||||
{ Action import-table
|
||||
Text = "Import"
|
||||
Picture = "icon:/small/open"
|
||||
}
|
||||
{ Action new-table
|
||||
Text = "New table"
|
||||
Picture = "icon:/small/new"
|
||||
}
|
||||
{ Action paste-table
|
||||
Text = "Paste"
|
||||
Picture = "icon:/small/paste"
|
||||
}
|
||||
{ Action reload
|
||||
Text = "Reload"
|
||||
Picture = "icon:/small/refresh"
|
||||
}
|
||||
{ Action remove-table
|
||||
Text = "Remove"
|
||||
Picture = "icon:/small/delete"
|
||||
}
|
||||
{ Action rename-table
|
||||
Text = "Rename"
|
||||
Picture = "icon:/small/edit"
|
||||
}
|
||||
{ Action save
|
||||
Text = "Save"
|
||||
Picture = "icon:/small/save"
|
||||
}
|
||||
{ Action save-data
|
||||
Text = "Save"
|
||||
Picture = "icon:/small/save"
|
||||
}
|
||||
{ Action select-all-data
|
||||
Text = "Select all"
|
||||
Picture = "icon:/small/select-all"
|
||||
}
|
||||
{ Action show-system
|
||||
Text = "Show system tables"
|
||||
Picture = "$ToolButton"
|
||||
}
|
||||
{ Action unselect-all-data
|
||||
Text = "Unselect all"
|
||||
Picture = "icon:/small/undo"
|
||||
}
|
||||
}
|
||||
|
||||
{ Toolbars
|
||||
{ Toolbar connection
|
||||
Text = "Connection editor"
|
||||
List = "database,show-system,new-table,save,reload,remove-table,rename-table,copy-table,paste-table,import-table"
|
||||
Default = "database,show-system,|,new-table,save,reload,|,remove-table,rename-table,copy-table,paste-table,import-table"
|
||||
}
|
||||
{ Toolbar connection-data
|
||||
Text = ""
|
||||
List = "edit-data,export-data,save-data,add-data,delete-data,select-all-data,unselect-all-data"
|
||||
Default = "edit-data,export-data,save-data,add-data,delete-data,select-all-data,unselect-all-data,$lblCount"
|
||||
}
|
||||
{ Toolbar connection-export
|
||||
Text = ""
|
||||
List = "export-request"
|
||||
Default = "export-request"
|
||||
}
|
||||
}
|
||||
|
|
@ -1768,20 +1768,21 @@ Public Sub panToolbar_Draw()
|
|||
|
||||
If $bConfigure Then
|
||||
If Not $hConfigureImage Then
|
||||
If Color[Color.Background].Luminance > 127 Then
|
||||
$hConfigureImage = Image.Load("img/configure.png")
|
||||
Else
|
||||
$hConfigureImage = Image.Load("img/configure_dark.png")
|
||||
Endif
|
||||
$hConfigureImage = Picture["img/configure.png"].Image
|
||||
' If Color[Color.Background].Luminance > 127 Then
|
||||
' $hConfigureImage = Image.Load("img/configure.png")
|
||||
' Else
|
||||
' $hConfigureImage = Image.Load("img/configure_dark.png")
|
||||
' Endif
|
||||
Endif
|
||||
Paint.Brush = Paint.Image($hConfigureImage)
|
||||
Paint.Rectangle(0, 0, panToolBar.W, panToolBar.H)
|
||||
Paint.Fill
|
||||
Else If GetToolBar().Design Then
|
||||
Paint.Rectangle(0.5, 0.5, Paint.W - 1, Paint.H - 1)
|
||||
Paint.LineWidth = 1
|
||||
Paint.Background = Color.LightBackground
|
||||
Paint.Stroke
|
||||
' Else If GetToolBar().Design Then
|
||||
' Paint.Rectangle(0.5, 0.5, Paint.W - 1, Paint.H - 1)
|
||||
' Paint.LineWidth = 1
|
||||
' Paint.Background = Color.LightBackground
|
||||
' Paint.Stroke
|
||||
Endif
|
||||
|
||||
End
|
||||
|
|
|
|||
Loading…
Reference in a new issue