[Gambas-user] [Git][gambas/gambas][master] Really disable filter in project creation dialog and make the terminal tab of…

[Benoît Minisini]

Benoît Minisini pushed to branch master at Gambas / gambas


Commits:
c1c52f05 by gambas at 2018-01-25T11:01:45+01:00
Really disable filter in project creation dialog and make the terminal tab of the project version control dialog start in the current project directory.

[DEVELOPMENT ENVIRONMENT]
* BUG: Really disable filter in project creation dialog.
* BUG: The terminal tab of the project version control dialog now correctly starts in the current project directory.

- - - - -


5 changed files:

- app/src/gambas3/.project
- app/src/gambas3/.src/Project.module
- app/src/gambas3/.src/Project/CProjectList.class
- app/src/gambas3/.src/Project/FCreateProject.form
- app/src/gambas3/.src/VersionControl/FVersionControl.class


Changes:

=====================================
app/src/gambas3/.project
=====================================
--- a/app/src/gambas3/.project
+++ b/app/src/gambas3/.project
@@ -33,6 +33,7 @@ Description="Integrated Development Environment for Gambas"
 Authors="Benoît Minisini\nFabien Bodard\nCharlie Reinl\nJosé Luis Redrejo\nRobert Rowe\nTobias Boege"
 Arguments=[["-t","~/gambas/git/master/app/src/gambas3"]]
 CurrentArgument=0
+Environment="GB_GUI=gb.qt5"
 TabSize=2
 Translate=1
 Language=en


=====================================
app/src/gambas3/.src/Project.module
=====================================
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -316,6 +316,7 @@ Public Sub Main()
 
   Application.Theme = Settings["/Theme"]
   DESKTOP_FONT = Application.Font.ToString()
+
   Try Application.Font = Font[Settings["/Font"]]
 
   'Print Application.Theme


=====================================
app/src/gambas3/.src/Project/CProjectList.class
=====================================
--- a/app/src/gambas3/.src/Project/CProjectList.class
+++ b/app/src/gambas3/.src/Project/CProjectList.class
@@ -22,6 +22,7 @@ Private $sLastURL As String
 Private $hHelp As WebView
 Private $hCurrent As ProjectBox
 Private $iCount As Integer
+Private $bNoFilter As Boolean
 
 Public Sub _new(hList As ScrollView, hFilter As ButtonBox, iType As Integer, Optional iArrange As Integer = Arrange.Row)
   
@@ -30,6 +31,8 @@ Public Sub _new(hList As ScrollView, hFilter As ButtonBox, iType As Integer, Opt
   $iType = iType
   $iArrange = iArrange
   
+  $bNoFilter = Not $hFilter.Enabled
+  
   $hObserver = New Observer($hFilter) As "Filter"
   $hObsList = New Observer(hList) As "ScrollView"
   
@@ -444,7 +447,7 @@ Public Sub ApplyFilter(sFilter As String)
 
   $hList.Arrangement = Arrange.None
   
-  If Not sFilter Then
+  If $bNoFilter Or If Not sFilter Then
     sFilter = "*"
   Else
     sFilter = "*" & String.LCase(sFilter) & "*"


=====================================
app/src/gambas3/.src/Project/FCreateProject.form
=====================================
--- a/app/src/gambas3/.src/Project/FCreateProject.form
+++ b/app/src/gambas3/.src/Project/FCreateProject.form
@@ -33,6 +33,7 @@
         Border = Border.Plain
         { txtFilter ButtonBox
           MoveScaled(1,0,24,4)
+          Enabled = False
           Foreground = Color.LightForeground
           Picture = Picture["icon:/small/clear"]
           Border = False


=====================================
app/src/gambas3/.src/VersionControl/FVersionControl.class
=====================================
--- a/app/src/gambas3/.src/VersionControl/FVersionControl.class
+++ b/app/src/gambas3/.src/VersionControl/FVersionControl.class
@@ -98,7 +98,7 @@ Public Sub tabVersionControl_Click()
     Case 1
       edtDiff.SetFocus
     Case 2
-      Try trmShell.Exec(["bash"])
+      Try trmShell.Exec(["bash"], ["PWD=" & Project.Dir])
       trmShell.SetFocus
   End Select
 



View it on GitLab: https://gitlab.com/gambas/gambas/commit/c1c52f05e78622a3586dd15f64aba0a33188bc00

---
View it on GitLab: https://gitlab.com/gambas/gambas/commit/c1c52f05e78622a3586dd15f64aba0a33188bc00
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.gambas-basic.org/pipermail/user/attachments/20180125/623653c7/attachment-0001.html>