From beeabd049f4195b1873133b357e12537dcc006a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= <gambas@users.sourceforge.net>
Date: Tue, 29 Sep 2015 15:03:16 +0000
Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * NEW: Put the WebView icon in the
 IDE.

[GB.FORM.EDITOR]
* OPT: Don't raise Cursor event if we are between calls to Begin / End or
  during an undo or redo process.

[GB.GUI.QT.WEBKIT]
* NEW: No need to put the WebView icon there.


git-svn-id: svn://localhost/gambas/trunk@7367 867c0c6c-44f3-4631-809d-bfa615b0a4ec
---
 app/src/gambas3/.project                      |   1 +
 app/src/gambas3/.src/FMain.class              |   2 ++
 app/src/gambas3/img/control/webview.png       | Bin 0 -> 1189 bytes
 comp/src/gb.form.editor/.info                 |   4 +++
 comp/src/gb.form.editor/.src/CDocument.class  |  20 +++++++++++
 comp/src/gb.form.editor/.src/TextEditor.class |  32 +++++++++++++-----
 .../.src/_TextEditor_Line.class               |   2 ++
 .../src/gb.form/.src/Color/ColorPalette.class |   2 ++
 main/lib/gui.qt.webkit/control/webview.png    |   1 -
 9 files changed, 54 insertions(+), 10 deletions(-)
 create mode 100644 app/src/gambas3/img/control/webview.png
 delete mode 120000 main/lib/gui.qt.webkit/control/webview.png

diff --git a/app/src/gambas3/.project b/app/src/gambas3/.project
index 3a4adbb06..eefe315d8 100644
--- a/app/src/gambas3/.project
+++ b/app/src/gambas3/.project
@@ -2,6 +2,7 @@
 # Compiled with Gambas 3.8.90
 Title=Gambas 3
 Startup=Project
+Profiling=1
 Icon=img/logo/logo-ide.png
 Version=3.8.90
 VersionFile=1
diff --git a/app/src/gambas3/.src/FMain.class b/app/src/gambas3/.src/FMain.class
index 6e97a5735..343a04fd9 100644
--- a/app/src/gambas3/.src/FMain.class
+++ b/app/src/gambas3/.src/FMain.class
@@ -2466,8 +2466,10 @@ Public Sub OpenExternFile(Optional sPath As String)
   
   If Not sPath Then
     Dialog.Title = ("Select a file")
+    Dialog.Path = Settings["/OpenExtern"]
     If Dialog.OpenFile() Then Return
     sPath = Dialog.Path
+    Settings["/OpenExtern"] = sPath
   Endif
   
   $bInOpenExtern = True
diff --git a/app/src/gambas3/img/control/webview.png b/app/src/gambas3/img/control/webview.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c8dbf4664759cc8a9ee814e537e013758b4f58d
GIT binary patch
literal 1189
zcmV;W1X}xvP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000ie
z000ie0hKEb8vp<VS4l)cR9J=0m)~zxMHI(BXYSp*Kgwz;wzO=ipshh66hUG_d>|&g
zSbv+CC=rwp2|gJA1rkks6+=i(dGW;u6MQj7lm}5H0U;;_N`T6*F4At>ZDHGP@7|g5
z;a(`MyJc;#ILSAYnYokmo$onw?ity&Yu9Vm+D@RJ`E5B7+2LAiJGXD&UZ2Ti=GA&O
zo2~Ea>grU$yc-9IY}TuJw>+aga02dJHua8K27CxC<R>+yK(n&eWkuTg?+8p7I5uqQ
zD_UM?P}If3`4La?;=vpREwt3cczb!0ZEY#yRcc$+XQxJC|255%HLz)sP|}v3yw6Jq
z`uXz07&VRq+H&<)z^B~>HXg`xVmP=z1b)p~{u(!Uz~wQEui>i;1-|Ybrx?J#a|QYf
z8jJ!XU=-I2hPQqy@NHk|o&;uf!5_nh21jU$38lD@_YEKYGRX0qj}^fxg;+od+}(>X
zX$*UNCRv(tXs@e$&WbDJ0Tha$t;N@tTfXMwqk|ml_c2DWRzU#P3RZ_>YXoZ))_}E&
z^CN~MH#9|E`H&R}{BXI5YYnFdC%H0OV%v{5I5p^l0jz+wVQ(br0WDx`<O<=HW{>9{
zaX8plIUXvy;Ird7{u~LgBCKslGBRO71SH}tDjG*Xf!v-~Y|6xVv&F;L;F*7^z}cY^
zy+Z*>$H8jhM87{JuO^aNrl2F)jlvp5ecWM7Yy6J;(lO!8VEKS7OW@)tbhOs;{_46&
zZf3|%dD)}6lz><$=_y>wmzSX|fq@A{Ns^>uE}L4?U{ypyg$8erjS5K^b!SbiqCVl^
zYo?*#mv=$g7%<v!;ELgJ7M^d6(Ufr5urx*6LXUI9C2|vn!&x7&prTkXAWE<Xx(6&5
zmS`SLPo2*q)e~q)hO&=o_`Xl^_<|ZXwj=?_q{A)CA96W*Bj9}A0D`DU9Z?iZ(0OW-
z&20{%gqyx)T_#pNfu|O!(BFjqd+cG4(u}*jc5$3Fi{pH9q(FW$iW8CWCSVyFSL{9+
zV6_j*WlMXadIC?>DVC)bmqrW%JliPv5uusw!*wZs@7J6ivYgM){Kf%Eu&h?my0Co8
zshEg1uXI6!7#JAiA3=2+jtJ`-UEWz4<JH!1&omfe>#Fkd&r0CE_884IU;@iGJpq0&
z{aTg7<zW-L?k=<}5Vp3@fk51aFJ4X(7wF3y4qXZ;24P|;hkVg;GONQx6~PnO(-Fs;
zrB0dkcf7h$vAZKdTr7ur1NL{9@B_+X;MVlh$Hnq_M}nu9%w8qkvm)wP;nI{&@xlHg
z{i9($Ftc6E8BSc&q0fPqTE*Ts60Et0@u~;_tj#$5yt9UV$9%5dG^D(#q*BtB?@otl
zZuug`)@MB4UGL#lS?pC^6M8P}+~5K5Tc4r(x+XtiiN%CHuP0g6<j^*UDt}H@@%m=P
z`sVvn(LeBa!T*9lE}PBHyWz-Y&J~dzU0q!d?0Nn-kQqKT_S`Z700000NkvXXu0mjf
DG%_~h

literal 0
HcmV?d00001

diff --git a/comp/src/gb.form.editor/.info b/comp/src/gb.form.editor/.info
index dab604220..437187b40 100644
--- a/comp/src/gb.form.editor/.info
+++ b/comp/src/gb.form.editor/.info
@@ -353,6 +353,10 @@ HideSelection
 m
 
 
+_RaiseCursor
+m
+
+
 EnsureVisible_Timer
 m
 
diff --git a/comp/src/gb.form.editor/.src/CDocument.class b/comp/src/gb.form.editor/.src/CDocument.class
index f06aabc2e..54f28d7e2 100644
--- a/comp/src/gb.form.editor/.src/CDocument.class
+++ b/comp/src/gb.form.editor/.src/CDocument.class
@@ -171,6 +171,8 @@ Public Sub End()
   EnableHighlight
   AddUndo(CCommand(Me, CCommand.END,, Me.Current.Column, Me.Current.Line))
   
+  CheckUnlock
+  
 End
 
 Private Function Current_Read() As TextEditor
@@ -1264,6 +1266,24 @@ End
 Public Sub EnableUndo()
   
   Dec $iNoUndo
+  CheckUnlock
   
 End
 
+Public Sub IsLocked() As Boolean
+  
+  Return $iBegin + $iNoUndo
+  
+End
+
+Private Sub CheckUnlock()
+
+  Dim hView As TextEditor
+  
+  If IsLocked() Then Return
+  For Each hView In GetAllViews()
+    hView._RaiseCursor
+  Next
+  
+
+End
\ No newline at end of file
diff --git a/comp/src/gb.form.editor/.src/TextEditor.class b/comp/src/gb.form.editor/.src/TextEditor.class
index 9adefd3db..970bb51e6 100644
--- a/comp/src/gb.form.editor/.src/TextEditor.class
+++ b/comp/src/gb.form.editor/.src/TextEditor.class
@@ -95,6 +95,8 @@ Private $Y As Integer
 Private $XY As Point
 Private $bShowCursor As Boolean
 Private $bHideCursor As Boolean
+Private $LX As Integer
+Private $LY As Integer
 
 Private $hTimerCursor As Timer
 Private $hTimerChange As Timer
@@ -148,6 +150,7 @@ Private $bFirstFocus As Boolean
 
 Private $aFold As Integer[]
 
+Private $iSaveCursor As Integer
 Private $aSaveCursor As Integer[]
 Private $hFontNumber As Font
 
@@ -1387,6 +1390,20 @@ Public Sub HideSelection()
 
 End
 
+Public Sub _RaiseCursor()
+
+  If $iSaveCursor Then Return
+  If $X = $LX And If $Y = $LY Then Return
+  If $hDoc.IsLocked() Then Return
+
+  $LX = $X
+  $LY = $Y
+  EnsureVisible
+  If $bShowPosition Then UpdatePosition
+  Raise Cursor
+
+End
+
 Public Sub Goto(NX As Integer, NY As Integer, Optional Mark As Boolean)
 
   Dim bRaiseCursor As Boolean
@@ -1450,16 +1467,9 @@ Public Sub Goto(NX As Integer, NY As Integer, Optional Mark As Boolean)
   _RefreshLine($Y)
   
   '$hView.EnsureVisible($XX, $hRows._GetRowY($Y), $MW + 3, $hRows._GetRowHeight($Y))
-  EnsureVisible
   
   CheckMatch
-  
-  If bRaiseCursor Then 
-    If $bShowPosition Then
-      UpdatePosition
-    Endif
-    Raise Cursor
-  Endif
+  _RaiseCursor
   
 End
 
@@ -4213,7 +4223,8 @@ End
 
 Public Sub _SaveCursor()
   
-  $aSaveCursor = [$X, $Y, $SX, $SY]
+  If $iSaveCursor = 0 Then $aSaveCursor = [$X, $Y, $SX, $SY]
+  Inc $iSaveCursor
   
 End
 
@@ -4221,6 +4232,9 @@ Public Sub _RestoreCursor()
   
   Dim X, Y, SX, SY As Integer
   
+  Dec $iSaveCursor
+  If $iSaveCursor Then Return
+  
   X = $aSaveCursor[0]
   Y = $aSaveCursor[1]
   SX = $aSaveCursor[2]
diff --git a/comp/src/gb.form.editor/.src/_TextEditor_Line.class b/comp/src/gb.form.editor/.src/_TextEditor_Line.class
index c2a36800a..92326ccc9 100644
--- a/comp/src/gb.form.editor/.src/_TextEditor_Line.class
+++ b/comp/src/gb.form.editor/.src/_TextEditor_Line.class
@@ -44,10 +44,12 @@ Private Sub Text_Write(Value As String)
 
   With GetView()
     If ._GetDocument().Lines[_Line] <> Value Then
+      ._SaveCursor
       .Begin
       .Remove(0, _Line, String.Len(._GetDocument().Lines[_Line]), _Line)
       .Insert(Value)
       .End
+      ._RestoreCursor
     Endif
   End With
 
diff --git a/comp/src/gb.form/.src/Color/ColorPalette.class b/comp/src/gb.form/.src/Color/ColorPalette.class
index c1c496c7d..e2af5e387 100644
--- a/comp/src/gb.form/.src/Color/ColorPalette.class
+++ b/comp/src/gb.form/.src/Color/ColorPalette.class
@@ -206,6 +206,7 @@ Public Sub View_MouseMove()
   If I = $iIndex Then Return
   
   $iIndex = I
+  'Debug I
   $iLastIndex = $iIndex
   
   If I >= 0 Then
@@ -264,6 +265,7 @@ Public Sub View_Leave()
 
   If $iIndex >= 0 Then
     $iIndex = -1
+    'Debug -1
     $hView.Refresh
   Endif
 
diff --git a/main/lib/gui.qt.webkit/control/webview.png b/main/lib/gui.qt.webkit/control/webview.png
deleted file mode 120000
index b8734ada7..000000000
--- a/main/lib/gui.qt.webkit/control/webview.png
+++ /dev/null
@@ -1 +0,0 @@
-../../../../gb.qt4/src/webkit/control/webview.png
\ No newline at end of file