[DEVELOPMENT ENVIRONMENT]

* NEW: Use the new QT4/QT5 switcher components.
* NEW: Support for QT5 component.

[GB.FORM]
* NEW: New syntaxes in 'icon.map' file that allows to specify different 
  icons for small or big sizes.
* NEW: New 'user' and 'group' icons.

[GB.FORM.STOCK]
* NEW: New 'user' and 'group' icons.

[GB.GUI.QT]
* NEW: New QT4/QT5 switcher component.

[GB.GUI.QT.WEBKIT]
* NEW: New QT4/QT5 WebKit switcher component.

[GB.QT4]
* BUG: Remove a debugging message in Style.Name property.
* BUG: Trigger pending focus and activate events before showing a modal 
  dialog.

[GB.QT5]
* BUG: Remove a debugging message in Style.Name property.
* BUG: Trigger pending focus and activate events before showing a modal 
  dialog.



git-svn-id: svn://localhost/gambas/trunk@7101 867c0c6c-44f3-4631-809d-bfa615b0a4ec

Makefile.am

@@ -55,6 +55,6 @@ install-exec-local:
 	  echo ; \
 	fi
 	@rm -f $(srcdir)/warnings.log
-	 
+
 dist-hook:
 	@(cd $(distdir); rm -rf `find . -name ".gambas" -o -name ".lock" -o -name ".xvpics" -o -name "*~" -o -name "*.out"  -o -name "*.pot" -o -name "*.gambas" -o -name "core.*" -o -name "vgcore.*" -o -name ".kdbg*" -o -name ".svn"`;)

app/src/gambas3/.project

@@ -6,7 +6,7 @@ Icon=img/logo/logo-ide.png
 Version=3.7.90
 VersionFile=1
 Component=gb.image
-Component=gb.qt5
+Component=gb.gui.qt
 Component=gb.form
 Component=gb.clipper
 Component=gb.db
@@ -21,10 +21,10 @@ Component=gb.form.editor
 Component=gb.settings
 Component=gb.form.mdi
 Component=gb.form.stock
+Component=gb.gui.qt.webkit
 Component=gb.net
 Component=gb.net.curl
 Component=gb.markdown
-Component=gb.qt5.webkit
 Description="Integrated Development Environment for Gambas"
 Authors="Benoît Minisini\nFabien Bodard\nCharlie Reinl\nJosé Luis Redrejo\nRobert Rowe\nTobias Boege"
 TabSize=2

app/src/gambas3/.src/Component/CComponent.class

@@ -117,6 +117,8 @@ Static Private Sub InitComponentNames()
   $cName["gb.gtk3"] = ("GTK+3 toolkit")
   $cName["gb.gui"] = ("QT/GTK+ switcher component")
   $cName["gb.gui.opengl"] = ("OpenGL with QT/GTK+ switcher component")
+  $cName["gb.gui.qt"] = ("QT4/QT5 switcher component")
+  $cName["gb.gui.qt.webkit"] = ("QT4/QT5 WebKit switcher component")
   $cName["gb.httpd"] = ("Embedded HTTP server")
   $cName["gb.image"] = ("Image management")
   $cName["gb.image.effect"] = ("Image filtering component")

app/src/gambas3/.src/Project/FProjectProperty.form

