From 03e13e7354c7ed743ec2bab5064d65335588e49c Mon Sep 17 00:00:00 2001 From: Yee Cheng Chin Date: Wed, 12 Dec 2018 00:33:34 -0800 Subject: [PATCH] Expose "automatically install updates" option in preference pane Currently the updater (Sparkle) supports an option to automatically download and install updates in the background. The only user-visible way to turn it on/off is by checking the checkbox in the new update dialog box but that dialog box only shows up if auto-update is off, meaning that there's no way to undo setting that setting. Fix this by exposing the setting in user preference panel. Also, previously auto-update would even still keep on working even if "check for updates" is off, since it has precedence. Make the preference pane un-check auto-update if "check for updates" is turned off. Fix #808 --- .../Preferences.nib/designable.nib | 68 +++++++++++------- .../Preferences.nib/keyedobjects.nib | Bin 14701 -> 20756 bytes src/MacVim/MMPreferenceController.h | 2 + src/MacVim/MMPreferenceController.m | 16 ++++- 4 files changed, 60 insertions(+), 26 deletions(-) diff --git a/src/MacVim/English.lproj/Preferences.nib/designable.nib b/src/MacVim/English.lproj/Preferences.nib/designable.nib index 83fcd54b7d..889450913a 100644 --- a/src/MacVim/English.lproj/Preferences.nib/designable.nib +++ b/src/MacVim/English.lproj/Preferences.nib/designable.nib @@ -1,30 +1,32 @@ - - + + - + + + - + - + - + - + @@ -38,8 +40,8 @@ - - + + @@ -47,11 +49,11 @@ - + - + @@ -74,8 +76,8 @@ - - + + @@ -83,19 +85,21 @@ - - + + This applies to files opened from the Finder (e.g. by double-clicking on a file or by dragging a file onto the MacVim dock icon) or from external programs such as Xcode. @@ -104,7 +108,7 @@ - + @@ -131,8 +135,8 @@ - - + + @@ -161,8 +165,8 @@ - - + + @@ -170,15 +174,31 @@ - - + + + + diff --git a/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib b/src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib index cd0271eebcaf356b89789a74d133714b8acaa253..3dc85ed47f1f86b8a8b7e81e61aba54fd2eb8bc9 100644 GIT binary patch literal 20756 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 literal 14701 zcmcgycVJUh+dt=yHtD=gnlv3rZqhVu#to&ERS_8lMQK6Gl2t+zN+eBc2DNVmPT0tB zqv)$L#MiwCZpA%OKx7GsfQSqC*6%s@CZ!boeEt6TS}slQJ@+}!d7j@h&zaF03`Ap< zl{*kd3}O+7c$CHu=7&tQ&GAQ~fpBP|Ej;65e^V@ak+a9P zJyAMRAu}pPHsnMeRE372Iy4bAp;mMWT7_1lHRyVDBU*>nqYY>ix)a@n?nU>Z`_Uul zN%RtW8NG|%Lp#wy^btCQK0(LP7w81~7X6BT!#qyIIXD;VaRD}C5j(IGSK(f`2A_q8 z;#ypX>+yIz0Z+q?*oT|(Y#hd|_!1n$aompQ;YIi=d?UUIZ^XCZJMmrkUi>J23_pXP z#e48x{1HBmKf_<)6Zl*F9sUjf&hShcla3x@RE)snG5Jg>V`CglPo|2gVa{R(FtyA` zrj8lMjAte@Q>td_fer$jC9QHhR1UrUpV8^oK z*h%bUb~@{2{cM1}m<_REww;~JCfEh+LUs|mjJ<-rlD&$(fnCeq$lk{fOs`vJR)J-{AhKVpxupR&ifQqInma}I6> zcMsl)wxA=-=iCqIL+(fJC+=tN7w%W?H|}@t5AIJM@t9|Lmgjh$Pvg^h6|d$q_)I>F z&*pRZTwdVwcnz=R^LZVw=L>iPU&t5n#e4~GUmj6g6DYw!B5P~R{<01txx34xF=+y=u7&M^GUgpw?U zBhm4;rl2<(oun{EM-zsmlcVG?Ihepb2oL`yuqS~l$&qbHg!NjGbuui9zE$sS@e`JC zje@?eZgj*y(;xANn*2aL76}J~{>U~|hU};uRZLQ*3Bd~!m5=`DG@ufX#=4=1JQBI+CUk?13sll6CQz7na}Pk8MOfP*3C-SKk0%ls9{!+WQ3o zRioah59*8hq5h}_orMOVv(Z3w4jP08qakQ0QIQMCedGc1FnN?bPM#$%keA78++qw~=PXe4mh5RONh{GhB_e>4^dd8ukA)HjUu&hQ68dTKI) zoWB#*qfuzIEU^pG7}S8qqH$A(* zHDn+ewhQ@?AI${b>rpeh5Y0jXbTOKZg0PbF(F7C*j1Kh&gTT8yYolNS1O~OM+7C%0<;hK-H2BJR{ zQ!EXzJ?xTr0A7b%0H00@RgD4|Q|C(~TD;9vxk(g{hqc1D`f#Mh8vfMD(CG4ap(JBsULVDKL#f zjbcb5#nl|YI1?O?6m5$5{UI@`%q3Pt{IHUUKPuLFo5WEK;zY4$rKhiB2f6}XiLL^< zUX89n*P`n{!AU61l*I$zsm+!SasnIhlgH%~f#iXZJ%d|Y!Is*iF@MXr5yN49imBaz z*1}8l`v!Caa%@L80rh{Qo6#-k)~;>%fKr(WBDHX_G1bUV=h54rKn#_-474=gTBGRKy#=CAT$OnYeXpOk448T z*$y!ilZrT~H3>}8p8C4QD%qZ@d-jHpU{AZin%Y59m!VhCt6)iO=r!;LZ=g5PTj*`{ z4%*r%pf}Qf^8I+!AB2$SISJ-%XgdXS=^(odT9lVnLQ(rZtp5YF3++aG z&|b6;eTep>0~C{VtrR!Z$m!>XRZdOfSYlU@a}0f&qPhVcqo$&~{26_@w$jrZ zrAB^nNjYTdw}>7BjfP0nYeCvk8}YUQW+JowJ~0LW69b`OAml%T zS>SZ6I@K&lCFzlb`$@3(t){$IR|BtoE6)t}sVT5y9oh;(FNNctjd^(H*e+OY@&cfu zr?3a8p5Yf22m;H&z-+*(?B5mk+hzrtW{CiIs5II|0K^=BC;+zF7584a-vYS56c*bW zkBKe**sQQmtnho9J>mu7SQtWtNK3!aT);8-VKOV0L0!35cT7tXIjabaOlGBZaC~m`kurgH5%%4d&|65 zSNH#GuiMxO#Qp%pKAk}9-zY3@08a*Crkmzu!Ge>F_`Sfd0z*0m604aMh17k{03G?l zad5m+EU99uI?x*=0^&>}nFqBFQl2gvF_gPI25vrkde0CLvp zYJw<3{Y9@{|J+|p2Q{7FO-(hRrn40_seMq+2u&?r2*n}!CFb57Gx zPw)@2s{jr4?sH~W;Z-z*r{Jlep@B&a4IzWURrIa*w}I5;0t%uVgtb5jSPH>Ee>ffu zLL8)GKgp`-SCU>?Ltr@&xWHR1{Gu!FMNVlQXvXgHCGXbAMbzTq8oIndW1DcD6Bkc}4S4bg6Iq*~Gdoo;m zLq33(q;T7ne;DHrMdM)ZvO}N@hp62vLXhdna*(0a3L2v5f|w6}1JK$u%L~Y&!5M-Z zo{luwi;mzKXs?{7D+%4nn5#s+p%C}5AHwKL@XV0b)sk8{#^G5wa7u{YfG?I)vy%jr zaY5Vy>1DFq8ytyv+c)AM4j~7`Tlwpxj_Q7Z(_T<%Kr%2k-*VI`4L=5OD{- z42^^ma3s0+v=R^#oKQ+YDCp|QJ+z>ct2w+F)!v1d;H7vOUXCxvEAUFZ3a`djka{wX zTttE-PA(&aEFw3P^<>zYjOA*44K)^+zXRU@?UOJWO-4~;8A(RwVFZyi>Ct-jQM_+I z@NPZ(p3z?L60n!c(OY;OUXM2b4;3UAQp7RjLJc>FrijK-)J_yw&y0jyL~u|+s21f8 zN6jf&8NQunW%v$Avl<}D8VhNEGQXm+rfZIc@1|+ekV;6B&a}Y$@crEuIDw2$F7V{) zs(Sa5o!0-hx}}|~dm2_Zu5)!0p>&lOM$Hz~?n_!k%>hA+pTp1N7tk!c1^MxdP*FoQ zjbB3b_+|VGeigrlUcs+}DZGK-#BZT6eg|)b#muIol{+&)Fhv4JE3W}9sDyROsBWbJY1Y(2axIsrv`kf#0GXr$_{@ZBGMOb{fPj_E zhHS5+qpFg|!=5sds;a^8dP7B`KzSdk-H1QL`|$xXh0Gv6GOT;$-=*%yhq_k&_y|6V zKS_p-Md%20bH;j`<#cm8nMS56!J`;lQP3L?LAsQ5abAe9b7b&!DNga1gjS%9Acrwt zUm&a$baHixzeaZuFEO0@=jH%Ul-=&2zv2Br|45f}oRz?9$)#?;jiDC7u2Y7!$Y6lqboLS$BV zob{~kNo`tQajz84m@-tmfw42?Bup+L!~V(oJ*Ta|RZ(1SAS8Mr7N+unze7Z4%Zeg` z>6;?k1rZU2unq{*FxwQ5K(d#Lv?rDLPq_aJ?VZ78GQ*hR-CSlHnRANElZ>M;v z8K0rCfG<}PC}s@Pz>I}pq|{pN37XtYi;L<8ME?B(LiIU-n2l zJp@{eSD>X#C<(chvL)*wN6?V@3gq&J&hmqBpqzm0%}4XmGa)3(#JVA50ZE*K5LyKF z>?b1x{`_^yurd`?nFIt?(iv12LcE!923J^fy2utWi_vUmDHR!QO_L>Lv5Ne=i^ynK zxo2g68Ld?`071HcK*&e!%qnIza|JY#W6%`Spa^p%a}{&7+-9cj=6UEc<{IW&NU3%* zYe0P~nCqDvn6=1RLAad6@+5mODUk>b0fksC_3w1c;MaoM>%G>lNZ5TrG-r4(u7*5B~M>289Wy5Ww z!_ffEq#)h9T$8q7kP?#@4MKy+O=`6|Pld=bs&I(NOUd$+O|q+*O|(gt$LnZstn2+d z>3u<Dwb!fqNOSCWgCMByVxtd%N@BhdC(PdLz)hfIZG-uudy}UIv)1G5b|CXE8m6rn{1lo7CX#q312w=o|uyO`a~Msh7#LvA3;$*`mX z;Q0eo{P+;8@%~N)JjFao#Sgomhd>$6k;_3C)Vi0D>p(QC!9U5>s8@uIFWI>LUhrA~_kER+p*}}ga9^h0PpH_uQ1EQI){36S;93Z#LYqzuP$wvMe z{2-ggrg!s$w~|{<`a!y*1-`H9?<=R(DL2UGgB!fL(+#eJt=z#gAv8fQ2%UkXjGKZ` zQAbaAg=_(9IK>riBpXh;LMY^_D*J#dRQkF7DQB`L)Pm<*g`&(gu*nt!zehLO+L)`E z)pU~$JmQtiwcs6Lvkf$L11kd1t_QDo3%-K68HHIpvjMi-s7KtwtYy}d+vK3KjI39a zO=PKBO>X*2-vRG-`VQc|iuw+CDP_wW$?aWineD^81orzM*?uqZ`&(1dd`vtPf?zKj z4_gCe1S_%w*t3C=JIGyR*dE1mr3@!!HuBuE*}%-hWc+PP8qG#>C&l07^JoV}Ng4hd zBBQzyxmzXz4WL+(NV3^b)xUBsxcp|waU$Memo7rre!wbrBBK3(MdW^RKEN5a1)=-e z1)H6N@p6>UPGcLP+Gogv}FB^!$2&``M#<5T<*JA(!H427N2 zmQc1YQauZJ=sT@vu^o1`>7Mp9wi%|ZB9G7s^-a(OrWsGt+Gt+p_tm7vPG^HKwuU@L z#~NV&G1b7L}qdbECzJl*+NNfeL)m~ z*fH80n+2beV_Kh;uM{4~uy|6zOO=fd&AYmgrk0r?_Q|gdHqaebjaNJ*`{E2$%>gwga*Ws}B+92<| zj*|y~70Z9mG(wqtF}ozCi0*6L$S!7=o~DTI;+m2a*GhI3dns(P(6v8Do+nQ=3dP-- zgcXjEH(EwO`jFqrS(n@0sN*Y=)URXLu-8K`iBjJ}ULr3x3YAg0S4{;9nN1f_j0BIR zfNv=ESH2;BXmkd`k*TM=&?s0s8ThL=x^aW1C%L(mT?cEek-2$=yh_)4nnJ+7f?=<3 zD8xJYa70&Cbbr=;o@vQ>?qKhPd8*`jUMFwRc?{iUI!4}?^hdx}JJ*xCw@ZOGdtVCN z%r2Sog8=V`*+Hbl)QHkhfv$H`z7rB3IgL>So;&lB2*(IwwEF zuy6kBxXkQM#$%mp4S^OsL-9 z4B6_Ca5(7qh7{Po$i4(QS#3bx5{J#$4eX1^(M^naRZ@(vvv06(f=8p^*+F)a_d#7L zEI`Ai+Y*%%B$K-gfV}OL)hQ#o&$c2t+je#bDD5(Nwq0a5RhmhDy>p(1adKWaI0i{u zBo=Rl0xL~c$pJd2?aXtIOZFobBRsjfy1G-JD3S9s&U(Mlhy9$5LnU?`w1J>wgtl!i zf*zyNBpgR3K%aRuoOu{X27xCS0Q+eDz*4JWW498#pc@V&YXC!cD0%s*~b^_-laBcz%37nU}ngrG+aDD>o z5?G(W1qp0O;KBqhO5oxIE=gcx0-F-poWNoNTN2osz@-UnOW?8uwkL3T0#_ukBY~X> z>`GvF0!!p$ffv#Rm7o?fgiIkz$QE*hTtN`>1dX5-@&%os7YYP}P$(1$#X^Z-6ik9y z5Cw~16-ou0P$t-ga-l+S2u{HzxCKe@2t9;Kp{GzK^b)Ft-a;Rtuh38EFVqNU2?K<) zg@M93!XRO=Fhm$C)C$9d;ljDH74ZF0?K(0{`8&6D@=d>QaPn07Hhw5yi+A$F8ik?}Lp)LWFdRMlHcsxLC9~A2@JKn33XL@{ z!EpAx5Lv+vd!rh34zr258;bq|P-*|dX0b(VA2>@AS< zY-DeTjO1>}9G-{M(Jw&|I?8^{{=%ub9Ik*9ITz>VJX~L{mb-wvkekHK<>qq$$buP2A1gtpMsL0IFL7n%e=EA8;q&taLVL`~?0YelmXeGB_bJ7;3tx3Br?V+@1(q2v5opvnkc-psVKc)SW_FLK?=_s8^=hD;C zRp}Y&+3C6IBh#m*`_fy|W9f6#N&15HMd@qPH>BU0eqZ`i>93~mOy8BhCw*V~;q))k ze^9AaIjRCxsj5s>uBue^SB+AQRgF`PS2e1Fs<>)_YPsra)lI6~RS&2hSG}k@rWVv1 zb-r4sE>IV$i`7Q8N!>?1K|NdDroK!)501|*P%lz1Q7==k$|%fmX7tMFlhH4uCSz2_ z-kc^cs z+A?jq)}eK2C2bFFPwjZ^MC~N)WbIUKqt>hSY5m%H+FP~jwHvjYwExlGsl8kKfc9PO z5$z}1Pqm+Ezkq0+oiF5T^84oZ&p#`FK>on|LHR@ShvrYopPN5FKasyMe{ufO{N?%U z^H1n_omOYjNxHteA-eN*<8?k=NVi0{Ot(t6Mt8k#t?nk>zje3h*6B9rZqwbayF+)E z?jGHJy4Q5?>2~S%==SOM>kjG*^=7?AU#c(Dm+KvRmtN9epr5Fpq@SXnrVr}l`Zj&L zeyRR>{TBU8`d9R?>EF=5rGH0%yue&wDJU%{D=05;6u1hcf?fq@7t|KC7jzWNEtp@B zC|FpqxL|3)s)98Iw-(%0@N>bh24uhn*1#Lm3@Ss0ABf zG1MB`4IPHLhWUnsVWDBMVX0xQVVhxxVW(l2VUJ;-VZY&^;ip2Tuy0}i!m|p`EctkvheA`7m7kf3yT&PEiGDJ zw4&(tqKAuKD0;EzaM97CV@019eOB~E(N{$$iZhCb77r^vw|GSH1;us6qlzyqZYXXp zURk`l_{!p|imxfYuK4=m8;Tz+-d4P$cxUmh;yuOtiuV`)P*PA*SW;Y4Qer9*OROcO zC1;mhS+b$z&XT7}UN6~S@~bh;XfPHTON|^X_tT7HS4m6H3 zjxmlkjyE82T`m?>deXj*JqYP!*MpXqVa7SpSyZKl1Z!=|IAW2WP# z&rM&Ni_J!}*=#YFn#;`PW{25j9&V1Bk!67H<{TiJQgU;$HDX z@qqY|__27zf-P2y&0@EdTO1abMY4D-=UUcSZm`^F`M2d3%R0+?%SOv4%k7r`Snjm! zwCu9%vFx+#w;Z$_vK+P?wR~&&-twd6XKSw2U^QDU)>3PkwcI+|I>tKII^H_bI>|c4 zI?X!W8nj+#z23UkdXx2L>#f%H){WLp)(5RmTi>%DvL3b`wH~t`xBgL@Tbfs@E!CA4 zlnyLCx3sZzW@)^1LFuB>C8f(s*O%T``atPJrH_BjAiCBOIc}ISy_46u(By-?PVQh zbIazJCCV0-EiT(!_Db1td%9h1&$MUTbM1L{t-X(Zj6H0>#2&TB?QQmUdxw3E{Vw~P z_V?`{*mv9a+CQ`(uzzI#xID95TV7RuPWidz=a-KxA60%~c|&=yd|vs|@@vc2mOoa$ zx%|oUr^}x$f4+Q6`H}LkE7B`$750jX3TK78!c$RMabd;mie(j-SFEg9U2$c_)fLxP zJYR93;=uU;TYq1!SSNwWyh+#mE&v2w~p@}KRSMP{Ob7K@uw3zStsvIcdDJ4&TMC{ zGta4Y>YN46LT9nl=rlVm&QfQYv)t)$x}1`;hqIrv#yP-wzO%tO(dl)*>)htt;oRxm z<=o@k=iKi+=se^+>^$l`<~;8F-1(*Rg!3Eccg`Q2KRJJK{^tC{gf`F?s&Nf)4RoFB+U45g z+UMHuI_Ns&I_x^?I_5g=`rP%U>xAnY*LSWTTtB&fasB4{!;RdGn{%hRRqhOTmOIBS zxHay4x87}V7r9H^Cb#Iex@~T|yTa{syWJjlrMt>q?e635=dN)Na1V43au0FWx`(^Z zbD!@X>8^K=c8_t7b&q#XbWd_maZhtkch7M9+%w&?+?Pm<#7SwAO3IM3q#Q|*G*Z5# zmkd&oR3e!qQL;)l$u3n$PRT8Kq)Mqus+RgnHPYGAAZe&HTpA&bltxKoq;b+jX|gm; z@=89bS-Mziky@pwG)HQeE|ca<3#7%;GHHdhTDnTQR=QrgQMy@LCvB8&m+qAAk?xls zk{*>dOHWD9O3zDMq?e>uq}QZ3q_?DZq<5ul(hg~-v`g9}?UVLP2c<*OVdF~Jc=~y2JOexfJ%c<$Jhh%WPrYZf=OWJ}&lHc}6Z5otR(P)U XJm`52$v<#E2D}Ph}dtUe-@1X&5 diff --git a/src/MacVim/MMPreferenceController.h b/src/MacVim/MMPreferenceController.h index 6c7679bedc..0e8deb39cb 100644 --- a/src/MacVim/MMPreferenceController.h +++ b/src/MacVim/MMPreferenceController.h @@ -17,9 +17,11 @@ // General pane IBOutlet NSPopUpButton *layoutPopUpButton; + IBOutlet NSButton *autoInstallUpdateButton; } // General pane - (IBAction)openInCurrentWindowSelectionChanged:(id)sender; +- (IBAction)checkForUpdatesChanged:(id)sender; @end diff --git a/src/MacVim/MMPreferenceController.m b/src/MacVim/MMPreferenceController.m index 2b1eab9417..5314ba8a50 100644 --- a/src/MacVim/MMPreferenceController.m +++ b/src/MacVim/MMPreferenceController.m @@ -86,8 +86,20 @@ - (IBAction)openInCurrentWindowSelectionChanged:(id)sender BOOL openInCurrentWindowSelected = ([[sender selectedCell] tag] != 0); BOOL useWindowsLayout = ([[layoutPopUpButton selectedItem] tag] == MMLayoutWindows); - if (openInCurrentWindowSelected && useWindowsLayout) - [layoutPopUpButton selectItemWithTag:MMLayoutTabs]; + if (openInCurrentWindowSelected && useWindowsLayout) { + [[NSUserDefaults standardUserDefaults] setInteger:MMLayoutTabs forKey:MMOpenLayoutKey]; + } +} + +- (IBAction)checkForUpdatesChanged:(id)sender +{ + // Sparkle's auto-install update preference trumps "check for update", so + // need to make sure to unset that if the user unchecks "check for update". + NSButton *button = (NSButton *)sender; + BOOL checkForUpdates = ([button state] != 0); + if (!checkForUpdates) { + [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"SUAutomaticallyUpdate"]; + } } @end