[DEVELOPMENT ENVIRONMENT]

* NEW: Synchronization with Gambas 2.


git-svn-id: svn://localhost/gambas/trunk@1248 867c0c6c-44f3-4631-809d-bfa615b0a4ec
This commit is contained in:
Benoît Minisini 2008-03-24 22:54:33 +00:00
parent 928386b1e0
commit bddfea0fce
12 changed files with 3367 additions and 3393 deletions

Binary file not shown.

File diff suppressed because it is too large Load Diff

183
app/src/gambas3/FInfo.class Normal file
View File

@ -0,0 +1,183 @@
' Gambas class file
PRIVATE SUB GetInfo(sPath AS String)
DIM sLink AS String
DIM sType AS String
DIM sSize AS String
DIM sTime AS String
DIM sInfo AS String
DIM iSize AS Long
DIM bLine AS Boolean
DIM sLine AS Integer
DIM sOutput AS String
IF Left(sPath) = "$" THEN
sInfo = Subst("&1 element(s)", Project.ProjectTree[sPath].Children)
ELSE
IF NOT sPath THEN sPath = Project.Dir
WITH Stat(sPath)
IF .Type = gb.Link THEN
sLink = .Link
ENDIF
END WITH
WITH Stat(sPath, TRUE)
IF .Type = gb.Directory THEN
IF sPath = Project.Dir THEN
sType = ("Gambas project")
ELSE
sType = ("Directory")
ENDIF
SHELL "(cd " & Quote.Shell(sPath) & "; du -k | tail -n1" & ")" TO sSize
iSize = Val(sSize)
ELSE
SELECT CASE File.Ext(sPath)
CASE "module"
sType = ("Module")
bLine = TRUE
sInfo = "UTF-8 Gambas module file"
CASE "class"
sType = ("Class")
bLine = TRUE
sInfo = "UTF-8 Gambas class file"
CASE "form"
sType = ("Form")
bLine = TRUE
sInfo = "UTF-8 Gambas form file"
CASE "png", "jpg", "gif", "jpeg", "svg"
sType = ("Picture")
CASE "txt"
sType = ("Text file")
bLine = TRUE
CASE "htm", "html"
sType = ("HTML file")
bLine = TRUE
CASE "css"
sType = ("CSS file")
bLine = TRUE
CASE "xml"
sType = ("XML file")
bLine = TRUE
CASE ELSE
IF UCase(File.Name(sPath)) = "CHANGELOG" THEN
sType = ("ChangeLog")
bLine = TRUE
ELSE
sType = ("File")
ENDIF
END SELECT
iSize = CInt((.Size + 1023) \ 1024)
IF NOT sInfo THEN
IF sLink THEN
sInfo = sLink
IF Left(sInfo) <> "/" THEN sInfo = File.Dir(sPath) &/ sLink
ELSE
sInfo = sPath
ENDIF
SHELL "file -b " & Quote.Shell(sInfo) TO sInfo
ENDIF
ENDIF
IF bLine THEN
SHELL "wc -l " & Quote.Shell(sPath) TO sOutput
TRY sLine = Split(sOutput, " ")[0]
ENDIF
IF sLine THEN
sSize = Subst(("&1 K, &2 line(s)"), iSize, sLine)
ELSE
sSize = Subst(("&1 K"), iSize)
ENDIF
IF sLink THEN
IF sLink LIKE (Project.Dir & "/*") THEN
sLink = Mid$(sLink, Len(Project.Dir) + 2)
ENDIF
IF sLink LIKE (System.User.Home &/ "/*") THEN
sLink = "~" &/ Mid$(sLink, Len(System.User.Home) + 1)
ENDIF
ENDIF
sTime = Str(.LastModified)
END WITH
ENDIF
FINALLY
lblLink.Text = sLink
lblLink.Parent.Visible = sLink
lblLink.Pos = 0
lblType.Text = sType
lblType.Parent.Visible = sType
lblSize.Text = sSize
lblSize.Parent.Visible = sSize
lblTime.Text = sTime
lblTime.Parent.Visible = sTime
lblInfo.Text = sInfo
lblInfo.Parent.Visible = sInfo
CATCH
lblInfo.Text = "ERROR: " & Error.Text & "\n" & sPath
lblInfo.Parent.Show
END
PUBLIC SUB Run()
DIM sPath AS String
DIM sInfo AS String
DIM hPict AS Picture
DIM hTree AS ColumnView
hTree = Project.ProjectTree
lblName.Text = hTree.Current.Text
lblName.Adjust
sPath = hTree.Key
GetInfo(sPath)
'lblInfo.Text = sInfo
'lblInfo.Adjust
IF Left(sPath) <> "$" THEN
IF sPath = Project.Dir THEN
hPict = Project.GetIcon(Project.Dir, 16)
ELSE
hPict = Project.GetFileIcon(sPath, 16)
ENDIF
picInfo.Picture = hPict
picInfo.Resize(hPict.Width, hPict.Height)
panInfo.Height = Max(lblName.Height, hPict.Height) + panInfo.Padding * 2 + 4
picInfo.Show
ELSE
picInfo.Hide
ENDIF
'Object.Lock(ME)
ME.ShowDialog
END
PUBLIC SUB btnClose_Click()
ME.Close
END