@@ -8,12 +8,18 @@
   Resizable = False
   Arrangement = Arrange.Vertical
   { mnuInsertEnv Menu
-    { Menu1 Menu mnuInsertEnv
-      Name = "Menu1"
+    { Menu17 Menu mnuInsertEnv
+      Name = "Menu17"
       #Translate = False
       Text = "GB_GUI=gb.qt4"
       Tag = "GB_GUI=gb.qt4"
     }
+    { Menu1 Menu mnuInsertEnv
+      Name = "Menu1"
+      #Translate = False
+      Text = "GB_GUI=gb.qt5"
+      Tag = "GB_GUI=gb.qt5"
+    }
     { Menu2 Menu mnuInsertEnv
       Name = "Menu2"
       #Translate = False

app/src/gambas3/.src/Welcome/FSystemInfo.form

@@ -4,7 +4,7 @@
   MoveScaled(0,0,68,75)
   Background = Color.TextBackground
   Text = ("System information")
-  Icon = Picture["icon:/16/system"]
+  Icon = Picture["icon:/large/system"]
   Resizable = False
   Arrangement = Arrange.Vertical
   Spacing = True

comp/src/gb.db.form/.info

@@ -56,11 +56,11 @@ b
 _Properties
 C
 s
-*,Control=True,CanCreate=True,CanDelete=True,Columns{Field[]},Labels,Editable,Header=True,Grid,Orientation{Align.Bottom;Left;Right;Top}=Bottom,Border=True
+"*,Control=True,CanCreate=True,CanDelete=True,Columns{Field[]},Labels,Editable,Header=True,Grid,Orientation{Align.Bottom;Left;Right;Top}=Bottom,Border=True"
 _Group
 C
 s
-Data
+"Data"
 _new
 m
 
@@ -107,15 +107,15 @@ s
 _Properties
 C
 s
-*,Text,Field{Field}
+"*,Text,Field{Field}"
 _Group
 C
 s
-Data
+"Data"
 _DrawWith
 C
 s
-CheckBox
+"CheckBox"
 _new
 m
 
@@ -178,19 +178,19 @@ s
 _Properties
 C
 s
-*,ReadOnly,Field{Field},Table{Table},Filter,Display{Field:Table},All
+"*,ReadOnly,Field{Field},Table{Table},Filter,Display{Field:Table},All"
 _Group
 C
 s
-Data
+"Data"
 _DrawWith
 C
 s
-ComboBox
+"ComboBox"
 _Event
 C
 s
-Click
+"Click"
 _new
 m
 
@@ -225,23 +225,23 @@ C
 _Properties
 C
 s
-*,Table{Table},Field{Field},Filter,Header,Grid,Highlight=True,Columns{Field[]:Table}
+"*,Table{Table},Field{Field},Filter,Header,Grid,Highlight=True,Columns{Field[]:Table}"
 _DefaultEvent
 C
 s
-Change
+"Change"
 _DefaultSize
 C
 s
-20,4
+"20,4"
 _DrawWith
 C
 s
-MenuButton
+"MenuButton"
 _Group
 C
 s
-Data
+"Data"
 Table
 p
 s
@@ -368,15 +368,15 @@ Control
 _Properties
 C
 s
-*,Field{Field}
+"*,Field{Field}"
 _Group
 C
 s
-Data
+"Data"
 _DrawWith
 C
 s
-TextBox
+"TextBox"
 _new
 m
 
@@ -455,11 +455,11 @@ b
 _Properties
 C
 s
-*,Connection{Connection},Table{Table},Filter,ReadOnly
+"*,Connection{Connection},Table{Table},Filter,ReadOnly"
 _Group
 C
 s
-Data
+"Data"
 _new
 m
 
@@ -566,15 +566,15 @@ C
 _Properties
 C
 s
-*,Mode{Select.None;Single;Multiple}=None,Editable,Header{TableView.None;Horizontal;Vertical;Both}=Both,Grid,Highlight=True,Columns{Field[]},Labels,Border=True,Sorted=True
+"*,Mode{Select.None;Single;Multiple}=None,Editable,Header{TableView.None;Horizontal;Vertical;Both}=Both,Grid,Highlight=True,Columns{Field[]},Labels,Border=True,Sorted=True"
 _DrawWith
 C
 s
-GridView
+"GridView"
 _Group
 C
 s
-Data
+"Data"
 :Activate
 :
 

comp/src/gb.form.stock/.component

@@ -1,4 +1,4 @@
 [Component]
 Key=gb.form.stock
-Version=3.7.0
+Version=3.7.90
 Requires=gb.form

comp/src/gb.form.stock/.project

@@ -1,8 +1,8 @@
 # Gambas Project File 3.0
-# Compiled with Gambas 3.7.0
+# Compiled with Gambas 3.7.90
 Title=Default stock icons
 Startup=Main
-Version=3.7.0
+Version=3.7.90
 VersionFile=1
 Component=gb.image
 Component=gb.gui

comp/src/gb.form.stock/.src/Main.module

@@ -35,6 +35,8 @@ Private Sub MakeStock()
   Dim bOK As Boolean
   Dim bFound As Boolean
   Dim sTest As String
+  Dim aPath As String[]
+  Dim I As Integer
   
   hFile = Open "~/gambas/3.0/trunk/comp/src/gb.form/map/icon.map"
   
@@ -52,9 +54,13 @@ Private Sub MakeStock()
     If Left(sIcon) = ";" Then Continue
     sPath = Trim(aLine[1])
     If Not sPath Then Continue
-    sPath = Split(sPath, ";")[0]
     
-    If sPath Begins "[elementary]" Then sPath = Mid$(sPath, InStr(sPath, "]") + 1)
+    aPath = Split(sPath, ";")
+    For I = 0 To aPath.Max
+      sPath = aPath[I]
+      If sPath Begins "[elementary]" Then Break
+      If Left(sPath) <> "[" Then Break
+    Next
     
     Print sIcon;; sPath
     If sIcon = "favorite" Then Stop