Commit e143bc65 authored by Benoît Minisini's avatar Benoît Minisini
Browse files

Debugger panel: Use a label to show the current error. Make the expression watch panel bigger.

[DEVELOPMENT ENVIRONMENT]
* NEW: Debugger panel: Use a label to show the current error. Do not use a balloon anymore.
* NEW: Debugger panel: The expression watch panel is now bigger.
parent 2cf8ae55
Pipeline #320845567 passed with stage
in 23 minutes and 6 seconds
This diff is collapsed.
......@@ -282,9 +282,9 @@
msgid ""
msgstr ""
"Project-Id-Version: gambas3 3.16.90\n"
"POT-Creation-Date: 2021-06-14 23:19 UTC\n"
"PO-Revision-Date: 2021-05-07 23:18 UTC\n"
"Last-Translator: Hasan Merkit <hasanmerkit@outlook.com>\n"
"POT-Creation-Date: 2021-06-14 23:23 UTC\n"
"PO-Revision-Date: 2021-06-14 23:24 UTC\n"
"Last-Translator: Benoît Minisini <g4mba5@gmail.com>\n"
"Language: tr\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
......@@ -2365,14 +2365,12 @@ msgid "Remove current expression"
msgstr "Geçerli ifadeyi sil"
#: FDebugInfo.form:151
#, fuzzy
msgid "Remove all expressions"
msgstr "Geçerli ifadeyi sil"
msgstr ""
#: FDebugInfo.form:162
#, fuzzy
msgid "Enter an expression"
msgstr "İfadeyi izle"
msgstr ""
#: FDebugInfo.form:174
msgid "Display ME"
......@@ -4389,9 +4387,8 @@ msgid "Create package now"
msgstr "Şimdi paket oluştur"
#: FMakeInstall.form:971
#, fuzzy
msgid "Open target folder"
msgstr "Profil aç"
msgstr ""
#: FMakePatch.class:19
msgid "Please select the origin archive."
......@@ -5438,9 +5435,8 @@ msgid "Check prefix of variables"
msgstr "Değişkenlerin ön eklerini kontrol et"
#: FProjectProperty.form:969
#, fuzzy
msgid "Export by default to"
msgstr "Tarihe göre sırala"
msgstr ""
#: FProjectProperty.form:1036
msgid "Add branch to version number"
......@@ -7131,9 +7127,8 @@ msgid "Illegal instruction"
msgstr ""
#: MErrorMessage.module:106
#, fuzzy
msgid "Incorrect declaration of symbol '&1' in class '&2'"
msgstr "bilinmeyen sembol '&2' , '&1' sınıfında "
msgstr ""
#: MErrorMessage.module:107
msgid "Internal compiler error"
......@@ -7412,9 +7407,8 @@ msgid "Syntax error. Cannot use this syntax in assignment"
msgstr ""
#: MErrorMessage.module:176
#, fuzzy
msgid "Syntax error. Class name expected"
msgstr "Sözdizim hatası. Sınıfın bir tanımlıyıca ihtiyacı var."
msgstr ""
#: MErrorMessage.module:177
msgid "Syntax error. Identifier expected"
......@@ -7465,9 +7459,8 @@ msgid "Syntax error. Point syntax used outside of WITH / END WITH"
msgstr ""
#: MErrorMessage.module:189
#, fuzzy
msgid "Syntax error. STRUCT must be followed by an identifier"
msgstr "Sözdizim hatası. Sınıfın bir tanımlıyıca ihtiyacı var."
msgstr ""
#: MErrorMessage.module:190
msgid "Syntax error. The &1 argument is not a valid identifier"
......@@ -7694,9 +7687,8 @@ msgid "Unknown operator"
msgstr "Bilinmeyen işleç"
#: MErrorMessage.module:246
#, fuzzy
msgid "Unknown symbol"
msgstr "Bilinmeyen hata"
msgstr ""
#: MErrorMessage.module:247
msgid "Unknown symbol '&2' in class '&1'"
......@@ -8396,14 +8388,12 @@ msgid "Unable to run terminal."
msgstr "Uçbirim açılamadı."
#: Project.module:7150
#, fuzzy
msgid "Save file as"
msgstr "Profili kaydet"
msgstr ""
#: Project.module:7160 Save.module:57
#, fuzzy
msgid "Unable to save file."
msgstr "Profil kaydedilemedi."
msgstr ""
#: SoftwareBox.class:236
msgid "Published &1"
......@@ -8480,12 +8470,3 @@ msgstr "Bu sınıf mevcut değil."
#: WikiMarkdown.class:187
msgid "This symbol does not exist."
msgstr "Sembol mevcut değil."
#~ msgid "Cannot save file !"
#~ msgstr "Dosya kaydedilemedi !"
#~ msgid "Snapping value is incorrect."
#~ msgstr "Girilen değer yanlış."
#~ msgid "Standard type"
#~ msgstr "Standart tür"
......@@ -71,6 +71,7 @@ Public Sub CheckErrorMessage(hEditor As FEditor)
Dim sPath As String
If Not $sError Then Return
If hEditor Then
If hEditor.Name == $sPosClass And If hEditor.GetEditor().Line = ($iPosLine - 1) Then
hEditor.ShowErrorMessage($sError, "error")
......@@ -78,10 +79,10 @@ Public Sub CheckErrorMessage(hEditor As FEditor)
sPath = Project.FindForm(hEditor.Name)
FMain.ShowError($sError, sPath)
Endif
Else
FDebugInfo.ShowError($sError)
Endif
FDebugInfo.ShowError($sError)
End
......
......@@ -341,11 +341,8 @@ End
Public Sub ReadConfig()
'Dim hButton As ToolButton
Dim hCtrl As Control
Dim hFont As Font
Dim H As Integer
Dim hChild As Control
Dim fSize As Float
Settings.Read(panDebug)
......@@ -364,6 +361,10 @@ Public Sub ReadConfig()
InitFont(cvwObject, fSize)
cmbWatch_Change
Project.SetEditorFont(lblError)
panError.H = lblError.Font.Height + Desktop.Scale
picError.W = panError.H
picError.Padding = Desktop.Scale \ 2
FDebugButton.ReadConfig
......@@ -376,12 +377,11 @@ Public Sub ReadConfig()
Project.SetSmallFont(hCtrl)
Next
H = Max(Stock.GetSize("tiny"), cmbWatch.Font.H) * 1.4
panWatch.H = H
For Each hChild In panWatch.Children
If hChild Is PictureBox Or If hChild Is ToolButton Then hChild.W = hChild.H
Next
'H = Max(Stock.GetSize("small"), cmbWatch.Font.H) * 1.4
'panWatch.H = H
' For Each hChild In panWatch.Children
' If hChild Is PictureBox Or If hChild Is ToolButton Then hChild.W = hChild.H
' Next
$iChangeColor = Color.Merge(MTheme.GetColor("Highlight"), Color.Background)
$iErrorColor = MTheme.GetColor("Error")
......@@ -968,9 +968,13 @@ End
Public Sub ShowError(sMsg As String)
If Me.Visible Then
Balloon(sMsg, lvwStack, Picture["icon:/32/error"], 8, 8)
Else
lblError.Text = sMsg
lblError.Foreground = MTheme.GetColor("Foreground")
panError.Background = MTheme.GetColor("Error")
panError.Show
sepError.Show
If Not Me.Visible Then
sMsg = Replace(sMsg, "\n", "<br>")
Message.Error(sMsg)
Endif
......@@ -1432,6 +1436,8 @@ Public Sub OnProjectDebug()
$sLastLocal = ""
$sLastObject = ""
If Settings["/ShowDebugPanelAutomatically", True] Then FDebugButton.SelectButton(TAB_CONSOLE)
panError.Hide
sepError.Hide
End
......@@ -1765,69 +1771,13 @@ Public Sub GetWatches() As String
End
' Public Sub cmbWatch_GotFocus()
'
' If cmbWatch.Foreground <> Color.Default Then
' cmbWatch.Font = cvwVariable.Font
' cmbWatch.Text = ""
' cmbWatch.Foreground = Color.Default
' Endif
'
' End
'
' Public Sub cmbWatch_LostFocus()
'
' If Not Trim(cmbWatch.Text) Then
' cmbWatch.Text = ("Enter an expression")
' Project.SetSmallFont(cmbWatch)
' cmbWatch.Font.Italic = True
' cmbWatch.Foreground = Color.LightForeground
' Endif
'
' End
' Public Sub cmbWatch_Change()
'
' If cmbWatch.Foreground <> Color.Default Then Return
'
' If Not cmbWatch.Text Then
' cmbWatch.Foreground = Color.LightForeground
' Project.SetSmallFont(cmbWatch)
' cmbWatch.Font.Italic = True
' cmbWatch.Text = ("Enter an expression")
' Endif
'
' End
'
' Public Sub cmbWatch_KeyPress()
'
' If cmbWatch.Foreground <> Color.Default Then
' If Key.Text And If Asc(Key.Text) >= 32 And If Asc(Key.Text) <> 127 Then
' cmbWatch.Text = ""
' cmbWatch.Font = cvwVariable.Font
' cmbWatch.Foreground = Color.Default
' Return
' Endif
' Stop Event
' Endif
'
' End
'
' Public Sub cmbWatch_Cursor()
'
' If cmbWatch.Foreground <> Color.Default Then
' cmbWatch.Pos = 0
' Endif
'
' End
Public Sub cmbWatch_Change()
If cmbWatch.Length = 0 Then
Project.SetSmallFont(cmbWatch)
cmbWatch.Font.Italic = True
cmbWatch.Font = lvwStack.Font
'cmbWatch.Font.Italic = True
Else
cmbWatch.Font = cvwVariable.Font
Project.SetEditorFont(cmbWatch)
Endif
UpdateWatchButtons
......
......@@ -13,7 +13,7 @@
}
}
{ wizDebug Wizard
MoveScaled(2,5,122,41)
MoveScaled(2,5,122,44)
Arrangement = Arrange.Vertical
Count = 8
ShowTitle = False
......@@ -21,51 +21,51 @@
Border = False
Index = 0
Text = ("Debugging")
{ panDebug HBox
MoveScaled(1,2,112,36)
{ panDebug VBox
MoveScaled(0,3,112,40)
Expand = True
{ splDebug HSplit
MoveScaled(6,1,94,34)
MoveScaled(1,1,94,32)
Expand = True
{ lvwStack ListView
MoveScaled(0,0,14,33)
MoveScaled(0,0,14,31)
Mouse = Mouse.Pointing
Border = False
}
{ Panel7 VBox
MoveScaled(16,1,74,32)
MoveScaled(15,1,74,30)
{ panWatch HBox
MoveScaled(1,1,71,3)
MoveScaled(1,1,71,4)
Drop = True
{ Panel5 HBox
MoveScaled(1,0,41,3)
MoveScaled(1,0,47,4)
Background = Color.TextBackground
Expand = True
{ btnAddWatch ToolButton
MoveScaled(0,0,3,3)
MoveScaled(0,0,4,4)
ToolTip = ("Add expression")
Picture = Picture["icon:/tiny/add"]
Picture = Picture["icon:/small/add"]
}
{ btnAddTrack ToolButton
MoveScaled(3,0,3,3)
MoveScaled(4,0,4,4)
ToolTip = ("Watch expression")
Picture = Picture["icon:/tiny/watch"]
Picture = Picture["icon:/small/watch"]
}
{ btnKillWatch ToolButton
MoveScaled(6,0,3,3)
MoveScaled(8,0,4,4)
ToolTip = ("Remove current expression")
Picture = Picture["icon:/tiny/remove"]
Picture = Picture["icon:/small/remove"]
}
{ btnKillAllWatch ToolButton
MoveScaled(9,0,3,3)
MoveScaled(12,0,4,4)
ToolTip = ("Remove all expressions")
Picture = Picture["icon:/tiny/trash"]
Picture = Picture["icon:/small/trash"]
}
{ Panel10 Panel
MoveScaled(13,0,1,3)
MoveScaled(17,0,1,3)
}
{ cmbWatch ComboBox
MoveScaled(16,0,22,3)
MoveScaled(20,0,22,4)
Expand = True
Placeholder = ("Enter an expression")
Border = False
......@@ -83,12 +83,15 @@
{ Separator3 Separator
MoveScaled(63,0,0,3)
}
{ Panel4 Panel
MoveScaled(66,0,4,4)
}
}
{ Separator4 Separator
MoveScaled(4,11,30,0)
MoveScaled(2,7,30,0)
}
{ splVariable HSplit
MoveScaled(3,12,67,19)
MoveScaled(1,8,67,19)
Expand = True
{ cvwVariable ColumnView
MoveScaled(4,2,27,15)
......@@ -106,8 +109,25 @@
}
}
}
{ Panel4 Panel
MoveScaled(107,1,4,4)
{ sepError Separator
MoveScaled(35,34,17,0)
Visible = False
}
{ panError HBox
MoveScaled(1,35,103,4)
Visible = False
Spacing = True
{ picError PictureBox
MoveScaled(0,0,4,4)
Picture = Picture.Load("icon:/medium/error")
Stretch = True
Alignment = Align.Center
}
{ lblError TextLabel
MoveScaled(6,0,73,4)
Expand = True
Alignment = Align.Normal
}
}
}
Index = 1
......
......@@ -133,8 +133,8 @@
MoveScaled(3,2,37,4)
Font = Font["Italic"]
AutoResize = True
Text = ("Click on Insert to add a new menu.")
Alignment = Align.TopNormal
Text = ("Click on Insert to add a new menu.")
}
{ panMenu HPanel
MoveScaled(2,1,59,56)
......
# Gambas Form File 3.0
{ Form Form
MoveScaled(0,0,98,66)
MoveScaled(0,0,102,66)
Action = "option"
Text = ("Preferences")
Icon = Picture["icon:/small/options"]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment