Compare revisions

Benoît Minisini · Benoît Minisini · Benoît Minisini · Benoît Minisini · Benoît Minisini · Benoît Minisini
--- a/VERSION
+++ b/VERSION
-3.18.1
+3.18.2
--- a/app/src/gambas3/.src/Component/CClassInfo.class
+++ b/app/src/gambas3/.src/Component/CClassInfo.class
@@ -251,7 +251,9 @@ Public Sub InitControl()
        Endif
      Endif

-      If Family <> "Form" Then 
+      If hSym.Component = CComponent.PROJECT_NAME Then
+        bDoNotApply = True
+      Else If Family <> "Form" Then 
        If MultiContainer Then
          bDoNotApply = Not CPropertyInfo.ALLOWED_MULTI_CONTAINER_PROP.Exist(sProp)
        Else

--- a/app/src/gambas3/.src/Component/CDocumentation.class
+++ b/app/src/gambas3/.src/Component/CDocumentation.class
@@ -874,6 +874,7 @@ Private Sub ScanClass(hModule As Object, cSymbol As Collection, bModule As Boole
        If aSym[aSym.Count - 2] == "USE" Then
          sName = aSym[aSym.Max]
          hSymbol2 = hSymbol.Copy()
+          hSymbol2.Kind = If(IsUCase(sKind), "V", "v")
          hSymbol2.Name = sName
          hSymbol2.LineNumber = hSymbol.LineNumber
          hSymbol2.NotPublic = True

--- a/app/src/gambas3/.src/Debug/Design.module
+++ b/app/src/gambas3/.src/Debug/Design.module
@@ -314,6 +314,7 @@ Public Sub Debug_Read(Data As String)
  Dim iPos As Integer
  Dim sComp As String
  Dim bLineChanged As Boolean
+  Dim iPid As Integer
  
  $sBuffer &= Data
  iPos = InStr($sBuffer, "\n") 
@@ -353,18 +354,19 @@ Public Sub Debug_Read(Data As String)
      '   [3] Local variables
      '   [4] Current object
    
-      If ProcessId = 0 Then
-        Try ProcessId = CInt(Scan(aData[0], "?[[]*]")[0])
-        If ProcessId Then
+      Try iPid = CInt(Scan(aData[0], "?[[]*]")[0])
+      If iPid And If iPid <> ProcessId Then
+        ProcessId = iPid
        ProcessFiles = -1
        ProcessMemory = -1
+        If Not $hTimerWatch Then
          $hTimerWatch = New Timer As "TimerWatch"
          $hTimerWatch.Delay = 1000
+        Endif
        $hTimerWatch.Start
        TimerWatch_Timer
        FDebugger.UpdateProcessInfo(ProcessId, ProcessFiles, ProcessMemory)
      Endif
-      Endif

      aPos = Split(Trim(aData[2]), " ")
      While aPos.Count
@@ -638,8 +640,8 @@ Private Sub AfterStop()
    $hBrowser = Null
  Endif

-  For Each hForm In Project.Workspace.Windows
-    Try hForm.OnProjectDebug 
+  For Each hForm In Project.Files
+    Try hForm.OnProjectDebug()
  Next

  FMain.OnProjectDebug
@@ -688,6 +690,8 @@ Public Sub Stop()
    If $bGnomeTerminal Then Pause()
    Try $hProcess.Kill
    $hProcess.Wait(1)
+  Else If $bExtern Then
+    If ProcessId > 0 Then Try Signal.Send(ProcessId, Signal.SIGKILL)
  Endif
  AfterStop

@@ -1099,8 +1103,8 @@ Private Sub Start(sCmd As String)
  $bStart = True
  Project.Running = True

-  For Each hForm In Project.Workspace.Windows
-    Try hForm.OnProjectDebug
+  For Each hForm In Project.Files
+    Try hForm.OnProjectDebug()
  Next
  FOutput.OnProjectDebug
  FMain.OnProjectDebug

--- a/app/src/gambas3/.src/Debug/FDebugConfig.class
+++ b/app/src/gambas3/.src/Debug/FDebugConfig.class
@@ -61,6 +61,7 @@ Private Sub LoadSettings()
  
  btnRedirectStderr.Value = Project.Config["/Debug/RedirectStderr"]
  btnUseHttpServer.Value = Project.Config["/Debug/UseHttpServer"]
+  btnUseHttpServer.Enabled = Not Project.Components.Exist("gb.web.gui")
  cmbBrowser.Index = Design.Browsers.Find(Project.Config["/Debug/Browser"])
  
  btnResetOtherProjects.Visible = Not IsNull(Project.Config["/Debug/Projects"])

--- a/app/src/gambas3/.src/Debug/FDebugConfig.form
+++ b/app/src/gambas3/.src/Debug/FDebugConfig.form
@@ -160,7 +160,7 @@
        Text = ("Use terminal emulator")
      }
      { btnUseTerminal SwitchButton
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
      }
    }
    { panTerminal HBox
@@ -188,7 +188,7 @@
        Text = ("Redirect standard error output")
      }
      { btnRedirectStderr SwitchButton
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
      }
    }
    { HBox11 HBox
@@ -201,7 +201,7 @@
        Text = ("Use embedded HTTP server")
      }
      { btnUseHttpServer SwitchButton
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
      }
    }
    { panBrowser HBox
@@ -230,7 +230,7 @@
      }
      { SwitchButton1 SwitchButton btnSetEnv
        Name = "SwitchButton1"
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
        Tag = "GB_REVERSE=1"
      }
    }
