[DEVELOPMENT ENVIRONMENT]

* NEW: The icon of database connections that can be used as a template now use the "exported" emblem.
* NEW: The project filter entered in the welcome dialog is now transmitted to the open project dialog.
* NEW: The project filter now takes the project version into account.
* NEW: Update some module icons.

app/src/gambas3/.src/Project/CProjectTree.class

@@ -815,6 +815,7 @@ Public Sub GetFileIcon(sPath As String, Optional iSize As Integer, hStat As Stat
           sIcon = sPrefix &/ "pdf"
 
         Case "connection"
+          If Exist(File.SetExt(sPath, "template")) Then bExported = True
           sIcon = sLocalPrefix &/ "database.png"
           
         Case "console"
@@ -863,6 +864,12 @@ Public Sub GetFileIcon(sPath As String, Optional iSize As Integer, hStat As Stat
   Else
 
     sKey = File.Dir(sIcon) &/ File.BaseName(sIcon) & "-"
+    If iSize Then 
+      sKey &= CStr(iSize) & "-"
+    Else
+      sKey &= "16-"
+    Endif
+    
     
     If bLink Then sKey &= "l"
     
@@ -912,12 +919,12 @@ ADD_EMBLEM:
   If bLink Then hImage = Project.AddLinkEmblem(hImage)
   
   If Not bNoEmblem Then
-    If bConflict Then hImage = Project.AddEmblem(hImage, "img/32/conflict.png", iEmblemSize)
-    If bLocked Then hImage = Project.AddEmblem(hImage, "icon:/32/lock", iEmblemSize)
-    If bAdded Then hImage = Project.AddEmblem(hImage, "img/32/added.png", iEmblemSize)
-    If bModified Then hImage = Project.AddEmblem(hImage, "img/32/modified.png", iEmblemSize)
     If bExported Then hImage = Project.AddEmblem(hImage, "img/32/exported.png", iEmblemSize)
     If bDoNotTranslate Then hImage = Project.AddEmblem(hImage, "img/32/do-not-translate.png", iEmblemSize)
+    If bAdded Then hImage = Project.AddEmblem(hImage, "img/32/added.png", iEmblemSize)
+    If bModified Then hImage = Project.AddEmblem(hImage, "img/32/modified.png", iEmblemSize)
+    If bConflict Then hImage = Project.AddEmblem(hImage, "img/32/conflict.png", iEmblemSize)
+    If bLocked Then hImage = Project.AddEmblem(hImage, "icon:/32/lock", iEmblemSize)
   Endif
   
   Return

app/src/gambas3/.src/Project/FOpenProject.class

@@ -31,6 +31,9 @@ Public Sub _new()
   
   tabProject[2].Visible = False
   
+  txtFilter.Text = Settings["FWelcome/Filter"]
+  Debug txtFilter.Text
+  
 End
 
 

app/src/gambas3/.src/Project/ProjectBox.class

@@ -444,6 +444,7 @@ Public Sub Match(sFilter As String) As Boolean
   With $hProjectInfo
     If .Name Like sFilter Then Return True
     If String.LCase(.Title) Like sFilter Then Return True
+    If .Version Like sFilter Then Return True
     If $bShowAuthors And If String.LCase(.Authors.Join(" ")) Like sFilter Then Return True
     If String.LCase(Group) Like sFilter Then Return True
     If String.LCase(.Description) Like sFilter Then Return True

app/src/gambas3/.src/Welcome/FWelcome.class

@@ -1,5 +1,7 @@
 ' Gambas class file
 
+Static Public Filter As String
+
 Static Private $sPath As String
 Static Private $hLogo As Image
 
@@ -29,17 +31,17 @@ Private $hRecent As CProjectList
 Private $hExample As CProjectList
 Private $hSoft As CProjectList
 
-Static Public Function Run() As String
-
-  'DIM hForm AS Form
-
-  $sPath = ""
-  'hForm = NEW FWelcome
-  FWelcome.ShowModal()
-  Return $sPath
-
-End
-
+' Static Public Function Run() As String
+' 
+'   'DIM hForm AS Form
+' 
+'   $sPath = ""
+'   'hForm = NEW FWelcome
+'   FWelcome.ShowModal()
+'   Return $sPath
+' 
+' End
+' 
 Public Sub _new()
   
   $hRecent = New CProjectList(lstRecent, txtFilter, CProjectList.TYPE_RECENT, Arrange.Row) As "ProjectItem"
@@ -234,10 +236,11 @@ Public Sub Form_KeyPress()
 End
 
 
-Public Sub Form_Close()
+Public Sub Form_Hide()
 
   'Settings.Write(Me)
   Settings["/FWelcome/SortRecent"] = $iSort
+  Settings["/FWelcome/Filter"] = txtFilter.Text
 
 End