From 97913aa3297e31eaa9c3ed0bde250e2f5aa64d9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Thu, 2 Oct 2014 21:38:50 +0000 Subject: [PATCH] [CONFIGURATION] * NEW: Switch to version 3.6.0. [DEVELOPMENT ENVIRONMENT] * BUG: Correctly reset position buttons when a project is loaded. * BUG: Text editor: Fix word delimiter characters for automatic completion. [GB.GUI.BASE] * BUG: ScrollArea: Prevent a possible crash. [GB.NET.SMTP] * BUG: Remove a debugging message. git-svn-id: svn://localhost/gambas/trunk@6518 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- VERSION | 2 +- acinclude.m4 | 4 +-- app/src/gambas3/.project | 4 +-- app/src/gambas3/.src/Editor/CPosition.class | 1 + .../.src/Editor/Code/FTextEditor.class | 2 +- app/src/gambas3/.src/Options/FOption.form | 24 ++++++++----- comp/src/gb.form/.component | 2 +- comp/src/gb.form/.project | 6 ++-- .../.src/File/Bookmark/FEditBookmark.form | 7 ++-- comp/src/gb.form/.src/Test/FTabPanel.class | 6 ++-- comp/src/gb.form/.src/Test/FTabPanel.form | 35 ------------------- comp/src/gb.gui.base/.component | 2 +- comp/src/gb.gui.base/.project | 4 +-- comp/src/gb.gui.base/.src/ScrollArea.class | 6 ++-- comp/src/gb.gui.base/.startup | 2 +- comp/src/gb.net.smtp/.src/TcpSession.class | 2 +- comp/src/gb.report/.component | 2 +- comp/src/gb.report/.project | 4 +-- version.m4 | 6 ++-- 19 files changed, 46 insertions(+), 75 deletions(-) diff --git a/VERSION b/VERSION index 39e1176b8..084e244ce 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.5.90 \ No newline at end of file +3.6.0 \ No newline at end of file diff --git a/acinclude.m4 b/acinclude.m4 index 25f3d68dc..d49bc1e66 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -81,8 +81,8 @@ AC_DEFUN([GB_INIT_AUTOMAKE], AC_DEFINE(GAMBAS_VERSION_STRING, "GB_VERSION_MAJOR", Gambas version string) AC_DEFINE(GAMBAS_FULL_VERSION_STRING, "GB_VERSION_MAJOR.GB_VERSION_MINOR", Gambas full version string) - AC_DEFINE(GAMBAS_FULL_VERSION, 0x03050090, [Full Gambas version]) - AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03050000, [Gambas bytecode version]) + AC_DEFINE(GAMBAS_FULL_VERSION, 0x03060000, [Full Gambas version]) + AC_DEFINE(GAMBAS_PCODE_VERSION, 0x03060000, [Gambas bytecode version]) AC_DEFINE(GAMBAS_PCODE_VERSION_MIN, 0x03000000, [Minimum Gambas bytecode version]) GB_CLEAR_MESSAGES diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project index 4d178e8e9..4211ff570 100644 --- a/app/src/gambas3/.project +++ b/app/src/gambas3/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.0 Title=Gambas 3 Startup=Project Icon=img/logo/logo-ide.png -Version=3.5.90 +Version=3.6.0 VersionFile=1 Component=gb.image Component=gb.qt4 diff --git a/app/src/gambas3/.src/Editor/CPosition.class b/app/src/gambas3/.src/Editor/CPosition.class index f5dc7350f..606b38b59 100644 --- a/app/src/gambas3/.src/Editor/CPosition.class +++ b/app/src/gambas3/.src/Editor/CPosition.class @@ -16,6 +16,7 @@ Static Public Sub Clear() $aPositions.Clear $iCurrent = 0 + UpdatePosition End diff --git a/app/src/gambas3/.src/Editor/Code/FTextEditor.class b/app/src/gambas3/.src/Editor/Code/FTextEditor.class index f52745524..95b7a5446 100644 --- a/app/src/gambas3/.src/Editor/Code/FTextEditor.class +++ b/app/src/gambas3/.src/Editor/Code/FTextEditor.class @@ -1254,7 +1254,7 @@ End Public Sub IsWordChar(sCar As String) As Boolean - Return InStr("&~\"#'{([|`\\^@)]°=+}€$£%*!§:/;.,? \t", sCar) = 0 + Return InStr("&~\"#'{([|`\\^@)]°=+}€$£%*!§:/;.,?<>¢«»¥·©®¬¿×·÷¡øø \t", sCar) = 0 End diff --git a/app/src/gambas3/.src/Options/FOption.form b/app/src/gambas3/.src/Options/FOption.form index bb09bc5b3..77779792a 100644 --- a/app/src/gambas3/.src/Options/FOption.form +++ b/app/src/gambas3/.src/Options/FOption.form @@ -357,15 +357,21 @@ Expand = True Text = ("Default tab size") } - { txtTabSize SpinBox - MoveScaled(50,0,7,4) - MinValue = 1 - MaxValue = 16 - Value = 2 - } - { Label3 Label - MoveScaled(58,0,8,4) - Text = ("space(s)") + { Panel3 HBox + MoveScaled(50,0,16,4) + Spacing = True + { txtTabSize SpinBox + MoveScaled(0,0,6,4) + Expand = True + MinValue = 1 + MaxValue = 16 + Value = 2 + } + { Label3 Label + MoveScaled(8,0,8,4) + AutoResize = True + Text = ("space(s)") + } } } { HBox18 HBox diff --git a/comp/src/gb.form/.component b/comp/src/gb.form/.component index 2e6f26342..ddb4a1218 100644 --- a/comp/src/gb.form/.component +++ b/comp/src/gb.form/.component @@ -1,5 +1,5 @@ [Component] Key=gb.form -Version=3.5.90 +Version=3.6.0 Authors=Benoît Minisini Needs=Form diff --git a/comp/src/gb.form/.project b/comp/src/gb.form/.project index 825f0db25..d6d38d72d 100644 --- a/comp/src/gb.form/.project +++ b/comp/src/gb.form/.project @@ -1,15 +1,15 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.0 Title=More controls for graphical components Startup=FTabPanel -Version=3.5.90 +Version=3.6.0 VersionFile=1 Component=gb.image Component=gb.gui Component=gb.form Component=gb.settings Authors="Benoît Minisini" -Environment="GB_GUI=gb.gtk" +Environment="GB_GUI=gb.qt4" TabSize=2 Translate=1 Language=en diff --git a/comp/src/gb.form/.src/File/Bookmark/FEditBookmark.form b/comp/src/gb.form/.src/File/Bookmark/FEditBookmark.form index 41243593d..aa58f9b55 100644 --- a/comp/src/gb.form/.src/File/Bookmark/FEditBookmark.form +++ b/comp/src/gb.form/.src/File/Bookmark/FEditBookmark.form @@ -18,17 +18,17 @@ Spacing = True { btnUp Button MoveScaled(0,0,18,4) - Text = ("&Up") + Text = Shortcut(("Up"), "U") Picture = Picture["icon:/small/up"] } { btnDown Button MoveScaled(19,0,18,4) - Text = ("&Down") + Text = Shortcut(("Down"), "D") Picture = Picture["icon:/small/down"] } { btnDelete Button MoveScaled(38,0,18,4) - Text = ("&Remove") + Text = Shortcut(("Remove"), "R") Picture = Picture["icon:/small/delete"] } { Panel1 Panel @@ -38,7 +38,6 @@ { btnClose Button MoveScaled(68,0,18,4) Text = ("Close") - Picture = Picture["icon:/small/close"] Cancel = True } } diff --git a/comp/src/gb.form/.src/Test/FTabPanel.class b/comp/src/gb.form/.src/Test/FTabPanel.class index fc795ce8e..892300882 100644 --- a/comp/src/gb.form/.src/Test/FTabPanel.class +++ b/comp/src/gb.form/.src/Test/FTabPanel.class @@ -20,8 +20,8 @@ Public Sub Form_Open() Dim I As Integer Dim hLabel As Label - TabPanel2.Count = 12 - For I = 0 To 11 + TabPanel2.Count = 2 + For I = 0 To TabPanel2.Count - 1 TabPanel2.Index = I TabPanel2.Text = "Tab " & (I + 1) & " " & String$(CInt(Rnd(1, 10)), "-") TabPanel2.Picture = Picture["icon:/16/bookmark"] @@ -33,8 +33,6 @@ Public Sub Form_Open() hLabel.Border = Border.Plain Next - TabPanel2.Index = 2 - End Public Sub Form_DblClick() diff --git a/comp/src/gb.form/.src/Test/FTabPanel.form b/comp/src/gb.form/.src/Test/FTabPanel.form index ee4a75ae1..1ff03827b 100644 --- a/comp/src/gb.form/.src/Test/FTabPanel.form +++ b/comp/src/gb.form/.src/Test/FTabPanel.form @@ -5,41 +5,6 @@ Spacing = True Margin = True Padding = 24 - { TabPanel1 TabPanel - MoveScaled(37,41,30,23) - #Translate = False - Background = &HFFFF00& - Expand = True - Count = 5 - Orientation = Align.Bottom - Closable = True - Highlight = True - Index = 0 - Text = "Tab 1" - Index = 1 - Text = "Tab 2" - Index = 2 - Text = "Tab 3" - Index = 3 - Text = "Tab 4" - Index = 4 - Text = "Tab 5" - Index = 0 - } - { TabStrip1 TabStrip - MoveScaled(54,41,34,27) - Background = &HFF7F7F& - Count = 4 - Index = 0 - Text = ("&TabStrip1") - Index = 1 - Text = ("&Bonbon") - Index = 2 - Text = ("&Charles") - Index = 3 - Text = ("") - Index = 0 - } { TabPanel2 TabPanel MoveScaled(5,5,78,33) #Translate = False diff --git a/comp/src/gb.gui.base/.component b/comp/src/gb.gui.base/.component index f0ebc4865..ab615dd15 100644 --- a/comp/src/gb.gui.base/.component +++ b/comp/src/gb.gui.base/.component @@ -1,5 +1,5 @@ [Component] Key=gb.gui.base -Version=3.5.90 +Version=3.6.0 Hidden=True Needs=Form diff --git a/comp/src/gb.gui.base/.project b/comp/src/gb.gui.base/.project index a3d32df30..84d766900 100644 --- a/comp/src/gb.gui.base/.project +++ b/comp/src/gb.gui.base/.project @@ -1,8 +1,8 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.0 Title=gb.gui.base Startup=FTreeView -Version=3.5.90 +Version=3.6.0 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/comp/src/gb.gui.base/.src/ScrollArea.class b/comp/src/gb.gui.base/.src/ScrollArea.class index cdb52b6c6..c29f1a4ad 100644 --- a/comp/src/gb.gui.base/.src/ScrollArea.class +++ b/comp/src/gb.gui.base/.src/ScrollArea.class @@ -414,8 +414,10 @@ Public Sub DrawingArea_Draw() hFrame = New Rect(FW, FW, DW - FW * 2, DH - FW * 2) If hClip Then hClip = hClip.Intersection(hFrame) - Paint.Rectangle(hClip.X, hClip.Y, hClip.W, hClip.H) - Paint.Clip() + If hClip Then + Paint.Rectangle(hClip.X, hClip.Y, hClip.W, hClip.H) + Paint.Clip() + Endif Endif Endif diff --git a/comp/src/gb.gui.base/.startup b/comp/src/gb.gui.base/.startup index e93026aa9..9a66cb3c5 100644 --- a/comp/src/gb.gui.base/.startup +++ b/comp/src/gb.gui.base/.startup @@ -2,7 +2,7 @@ FTreeView gb.gui.base 0 0 -3.5.90 +3.6.0 gb.image gb.gui diff --git a/comp/src/gb.net.smtp/.src/TcpSession.class b/comp/src/gb.net.smtp/.src/TcpSession.class index f8ccc1134..c7d4be85f 100644 --- a/comp/src/gb.net.smtp/.src/TcpSession.class +++ b/comp/src/gb.net.smtp/.src/TcpSession.class @@ -22,7 +22,7 @@ End Public Sub Client_Closed() - Debug "Connection Closed by foreign host." + 'Debug "Connection Closed by foreign host." End diff --git a/comp/src/gb.report/.component b/comp/src/gb.report/.component index a5705a0ef..cb88d10cd 100644 --- a/comp/src/gb.report/.component +++ b/comp/src/gb.report/.component @@ -1,6 +1,6 @@ [Component] Key=gb.report -Version=3.5.90 +Version=3.6.0 State=1 Authors=Fabien Bodard Needs=Form,ImageIO diff --git a/comp/src/gb.report/.project b/comp/src/gb.report/.project index 341aade8f..1bede70f7 100644 --- a/comp/src/gb.report/.project +++ b/comp/src/gb.report/.project @@ -1,9 +1,9 @@ # Gambas Project File 3.0 -# Compiled with Gambas 3.5.90 +# Compiled with Gambas 3.6.0 Title=Report designer Startup=Report9 Icon=printer1.png -Version=3.5.90 +Version=3.6.0 VersionFile=1 Component=gb.image Component=gb.gui diff --git a/version.m4 b/version.m4 index 916f7e46b..64a40c525 100644 --- a/version.m4 +++ b/version.m4 @@ -1,9 +1,9 @@ ## Package version and e-mail for bugs are defined here -m4_define([GB_VERSION], [3.5.90]) +m4_define([GB_VERSION], [3.6.0]) m4_define([GB_MAIL], [gambas@users.sourceforge.net]) m4_define([GB_URL], [http://gambas.sourceforge.net]) m4_define([GB_VERSION_MAJOR], [3]) -m4_define([GB_VERSION_MINOR], [5]) -m4_define([GB_VERSION_RELEASE], [90]) +m4_define([GB_VERSION_MINOR], [6]) +m4_define([GB_VERSION_RELEASE], [0])