From 0badb09bd805cd48c12b66c08903d75b0e5aa9a2 Mon Sep 17 00:00:00 2001 From: gambas Date: Fri, 15 Dec 2017 21:43:22 +0100 Subject: [PATCH] [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. --- .../gambas3/.src/Project/CProjectTree.class | 15 +++++++--- .../gambas3/.src/Project/FOpenProject.class | 3 ++ app/src/gambas3/.src/Project/ProjectBox.class | 1 + app/src/gambas3/.src/Welcome/FWelcome.class | 27 ++++++++++-------- app/src/gambas3/img/module/form.png | Bin 164 -> 168 bytes app/src/gambas3/img/module/module.png | Bin 416 -> 384 bytes app/src/gambas3/img/module/report.png | Bin 242 -> 240 bytes app/src/gambas3/img/module/termform.png | Bin 751 -> 756 bytes app/src/gambas3/img/module/webform.png | Bin 929 -> 922 bytes 9 files changed, 30 insertions(+), 16 deletions(-) diff --git a/app/src/gambas3/.src/Project/CProjectTree.class b/app/src/gambas3/.src/Project/CProjectTree.class index 22e31b425..7c9ae468e 100644 --- a/app/src/gambas3/.src/Project/CProjectTree.class +++ b/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 diff --git a/app/src/gambas3/.src/Project/FOpenProject.class b/app/src/gambas3/.src/Project/FOpenProject.class index eb97e5790..aa19e11e3 100644 --- a/app/src/gambas3/.src/Project/FOpenProject.class +++ b/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 diff --git a/app/src/gambas3/.src/Project/ProjectBox.class b/app/src/gambas3/.src/Project/ProjectBox.class index 3b8a539a8..7cbd46280 100644 --- a/app/src/gambas3/.src/Project/ProjectBox.class +++ b/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 diff --git a/app/src/gambas3/.src/Welcome/FWelcome.class b/app/src/gambas3/.src/Welcome/FWelcome.class index 1fde37f5e..014c5d62c 100644 --- a/app/src/gambas3/.src/Welcome/FWelcome.class +++ b/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 diff --git a/app/src/gambas3/img/module/form.png b/app/src/gambas3/img/module/form.png index b517db0085dda7cb0f9a487a8c0c11fd68c35817..789bfc679ef724b642b5e050ade409989a908dd1 100644 GIT binary patch delta 118 zcmZ3&xPozlWqy>Wi(^Pc>)UJAVhsvBE*CqGU;S|NzY|Z6yEgX$F^!sF$5}hoLznD7 ze$Tz*Wn5%T_iPneZSVa|3o=c0_l)UIJLI)IhTrRf0JUD5xy7}T&iyBy2>P3&dnZ3ee`|=uo z<8140wdX My85}Sb4q9e0D*Ze7XSbN diff --git a/app/src/gambas3/img/module/module.png b/app/src/gambas3/img/module/module.png index 02535c498cbb5ef14aa5b48437fa54fbb43de722..da6ca01efd65f81d157c800d8949e0a573da3bcc 100644 GIT binary patch delta 357 zcmV-r0h<1x1AqgNB!3BTNLh0L01m_e01m_fl`9S#0003pNkl?IBVBD&IAh48p9^0F&N!j#2RL> z9BmFG*u!uV0`=rEg)6)Tyo3$Bpc3#LW|I`)djcz1#8bd;Fpni11iYBEz;Sea#&y8U zsG^3GfG2tcjb5p==yMy?g-!}oWAOe?3M7(LAQkAjK%9@!5eB0AGvE~*M)h65KLY-m zgureKUXE5{-mw*HK~z}7?Upf1LopPEzf%iU?9vW8`6s&B?IGyuA_#6Sx+;iUCvov-IQTOZ!9^Sd zCmp0ZiJ%UGQV@?zhWMzU^}QA}fxzX1B!`omn+yMaD2fk5)5-e*{zpyvM4fdLJ%H4M`d}3Hxli4@?4gzy`1dw1JwWb70r@gQR6(5ts(%a=|81ZXh30MUVBHk)mz-cH}Pry~gk8JmBSQ|Ktc(crB*!^Okn_T{sCZP8XK9(wB z5|9M^`ZEGffbkH&=jy<5h;JkQ7V(!KH>E>t$+DCKNkHFMknh|7yaQ=`0BImX(k9Xz Q2><{907*qoM6N<$f_!zHDgXcg diff --git a/app/src/gambas3/img/module/report.png b/app/src/gambas3/img/module/report.png index d735563174c56c7e813ebe990a22575780161f0f..39405787c4199038e5663c2c7fd9d484cf833232 100644 GIT binary patch delta 191 zcmV;w06_op0q_BkIe(%_L_t(oh3!|#4Z|=DV}cH#Ihu4Bt)fA+lt#!ghc;+meKctR z`w_)J#FuS=A|b(q4cr~wckvv?cck#T%pCyqk)r?b*d8qNbgJMmzJB(Xci_-~nSq(X z%rLX+!lnE}1F8ylhr2^ns|}R$+Z}<3fQUdu5RvM_rTkqEL^$1oW^y16WDc}Dg3N&^ tq=C$Vc1Mso5QW{pVEb-A8<%$=@c|(ii;WN)Pv8Im002ovPDHLkV1kW0Su+3t delta 193 zcmV;y06zcl0rCNmIe(-{L_t(oh3!_s4a6V}b5A!w7K#KTWR(n(l|W)4Ht4S}SU;Ftct0t^9Q(P*o5ShzP3MeQ_)Q@(KW37=Y1M1w&P2IVGU zZbFOH5H#7)7zELjQ-fdxL7Nbj5VR!(5%uauG!;b-)sQ6>H|`sv%d6*m+?$#Y-uq7< z=fMB`IOpU04*cs9-VWc~9`!2=%SVR-K-E_kEhN*&z|rCNvVRtId%S-J0O;-QElcsO zt*u{T6(2!S09{>O^!4>s2Ebym(B0ilPfrh$Bz+p7;2rp#1VLb6V1VJ_VH^&J7Wesl zTwPs}OeRUE)8zvQ27`=^jREld{7gQdr>?FJv)N2@b2G763{ezWTU*oZX=nt&U=V<8 zHp|e^5UEs(&40~J#>dA|6a|2hkrAq@^xNw0fXQUSZnpy<%QAO&cUtb?;DDv2B^(Y1 z7Z(@Q*VmKFRCm$bCB(An9E+wDdWw3nP@GO5?0ERB%^71mZwY7voAntoR=x#q4?0~AO zBoYb2;V^S^bDW-@qN=Z-s3?jA0s*F{r>U;4E)T$)Zf|c{U0r2+dz+1o4WiK~`}_L< zc)eaaIyy=ZV7J@p@9$@HbQGJ-ro~lN<>cgqcs#Df+S=N51L(d3E|-f~EC#^+{XL6| zi|_ItkAFuyKRi5?9w3v+aC38m&1NGKiO|&4gw<+Ak|ZW3CbTbHQ55#}_DT=%`1r`w z)D$x_Gc+_bFgQ4<<-Fe4CFAMoiTU|?&d$zC4*+m{d`vhTCJ+eVbUJBoZ$}hGc6WC< zKR+j(PIG;IZN$tS$kQ2ENlJ3Bi9K;2g+Ehod@hVAX`ntvu78XEc-pxj5*Qn|~0 zdkZQ8=-ByQfYoZHudk1RfdM2*`ZPe<8F){EATT;QN-!A2>2#|0{{DUng#yWB zl593xI{?4m&(zcu0MF0Q6pKab>+3O@OtiGL5R1hSMUhMJv}{ibaWsH>YtosGO0Dx8|iAnYi}h64k+ZWi6y^6LDvBaLpO3k@IgCbQZ2(?%dwWYdoo07;m(9&hCMPF3IywTt#^2f5 zsh%GnAAhS4u(!9z&CLyVyPa@2OmlNHHk%Del88p5>Ju)@GKYtU)dwh*O3cpAGCx00 zV`C#@V`Hk%kmHa(@dkg;S7X~cO%mefUqW}N^07*qoM6N<$f}C$f1^@s6 diff --git a/app/src/gambas3/img/module/webform.png b/app/src/gambas3/img/module/webform.png index cada1081d0bfde5d7f2e1b7c387286e08997d18d..8e937e140754d98a9a983fba01f534b94d192443 100644 GIT binary patch delta 878 zcmV-!1Cjip2bu?vIe$z^L_t(oh3%HlOEOy+$3IgSaTZ!cMcJlpjz6Fh33AgSYEk_M z)xLqCUki;SNH=Y5+d_!8K`VoHLl8k}ZP%usJ+k1Om-1}Xfne)u^ zeC9l7&V1p&E}=3oOP2DVEPSU$1%Qq}S+tS<`g}u+sy|v#vVT}>uG_u>Z3n1pK`VvB zVH8C{(=^iQGyuK5y_n5rTrL-OyZvVX;_*0vKmbkC=;-Lc;c(z|IuQhcWHO1OD4d<0 zVX;_{Wf_yn^zQ*^nugEkBcIPRJUq<({XK<3f#v1pYD}R}!0-2Sdwa{q#s(gb2T77z z=5DzM;_)~>pMMWQ5a{aaA{L9`a5z|4Sg489>-8)yE+UE|xm*sv-%m1`{C$8xAV4mc zqgX5=iXvXG7mvro`1p8D+|$z&`}_NBZ*Q}@x=OKFBoGMv9zZx8M$U1F1feeW?d=Uw6mh%VM59rrrlwF;l}IGg6rkxIP=6E!y_76(vOwOYJUj%I2KkjZ4Q*=#&KJdj8v zI5|1t>gtMex%R(hG#csb>};5$a#nn$mY<=)U|?x!iPO_l4i66jkR%CNmKhovs$Oqx zZIMc)(0}Q49335z&1PGrZVk}W(?cSW06uzIk)~;Qyk{zr4KU z`uZC9I3=5@X$vGtA`*%4{{CK503el05ex>2Mx%Aljf{*`$7Zwn`v5MNi+ny$C=_CD zZjRa6*_wHsPFDv8RNuam3?*Z`T6pp7?5STRr=NdCX)$|$HVjU zGdnvwz{lQLSy`!xE0s!wLLt`I*Li(?#qD-8I5^l6pw5(jWyunW1P2EPsH%!6ij0nq zGG{O_K&ezBlgV&%bHmHa3s$QYS(d*nUa@2qQ~HkqDvCrRD2l?}-5rmQj{x-b^;Hc? ztDb)b_+>|Ax7&Z&^)yr4Jz?7c>RRyGxBs--z5@U2Z*Q1Iq+Lk)tpET307*qoM6N<$ Ef(1CAHUIzs delta 885 zcmV-*1B(2b2cZX$Ie$}0L_t(oh3%HjOKNKrho4;+aSybJPLxfW=JsPyB1J+qh#FM? zK{anf(APjC3DSvEn>G-lY0$_ZYOo0+DouB@zycK{B}~jn@eU%vV@JE4+i7s`Z}fhw zz1FkWdcWYmF5#^)JUm?flYx(qj|G6HKN<8r{q^&}(b3VD27eqG8L8@jdj`H8pr!87K2J|i54X3s6bc3A=H@Ckg+c+Z*UQz_70b)ZxLhtI zNowf3;Tnj?<9~QO9t1(4rKN>fEQZZyV|seJ%1*1*GBY!SD2n8AIlNvk$z<~P0sMYH zxm=E7v4|*&xZQ4CE*Jg%{Z)4N_xJdGKGxROSXfw~SS;fA`+pB06bhlLDjJOjyckVPJS62AQFjGg1_gZp6UW*G8rru3wL*S zBoYbs_VzeCJEL5#zPI#xJN=G#U*%J3C~v*+#A#1GKfZkw_$f*IK?wRaM+>H{;{ujE#+<*XtP=7^uvj zo}O}XaRI!ZlJ!)#1d=2X4u^Spd8rBjkV>Tp1Oh~((VFjidwVNwqtW2#W@sj14GD2lACth{?B=yW;& z%w{tdi{MaNvTvKlgV&-dCBABBWAN1S(ZN({KEk7nhB4`LpU5pQ53GPuQ@+I2jIt# z9}Er-;&3<`*8I}|Z?amg|M=BYPv8C~{C0qv68!vb|7v}E2L9LIx6?e6=_Sp600000 LNkvXXu0mjftdy#;