From 8ddfaa557834dcefff54a778ea3422d6b2a96f77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Fri, 10 Oct 2014 18:21:19 +0000 Subject: [PATCH] [DEVELOPMENT ENVIRONMENT] * BUG: When browsing the entire project, skip *.WAV and *.OGG files, and check that the file is not binary as last resort. * NEW: Make module icons a little bit less dark git-svn-id: svn://localhost/gambas/trunk@6527 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- app/src/gambas3/.src/Project/FCreateFile.class | 10 +++------- app/src/gambas3/.src/Search/FSearch.class | 4 +++- app/src/gambas3/img/module/class.png | Bin 328 -> 495 bytes app/src/gambas3/img/module/form.png | Bin 143 -> 156 bytes app/src/gambas3/img/module/module.png | Bin 296 -> 376 bytes app/src/gambas3/img/module/report.png | Bin 303 -> 387 bytes app/src/gambas3/img/module/webpage.png | Bin 676 -> 710 bytes 7 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/src/gambas3/.src/Project/FCreateFile.class b/app/src/gambas3/.src/Project/FCreateFile.class index df57beaeb..f46a513d3 100644 --- a/app/src/gambas3/.src/Project/FCreateFile.class +++ b/app/src/gambas3/.src/Project/FCreateFile.class @@ -123,7 +123,6 @@ Public Sub Form_Open() 'Dim aFilter As String[] Dim hPanel As Container Dim hPictureBox As PictureBox - Dim aFilterType As String[] Dim sType As String $bDoNotSetName = False @@ -134,20 +133,17 @@ Public Sub Form_Open() If Project.IsSourceDir($sDir) Then - aFilterType = ["module", "class"] - lvwType.Add("module", ("Module"), Project.MakeModuleIcon("module", 32).Picture) lvwType.Add("class", ("Class"), Project.MakeModuleIcon("class", 32).Picture) For Each hModule In CModule.All - aFilterType.Add(hModule.Key) - lvwType.Add(hModule.Key, hModule.Name, Project.MakeModuleIcon(hModule.Key, 32).Picture) + If hModule.Used Then + lvwType.Add(hModule.Key, hModule.Name, Project.MakeModuleIcon(hModule.Key, 32).Picture) + Endif Next Else - aFilterType = ["image", "html", "css", "js", "text"] - lvwType.Add("image", ("Image"), Picture["icon:/32/image"]) lvwType.Add("text", ("Text file"), Picture["icon:/32/text"]) lvwType.Add("html", ("HTML file"), Picture["icon:/32/html"]) diff --git a/app/src/gambas3/.src/Search/FSearch.class b/app/src/gambas3/.src/Search/FSearch.class index 9aecbc119..140493748 100644 --- a/app/src/gambas3/.src/Search/FSearch.class +++ b/app/src/gambas3/.src/Search/FSearch.class @@ -18,7 +18,7 @@ Private $hCurrent As Object Private $sGrep As String Private $bReplace As Boolean Private $aBrowse As New CFindResult[] -Private $aExt As String[] = ["JPG", "JPEG", "BMP", "GIF", "PNG", "ICO", "XPM", "GAMBAS"] +Private $aExt As String[] = ["JPG", "JPEG", "BMP", "GIF", "PNG", "ICO", "XPM", "GAMBAS", "WAV", "OGG"] Private $bCancel As Boolean Private $cGrepCache As New Collection @@ -713,6 +713,8 @@ Private Sub Browse(Optional bReplace As Boolean, Optional bAgain As Boolean) If sName Begins "callgrind.out." Then Continue If sName Begins "cachegrind.out." Then Continue + If Not Project.IsTextFile(sPath) Then Continue + If sFile Begins ".src/" Then FDebugInfo.SetSearchListInfo(sName) Else diff --git a/app/src/gambas3/img/module/class.png b/app/src/gambas3/img/module/class.png index b4216666d3aac8072e144dfb61b2ec1bed0aaaa8..ef72f4d6798d6834f47ac97e3f155545816f2948 100644 GIT binary patch delta 433 zcmV;i0Z#tN0`CKmNPhv5Nkl6IWd-I%E+<=u!gph5EiOwGknAr%}k$?2GTrNLLk|djH;GDYy zJdrdHU}l-5Z)Ub6X)bVES(e@E_xt+*(U|xG@L1BknSIIgd<8g_rs>5>rE&(?1dy~+ zDwXaY>I!2Acp&Ly*k!%j?QS1VBuTOd-1pwg%px;;GZn!(_fFCcU?)w}tH(8M5=Rjv zT@K~vKNbICV1H&mLOJ(W2EfN)bcGq$3*ek9OmgE9-iC3x(P*@0=mos+-oN+W-w^Zccx#XubZU&BL+Ld4g= zTBp-9#ndNc*+T%p-)p8MTr b`e*zEn>&UnUe=9J00000NkvXXu0mjf8H&)1 delta 265 zcmV+k0rvjy1IPl9NPht8NklYU7{!0z4Z$foWzfwRPy{C-q+?X@KlnHq z#dq)xf>m4uDVR`o@G+c3DC#1`(j1pYLR)RNesH%hHy)JK1AjK6C|a$&BuN&4UEqB@ zKLG$906fn-tc-rY-vRIG_9P9RbGI`A zl7_%FV9vSyZnwK>W-CBmmSwNW7cjH-NN$&9S=GOsmYoU+!|-0xC(x3#0|>Zk49K$V z+stmvY|+ftfilOUC|(-_03@|*dTRZD0YMPlN%{iteZT!zZvOKF+eu->`t;-n00000 LNkvXXu0mjfCnJ6G;pBSDEGz@N!|V*pI@N2^7lr+K#%bq-pQI-RfkDRE zTP5%mxS#Brc*jdFuvxft8+ew?j`!0000J}JHK}b7$eQXivE8OH*l6~-bMyVV=YAJDP}NL_@qgOo-y-fck&c0uWyyBC z?G1>c2xAN)a?y!R2A%*;rxRJ0^%|^JD;&qMVxve>?=zpzzf4qB z0m3jGCAKJv0)V@lR6Y2&0k#`sj3!C)XNO6Ws4?a;i>l_pGEGxF&*OYPv)k=(UAGm~ zG!5(Zn(1`P;cReVv)KUTw#FP-0+eM*UDpIb&@!m1irH+2F~%O{BJwx^5RnJF4nQ2o zZ*d%dTUe7c^vYwfNfk8u;KNv_Q1o(uw0%-{N|NlRb0VLrJh`74Cy1l)9e0+RDLPAnf zQgU)~d3kw#eSKF~*ZleO7cN}5Xwjne>(}q!zyJRI`wt#Gc=qhs^XJdszkmPt?_Z!% zORq<80S)3R3GxeOXjo9ce#3_CJ9ZrTzk1Jopm2$&i(^OyWA3?&e1{ZxS|2twohV6K ze$H?E=YRQ{W*Z6)mj7hG-59Q`+JKHs+;Xo@Q_|2 zKF#9V=HwWM#NEC&F`F8fZ>e0wP*9c9$r#@z+iMusKDA)mwRy7?@>NY)Bt+&})h&?X Uoz8#pi#y1Jp00i_>zopr0F&f|DgXcg diff --git a/app/src/gambas3/img/module/webpage.png b/app/src/gambas3/img/module/webpage.png index 3fb6aaf9e86a9aa7640af03457e1d507c645a3b5..a48aa5f90d38af3e2a70508c08a73972ab66d309 100644 GIT binary patch delta 649 zcmV;40(SkR1;z!CNq=ZbL_t(Ijir-6NLyhP#edhll$PiqJP@54c$h&Vf`3RrO0ZKW zGiuy433aH@4lXV(nF6Iq8(&q>Nf!sFVuuDCd=4(52`Kn7NexPLQE5#yw}Xk;IQGDW z%i-R`clpkNCa7wks%BL6P*wlb>#)xCHP6eV#TURQAP%%Rj(>yex`+stWf2aC0cwB^ zycdzmgMg|&2fhQZmY0{=*w{c-85$a*QmK&3%t$-=?{z-JM8*HXVLZre8be4ftEP6~wr-QC@k z%Vo;tGJ!yVLVuw^S63JLe4eGHC4gyF?GaVY0MjEQBh1dua&~sc>gpHCJ&&h_x~&MPY+P5)gHLV zOaFaBHXIHI=H}+u-rlBEDgh9UM!CJc1;8-wAG)@-Mn^{nr>CccLLq>xXMTSE7m&QU zxe?p8F$@C{As7sjN~MTKqZ}U}Q>|9HzP@I2bCXysMt^^Q4M?IzNB}H~$j^oop8?;1*DEV4tgo-5stgVe;`MrQ z90w6$Vq$`+si~({u8VkqkHA~N*xlWwSS%tU`2Bu{hld+sS_D2c!t?~H+M}vpRP{hr jf7j!DQ0ID^=l=q_If;no8#xpJ0000? zTxb$el!D#13thR@T`5>?`x^rK2i$b8D>WlH`3o|^Kugof*F}?Ij29j}4)?ytx#t{d zq<|7|2HXR`2j_l(l}7tbV(_h`FOuH-zW?gt;zB_X$QYy9*?(EBuCA(3DD)+Lm-NvX z^C$W18{lUchSckIj4?=JVPSz%se~kqF*F(t!Y~B51jdsO{0PGk*LBHcGE}QoY}=;W z?eg^W#N^~8)oK;Tad2IiPNxHKlH?q%udgGCa=A=CpU3k&n$0H7W)siz$mjEv%Vi`{ ztJMJh0&@b+T7Rt;#uyF`4%pe*K@#b7np7%9DwQIgP9urk-Cg$g_c6xMYPA4P1>7GU z9pN|*Q4|pb0g|}BzGhfgS64`)-EI>_5!2Jt93LM8_+ygZ1wkOovb3?Wp~uHZNz&or zp)AXiBz3!8Nz&flo~EXzG%+!uhldAA%8iY9K)`=}jemJ|m!y8bA7ja(XB2L3Zji*? z-Ca!K_VzZ$Mk%~l;?~v{lCW(X%d)U63){Al#P;@fyhPvk<0Y1Ws8*}RGG;OvR#sMG z8JCxrnVFeketsTF)a!MC2q+F|oOU`LT-U{M94eIx*=&|xuSc)fBb&{#w6uidI24P; zp^?5O_h0ZDxD3OPMxzm1+4DRW7Z+nIZ*FeBuyQg?TCG0Np~ zT3cHihUuH6PtU?MqRJd_3i!aUL7e>oRvhjB2Z@*CG-aIXF#rGn07*qoM6N<$f`j}m Ad;kCd