From 38eefd7d214bf6d5a741a761cc89d73bc44b4200 Mon Sep 17 00:00:00 2001
From: gambas <g4mba5@gmail.com>
Date: Tue, 24 Nov 2020 21:37:43 +0100
Subject: [PATCH] Translation dialog: Importing a translation now correctly
 refreshes the translation view.

[DEVELOPMENT ENVIRONMENT]
* BUG: Translation dialog: Importing a translation now correctly refreshes the translation view.
*
---
 .../gambas3/.src/Editor/Code/FCompletion.form   |  12 ++++++------
 app/src/gambas3/.src/Project.module             |   2 +-
 .../gambas3/.src/Translation/FTranslate.class   |   2 +-
 app/src/gambas3/img/32/do-not-translate.png     | Bin 433 -> 156 bytes
 app/src/gambas3/img/symbol/method.png           | Bin 313 -> 313 bytes
 app/src/gambas3/img/symbol/s-method.png         | Bin 390 -> 384 bytes
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/src/gambas3/.src/Editor/Code/FCompletion.form b/app/src/gambas3/.src/Editor/Code/FCompletion.form
index 2fe21d6bf..dc47b5058 100644
--- a/app/src/gambas3/.src/Editor/Code/FCompletion.form
+++ b/app/src/gambas3/.src/Editor/Code/FCompletion.form
@@ -10,7 +10,7 @@
   Arrangement = Arrange.Fill
   { panComp Panel
     MoveScaled(1,1,67,15)
-    Background = Color.Background
+    Background = Color.TextBackground
     Arrangement = Arrange.Horizontal
     Border = Border.Plain
     { gvwComp GridView
@@ -28,16 +28,16 @@
       Expand = True
       NoHeader = True
     }
-    { panResizeTop Panel
-      MoveScaled(64,1,2,2)
-      Mouse = Mouse.SizeNESW
-      Ignore = True
-    }
     { panResizeBottom Panel
       MoveScaled(64,12,2,2)
       Mouse = Mouse.SizeNWSE
       Ignore = True
     }
+    { panResizeTop Panel
+      MoveScaled(64,1,2,2)
+      Mouse = Mouse.SizeNESW
+      Ignore = True
+    }
     { timHideLater #Timer
       #MoveScaled(0,8)
     }
diff --git a/app/src/gambas3/.src/Project.module b/app/src/gambas3/.src/Project.module
index 7d0f88361..fb03a93c9 100644
--- a/app/src/gambas3/.src/Project.module
+++ b/app/src/gambas3/.src/Project.module
@@ -5654,7 +5654,7 @@ Public Sub SetCurrentPopup(hMenu As Menu)
   Try $hCurrentPopup.Enabled = False
   $hCurrentPopup = hMenu
   Try $hCurrentPopup.Enabled = True
-  'Debug $hCurrentPopup.Name;; $hCurrentPopup.Window.Title
+  'Debug $hCurrentPopup.Window.Name; "."; $hCurrentPopup.Name
 
 End
 
diff --git a/app/src/gambas3/.src/Translation/FTranslate.class b/app/src/gambas3/.src/Translation/FTranslate.class
index 1282d3b89..cd001b0d6 100644
--- a/app/src/gambas3/.src/Translation/FTranslate.class
+++ b/app/src/gambas3/.src/Translation/FTranslate.class
@@ -1047,7 +1047,7 @@ Public Sub btnImport_Click()
 
   DisplayTrans
   $bModify = True
-  SaveTranslate
+  SetLang($sLang)
 
   Dec Application.Busy
 
diff --git a/app/src/gambas3/img/32/do-not-translate.png b/app/src/gambas3/img/32/do-not-translate.png
index f01771b09e5e7ac359838d2d93f9a015999f6c4b..cd89a7ef61cc2a3381e6b7122e9c03d22bf575d7 100644
GIT binary patch
delta 119
zcmdnUJcn_D1Sb<S0|Nt}$fWd%iW1430X`wF?gc*oYZ(4lGwiu%?Ff`)DhcunW@wnL
z?I!``X?wajhDcmaPEcT5!_<86FoRL}p*h=Fj?G|5ws4R%Q00LjJ{}h)2Id&I#aqmr
RdV$&)JYD@<);T3K0RX@qAn*VH

