From a0ee7de173f378e7cc0d8ae2b7f2a8755a3eedfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 1 Aug 2015 11:12:22 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: Fix project property dialog layout. [GB.GUI.BASE] * BUG: Remove a debugging message. git-svn-id: svn://localhost/gambas/trunk@7208 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.src/Help/FHelpBrowser.class | 2 +- app/src/gambas3/.src/Help/FHelpBrowser.form | 37 ++++--- app/src/gambas3/.src/Help/FHelpShortcut.class | 2 +- app/src/gambas3/.src/Help/FHelpShortcut.form | 4 +- app/src/gambas3/.src/Project.module | 1 + .../Project/Component/FComponentChooser.form | 1 - .../.src/Project/FProjectProperty.form | 102 ++++++------------ .../gb.gui.base/.src/GridView/GridView.class | 1 - 8 files changed, 59 insertions(+), 91 deletions(-) diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.class b/app/src/gambas3/.src/Help/FHelpBrowser.class index e8fa2857a..13614ce1d 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.class +++ b/app/src/gambas3/.src/Help/FHelpBrowser.class @@ -173,7 +173,7 @@ Public Sub Form_Resize() Dim bVisible As Boolean = Me.Height > Desktop.Scale * 30 And Me.Width > Desktop.Scale * 30 panToolbar.Visible = bVisible - sepToolbar.Visible = bVisible + 'sepToolbar.Visible = bVisible End diff --git a/app/src/gambas3/.src/Help/FHelpBrowser.form b/app/src/gambas3/.src/Help/FHelpBrowser.form index be6993cea..eae374af3 100644 --- a/app/src/gambas3/.src/Help/FHelpBrowser.form +++ b/app/src/gambas3/.src/Help/FHelpBrowser.form @@ -1,7 +1,7 @@ # Gambas Form File 3.0 { Form Form - MoveScaled(0,0,59,32) + MoveScaled(0,0,113,71) Visible = False Action = "help" Text = ("Help browser") @@ -67,7 +67,7 @@ MoveScaled(51,0,1,4) } { btnWebSite ToolButton - MoveScaled(52,0,21,4) + MoveScaled(52,0,31,4) #Translate = False ToolTip = "Gambas web site" AutoResize = True @@ -75,7 +75,7 @@ Picture = Picture["icon:/small/gambas"] } { btnPrint ToolButton - MoveScaled(73,0,8,4) + MoveScaled(84,0,8,4) AutoResize = True Text = ("Print") Picture = Picture["icon:/small/print"] @@ -84,22 +84,25 @@ { Printer1 #Printer #MoveScaled(4,2) } - { sepToolbar Separator - MoveScaled(12,5,20,0) - } - { splHelp HSplit - MoveScaled(2,9,80,29) + { Panel1 Panel + MoveScaled(2,9,81,30) Expand = True - { tvwClasses TreeView - MoveScaled(3,1,16,27) - Visible = False + Arrangement = Arrange.Fill + Border = Border.Plain + { splHelp HSplit + MoveScaled(0,0,80,29) Expand = True - Sorted = True - Border = False - } - { !webHelp HelpView - MoveScaled(22,2,28,16) - #Public = True + { tvwClasses TreeView + MoveScaled(3,1,16,27) + Visible = False + Expand = True + Sorted = True + Border = False + } + { !webHelp HelpView + MoveScaled(22,2,28,16) + #Public = True + } } } { movWaiting MovieBox diff --git a/app/src/gambas3/.src/Help/FHelpShortcut.class b/app/src/gambas3/.src/Help/FHelpShortcut.class index 38452a97d..3dae42b46 100644 --- a/app/src/gambas3/.src/Help/FHelpShortcut.class +++ b/app/src/gambas3/.src/Help/FHelpShortcut.class @@ -33,7 +33,7 @@ End Public Sub Form_Arrange() webShortcut.Raise - webShortcut.Move(tabShortcut.ClientX, tabShortcut.ClientY, tabShortcut.ClientW, tabShortcut.ClientH) + webShortcut.Move(tabShortcut.X + tabShortcut.ClientX, tabShortcut.Y + tabShortcut.ClientY, tabShortcut.ClientW, tabShortcut.ClientH) End diff --git a/app/src/gambas3/.src/Help/FHelpShortcut.form b/app/src/gambas3/.src/Help/FHelpShortcut.form index 32bee5f95..36c6cfad5 100644 --- a/app/src/gambas3/.src/Help/FHelpShortcut.form +++ b/app/src/gambas3/.src/Help/FHelpShortcut.form @@ -9,9 +9,9 @@ Persistent = True Utility = True Arrangement = Arrange.Fill + Margin = True { tabShortcut TabPanel MoveScaled(1,1,48,44) - Border = False Count = 4 Index = 0 Text = ("Project") @@ -24,7 +24,7 @@ Index = 0 } { webShortcut HelpView - MoveScaled(32,34,34,28) + MoveScaled(24,28,34,28) NoHeader = True } } diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module index 5371af5df..0c01096dc 100644 --- a/app/src/gambas3/.src/Project.module +++ b/app/src/gambas3/.src/Project.module @@ -246,6 +246,7 @@ Public Sub InitWebView() Endif 'WebSettings.Fonts.StandardFont = Application.Font.Name + WebSettings.Fonts.SerifFont = Application.Font.Name WebSettings.Fonts.SansSerifFont = Application.Font.Name WebSettings.Fonts.DefaultFontSize = Application.Font.Ascent diff --git a/app/src/gambas3/.src/Project/Component/FComponentChooser.form b/app/src/gambas3/.src/Project/Component/FComponentChooser.form index 7ff2c5a0e..67a9beceb 100644 --- a/app/src/gambas3/.src/Project/Component/FComponentChooser.form +++ b/app/src/gambas3/.src/Project/Component/FComponentChooser.form @@ -12,7 +12,6 @@ Count = 2 ShowTitle = False ShowButton = False - Border = False Animated = True Index = 0 Text = ("") diff --git a/app/src/gambas3/.src/Project/FProjectProperty.form b/app/src/gambas3/.src/Project/FProjectProperty.form index 5b792916a..0f9093140 100644 --- a/app/src/gambas3/.src/Project/FProjectProperty.form +++ b/app/src/gambas3/.src/Project/FProjectProperty.form @@ -93,34 +93,31 @@ } } { ipnProject IconPanel - MoveScaled(1,0,108,69) + MoveScaled(1,1,108,69) Expand = True Arrangement = Arrange.Vertical + Spacing = True Count = 8 Border = True Index = 0 Text = ("General") { Panel1 Panel - MoveScaled(1,0,88,10) + MoveScaled(1,0,85,9) { btnIcon ToolButton - MoveScaled(1,1,8,8) + MoveScaled(0,0,8,8) Border = True } { txtName TextLabel - MoveScaled(10,1,77,8) + MoveScaled(9,0,66,8) Expand = True Alignment = Align.Left } } - { Separator3 Separator - MoveScaled(53,11,29,0) - } { panGeneral HPanel MoveScaled(1,11,84,58) Expand = True AutoResize = True Spacing = True - Margin = True { Label16 Label MoveScaled(0,0,16,4) Font = Font["Bold"] @@ -198,7 +195,6 @@ MoveScaled(1,1,82,68) Expand = True Spacing = True - Margin = True { lblInfo Label MoveScaled(0,0,79,3) Font = Font["Bold"] @@ -359,9 +355,8 @@ Index = 2 Text = ("Components") { Panel3 HBox - MoveScaled(3,2,77,6) + MoveScaled(3,2,77,4) Spacing = True - Margin = True { chkShowUsed CheckBox MoveScaled(1,0,46,3) Expand = True @@ -373,83 +368,66 @@ Picture = Picture["icon:/small/undo"] } } - { Separator5 Separator - MoveScaled(2,13,21,0) - } { choComponent ComponentChooser MoveScaled(8,27,67,37) Expand = True } Index = 3 Text = ("Libraries") - { Panel9 Panel - MoveScaled(2,1,82,9) + { Panel4 Panel + MoveScaled(3,2,80,7) Background = Color.TextBackground - Arrangement = Arrange.Fill + Arrangement = Arrange.Horizontal + Spacing = True Margin = True - { Panel4 Panel - MoveScaled(1,1,80,7) - Arrangement = Arrange.Horizontal - Spacing = True - Margin = True - Border = Border.Plain - { PictureBox1 PictureBox - MoveScaled(1,1,6,6) - Picture = Picture["icon:/32/warning"] - AutoResize = True - Alignment = Align.Left - } - { TextLabel1 TextLabel - MoveScaled(7,1,66,5) - Font = Font["-1"] - Expand = True - Text = ("WARNING! The project executable and the libraries it depends on must be stored inside the same directory. Otherwise the libraries will not be found.") - Alignment = Align.Left - } + Border = Border.Plain + { PictureBox1 PictureBox + MoveScaled(1,1,6,6) + Picture = Picture["icon:/32/warning"] + AutoResize = True + Alignment = Align.Left + } + { TextLabel1 TextLabel + MoveScaled(7,1,66,5) + Font = Font["-1"] + Expand = True + Text = ("WARNING! The project executable and the libraries it depends on must be stored inside the same directory. Otherwise the libraries will not be found.") + Alignment = Align.Left } - } - { Separator6 Separator - MoveScaled(35,11,21,0) - Visible = False } { gvwLibrary GridView MoveScaled(6,20,59,29) Expand = True - Border = False Mode = Select.Single Grid = False } - { Separator7 Separator - MoveScaled(25,51,23,0) - } { HBox18 HBox - MoveScaled(1,53,84,6) + MoveScaled(1,53,84,4) Spacing = True - Margin = True { btnInsertLib Button - MoveScaled(1,1,17,4) + MoveScaled(0,0,17,4) Text = Shortcut(("Add"), "A") & "..." Picture = Picture["icon:/small/add"] } { btnRemoveLib Button - MoveScaled(19,1,17,4) + MoveScaled(18,0,17,4) Text = Shortcut(("Remove"), "R") Picture = Picture["icon:/small/remove"] } { btnMoveUpLib Button - MoveScaled(37,1,6,4) + MoveScaled(36,0,6,4) Picture = Picture["icon:/small/up"] } { btnMoveDownLib Button - MoveScaled(44,1,6,4) + MoveScaled(43,0,6,4) Picture = Picture["icon:/small/down"] } { Panel2 Panel - MoveScaled(51,1,12,4) + MoveScaled(50,0,12,4) Expand = True } { btnUndoLib Button - MoveScaled(66,1,17,4) + MoveScaled(65,0,17,4) Text = Shortcut(("Reset"), "R") Picture = Picture["icon:/small/undo"] } @@ -459,17 +437,12 @@ { tvwEnv TableView MoveScaled(3,6,68,20) Expand = True - Border = False Padding = 4 Header = GridView.Horizontal } - { Separator8 Separator - MoveScaled(30,31,24,0) - } { HBox3 HBox - MoveScaled(1,36,40,6) + MoveScaled(1,36,40,4) Spacing = True - Margin = True { btnInsertEnv MenuButton MoveScaled(0,0,19,4) Text = ("&Insert") @@ -487,17 +460,12 @@ { tvwArg TableView MoveScaled(6,4,58,19) Expand = True - Border = False Padding = 4 Header = GridView.Vertical } - { Separator9 Separator - MoveScaled(26,27,34,0) - } { HBox2 HBox - MoveScaled(9,45,53,6) + MoveScaled(9,45,53,4) Spacing = True - Margin = True { btnInsertArg Button MoveScaled(0,0,17,4) Text = Shortcut(("Insert"), "I") @@ -520,9 +488,8 @@ Index = 6 Text = ("Options") { Panel6 VBox - MoveScaled(0,0,89,66) + MoveScaled(0,0,86,66) Spacing = True - Margin = True { Label7 Label MoveScaled(0,0,84,3) Font = Font["Bold"] @@ -703,13 +670,12 @@ { gvwStat GridView MoveScaled(10,7,62,25) Expand = True - Border = False Padding = 8 } Index = 0 } { Panel10 HBox - MoveScaled(29,71,63,4) + MoveScaled(29,72,63,4) Spacing = True { Panel11 Panel MoveScaled(2,1,19,3) diff --git a/comp/src/gb.gui.base/.src/GridView/GridView.class b/comp/src/gb.gui.base/.src/GridView/GridView.class index c3cd0ff39..0955e3e92 100644 --- a/comp/src/gb.gui.base/.src/GridView/GridView.class +++ b/comp/src/gb.gui.base/.src/GridView/GridView.class @@ -713,7 +713,6 @@ Public Sub ScrollArea_Draw() If Not hRowBorder Then If $iMode And If Not _DoNotDrawSelection Then If _IsRowSelected(I) Then - If I = 0 Then Debug Y;; hSpan.Y;; Paint.ClipRect.Y Paint.FillRect(0, Y, Paint.W, H, Color.SetAlpha(Color.SelectedBackground, 192)) Endif Endif