@@ -245,7 +245,7 @@
      }
      { SwitchButton2 SwitchButton btnSetEnv
        Name = "SwitchButton2"
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
        Tag = "GB_NO_JIT=1"
      }
    }
@@ -260,7 +260,7 @@
      }
      { SwitchButton3 SwitchButton btnSetEnv
        Name = "SwitchButton3"
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
        Tag = "GB_JIT_DEBUG=1"
      }
    }
@@ -275,7 +275,7 @@
      }
      { SwitchButton4 SwitchButton btnSetEnv
        Name = "SwitchButton4"
-        MoveScaled(47,0,8,4)
+        MoveScaled(47,0,7,4)
        Tag = "GB_DB_DEBUG=1"
      }
    }
@@ -319,7 +319,7 @@
        Text = ("Activate remote debugging")
      }
      { btnRemoteDebugging SwitchButton
-        MoveScaled(45,0,8,4)
+        MoveScaled(45,0,7,4)
      }
    }
    { panRemoteDebugging VBox

--- a/app/src/gambas3/.src/Debug/FDebugger.class
+++ b/app/src/gambas3/.src/Debug/FDebugger.class
@@ -921,11 +921,19 @@ End

 Public Sub cvwDebug_Select()

-  Balloon.Hide(Last)
  UpdateWatchButtons
  
 End 

+Public Sub cvwDebug_Click()
+
+  If cvwDebug.Item.Children Then
+    cvwDebug.Item.Selected = False
+    cvwDebug.Item.Expanded = Not cvwDebug.Item.Expanded
+  Endif
+
+End
+
 Private Sub AddTrack(sExpr As String)

  If $cTrack.Exist("@" & sExpr) Then Return

--- a/app/src/gambas3/.src/Editor/Browse/FProjectBrowser.class
+++ b/app/src/gambas3/.src/Editor/Browse/FProjectBrowser.class
@@ -127,41 +127,10 @@ End

 Public Sub fvwProject_Activate()

-  If IsDir($hView.Path) Then
-    SetDir($hView.Path)
-  Else 
-    FMain.CloseProjectEditor()
-    Project.OpenFile($hView.Path)
-    Stop Event
-  Endif
+  mnuOpen_Click

 End

-' Public Sub btnPreview_Click()
-' 
-'   Dim iIconSize As Integer
-'   
-'   If panProject.Visible Then fvwProject.ShowPreview = btnPreview.Value
-'   If panProject2.Visible Then fvwProject2.ShowPreview = btnPreview.Value
-'   'mnuShowPreview.Checked = btnPreview.Value
-' 
-'   If btnPreview.Value Then
-'     iIconSize = $iIconSizePreview
-'   Else 
-'     iIconSize = $iIconSizeNormal
-'   Endif
-'   sldIconSize.Value = iIconSize
-' 
-' End
-' 
-' Public Sub btnDetail_Click()
-' 
-'   If panProject.Visible Then fvwProject.ShowDetailed = btnDetail.Value
-'   If panProject2.Visible Then fvwProject2.ShowDetailed = btnDetail.Value
-'   UpdateMenu
-'   
-' End
-
 Public Sub btnParent_Click()

  SetDir(File.Dir($hView.Dir))
@@ -175,9 +144,19 @@ Public Sub btnReload_Click()

 End

+Private Sub GetCurrentPath() As String
+
+  Dim sPath As String
+
+  sPath = $hView.Path
+  If Not sPath Then sPath = $hView.Dir
+  Return sPath
+  
+End
+
 Public Sub mnuProperty_Click()
  
-  FFileProperty.Run($hView.Path)
+  FFileProperty.Run(GetCurrentPath())
  
 End

@@ -527,16 +506,15 @@ Public Sub mnuPopup_Show()
  Dim sPath As String
  Dim bIsDir As Boolean

-  sPath = $hView.Path
+  sPath = GetCurrentPath()
  bIsDir = IsDir(sPath)
  Try bLink = Stat(sPath).Type = gb.Link
-  If Error Then Return
  
-  mnuOpen.Visible = Not bIsDir
+  mnuOpen.Visible = sPath <> $hView.Dir
  mnuCut.Visible = mnuCopy.Visible
  
  mnuOpenWith.Visible = False
-  If mnuOpen.Visible Then
+  If mnuOpen.Visible And Not bIsDir Then
    sMime = MMime.GetMime(sPath)
    If sMime Then
      hProgList = DesktopFile.FromMime(sMime)
@@ -645,6 +623,12 @@ Public Sub mnuOpenWith_Show()
  
 End

+Public Sub mnuEditWithProg_Click()
+  
+  FMain.OpenFileWith($hView.Path, Last)
+  
+End
+
 Public Sub mnuRename_Click()

  $hView.Rename
@@ -740,27 +724,39 @@ Public Sub fvwProject_Drop()

 End

+Public Sub mnuOpen_Click()

-Public Sub mnuOpenWithFileManager_Click()
+  Dim sPath As String
+  
+  sPath = GetCurrentPath()
  
-  If Not $hView.Path Then
-    Desktop.Open($hView.Dir)
+  If IsDir(sPath) Then
+    SetDir(sPath)
  Else
-    Desktop.Open($hView.Path)
+    FMain.CloseProjectEditor
+    FMain.OpenFile(sPath)
+    Stop Event
  Endif
  
 End

+
+Public Sub mnuOpenWithFileManager_Click()
+
+  Desktop.Open(GetCurrentPath())
+
+End
+
 Public Sub mnuCopyPath_Click()

-  Dim sPath As String = Project.StripPath($hView.Path)
+  Dim sPath As String = Project.StripPath(GetCurrentPath())
  If sPath Then Clipboard.Copy(sPath)

 End

 Public Sub mnuInfoVC_Click()

-  FFileInfoVC.Run($hView.Path)
+  FFileInfoVC.Run(GetCurrentPath())

 End


--- a/app/src/gambas3/.src/FMain.class
+++ b/app/src/gambas3/.src/FMain.class
@@ -166,12 +166,30 @@ Private Sub OpenProject()
  
 End

-Public Sub tvwProject_Activate()
+Public Sub OpenFile(sPath As String)
  
-  Dim sKey As String
  Dim sMime As String
  Dim hProgList As DesktopFile[]
  Dim hProcess As Process
+
+  Project.OpenFileIgnoreUnknown = True
+  Project.Activate(Project.OpenFile(sPath))
+  If Project.FileWasUnknown() Then
+    sMime = MMime.GetMime(sPath)
+    If sMime Then
+      hProgList = DesktopFile.FromMime(sMime)
+      If hProgList.Count Then
+        hProcess = hProgList[0].Run(sPath)
+        hProcess.Ignore = True
+      Endif
+    Endif
+  Endif
+  
+End
+
+Public Sub tvwProject_Activate()
+  
+  Dim sKey As String
  Dim sKeyClass As String
  
  sKey = tvwProject.Key
@@ -187,18 +205,7 @@ Public Sub tvwProject_Activate()
          If Project.IsSourcePath(sKeyClass) Then sKey = sKeyClass
        Endif
      Endif
-      Project.OpenFileIgnoreUnknown = True
-      Project.OpenFile(sKey)
-      If Project.FileWasUnknown() Then
-        sMime = MMime.GetMime(sKey)
-        If sMime Then
-          hProgList = DesktopFile.FromMime(sMime)
-          If hProgList.Count Then
-            hProcess = hProgList[0].Run(sKey)
-            hProcess.Ignore = True
-          Endif
-        Endif
-      Endif
+      OpenFile(sKey)
    Endif
  Endif
  
@@ -2279,7 +2286,8 @@ Public Sub CreateRunWithMenu(hParent As Menu)
  hParent.Children.Clear
  
  For Each hProg In hParent.Tag
-    hMenu = New Menu(hParent) As "mnuEditWithProg"
+    hMenu = New Menu(hParent) 'As "mnuEditWithProg"
+    Object.Attach(hMenu, Object.Parent(hParent), "mnuEditWithProg")
    hMenu.Caption = hProg.Name & " (" & hProg.ProgramName & ")"
    Try hMenu.Picture = hProg.GetIcon().Picture
    hMenu.Tag = hProg
@@ -2295,20 +2303,24 @@ Public Sub mnuEditWith_Show()
  
 End

-Public Sub mnuEditWithProg_Click()
+Public Sub OpenFileWith(sPath As String, hMenu As Menu)
  
  Dim hProcess As Process
  Dim hDesktopFile As DesktopFile
-  Dim sPath As String
  
-  sPath = GetCurrent()
  If Not sPath Then Return
-  hDesktopFile = Last.Tag
+  hDesktopFile = hMenu.Tag
  hProcess = hDesktopFile.Run(sPath)
  hProcess.Ignore = True
  
 End

+Public Sub mnuEditWithProg_Click()
+  
+  OpenFileWith(GetCurrent(), Last)
+  
+End
+
 Public Sub mnuClearDebugWindows_Click()
  
  FDebugExpr.Clear

--- a/app/src/gambas3/.src/Options/FOption.form
+++ b/app/src/gambas3/.src/Options/FOption.form
@@ -146,7 +146,7 @@
        Text = ("Add vendor prefix or name to package names")
      }
      { btnPrefix SwitchButton
-        MoveScaled(57,0,8,4)
+        MoveScaled(57,0,7,4)
      }
    }
    Index = 1
