From 05e6c7b33f8bbade08222267c52e2baf08377a30 Mon Sep 17 00:00:00 2001 From: abakkk Date: Wed, 27 Mar 2019 00:59:48 +0100 Subject: [PATCH] reinstate fill and change dashed shortcut --- draw.js | 13 ++++++++----- extension.js | 1 + locale/draw-on-your-screen.pot | 12 +++++++++--- prefs.js | 1 + schemas/gschemas.compiled | Bin 3080 -> 3140 bytes ...extensions.draw-on-your-screen.gschema.xml | 7 ++++++- 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/draw.js b/draw.js index fa5ca6f..f2e52b0 100644 --- a/draw.js +++ b/draw.js @@ -170,13 +170,11 @@ var DrawingArea = new Lang.Class({ } if (button == 1) { - this._startDrawing(x, y, false, shiftPressed); + this._startDrawing(x, y, shiftPressed); return Clutter.EVENT_STOP; } else if (button == 2) { this.toggleShape(); } else if (button == 3) { - /*this._startDrawing(x, y, true, shiftPressed); - return Clutter.EVENT_STOP;*/ this.menu.open(x, y); return Clutter.EVENT_STOP; } @@ -231,7 +229,7 @@ var DrawingArea = new Lang.Class({ return Clutter.EVENT_STOP; }, - _startDrawing: function(stageX, stageY, fill, eraser) { + _startDrawing: function(stageX, stageY, eraser) { let [success, startX, startY] = this.transform_stage_point(stageX, stageY); if (!success) @@ -248,7 +246,7 @@ var DrawingArea = new Lang.Class({ color: this.currentColor.to_string(), line: { lineWidth: this.currentLineWidth, lineJoin: this.currentLineJoin, lineCap: this.currentLineCap }, dash: { array: this.dashedLine ? this.dashArray : [0, 0] , offset: this.dashedLine ? this.dashOffset : 0 }, - fill: fill, + fill: this.fill, eraser: eraser, transform: { active: false, center: [0, 0], angle: 0, startAngle: 0, ratio: 1 }, text: '', @@ -424,6 +422,11 @@ var DrawingArea = new Lang.Class({ this.selectShape((this.currentShape == Object.keys(Shapes).length - 1) ? 0 : this.currentShape + 1); }, + toggleFill: function() { + this.fill = !this.fill; + this.emitter.emit('show-osd', this.fill ? _("Fill") : _("Stroke"), null); + }, + toggleDash: function() { this.dashedLine = !this.dashedLine; this.emitter.emit('show-osd', this.dashedLine ? _("Dashed line") : _("Full line"), null); diff --git a/extension.js b/extension.js index 6ff4f77..176c37d 100644 --- a/extension.js +++ b/extension.js @@ -150,6 +150,7 @@ var AreaManager = new Lang.Class({ 'toggle-linejoin': this.activeArea.toggleLineJoin.bind(this.activeArea), 'toggle-linecap': this.activeArea.toggleLineCap.bind(this.activeArea), 'toggle-dash' : this.activeArea.toggleDash.bind(this.activeArea), + 'toggle-fill' : this.activeArea.toggleFill.bind(this.activeArea), 'select-none-shape': () => this.activeArea.selectShape(Draw.Shapes.NONE), 'select-line-shape': () => this.activeArea.selectShape(Draw.Shapes.LINE), 'select-ellipse-shape': () => this.activeArea.selectShape(Draw.Shapes.ELLIPSE), diff --git a/locale/draw-on-your-screen.pot b/locale/draw-on-your-screen.pot index 47f3a3c..a9615d9 100644 --- a/locale/draw-on-your-screen.pot +++ b/locale/draw-on-your-screen.pot @@ -43,6 +43,12 @@ msgstr "" msgid "Text" msgstr "" +msgid "Fill" +msgstr "" + +msgid "Stroke" +msgstr "" + msgid "Dashed line" msgstr "" @@ -81,9 +87,6 @@ msgstr "" msgid "Smooth" msgstr "" -msgid "Fill" -msgstr "" - msgid "Dashed" msgstr "" @@ -148,6 +151,9 @@ msgstr "" msgid "Unselect shape (free drawing)" msgstr "" +msgid "Select fill/stroke" +msgstr "" + msgid "Change font family (generic name)" msgstr "" diff --git a/prefs.js b/prefs.js index adca46c..643bfe7 100644 --- a/prefs.js +++ b/prefs.js @@ -56,6 +56,7 @@ var INTERNAL_KEYBINDINGS = { 'select-rectangle-shape': "Select rectangle", 'select-text-shape': "Select text", 'select-none-shape': "Unselect shape (free drawing)", + 'toggle-fill': "Select fill/stroke", '-separator-3': '', 'toggle-font-family': "Change font family (generic name)", 'toggle-font-weight': "Change font weight", diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled index dfce124bc6d9c4dd8dc2e7db0ed13bc53f71b76d..6645b28b84262d3cc1ca01aba32b9b08235c0a7f 100644 GIT binary patch literal 3140 zcmZuzU1%It6rO5gV{4N%t<|(qliJ!%VRlW^w27p#)%3@zkPs@t2h-V|ySvlO&a5+& z-)bl-TJQ(yi$NN+2>w8!0k!nOpY%n7P|S;3@g)Ht6tuM9gHW`7-_4!fnRFMvd|%F- zJ@?#m&poq;pEEqmZ~{$z?gtMp>%<+(whCOeIN3qwv!r%JI}J`$Yg+Zansy7HefPki zJ)`Xh_X4h$OXeK6Ad-Gw*mhEk2g30!*YT64XN>8tqffXap6+KnAsl{JOYD?X`487- zK17wmUEno9El>wE02=_Lq-_GY7h*H81$Yo>iC`=A!wTEL+krj!#O9BRfn4n75>6QYg&)D5stgJ*!j>5CuHPR)E~!IyzEx0b%7 zoq8?o3*aT-po&k;_}9Vp*wH)s^H=CkT?czJxDA+kZT2kf)QzzBfi2*WibKsfbw zg>k59KMg($*!@F~(@xF&FM)pmuK)CAKkd}DurGpd05cc1y0lZXZfyJp;Dv85+q6@& z-xA<1;QhBwUZb6w=h6o@fWHgPG7dH46v3|p!#CTT=ua)r5&RkO-dFvzv{SP`=fFP# zTN*!*{X@SoyU;0fTv z;}^5EQ`7%l@HwDv@-f+O)Xeh|_-kM;Yw^lUP5T0DOTe$6w8;HZbHCTYt2nDR|NJlg zsafZG@HSxGpH1J;PR(=g1ar1={?r3^0tlhq2XK~fvvt6B0Ih;EUY<{A-_mSa5500W zaULP8#<_zd)i{eD0$KsixCej)umj-1;M&UB#97t|Yy>#FIMbQ|Q(%x5gcIntOyNb5k}rysd{Lyz zFN#!!7ez|be3f_B#b*6r!WOZ-EtPjPr(N-Uc9rwl73Sj!Q}#)zUflzED;xAo;^bHc z70$yx4Toj(^F|RXm;Aj7>$XRpqyFt>@AhzA?$L5`d>@*^9}e6icf(I29WE+Qbme+> zxSla8bi>#E(Hy^3%Eu3%N6uz<)$UH0A`=HnKHvs_gihX~3Zu8LQw(e#4r$y12L z?=x~@sMj5HFg79uls(cB@k1URx}2yS@!M><3;oBTCsjt*}p6F7oOn@U7bGt57e4yOIv*=yNb)O@ZDkC$Qps;v?Mr#!N15!j((^-Ym`9O=!jCqqh!j`$oruSg zw=ioIEPDd0Mb^v4{Y=A;&m(Nqa!t(CNZS63BZh}=_JmQ&%L&h;;JQKnwmDSt6Zo!; zQOt0dW%4pd^O;m}Dit;AhyFTXhIy$|4KS2cAxi57@%#AqLyst-r1J(l@0F)y(0rx4eKjmnEw;9-?a6k9~pb6LtY%jtNXkw=VYrOQ` zs@K>pPK#@cm^2$tF@8w z)a&8Tfv*8QDxRA0i{Ls8%2Udxrr!kK2fTOZ+84}2T?4-ltOIom?mzUYH^4suJ_GDm zd8mVWz%#%BVEVc9r|45x!k-5(0+Rd~V)W;QcTAFEgH+>#!Gm4EW&f zleg$ov(6m&G*FfNbQOK-P4K6{7lA*rO+h`>tY-%N1MrUa!d1pob3M$1ZvtByJ__cS zn)AB|=K1A2>9i#^%e3Wj$IKr}oqevE)!p%~<47ITy=G5ZGUaQwV@u7;=sAf7@Pu)> z(zujkIc~D(|7ZFJl2LS0tZgVx8-%wM=RfWWJh8#Tp7QaLP}oypJHBd1 zO~|008cw^;h;86iJYn3RigTsm6#JcrGUkxqHGxs&_BA9vIJgLdZLW=(hMy_PgK;@D zGU&T{%E!e1*DG4qaf6*7w%@0xe-xhk%(o^-Etz3S?JCns%eDy$;( WL;B(Sj`|-vret4CC_h*=Li`I!LCtvp 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 57c0d1c..770e394 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 @@ -117,10 +117,15 @@ toggle linecap - ["<Primary>a"] + ["<Primary>period"] toggle dash toggle dash + + ["<Primary>a"] + toggle fill + toggle fill + KP_1','1']]]> select color1