From 42eef3cdc65165af852dc256cabf2cadb2caf79e Mon Sep 17 00:00:00 2001 From: Franklin Sobrinho Date: Sun, 6 Dec 2015 19:35:31 -0300 Subject: [PATCH] Better hidden folders display preferences for editor file dialogs --- demos/gui/input_mapping/controls.scn | Bin 2686 -> 2852 bytes scene/gui/file_dialog.cpp | 2 +- tools/editor/editor_file_dialog.cpp | 18 +++++++++++------- tools/editor/editor_node.cpp | 1 + 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/demos/gui/input_mapping/controls.scn b/demos/gui/input_mapping/controls.scn index 276712ba2205efe1e3c9b04f52ba9d67e5d2ffbd..03567fb691c779a28c0392133ceab3c98a551c65 100644 GIT binary patch delta 2642 zcmew-vP8@+DA?JV0R#jX82H5)7%bQs7%ng~FfcMOG%zwSHLx)k}PGZMJ1UEmlE>nr&2{dhP;G{EG7Br={b%Xj47!JO^Un>C5gup^qEug z%kv&E@;+eP=HT7f;<%eNt2DQOfnVVqZ+T*7Nqky604oD^VK46q`6mgJpoX%F3Sd^KVSJIHipr&BVz@os+%)p@FfrCd z%^;y5;=t{|;55^L+rfuHQbB+I`N}K}&lwx+9R!^F6U-Cz9C$$vbaY^Lkab~C zu#{yiN>%*Im|6CKb)kc9f-G}-QD({mmR?3th6R!j7pse$k>32URBxS4js&r&7k0OeHC% zyyVmb8D<8C1_uWT=c$t)u!z>HzGf&&xOK?GB}nBAM|^5tS!PjwUapE2 zeB}vC$N^91&k2(1XH=IxU`ch(W2(waUHp>y?3pvR4%|-cS5O(op(alj%DOP{hUg7-1!Q~-?jRS*&-7}v0 z$zNHO>r;*}Ix{FR^X6nGXDj6ADI_Xnr&cPgP~lK0$yX>!O)M_fv}9MvEYVTOFH%U~ z&8kq6k*eVAa+x_tAu-vlnn7c?Dkg>n4h{T_42})#3?>W2 z8CIm#I2bd8wjELsS|G*Pu)jfzL14jFh8GL!tr&Pxr#ZY~aPgSfpu!-wK!w5X0fP*K zk7sy;41>o48HR!c8OJ{iK}i)2vJ6!VWEmzV$U1~GczGOl;BeoNabHv0f!}du0)Hm= z0~Wzdeg{E^IFBy2Vg>~U28L@&eTqB@431YF7#w&UA{C?(7@VXX7#vw0gdL_i2s`*X z2-iCVIT?XcN_`2q8Dhs6%^4&4s-9n2lLAFywCQRKRYl#Grvr-u1B1u{W`_Uu3JeTf z3fvC*4#E!l45AAB;3`T?f!QIRL0kbAdJJp}q>+5*P|P5yz@d=E_@6_8-65NS9Zbq9 zutWUHAg90&@vXH31B0LfivzPl6vKaqa8N*hcZhb7cZg;XQqXpYcHpjmz<%6OoSVx<{W6hs^@LYS%wA`Za}!V2typrSZ2DJL~PGq1QLF)ul_IO&7~gF{jR zg9C?iCPzs|X>L+pVrEWKK7+YJ8(U|9pF1y?l!FWlucwDgkb)ko0|Ntt7Kef~3qw!J zsjUh&^8Y+t977^n-%ht*x5`1}7<;{hL~}+`&&JI~ym<~(XgdAI2ua^1lwy>_dC z*sK{5lK)+}n)MGD7`I2yV2_C}>Xtvvy_hpT!;T~U2k&!fwx##qFZQ3N^_y|iDuxNV za}G=Fm5ZfwPq;SRe}CA3r9pwCMWAQn(IiLBy?68a z9`9K9`u9Ki#~&l~rnetH_}PYG!IYwNmd|(J)#EvQ`K1eoq3`Fay-e~ByLJSvahf!h z{Xm9Emf7r$sXCwjsjx2&oc5?P|vHYkW3Ud0}N(7i+`ca5Cl7`JEgK zpC8ed?0(MpL0-xCvX`pRciv-B)3Pd47TkV&?RDwtP4mPUB!vIGS7iAkU-SF?smHum zvP@&ITR!(+t>NMAyK7c1pZz~;1x02Z7B~6eYDQ<%6YrB17#%nkOgSDFX!uKqp+#xQ z0rT08LJTEq1^_=D|Jfx7o5U403pL$hCnu(J^LBU6VG1s-;ekKQw+V?ZJ zpFhy;!8!R-y|lpgA4{jKWpdcY#c)%LA!Rkgga?c~oUgfe6utUoE-~v%tdamPgQu&X R%Q~loCWfHkAZJiR5&(4ERzd&( delta 2490 zcmZ1?_D{qmDA?JV0R#jX82IHF7+$h7FjO)zFfcMOG%zwSDzG^)J1{WtD6nt^BqnF4 zrUWOa=A|m|J}_lqU{SD3h-TnZ;F##9!Du=$U$@?X;jRL&1H%LM6Amp5ObQYVQVPrt zVGOJa>HlQMHMODgpfxEOO%AFzut=NBX!G zRhqLtCo?^xBtAE>I6I+)JvXr^Ju^?g$U!twV}SsBQhrHEelCNkf(?6GesXDXd|s-8 z5<`+=5}STbYFY_{$OA43rjq=Egxm-01`RO`;t#kC7oso@T25kmv3^E=eNkqWq6=eUPQs)IOp+{RsYNB3iaQw@ zBo*8qFp2XNmlUOzBxl4IC6;97CwyuWIV7EA#Sx#IT9Oza&mf>+?YNmMwW6dnF(*DF zHK!o)CW}vEQff}(#fAEbA`ILLx(oOfHYC|_6eZ@Rr|Rcs<~?BMWlXF{&}xuoE-pze zcu>#8$6Sz@o|+KRAj?*km{Xd{z^@R|z|WpqQ4pV+l3CIq#E`G_kSR4KK0$?{IH}BG zWx_&+M8y{jc}cwrvJPAh*Vz(FOY+N$5*uc*l@=7F79}StW;i@`;AT$ED~Ugp>7d7+ zl$n>3nU`Liw2Cb^zbrMrv>+jf(Wz8PwjrpVIVH0=QE4VaO2THAlKk}a9LIf(DX9sU zm@|vx3zQ=miWTG>4zVZaWF}|F=jSzuB&=u1RE$mFP&~&_lBlep!dMWWaLlA#%avppi!&7} z>lv68Bb@g-h&%38=w-@_PgV?LC`piFU{;VjAjOcUaODA$l#8*0l%qOlSz=LUVqQrx zgPejsgO&ob(~<)WE)ot&E^CUPE;=#Vm+qurc&0(sRl$JU}yq0VGc^6+6-5dp#VhtaL z)C5)M9}X@L8EhOF9PFO)Y@Ym;MY+C#UxC5Fh{0Kbox#~7l~W-TCD%n}`i{33-6QC5YLj8p|@m)p!a3W>>X%?x@8l@1IINsJBq8`v4P zEXZP9;LyO&$l%z(&S0`YoMA;;jl))k(6&PgLJOoA1Qx7ic#)vwcr7v2fuX^?BLBHpdjPG?xW)n@6hZJ?Gfn^{eYRl{l4=Qht-~|9P}L+9QqxC9oij)9nu}x z9l{-?JW&%3ZUwd zw_bsTfmMN-flq;%fl+~(fnR|cRO2xSC@?#)GYBfMGcbV^9$dGYKPkns~Ln93>;Q7h$yf-tak8!Aidfl z{vms~!+VEj1_=dk$7%*i1$GC12B`(?4AKjbLd($|7Fv$(j0y~ms~Hp*urnxu15)O*{;aN@c%%1J;-W@)enWYJF+`4I|Ms&JM0JHhtk{*vmdf^J9s-u z9~5TLQ0Q?`XV6^0&Y-n`ok4p6yTflsbp{;;euw=Gx(e(L`V4vt*d2u(PCGC-20Jh~ zTxZZ%;86JV$Y8a@eTUBu%N;&D&UO%XV0dJ`+L76T!6_W%`$q>>JJs)ZobD3-NP6`_ zZl~oA%!*u(o~&jxU}*U4Qhn&K(`BdQkA>$uwL8yuQGdj|+S&M#^XdcMV1@HQx|cgJ zKaxk$YRJ&=`H}u=7yd`gtKAMC40by2!0^JD`NU(mCimx$lo49;o~&jxg6Q$|f5g0+ zK~=&3k@ISoVh0Ae4j*k~9XD2c9ryUnlANEHSDdKp#OfgGz`$Ulz`|gx!0aLD!RaXK d)d^}zNqf5set_icon(get_icon("MoveDown","EditorIcons")); fav_rm->set_icon(get_icon("RemoveSmall","EditorIcons")); - } - if (p_what==NOTIFICATION_PROCESS) { + } else if (p_what==NOTIFICATION_PROCESS) { if (preview_waiting) { preview_wheel_timeout-=get_process_delta_time(); @@ -48,12 +47,17 @@ void EditorFileDialog::_notification(int p_what) { preview_wheel_timeout=0.1; } } - } - - if (p_what==NOTIFICATION_DRAW) { + } else if (p_what==NOTIFICATION_DRAW) { //RID ci = get_canvas_item(); //get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size())); + } else if (p_what==EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED) { + + bool show_hidden = EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"); + + if (show_hidden != show_hidden_files) { + set_show_hidden_files(show_hidden); + } } } @@ -1013,7 +1017,7 @@ void EditorFileDialog::_go_forward(){ } -bool EditorFileDialog::default_show_hidden_files=true; +bool EditorFileDialog::default_show_hidden_files=false; void EditorFileDialog::set_display_mode(DisplayMode p_mode) { @@ -1142,7 +1146,7 @@ void EditorFileDialog::_save_to_recent() { EditorFileDialog::EditorFileDialog() { - show_hidden_files=true; + show_hidden_files=default_show_hidden_files; display_mode=DISPLAY_THUMBNAILS; local_history_pos=0; diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp index 8b04e4f77e..8e39ce36f8 100644 --- a/tools/editor/editor_node.cpp +++ b/tools/editor/editor_node.cpp @@ -4594,6 +4594,7 @@ EditorNode::EditorNode() { ResourceLoader::set_abort_on_missing_resources(false); FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files")); + EditorFileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files")); ResourceLoader::set_error_notify_func(this,_load_error_notify); ResourceLoader::set_dependency_error_notify_func(this,_dependency_error_report);