@@ -189,7 +189,7 @@
        Text = ("Indent with tab by default")
      }
      { btnTabIndent SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox35 HBox
@@ -202,7 +202,7 @@
        Text = ("Automatic word wrap by default")
      }
      { btnWrapText SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox54 HBox
@@ -215,7 +215,7 @@
        Text = ("Activate version control")
      }
      { btnVersionControl SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox44 HBox
@@ -228,7 +228,7 @@
        Text = ("Restore files when loading a project")
      }
      { btnStartupLoad SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { Label16 Label
@@ -277,7 +277,7 @@
        MoveScaled(38,1,5,2)
      }
      { btnCompressPng SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { Label82 Label
@@ -305,7 +305,7 @@
        MoveScaled(40,1,6,2)
      }
      { btnAutoTrans SwitchButton
-        MoveScaled(51,0,8,4)
+        MoveScaled(51,0,7,4)
      }
    }
    { panAutoTransEngine HBox
@@ -341,7 +341,7 @@
        Text = ("Show documentation in popups")
      }
      { btnHelpCompletion SwitchButton
-        MoveScaled(48,0,8,4)
+        MoveScaled(48,0,7,4)
      }
    }
    { HBox28 HBox
@@ -354,7 +354,7 @@
        Text = ("Always display optional messages")
      }
      { btnOptional SwitchButton
-        MoveScaled(48,0,8,4)
+        MoveScaled(48,0,7,4)
      }
    }
    { Label72 Label
@@ -372,7 +372,7 @@
        Text = ("Use offline documentation")
      }
      { btnOfflineHelp SwitchButton
-        MoveScaled(48,0,8,4)
+        MoveScaled(48,0,7,4)
      }
    }
    { panDownloadHelp HBox
@@ -473,7 +473,7 @@
        Text = ("Show indentation with vertical lines")
      }
      { btnShowIndent SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox17 HBox
@@ -486,7 +486,7 @@
        Text = ("Highlight current line")
      }
      { btnShowCurrent SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox16 HBox
@@ -499,7 +499,7 @@
        Text = ("Highlight modified lines")
      }
      { btnShowChange SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox15 HBox
@@ -512,7 +512,7 @@
        Text = ("Show line numbers")
      }
      { btnShowLineNumber SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox42 HBox
@@ -525,7 +525,7 @@
        Text = ("Procedure folding")
      }
      { btnFold SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox18 HBox
@@ -538,7 +538,7 @@
        Text = ("Procedure separation")
      }
      { btnShowLimit SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox29 HBox
@@ -551,7 +551,7 @@
        Text = ("Show spaces at end of line with dots")
      }
      { btnShowSpaces SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox51 HBox
@@ -564,7 +564,7 @@
        Text = ("Show Preview")
      }
      { btnShowPreview SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox20 HBox
@@ -578,7 +578,7 @@
        Text = ("Keywords in upper case")
      }
      { btnUpperCaseKeywords SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    Index = 4
@@ -599,7 +599,7 @@
        Text = ("Control structure completion")
      }
      { btnControlStructCompletion SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox43 HBox
@@ -612,7 +612,7 @@
        Text = ("Local variable declaration")
      }
      { btnLocalVarDecl SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox47 HBox
@@ -625,7 +625,7 @@
        Text = ("Comments insertion")
      }
      { btnComment SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox52 HBox
@@ -638,7 +638,7 @@
        Text = ("Close braces, brackets") & "..."
      }
      { btnCloseBraces SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox64 HBox
@@ -651,7 +651,7 @@
        Text = ("Close strings")
      }
      { btnCloseStrings SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { Label48 Label
@@ -669,7 +669,7 @@
        Text = ("Format on load & save")
      }
      { btnFormatOnLoad SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox30 HBox
@@ -682,7 +682,7 @@
        Text = ("Indent local variable declaration")
      }
      { btnIndentDim SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox31 HBox
@@ -695,7 +695,7 @@
        Text = ("Remove useless spaces at end of line")
      }
      { btnRemoveSpace SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { HBox32 HBox
@@ -708,7 +708,7 @@
        Text = ("Keep successive void lines")
      }
      { btnKeepVoidLine SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    Index = 5
@@ -728,7 +728,7 @@
        Text = ("Activate code snippets")
      }
      { btnCodeSnippet SwitchButton
-        MoveScaled(50,0,8,4)
+        MoveScaled(50,0,7,4)
      }
    }
    { Panel9 HBox
@@ -809,7 +809,7 @@
        Text = ("Activate animations")
      }
      { btnAnimation SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox59 HBox
@@ -822,7 +822,7 @@
        Text = ("Show shadows")
      }
      { btnShadow SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox3 HBox
@@ -835,7 +835,7 @@
        Text = ("Show tooltips")
      }
      { btnTooltip SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox26 HBox
@@ -848,7 +848,7 @@
        Text = ("Use utility windows")
      }
      { btnUtility SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox41 HBox
@@ -861,7 +861,7 @@
        Text = ("Close tabs with middle mouse click")
      }
      { btnCloseWithMiddleClick SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox48 HBox
@@ -874,7 +874,7 @@
        Text = ("Show file name in window title")
      }
      { btnShowFileInTitle SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox57 HBox
@@ -887,7 +887,7 @@
        Text = ("Show debugging panel if needed")
      }
      { btnShowDebug SwitchButton
-        MoveScaled(43,0,8,4)
+        MoveScaled(43,0,7,4)
      }
    }
    { HBox7 HBox
@@ -1221,7 +1221,7 @@
        Text = ("Invert colors for dark themes")
      }
      { btnInvertTheme SwitchButton
-        MoveScaled(48,0,8,4)
+        MoveScaled(48,0,7,4)
      }
    }
    { HBox10 HBox

--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -801,6 +801,8 @@ _INIT_AGAIN:
    
  Endif
  
+  If Project.Components.Exist("gb.web.gui") Then Project.Config["/Debug/UseHttpServer"] = True
+  
  Dec $iNoRefresh

  Inc Project.TimeStamp
@@ -2835,6 +2837,7 @@ Public Function MakeExecutable(bDoNotIncVersion As Boolean, bSilent As Boolean,
  Dim sPath As String
  Dim I As Integer
  Dim sDir As String
+  Dim sOptions As String

  If CheckStartupClass() Then Return True

@@ -2912,7 +2915,10 @@ Public Function MakeExecutable(bDoNotIncVersion As Boolean, bSilent As Boolean,
      
    Endif
    
-    sExec = System.Path &/ "bin/gba" & System.Version & " -o " & Shell$(sExecPath) & " " & Shell$(Project.Dir) & " > " & OUTPUT_FILE & " 2>&1"
+    sOptions = ""
+    If Config["/Executable/NoPublicDirectory", False] Then sOptions &= " -p"
+
+    sExec = System.Path &/ "bin/gba" & System.Version & sOptions & " -o " & Shell$(sExecPath) & " " & Shell$(Project.Dir) & " > " & OUTPUT_FILE & " 2>&1"
    Shell sExec Wait
    
    If CompressFiles And If CompressedFiles.Count Then
@@ -5830,7 +5836,8 @@ Public Sub SendMail()
  sTemp = File.SetName(sTemp, GetDefaultArchiveBaseName()) & ".tar.gz"
  Try Kill sTemp
  MakeSourcePackageTo(sTemp)
-  Desktop.SendMail(Null,,, If(Project.Title, Project.Title, Project.Name),, sTemp)
+  Try Desktop.SendMail(Null,,, If(Project.Title, Project.Title, Project.Name),, sTemp)
+  If Error Then FMain.ShowErrorWith(("Unable to send project by mail."))

 End


--- a/app/src/gambas3/.src/Project/CProjectTree.class
+++ b/app/src/gambas3/.src/Project/CProjectTree.class
@@ -293,7 +293,7 @@ Private Sub AddFile(sDir As String, sFile As String, Optional bAfter As Boolean,
        
      End With
      
-      If bSource And If Project.ShowAllClasses Then
+      If bSource And If Project.ShowAllClasses And If Not bDir Then
        If ExistForm(sFile) Then
        
          sParent = sKey

--- a/app/src/gambas3/.src/Project/FMakeExecutable.class
+++ b/app/src/gambas3/.src/Project/FMakeExecutable.class
@@ -35,6 +35,9 @@ Public Sub Form_Open()
  chkNoTest.Visible = Project.HasTest()
  chkNoTest.Value = Project.Config["/Executable/NoTestModule", False]

+  chkNoPublic.Visible = IsDir(Project.Dir &/ ".public")
+  chkNoPublic.Value = Project.Config["/Executable/NoPublicDirectory", False]
+
  ' If Project.CreateComponent Then 
  '   chkShortcut.Text = ("Install in the user component directory")
  ' Else
@@ -66,6 +69,7 @@ Public Sub btnOK_Click()
    .RunAfterMakingExec = Trim(txtCommand.Text)
    .Config["/Executable/DoNotIncrementVersion"] = chkIncVersion.Value = CheckBox.False
    .Config["/Executable/NoTestModule"] = CBool(chkNoTest.Value)
+    .Config["/Executable/NoPublicDirectory"] = CBool(chkNoPublic.Value)
    
    If chkSetVersion.Value Then
      .MajorVersion = txtMajor.Value 

--- a/app/src/gambas3/.src/Project/FMakeExecutable.form
+++ b/app/src/gambas3/.src/Project/FMakeExecutable.form
 # Gambas Form File 3.0

 { Form Form
-  MoveScaled(0,0,100,73)
+  MoveScaled(0,0,100,76)
  Text = ("Configure executable")
  Icon = Picture["icon:/small/exec"]
  Persistent = True
@@ -9,7 +9,7 @@
  Spacing = True
  Margin = True
  { tabExec TabPanel
-    MoveScaled(4,2,92,63)
+    MoveScaled(4,2,92,67)
    Expand = True
    Arrangement = Arrange.Fill
    Count = 2
@@ -23,7 +23,7 @@
    Index = 1
    Text = ("Options")
    { VBox1 VBox
-      MoveScaled(1,1,89,56)
+      MoveScaled(1,1,89,61)
      Margin = True
      { chkIncVersion CheckBox
        MoveScaled(1,1,43,4)
@@ -79,11 +79,15 @@
        MoveScaled(1,21,34,4)
        Text = ("Exclude test modules")
      }
+      { chkNoPublic CheckBox
+        MoveScaled(1,25,34,4)
+        Text = ("Exclude public directory")
+      }
      { Panel1 Panel
-        MoveScaled(20,28,7,1)
+        MoveScaled(39,30,4,1)
      }
      { Panel2 VBox
-        MoveScaled(1,30,86,26)
+        MoveScaled(1,33,86,26)
        Expand = True
        Spacing = True
        { Label1 Label
@@ -109,7 +113,7 @@
    Index = 0
  }
  { HBox3 HBox
-    MoveScaled(6,68,79,4)
+    MoveScaled(6,70,79,4)
    Spacing = True
    { Spring1 Spring
      MoveScaled(7,2,9,1)

--- a/app/src/gambas3/.src/Project/FProjectProperty.form
+++ b/app/src/gambas3/.src/Project/FProjectProperty.form
@@ -303,7 +303,7 @@
          Text = ("This component is hidden")
        }
        { btnHidden SwitchButton
-          MoveScaled(34,0,8,4)
+          MoveScaled(34,0,7,4)
        }
      }
      { panCompatible HBox
@@ -535,6 +535,14 @@
      }
    }
    Index = 4
+    Text = ("Environment")
+    Picture = Picture["icon:/large/news"]
+    { choEnv EnvChooser
+      MoveScaled(4,4,51,47)
+      Expand = True
+      Border = True
+    }
+    Index = 5
    Text = ("Options")
    Picture = Picture["icon:/large/options"]
    { Panel6 VBox
@@ -579,7 +587,7 @@
          Text = ("Show deprecated components and controls")
        }
        { btnShowDeprecated SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
        }
      }
      { Label8 Label
@@ -598,7 +606,7 @@
          Text = ("Module symbols are public by default")
        }
        { btnModulePublic SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
        }
      }
      { HBox11 HBox
@@ -611,7 +619,7 @@
          Text = ("Form controls are public")
        }
        { btnControlPublic SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
        }
      }
      { HBox5 HBox
@@ -624,7 +632,7 @@
          Text = ("Activate warnings")
        }
        { btnWarning SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
        }
      }
      { HBox2 HBox
@@ -637,7 +645,7 @@
          Text = ("Check prefix of variables")
        }
        { btnCheckPrefix SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
          Enabled = False
        }
      }
@@ -694,7 +702,7 @@
          Text = ("Project is translatable")
        }
        { btnTranslate SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
        }
      }
      { HBox8 HBox
@@ -729,11 +737,11 @@
          Text = ("Add branch to version number")
        }
        { btnVersionAddBranch SwitchButton
-          MoveScaled(47,0,8,4)
+          MoveScaled(47,0,7,4)
        }
      }
    }