delta 398
zcmbQkxRH5+1SbbG0|SH0lCEPD6(#DE1AIbU-3xsF*E9UDW&n{54F7Auj5-(z6ak7u
z5ReVwLS+B{|KBC{|K*kcU84WHCH}v<_W#AD|F3WS-<<w`OXmNr+5flY{(p1p|G$4p
zy3PVXYlTXJ{DK*F%K!eS_%(V(<*)juPZV~Qd?`ME<lA<j^fgZx#}JFtXD8hhYF6NJ
zjSY;sz;<WrxBvS$`MC&enEP?%Uj1_g{A%V$KL7JJOs$l7)^lun*-SSD(WQ;A)mi+M
zI^TvTtladjS^2TNY9V9Lyati}c}d%MvD&}Xl>hes39nG>`Sdf3E(h&Vlu|LP&-mC-
zrPa`=wuOHmQ&GT?9a{2StS#=(lb-CcuQ?I3Alg#Cm0L!2+poVGn<Z3dd}<F%Gn~ET
zR(NLbjNc2yZtl;Bn{29K`6}|8zFPH_xPp%nr3KG->We-5So`$VlYf^U-TLi1P4r*;
c*8g+wEml<U@QZc)3iKj_r>mdKI;Vst03?jYPyhe`

diff --git a/app/src/gambas3/img/symbol/method.png b/app/src/gambas3/img/symbol/method.png
index 981e9b31096f997434a91a20a09542109b7ce042..43c106ee9c6a65c8f32ca2306be85ea8edd19c9a 100644
GIT binary patch
delta 256
zcmdnVw3BIqV}1UE{QUd*1@{XI9u$Ds4?ygk2RZo<^9vq=M6&N?L&WnQ<Utrf@|N{K
zSq26Mp^_lKV1_5V6r%rqtyEmG^SAu3rzKyCTQukB0A)KoT^vI!PM@9RDb#Gh!?IU;
zy};l98&`TQ?b)a<IA_87Ed5Dtl^y9DD?)=;ozma1rg^Ep*^`}lGNl&A*TSVD+CQ5V
z?r`26S+Gl(iP7o$eAlMCyT7u0^bLsU@Ldrx!Pg@~<2ma$&To@*X1`f*Be0ui+SaGq
vuh|+a|MuTWTi5<g__v1l#E<T8-aqEG<d@s5tYPH{bQFW9tDnm{r-UW|u3LH?

delta 256
zcmdnVw3BIqV|~N_hWh{Y)&Hx3jGF&7Kz7~#Iv@fvAPAxW$c8W=Qj<4nU1VTj5Go1s
z3uf50Q~sag*XYU>zn}hkqEPasxT{kB7*Mvu)5S5w;`G@`H-(xNcwBF$u;>2!pKN{k
zrNW`y#r{=s#SxQYDi!A)eU#c|=(+zu5pUbR84I58+I%JPZbW=$g6z4=M;`WNr60WJ
z$HBr8ThGRs_Wqji5p%~RM^nYbg(iwgiu1*9sNeA4l)I@p$z9hZ;@YzHYouA8eYG!|
oy<6^<|C`X0J6FhW+~05RtS-0tn&hj+Ku0lny85}Sb4q9e0Bi7ndjJ3c

diff --git a/app/src/gambas3/img/symbol/s-method.png b/app/src/gambas3/img/symbol/s-method.png
index c8e1a90212416e6992648700630b79361458b4ff..64605e131b461b2a70edda79f1d4411a4cbb6ded 100644
GIT binary patch
delta 252
zcmV<Y00aMq1AqgNIRR0TIyxV3;BOzFA5X?lZr^S#t1Tj-B4gKMW7cC_(OmnO!$Faj
zA%C|?L_t(I%gs{B7Q!G5ETs!jN-ImZ|Nl@4?L$BmJ?Y$%8M2V6s{cYu2E;iUNSmb@
z?bU^zj?aA4sQ_J*@{>w1CGTBw(YrCbUR)5>U{HV6@`7HW3kw7k_(OUeprFBiFu#@o
zH0<)&mOy_Q0p=iHFr)>}64(onjrLfu*-cdK1>8m^78sinp9_jDibEFHEPhn+tE(|{
zta;3xdoyOsojYTg+k4B+&G)8tw#T&)HGX0H-{B5x@*p?i9Z}o>0000<MNUMnLSTX|
CcXNaQ

delta 258
zcmV+d0sa1f1BL^TIRR9WIyxdBpC5n!e<GqHaqw|i*;p{KFn;}hSJziq*H~!iXs`%!
z7Lk)7f4WITK~y-)%~IPIf*=q?@dAoyB8d3^{~62i5D-N@)x7P_z}^O-|3XW~im_@W
zZI&Krzh3C+^vpNi8lY=ZeqIyI$$OXFjnrD2-38Gf1N^@!aY1cRWe5Zm_)~bCprFBg
z(7zG^6wLCNmOy<G0s0_bFxtq(g2Se;7gRQqP_aPTRP6=KMmiQ~o8q4fiY1Co7RM|u
zs<>)2WsbE>nR6d-?jv*VjA3r?Ew?n^o7UML*PPe*h3$WbJHB!tUm81VxBvhE07*qo
IM6N<$f)vVl@c;k-