120
app/src/gambas3/FInfo.form Normal file
View File

@ -0,0 +1,120 @@
# Gambas Form File 2.0
{ Form Form
MoveScaled(0,0,49,37)
Text = ("Information")
Icon = Picture["icon:/small/info"]
Persistent = True
Border = Window.Fixed
Arrangement = Arrange.Vertical
Spacing = 8
Padding = 8
{ panInfo Panel
MoveScaled(1,1,35,4)
Arrangement = Arrange.Horizontal
Spacing = 4
Padding = 4
Border = Border.Sunken
{ picInfo PictureBox
MoveScaled(0,0,4,3)
Alignment = Align.Center
}
{ lblName Label
MoveScaled(8,1,18,2)
Font = Font["Bold"]
Expand = True
AutoResize = True
Text = ("")
}
}
{ HBox5 HBox
MoveScaled(1,6,35,3)
Spacing = 8
{ Label5 Label
MoveScaled(0,0,12,3)
Font = Font["Bold"]
Text = ("Link to")
}
{ lblLink TextBox
MoveScaled(14,0,18,3)
Background = Color.Background
Foreground = Color.Foreground
Expand = True
Text = ("")
ReadOnly = True
Border = False
}
}
{ HBox1 HBox
MoveScaled(1,10,35,3)
Spacing = 8
{ Label1 Label
MoveScaled(0,0,12,3)
Font = Font["Bold"]
Text = ("Type")
}
{ lblType Label
MoveScaled(16,0,16,3)
Expand = True
Text = ("")
}
}
{ HBox3 HBox
MoveScaled(1,14,35,3)
Spacing = 8
{ Label2 Label
MoveScaled(0,0,12,3)
Font = Font["Bold"]
Text = ("Size")
}
{ lblSize Label
MoveScaled(16,0,16,3)
Expand = True
Text = ("")
}
}
{ HBox4 HBox
MoveScaled(1,18,35,3)
Spacing = 8
{ Label3 Label
MoveScaled(0,0,12,3)
Font = Font["Bold"]
Text = ("Last modified")
}
{ lblTime Label
MoveScaled(16,0,16,3)
Expand = True
Text = ("")
}
}
{ HBox6 HBox
MoveScaled(1,22,35,3)
Expand = True
Spacing = 8
{ Label4 Label
MoveScaled(0,0,12,3)
Font = Font["Bold"]
Text = ("Details")
Alignment = Align.TopNormal
}
{ lblInfo TextLabel
MoveScaled(18,0,14,3)
Expand = True
AutoResize = True
Text = ("")
}
}
{ HBox2 HBox
MoveScaled(1,28,36,3)
{ Panel1 Panel
MoveScaled(5,0,3,2)
Expand = True
}
{ btnClose Button
MoveScaled(18,0,15,3)
Text = ("Close")
Default = True
Cancel = True
}
}
}