-    Index = 5
+    Index = 6
    Text = ("Statistics")
    Picture = Picture["icon:/large/statistics"]
    { gvwStat GridView

--- a/app/src/gambas3/.src/Translation/CTranslation.class
+++ b/app/src/gambas3/.src/Translation/CTranslation.class
@@ -79,7 +79,6 @@ Private Sub LoadTranslation(sLang As String)
  Dim sMsgComment As String
  Dim iMode As Integer
  Dim bFuzzy As Boolean
-  Dim iPos As Integer
  Dim cCache As New Collection
  Dim cKey As New Collection
  Dim bIgnore As Boolean
@@ -92,13 +91,11 @@ Private Sub LoadTranslation(sLang As String)
  While Not Eof(hFile)
    Line Input #hFile, sLine
    If Not sLine Then Break
+    If sLine Begins "#," And If Trim(Mid$(sLine, 3)) = "fuzzy" Then Continue
+    If sLine Begins "msg" Then Continue
    Header &= sLine & "\n"
  Wend

-  iPos = InStr(Header, "#, fuzzy")
-  If iPos = 0 Then iPos = InStr(Header, "#,fuzzy")
-  If iPos Then Header = Left(Header, iPos - 1)
-
  Header &= SubstHeader(File.Load("po-header.txt"), sLang)

  Do

--- a/app/src/gambas3/.src/Welcome/FSystemInfo.class
+++ b/app/src/gambas3/.src/Welcome/FSystemInfo.class
@@ -174,8 +174,7 @@ Static Public Sub GetInfo() As String[]
      aSearchPath = ["/usr/lib"]
    Endif
    
-    cSearch = ["QT4": "libQtCore.so.*.*.*", "QT5": "libQt5Core.so.*.*.*", "GDK2": "libgdk-x11-2*.so.*.*.*", "GTK+2": "libgtk-x11-2*.so.*.*.*", "GDK3": "libgdk-3*.so.*.*.*", "GTK+3": "libgtk-3*.so.*.*.*", "SDL": "libSDL-1.*.so.*.*.*", "GStreamer": "libgstreamer-*.so.*.*.*", "Poppler": "libpoppler.so.*.*.*", "Curl": "libcurl.so.*.*.*", 
-    "OpenGL": "libGL.so.*.*.*", "Cairo": "libcairo.so.*.*.*", "DBus": "libdbus-[0-9].so.*.*.*", "SQLite": "libsqlite3.so.*.*.*", "RSvg": "librsvg-2.so.*.*.*"]
+    cSearch = ["QT4": "libQtCore.so.*.*.*", "QT5": "libQt5Core.so.*.*.*", "GDK2": "libgdk-x11-2*.so.*.*.*", "GTK+2": "libgtk-x11-2*.so.*.*.*", "GDK3": "libgdk-3*.so.*.*.*", "GTK+3": "libgtk-3*.so.*.*.*", "SDL": "libSDL[2-9]-*.*.so.*.*.*", "GStreamer": "libgstreamer-*.so.*.*.*", "Poppler": "libpoppler.so.*.*.*", "Curl": "libcurl.so.*.*.*", "OpenGL": "libGL.so.*.*.*", "Cairo": "libcairo.so.*.*.*", "DBus": "libdbus-[0-9].so.*.*.*", "SQLite 3": "libsqlite3.so.*.*.*", "RSvg": "librsvg-2.so.*.*.*"]
    
  Endif


--- a/app/src/gambas3/help/wiki/style-offline-htmlview.css
+++ b/app/src/gambas3/help/wiki/style-offline-htmlview.css
@@ -26,7 +26,7 @@ DIV.syntax > P:last-child {

 H1 {
  display: block !important;
-  font-size: 1.5rem !important;
+  font-size: 2rem !important;
  margin-top: 0 !important;
  /*margin-bottom: 0 !important;*/
 }

--- a/app/src/gambas3/support.txt
+++ b/app/src/gambas3/support.txt
@@ -8,8 +8,8 @@
 18 Kari Laine
 18 Jon Nicholson
 16 DistroWatch.com
+16 Gianluigi Gradaschi
 16 Brian Grindley
-15 Gianluigi Gradaschi
 15 Yvick Miossec
 15 Christian Henri Fischer
 14 José Ignacio Dominguez Romero
@@ -26,14 +26,14 @@
 12 Jacky Tripoteau
 12 Edward Kelm
 12 Biznatch Enterprises
+11 Bernd Kühn
+11 Manfred Heyen
 11 Sharon Mayost (שרון מיוסט)
 10 Thierry Senges
-10 Bernd Kühn
-10 Manfred Heyen
+10 Santos Fernández Vázquez
 10 Nando Favaro
 9 Bruce Steers
 9 Technical Racing Products
-9 Santos Fernández Vázquez
 9 David Losada
 8 Laurent Gallego
 8 Mark Dootson
@@ -52,6 +52,7 @@
 7 Nicola Giacobbe
 7 Robert Blick
 6 Yves Ribéreau
+6 Jorge Carrión
 6 Alberto Alday
 6 Terry Blunt
 6 David Nelson
@@ -100,7 +101,6 @@
 4 Allen Murphy
 4 Kenneth Gerhardstein
 4 Serge Derrick
-4 Jorge Carrión
 4 Vincent Bermel
 3 Dallen Wilson
 3 Vincent Benner

--- a/comp/src/gb.eval.highlight/.src/TextHighlighter.class
+++ b/comp/src/gb.eval.highlight/.src/TextHighlighter.class
@@ -133,8 +133,6 @@ Public Sub ToHTML(Text As String, Optional Theme As Variant) As String
  aText = Split(Text, "\n")
  
  iColor = 0
-  aResult.Add("<tt><span style=\"color:#000000;\">")
-  sOldStyle = "color:#000000;"
  
  For Y = 0 To aText.Max
    
@@ -177,8 +175,8 @@ Public Sub ToHTML(Text As String, Optional Theme As Variant) As String
      If hStyle.Dotted Then sStyle &= "text-decoration:underline dotted;"
      
      If sStyle <> sOldStyle Then
+        sHtml = If(sOldStyle, "</span>", "") & "<span style=\"" & sStyle & "\">" & sHtml
        sOldStyle = sStyle
-        sHtml = "</span><span style=\"" & sStyle & "\">" & sHtml
      Endif
      
      sLineHtml &= sHtml
@@ -199,7 +197,7 @@ Public Sub ToHTML(Text As String, Optional Theme As Variant) As String
    
  Next
  
-  Return aResult.Join("<br>") & "</span></tt>"
+  Return "<tt><span style=\"color:#000000;\">" & aResult.Join("<br>") & "</span></tt>"
  
 End
No results found