From a1ce4aaf79007d65c4b4fb121cbceab916ec133b Mon Sep 17 00:00:00 2001 From: abakkk Date: Thu, 6 Aug 2020 00:26:10 +0200 Subject: [PATCH] Add font family reversed switching --- area.js | 7 +++++-- extension.js | 3 ++- locale/draw-on-your-screen.pot | 5 ++++- prefs.js | 3 ++- schemas/gschemas.compiled | Bin 4440 -> 4544 bytes ...extensions.draw-on-your-screen.gschema.xml | 5 +++++ 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/area.js b/area.js index aad49e2..2684308 100644 --- a/area.js +++ b/area.js @@ -930,9 +930,12 @@ var DrawingArea = new Lang.Class({ `${_(FontStyleNames[this.currentFontStyle])}`, "", -1, false); }, - switchFontFamily: function() { + switchFontFamily: function(reverse) { let index = Math.max(0, this.fontFamilies.indexOf(this.currentFontFamily)); - this.currentFontFamily = (index == this.fontFamilies.length - 1) ? 0 : this.fontFamilies[index + 1]; + if (reverse) + this.currentFontFamily = (index == 0) ? this.fontFamilies[this.fontFamilies.length - 1] : this.fontFamilies[index - 1]; + else + this.currentFontFamily = (index == this.fontFamilies.length - 1) ? this.fontFamilies[0] : this.fontFamilies[index + 1]; if (this.currentElement && this.currentElement.font) { this.currentElement.font.family = this.currentFontFamily; this._redisplay(); diff --git a/extension.js b/extension.js index b0f964d..a253683 100644 --- a/extension.js +++ b/extension.js @@ -215,7 +215,8 @@ var AreaManager = new Lang.Class({ 'toggle-background': this.activeArea.toggleBackground.bind(this.activeArea), 'toggle-grid': this.activeArea.toggleGrid.bind(this.activeArea), 'toggle-square-area': this.activeArea.toggleSquareArea.bind(this.activeArea), - 'switch-font-family': this.activeArea.switchFontFamily.bind(this.activeArea), + 'reverse-switch-font-family': this.activeArea.switchFontFamily.bind(this.activeArea, true), + 'switch-font-family': this.activeArea.switchFontFamily.bind(this.activeArea, false), 'switch-font-weight': this.activeArea.switchFontWeight.bind(this.activeArea), 'switch-font-style': this.activeArea.switchFontStyle.bind(this.activeArea), 'switch-text-alignment': this.activeArea.switchTextAlignment.bind(this.activeArea), diff --git a/locale/draw-on-your-screen.pot b/locale/draw-on-your-screen.pot index 7ff6129..15ef699 100644 --- a/locale/draw-on-your-screen.pot +++ b/locale/draw-on-your-screen.pot @@ -218,7 +218,10 @@ msgstr "" msgid "Toggle fill rule" msgstr "" -msgid "Change font family (generic name)" +msgid "Change font family" +msgstr "" + +msgid "Change font family (reverse)" msgstr "" msgid "Change font weight" diff --git a/prefs.js b/prefs.js index 91abf81..8ff013d 100644 --- a/prefs.js +++ b/prefs.js @@ -70,7 +70,8 @@ var INTERNAL_KEYBINDINGS = { 'switch-linecap': "Change linecap", 'switch-dash': "Dashed line", '-separator-4': '', - 'switch-font-family': "Change font family (generic name)", + 'switch-font-family': "Change font family", + 'reverse-switch-font-family': "Change font family (reverse)", 'switch-font-weight': "Change font weight", 'switch-font-style': "Change font style", 'switch-text-alignment': "Toggle text alignment", diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled index e05b0aa63b886a48c11c13eb10504ac5d338bd82..92584ee8996575d7c52df4ad18a835ea688069e0 100644 GIT binary patch literal 4544 zcmZ`-TWl3o6rCz4Z(0y6rD{cx@|d=l(ozsh)d~eQDQPf`QR(!~>Alm=of&54_5~83 z5n@P;F_9055EDgX0>&2*2=GTtOfZ^=CPqj!Ax2I8Q4AukHFM^1OTEcr?OC&DpL6zk z?Xu}f%{4U3SLCk}+#TArw@9rFJn7PC6PfSoln!MNwc8bC@;pVkf!~P=2+HHiDezgq zc5`((%PxpIFE329P7M3P@(kPZ>U38dQf*5ev5T(iWnCdGeyh|z5Rjs<9kzWNFa?+j zOarE;Favgk*|6FCTnThZnGY`ACpY|N+ z&x2n9jy`d47j@c`puY}20&J9VXfw`n@I~PFPwHNzKW*w)!2bY~Gw)8LPJ2G|N+f?7 zut~q&!b=uU=gRcPPo2Oi3yRMy=fU3r1J@d>sne!D1}?*5J@3EvF?HJ1E5R9H z+m2uFr%rnw^bT+jQ1#Rzn>uaw#{s_p?A}uS6Ls3`&wlXtz&Ag4jZ&x0agBk?uqh56 z4dc*eoO19YpmFc4)AXm!{(xtIy?{l4j4OP-k?A2pr7EDnGmYJy-uC>EckbTp9VhsVqYb7 z+8nO~J^*y@|Lh&=v^np`z~_Lria-CLPMdKqfG-12uTf7@r_DTH1y6{?(mehsu1z~A|0 zuwQ6X?*wbWTc@@jqd#rN9|rFO`WrR{`-nE@nM6UzCGS4u^;-^lsq*>?Fm=&geqI5|3jwV zy1uLE2)9*WHc~NN3|_Nxrck}S=7_K(aeNm`GUXg32^U)Y9_=?LPt8&L>HP5SOZ%@$ zp4Lp{-!jg>CGl^W$e(vII3Wcb;<+Gkt7IwXu-URFHucSF%QLq}cn^2|j1 z9*Hw-9p_h&jL-=yBq!89!xV|1oHs+x+ntEP+Mym`O*0u_eX$Z)0&wkM+hHGYPldG! z>xEkZ=4~0U0$@%!PX5Y(NdT_tlKP12q6%Q`vJR*OYJmoTH4N*iIe-dqo#PnBc*6Q; zIXDC03c;RHl=}eIO01<=&(r|(0oGJYfjWTo7V9Y65tiz>qEEQO$_fusl8>xiC}x*E;>JG*hNq6_iU@wuM<EN7-hm&Re`LyV~KFnj*|3&ds8A^SL=H{bf|HHPtO*hlann-^l9| zMbkGNb0ld@^L%V`Zy-^k>5N{?TiO<6Mb2w{z^2bvU7oLob@SAw+kZ&cZ)(UfF|p-K z(wPs|MU?pXd$V+$bjoT@5^o@SAMO{&Hb>Hd;y6X=XIQ$C)qLA6&2n%*O|(YUg6$%y zaU7Yb^m46EXR2W98n$ZUpSqBA<<9hgEgKs_4mkFAqVZ^0&sw}wz}MZ+ixIFAmsvvj%+)>aIb&#pkK9%QX|nk>l=@<4)H#yf0%v qEc{IJl!@z(aQg*i6YtTq|ElC^)j0ox;kww0@%5H?X63kKzW)OPC^M@7 literal 4440 zcmaJ_e~4UH8GX^jZkw7+8k26et8Q!3Oj6(MY<4%|&JpJf?8?U+ zXWbUZxrM*UO%R+fI#0q*11hYQYJqBqQdAedUlL2P2qLM1s8kKTMOOuGTeU(rs)RxW z{H;?wpiTA<+xsYhW;D8BiMtFoz-|QC^kx95I9q{jKo4-Agj5J;4{E> zUgf=5_?x+A3pE5&@JxHB=3-lwfCxE%~VI7Bj1N0{Bv%vJ(*M3BQ@=egs!u|y4{h&9b zPJTD^OR&ENUO4gEEOm1FUxU2?{OmX1>ZVT4Ji9OfL%>^KJGGwkPQDKM7;FSwKkwh7 zKY0QA8Q8ahnW7k=PJR#c71;NI&n>ocgz6e+(Qp{^Zmz!CnRSKK#=I^e5-It-#&{ju?M( z`WMzaP8k^6^!FR|C+GN#!A=5?8-H@05A12+sL{!FKCl;obptQm#W>_!5$6i*pMbCI zb6=-U&h>U3cFo<`Zy!9hojN(kzZ-TJaO#Jg2K@-^958){=Ox%b0RKArMwvSKM(8WB{{+@7T%Dp$&i&GbqO$|I5`Xg* z>f~&91a=bm>YJB+>g4QK9kvbJx9x{dQzu^w{WR=%fSxaR_B%Pp=LOiG1BKw}CHj-I z-M3(W1#DbCp!X3u+r0|=4p6uj{+s^f9G~m3H-XlnV;88Cb3GSOFz*M3-rM{lb#m$> zuoJ-V|2nlyot*3N1nfy5sq^Hl^D*p`1;-iu#)eH3$FVMdls1g zaIlyDSM4xn^aQ-ZYvTvapJZwa3~3V<{g{}Wy1^GqYCatFWMEWTFnsVXs+kWTF?+UK2yJgQ*}8Tk9z0@y>+_*edi(-Sn(#jnmB%}iNV)F zg)b_x>&rm6QQd2bG@ftrio6BkdXWi}wHGDdcOnETiNNfw_L{~|1~_qcMO~0LqUKEQ^M)R4H40H0umYridH?}E*8t)fX5zWU+&mvnW&g_ah zV^mST3J0j=+a1Wl4>%jP>3C*2n6U7F#E(Z0PPLjM9Ic}AT9en1VW>hkR?4^HR`Tn2xGK-V%zrTPH+jx@mHAqzT0vF!&T3~S$)mG;XBAd}-U=PZ zG#@jti)Q`WdGL;t`XTS3?9)(^hwaaMknKO5eHu>uMd(GsO@}u(z9K)qdgyqs;-4LN zZ}w?#5?AlLW+-MwD1wTJQvZr-G(41eYvOcZUeH#>-IvAPm&7%Tmm9U>VQr;x=accZ z*4T*kJ;rM!^Bzg#S?;_art#pvKl`+Qm4Aq8;RP&Ix>{Jj3-ft2mEX>)isjeJ`-LKs z%fc*PJC7yfR~7$VH{6B_JKHzQ)T|$*Kh>IvL$4A$y`91CEWD~0oufZvSv*@voV`qAbi&gs%}+P=G_Gu$rZ5%1K8j6yX2au>P!lfBtpBmzWxifE6i#cN1Zn;a6Ayjv1NaUt0l3!V zUZbCX`t8a3#y9U)pa}5qvw#b*{;mU1RuGK${?7aN9@ymldoOtM{@n%6vtuoQ>#M^f zk8f#~I=+YbKIWSkhq8VH^DWF8gr|>w598Y8+z*t2Zs0+H|0hrYa6Q*=W4_UM0^0%B z``v&!13E*tdR(O$hfw6_-|X3CGmd84MA&U1?meOK5Ey^ycm^hp463r?#W;9#tHM6- rSp#dh5F~3c7pHCFB=@Ump_cpJC+^E diff --git a/schemas/org.gnome.shell.extensions.draw-on-your-screen.gschema.xml b/schemas/org.gnome.shell.extensions.draw-on-your-screen.gschema.xml index 36065fa..4fe2746 100644 --- a/schemas/org.gnome.shell.extensions.draw-on-your-screen.gschema.xml +++ b/schemas/org.gnome.shell.extensions.draw-on-your-screen.gschema.xml @@ -226,6 +226,11 @@ switch font family switch font family + + ["<Primary><Shift>f"] + switch font family (reverse) + switch font family (reverse) + ["<Primary>w"] switch font weight