View File

@ -8,12 +8,9 @@ PRIVATE $sKeyDrag AS String
PRIVATE $sDeleteKey AS String
PRIVATE $bUpdateRecentMenu AS Boolean
'PRIVATE $fBalloon AS Float
PRIVATE $sKeyBalloon AS String
PRIVATE $bCanShowBalloon AS Boolean
PRIVATE $bShowBalloon AS Boolean
PRIVATE $bInTreeView AS Boolean
PRIVATE $bInRename AS Boolean
PRIVATE $sKeyInfo AS String
PUBLIC SUB _new()
@ -80,13 +77,19 @@ PUBLIC SUB Form_Close()
IF Project.Close() THEN
STOP EVENT
ELSE
'Config.SaveWindow(ME, "/FMain")
Settings.Write(ME)
Settings.Write(panProject, "panProject")
Settings.Write(panProperty, "panProperty")
Settings.Write(panTool, "panTool")
'Settings.Write(panStack, "panStack")
Settings.Write(panDebug, "panDebug")
' We must close them now, otherwise the Close event is raised when the embedded forms
' are destroyed, and then the Settings.Save() method gets no TopLevel form anymore for generating the
' settings key !
FProperty.Close
FDebugInfo.Close
Design.Exit
ENDIF
@ -530,7 +533,6 @@ END
PRIVATE SUB Rename(sKey AS String)
$bInRename = TRUE
HideBalloon
tvwProject[sKey].Rename
END
@ -708,6 +710,7 @@ PUBLIC SUB mnuPaste_Click()
END
PUBLIC SUB tvwProject_Select()
DIM sKey AS String
@ -725,34 +728,8 @@ PUBLIC SUB tvwProject_Select()
mnuPopup_Show
' IF Left(sKey, 2) = Project.KEY_FIND THEN
'
' sSave = sKey
' sKey = Mid$(sKey, 3)
' aKey = Scan(sKey, "*@*.*.*")
' sKey = aKey[0]
' IF File.Ext(sKey) = "form" THEN sKey = File.SetExt(sKey, "class")
' Project.OpenFile(sKey)
'
' hEdit = Project.Files[sKey].Editor
' iLine = Val(aKey[1])
' iCol = Val(aKey[2])
' iLen = Val(aKey[3])
' hEdit.Goto(iLine, iCol, TRUE)
' hEdit.Select(iLine, iCol - 1, iLine, iCol + iLen - 1)
'
' tvwProject[sSave].Selected = TRUE
' RETURN
'
' ENDIF
IF tvwProject.Current.Children THEN tvwProject.Current.Expanded = TRUE
HideBalloon
'timProject.Enabled = TRUE
'RefreshInfo
END
' PUBLIC SUB tvwProject_Expand()
@ -794,8 +771,8 @@ PUBLIC SUB ReadConfig()
'wrkProject.Font = tvwProject.Font
'tabProperty.Font = tvwProject.Font
panMessage.Height = lblMessage.Font.Height("") + 2
$bCanShowBalloon = Settings["/ShowBalloon", TRUE]
IF NOT $bCanShowBalloon THEN HideBalloon
'$bCanShowBalloon = Settings["/ShowBalloon", TRUE]
'IF NOT $bCanShowBalloon THEN HideBalloon
panMessage.Visible = Settings["/ShowMessages", TRUE]
END
@ -854,7 +831,6 @@ END
PUBLIC SUB tvwProject_MouseDown()
$bCtrl = Mouse.Control
HideBalloon
END
@ -1012,6 +988,8 @@ PUBLIC SUB Action_Activate(Key AS String) AS Boolean
CASE "until"
hEditor = Project.ActiveForm
IF NOT ERROR THEN hEditor.RunUntil
CASE "info"
FInfo.Run
END SELECT
@ -1240,114 +1218,6 @@ PUBLIC SUB panInfo_Show()
END
PRIVATE SUB GetInfo(sPath AS String) AS String
DIM sInfo AS String
DIM sType AS String
DIM sSize AS String
DIM iSize AS Long
DIM bLine AS Boolean
DIM sOutput AS String
DIM sName AS String
DIM sLink AS String
IF Left(sPath) = "$" THEN RETURN
IF NOT sPath THEN sPath = Project.Dir
WITH Stat(sPath)
IF .Type = gb.Link THEN
sLink = .Link
ENDIF
END WITH
WITH Stat(sPath, TRUE)
sName = tvwProject[sPath].Text
IF .Type = gb.Directory THEN
IF sPath = Project.Dir THEN
sType = ("Gambas project")
ELSE
sType = ("Directory")
ENDIF
SHELL "(cd " & Quote.Shell(sPath) & "; du -k | tail -n1" & ")" TO sSize
iSize = Val(sSize)
ELSE
SELECT CASE File.Ext(sPath)
CASE "module"
sType = ("Module")
bLine = TRUE
sInfo = "UTF-8 Gambas module file"
CASE "class"
sType = ("Class")
bLine = TRUE
sInfo = "UTF-8 Gambas class file"
CASE "form"
sType = ("Form")
bLine = TRUE
sInfo = "UTF-8 Gambas form file"
CASE "png", "jpg", "gif", "jpeg", "svg"
sType = ("Picture")
CASE "txt"
sType = ("Text file")
bLine = TRUE
CASE "htm", "html"
sType = ("HTML file")
bLine = TRUE
CASE "css"
sType = ("CSS file")
bLine = TRUE
CASE "xml"
sType = ("XML file")
bLine = TRUE
CASE ELSE
sType = ("File")
END SELECT
iSize = CInt((.Size + 1023) \ 1024)
IF NOT sInfo THEN
IF sLink THEN
sInfo = sLink
IF Left(sInfo) <> "/" THEN sInfo = File.Dir(sPath) &/ sLink
ELSE
sInfo = sPath
ENDIF
SHELL "file -b " & Quote.Shell(sInfo) TO sInfo
ENDIF
ENDIF
IF bLine THEN
SHELL "wc -l " & Quote.Shell(sPath) TO sOutput
sSize = Subst(("&1 K, &2 line(s)"), iSize, Val(sOutput))
ELSE
sSize = Subst(("&1 K"), iSize)
ENDIF
sOutput = "<b>" & sName & "</b><br>"
IF sLink THEN
IF sLink LIKE (Project.Dir & "/*") THEN
sLink = Mid$(sLink, Len(Project.Dir) + 2)
ENDIF
IF sLink LIKE (System.User.Home &/ "/*") THEN
sLink = "~" &/ Mid$(sLink, Len(System.User.Home) + 1)
ENDIF
sOutput &= "<font size=\"-1\"><b>(" & sLink & ")</b></font><br>"
ENDIF
sOutput &= "<br>" & sType & "<br>" & sSize & "<br>" & Str(.Time)
IF Trim(sInfo) THEN sOutput &= "<br><br>" & Trim(sInfo)
RETURN sOutput
END WITH
CATCH
RETURN "<b>" & ("ERROR") & "</b><p>" & Error.Text & "<p><pre>" & sPath & "</pre>"
END
PUBLIC SUB mnuOpenRecent_Show()
@ -1397,63 +1267,6 @@ PUBLIC SUB panProperty_Arrange()
END
PUBLIC SUB HideBalloon()
Balloon.Hide(tvwProject)
$sKeyBalloon = ""
END
PUBLIC SUB ShowBalloon()
DIM sInfo AS String
DIM X, Y AS Integer
DIM sPath AS String
DIM hPict AS Picture
DIM bVisible AS Boolean
IF NOT $bCanShowBalloon THEN RETURN
IF Application.ActiveWindow <> ME THEN RETURN
IF NOT Balloon.Visible AND IF NOT $bInTreeView THEN RETURN
IF $bInRename THEN RETURN
X = Mouse.ScreenX - tvwProject.ScreenX
Y = Mouse.ScreenY - tvwProject.ScreenY
tvwProject.Find(X, Y)
IF NOT tvwProject.Available THEN
HideBalloon
RETURN
ENDIF
'IF NOT tvwProject.Item.Selected THEN RETURN
sPath = tvwProject.Item.Key
IF sPath = $sKeyBalloon THEN RETURN
'X = tvwProject.Item.X + tvwProject.Item.Width / 2
Y = tvwProject.Item.Y + tvwProject.Item.Height / 2
sInfo = GetInfo(sPath)
IF NOT sInfo THEN RETURN
IF sPath = Project.Dir THEN
hPict = Project.GetIcon(Project.Dir, 32)
ELSE
hPict = Project.GetFileIcon(sPath, 32)
ENDIF
Balloon(sInfo, tvwProject, hPict, X, Y)
$sKeyBalloon = sPath
END
PUBLIC SUB tvwProject_MouseMove()
IF $bShowBalloon THEN ShowBalloon
END
PUBLIC SUB tvwProject_Leave()
$bInTreeView = FALSE
@ -1466,17 +1279,10 @@ PUBLIC SUB tvwProject_Enter()
END
PUBLIC SUB tvwProject_MouseWheel()
tvwProject_MouseMove
END
PUBLIC SUB HidePanels()
Action["find"].Value = FALSE
Action["console"].Value = FALSE
HideBalloon
Balloon.Hide
END
@ -1548,36 +1354,24 @@ PUBLIC SUB mnuClearDebugWindows_Click()
END
PUBLIC SUB tvwProject_KeyRelease()
'DEBUG Key.Code;; Key.Shift
IF NOT Key.Shift THEN
HideBalloon
$bShowBalloon = FALSE
ENDIF
END
PUBLIC SUB tvwProject_KeyPress()
'DEBUG Key.Code;; Key.Shift
IF Key.Shift THEN
$bShowBalloon = TRUE
ShowBalloon
ENDIF
END
PUBLIC SUB mnuFind_Click()
FFind.Find
END
PUBLIC SUB ToolButton6_Click()
Desktop.SendKeys("ù£æ")
'Desktop.SendKeys("ù£æ")
tvwProject.MoveFirst
tvwProject.MoveLast
WHILE tvwProject.Item.Children
tvwProject.MoveChild
tvwProject.MoveLast
WEND
WHILE tvwProject.Available
PRINT tvwProject.Item.Key
tvwProject.MoveAbove
WEND
END

View File

@ -401,13 +401,22 @@
Text = ("&Startup class")
Picture = Picture["icon:/small/play"]
}
{ Menu24 Menu
Text = ("")
}
{ mnuInformation Menu
Action = "info"
Text = ("&Information")
Picture = Picture["icon:/small/info"]
Shortcut = "Ctrl+I"
}
}
{ panToolbar Panel
MoveScaled(1,1,98,4)
MoveScaled(0,1,103,4)
Arrangement = Arrange.Row
AutoResize = True
{ ToolBar1 ToolBar
MoveScaled(0,0,97,3)
MoveScaled(0,0,101,3)
{ ToolButton1 ToolButton
MoveScaled(1,0,3,3)
ToolTip = ("New project")
@ -543,59 +552,59 @@
Toggle = True
}
{ Separator4 Separator
MoveScaled(55,0,1,3)
MoveScaled(58,0,1,3)
}
{ btnCompile ToolButton
MoveScaled(56,0,3,3)
MoveScaled(59,0,3,3)
ToolTip = ("Compile")
Action = "compile"
Text = ("")
Picture = Picture["icon:/small/make"]
}
{ btnCompileAll ToolButton
MoveScaled(59,0,3,3)
MoveScaled(62,0,3,3)
ToolTip = ("Compile all")
Action = "compile-all"
Text = ("")
Picture = Picture["icon:/small/make-all"]
}
{ btnGo ToolButton
MoveScaled(62,0,3,3)
MoveScaled(65,0,3,3)
ToolTip = ("Run")
Action = "start"
Text = ("")
Picture = Picture["icon:/small/play"]
}
{ btnPause ToolButton
MoveScaled(65,0,3,3)
MoveScaled(68,0,3,3)
ToolTip = ("Pause")
Action = "pause"
Text = ("")
Picture = Picture["icon:/small/pause"]
}
{ btnStop ToolButton
MoveScaled(68,0,3,3)
MoveScaled(71,0,3,3)
ToolTip = ("Stop")
Action = "stop"
Text = ("")
Picture = Picture["icon:/small/stop"]
}
{ btnStep ToolButton
MoveScaled(71,0,3,3)
MoveScaled(74,0,3,3)
ToolTip = ("Step")
Action = "step"
Text = ("")
Picture = Picture["icon:/small/end"]
}
{ btnForward ToolButton
MoveScaled(74,0,3,3)
MoveScaled(77,0,3,3)
ToolTip = ("Forward")
Action = "forward"
Text = ("")
Picture = Picture["icon:/small/forward"]
}
{ btnFrom ToolButton
MoveScaled(77,0,3,3)
MoveScaled(80,0,3,3)
ToolTip = ("Finish current function")
Action = "return"
Text = ("")
@ -603,14 +612,14 @@
}
{ btnUntil ToolButton mnuUntil
Name = "btnUntil"
MoveScaled(80,0,3,3)
MoveScaled(83,0,3,3)
ToolTip = ("Run until current line")
Action = "until"
Text = ("")
Picture = Picture["icon:/small/last"]
}
{ btnBreakpoint ToolButton
MoveScaled(83,0,3,3)
MoveScaled(86,0,3,3)
ToolTip = ("Toggle breakpoint")
Action = "break"
Text = ("")
@ -619,14 +628,14 @@
}
{ btnWatch ToolButton mnuWatch
Name = "btnWatch"
MoveScaled(86,0,3,3)
MoveScaled(89,0,3,3)
ToolTip = ("Watch expression")
Action = "watch"
Text = ("")
Picture = Picture["icon:/small/watch"]
}
{ ToolButton6 ToolButton
MoveScaled(90,0,3,3)
MoveScaled(93,0,3,3)
Visible = False
Text = ("")
Picture = Picture["icon:/small/wizard"]

View File

@ -54,7 +54,6 @@ PUBLIC SUB _new()
[fntEditor, "/Editor/Font", Project.DEFAULT_FONT],
[cmbGlobalFont, "/UseSmallFont", 1],
[cmbToolbox, "/SmallToolbox", 0],
[cmbBalloonTooltip, "/ShowBalloon", 1],
[cmbSortProperty, "/SortProperties", 1],
[txtTabSize, "/DefaultTabSize", 2],
[cmbProcLimit, "/Editor/ProcedureLimit", 2],
@ -228,13 +227,6 @@ PUBLIC SUB cmbTooltip_Click()
END
PUBLIC SUB cmbBalloonTooltip_Click()
Settings["/ShowBalloon"] = cmbBalloonTooltip.Index = 1
FMain.ReadConfig
END
PUBLIC SUB txtTabSize_Change()
Settings["/DefaultTabSize"] = txtTabSize.Value

View File

@ -1,7 +1,7 @@
# Gambas Form File 2.0
{ Form Form
MoveScaled(0,0,61,66)
MoveScaled(0,0,61,61)
Action = "option"
Text = ("Preferences")
Icon = Picture["icon:/small/options"]
@ -10,13 +10,13 @@
ToolBox = True
SkipTaskbar = True
{ TabStrip1 TabStrip
MoveScaled(1,1,59,60)
MoveScaled(1,1,59,55)
Padding = 8
Count = 3
Index = 0
Text = ("General")
{ HBox11 HBox
MoveScaled(2,46,54,3)
MoveScaled(2,42,54,3)
Spacing = 8
{ Label12 Label
MoveScaled(0,0,36,3)
@ -31,7 +31,7 @@
}
}
{ HBox12 HBox
MoveScaled(2,50,54,3)
MoveScaled(2,46,54,3)
Spacing = 8
{ Label13 Label
MoveScaled(0,0,36,3)
@ -46,7 +46,7 @@
}
}
{ Label25 Label
MoveScaled(1,41,56,3)
MoveScaled(1,38,56,3)
Font = Font["Bold"]
Text = ("Desktop")
}
@ -69,22 +69,8 @@
List = [("No"), ("Yes")]
}
}
{ HBox4 HBox
MoveScaled(2,9,54,3)
Spacing = 8
{ Label17 Label
MoveScaled(0,0,36,3)
Text = ("Show project information balloons")
}
{ cmbBalloonTooltip ComboBox
MoveScaled(37,0,10,3)
Text = ("")
ReadOnly = True
List = [("No"), ("Yes")]
}
}
{ HBox5 HBox
MoveScaled(2,13,54,3)
MoveScaled(2,9,54,3)
Spacing = 8
{ Label30 Label
MoveScaled(0,0,36,3)
@ -98,7 +84,7 @@
}
}
{ HBox6 HBox
MoveScaled(2,17,54,3)
MoveScaled(2,13,54,3)
Spacing = 8
{ Label11 Label
MoveScaled(0,0,36,3)
@ -113,7 +99,7 @@
}
}
{ HBox7 HBox
MoveScaled(2,21,54,3)
MoveScaled(2,17,54,3)
Spacing = 8
{ Label1 Label
MoveScaled(0,0,36,3)
@ -128,7 +114,7 @@
}
}
{ HBox8 HBox
MoveScaled(2,25,54,3)
MoveScaled(2,21,54,3)
Spacing = 8
{ Label2 Label
MoveScaled(0,0,36,3)
@ -142,7 +128,7 @@
}
}
{ HBox9 HBox
MoveScaled(2,29,54,3)
MoveScaled(2,25,54,3)
Spacing = 8
{ Label14 Label
MoveScaled(0,0,36,3)
@ -161,7 +147,7 @@
}
}
{ HBox10 HBox
MoveScaled(2,33,54,3)
MoveScaled(2,29,54,3)
Spacing = 8
{ Label16 Label
MoveScaled(0,0,36,3)
@ -175,7 +161,7 @@
}
}
{ HBox13 HBox
MoveScaled(2,37,54,3)
MoveScaled(2,33,54,3)
Spacing = 8
{ Label32 Label
MoveScaled(0,0,36,3)
@ -196,19 +182,19 @@
Text = ("Font")
}
{ fntEditor FontChooser
MoveScaled(2,5,54,17)
MoveScaled(2,5,54,15)
FixedOnly = True
ShowStyle = False
ShowPreview = False
ShowLabel = False
}
{ Label18 Label
MoveScaled(1,24,56,3)
MoveScaled(1,22,56,3)
Font = Font["Bold"]
Text = ("Options")
}
{ HBox2 HBox
MoveScaled(2,28,54,3)
MoveScaled(2,26,54,3)
Spacing = 8
{ Label4 Label
MoveScaled(0,0,36,3)
@ -222,7 +208,7 @@
}
}
{ HBox14 HBox
MoveScaled(2,48,54,3)
MoveScaled(2,46,54,3)
Spacing = 8
{ Label40 Label
MoveScaled(0,0,36,3)
@ -241,7 +227,7 @@
}
}
{ HBox15 HBox
MoveScaled(2,44,54,3)
MoveScaled(2,42,54,3)
Spacing = 8
{ Label8 Label
MoveScaled(0,0,36,3)
@ -255,7 +241,7 @@
}
}
{ HBox16 HBox
MoveScaled(2,40,54,3)
MoveScaled(2,38,54,3)
Spacing = 8
{ Label7 Label
MoveScaled(0,0,36,3)
@ -269,7 +255,7 @@
}
}
{ HBox17 HBox
MoveScaled(2,36,54,3)
MoveScaled(2,34,54,3)
Spacing = 8
{ Label6 Label
MoveScaled(0,0,36,3)
@ -283,7 +269,7 @@
}
}
{ HBox18 HBox
MoveScaled(2,32,54,3)
MoveScaled(2,30,54,3)
Spacing = 8
{ Label5 Label
MoveScaled(0,0,36,3)
@ -300,10 +286,10 @@
Index = 2
Text = ("Colors")
{ VBox1 VBox
MoveScaled(1,1,56,50)
MoveScaled(1,1,56,49)
Spacing = 8
{ HBox1 HBox
MoveScaled(0,0,48,3)
MoveScaled(1,1,48,3)
{ cmbTheme ComboBox
MoveScaled(0,0,29,3)
Expand = True
@ -333,7 +319,7 @@
}
}
{ Panel4 Panel
MoveScaled(1,3,46,33)
MoveScaled(1,5,46,33)
Background = Color.TextBackground
Expand = True
Arrangement = Arrange.Horizontal
@ -577,7 +563,7 @@
Index = 0
}
{ btnClose Button
MoveScaled(45,62,15,3)
MoveScaled(45,57,15,3)
Text = ("Close")
Cancel = True
}

View File

@ -35,6 +35,7 @@ PUBLIC SUB Form_Open()
$iBackground = grdProperty.Background
Settings.Read(spnHelp)
ReadConfig
END
@ -43,7 +44,8 @@ END
PUBLIC SUB Form_Close()
Settings.Write(ME)
Settings["FProperty/HelpWindowHeight"] = spnHelp.Height
Settings.Write(spnHelp)
END
@ -522,23 +524,16 @@ PRIVATE SUB ShowProperty()
ELSE
sProp = grdProperty[grdProperty.Row, 0].Text
'hProp = CControl.Properties[$hObject.Kind][sProp]
hProp = CComponent.Classes[$hObject.Kind].GetProperties()[sProp]
sType = hProp.Type
sOption = hProp.Argument
IF NOT $bDisableIntegratedHelp THEN
hSymbol = NEW CSymbolInfo
WITH hSymbol
.Component = CComponent.Classes[$hObject.Kind].Component
.Class = CComponent.Classes[$hObject.Kind].Name
.Kind = CComponent.Classes[$hObject.Kind].Parent
.Name = hProp.Name
END WITH
IF hProp.Name = CPropertyInfo.SCALE_NAME THEN
sHelp = ("If the form and controls dimensions must follow the size of the default font.")
ELSE
hSymbol = CComponent.Classes[$hObject.Kind].Symbols[hProp.Name]
sHelp = MHelp.GetSymbolHelpText(MHelp.GetSymbolHelpPath(hSymbol))
ENDIF
@ -886,7 +881,6 @@ PUBLIC SUB ReadConfig()
txtProperty.Font = grdProperty.Font
cmbProperty.Font = grdProperty.Font
spnProperty.Font = grdProperty.Font
spnHelp.Height = Settings["FProperty/HelpWindowHeight", spnHelp.Height]
MoveProperty
RefreshAll

View File

@ -57,11 +57,11 @@
MoveScaled(33,44,24,13)
Arrangement = Arrange.Fill
Orientation = Align.Bottom
Border = True
{ lblHelp TextLabel
MoveScaled(1,1,22,10)
Padding = 1
Text = ("")
Border = Border.Sunken
}
}
}

View File

@ -391,8 +391,6 @@ PRIVATE FUNCTION CloseProject() AS Boolean
INC Application.Busy
FMain.HideBalloon
Config.Clear("/OpenFile")
Workspace.Lock
FOR EACH hForm IN Workspace.Children

Binary file not shown.

Before

Width:  |  Height:  |  Size: 522 B