From 68bcbff7535aebda06601eadbbe3213800469e9a Mon Sep 17 00:00:00 2001 From: Jermolene Date: Fri, 21 Feb 2014 14:06:04 +0000 Subject: [PATCH 1/2] Rough and ready control over bitmap editor line width and colour Fixes #414 --- core/modules/widgets/edit-bitmap.js | 8 ++++++-- core/wiki/config/BitmapEditorColour.tid | 3 +++ core/wiki/config/BitmapEditorLineWidth.tid | 3 +++ .../tw5.com/tiddlers/widgets/EditBitmapWidget.tid | 14 +++++++++++--- 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 core/wiki/config/BitmapEditorColour.tid create mode 100644 core/wiki/config/BitmapEditorLineWidth.tid diff --git a/core/modules/widgets/edit-bitmap.js b/core/modules/widgets/edit-bitmap.js index 40f0e81aa..fd80ef1a3 100644 --- a/core/modules/widgets/edit-bitmap.js +++ b/core/modules/widgets/edit-bitmap.js @@ -16,6 +16,10 @@ Edit-bitmap widget var DEFAULT_IMAGE_WIDTH = 300, DEFAULT_IMAGE_HEIGHT = 185; +// Configuration tiddlers +var LINE_WIDTH_TITLE = "$:/config/BitmapEditor/LineWidth", + LINE_COLOUR_TITLE = "$:/config/BitmapEditor/Colour"; + var Widget = require("$:/core/modules/widgets/widget.js").widget; var EditBitmapWidget = function(parseTreeNode,options) { @@ -258,8 +262,8 @@ EditBitmapWidget.prototype.strokeMove = function(x,y) { // Redraw the previous image ctx.drawImage(this.currCanvas,0,0); // Render the stroke - ctx.strokeStyle = "#ff0"; - ctx.lineWidth = 3; + ctx.strokeStyle = this.wiki.getTiddlerText(LINE_COLOUR_TITLE,"#ff0"); + ctx.lineWidth = parseInt(this.wiki.getTiddlerText(LINE_WIDTH_TITLE,"3"),10); ctx.lineCap = "round"; ctx.lineJoin = "round"; ctx.beginPath(); diff --git a/core/wiki/config/BitmapEditorColour.tid b/core/wiki/config/BitmapEditorColour.tid new file mode 100644 index 000000000..7c3902acb --- /dev/null +++ b/core/wiki/config/BitmapEditorColour.tid @@ -0,0 +1,3 @@ +title: $:/config/BitmapEditor/Colour + +#ff0 \ No newline at end of file diff --git a/core/wiki/config/BitmapEditorLineWidth.tid b/core/wiki/config/BitmapEditorLineWidth.tid new file mode 100644 index 000000000..ba51e732c --- /dev/null +++ b/core/wiki/config/BitmapEditorLineWidth.tid @@ -0,0 +1,3 @@ +title: $:/config/BitmapEditor/LineWidth + +3 \ No newline at end of file diff --git a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid index 8dd1988ce..ecc0d8217 100644 --- a/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid +++ b/editions/tw5.com/tiddlers/widgets/EditBitmapWidget.tid @@ -1,7 +1,8 @@ -title: EditBitmapWidget -created: 201310241419 -modified: 201310300837 +created: 20131024141900000 +modified: 20140221140151790 tags: widget +title: EditBitmapWidget +type: text/vnd.tiddlywiki ! Introduction @@ -13,3 +14,10 @@ The content of the `<$edit-bitmap>` widget is ignored. |!Attribute |!Description | |tiddler |The tiddler to edit (defaults to the [[WidgetVariable: currentTiddler]]) | + +! Configuration + +The edit bitmap widget can be configured with these system tiddlers: + +* [[$:/config/BitmapEditor/LineWidth]] determines the line width: <$edit-text tiddler="$:/config/BitmapEditor/LineWidth" tag="input"/> +* [[$:/config/BitmapEditor/Colour]] determines the line width: <$edit-text tiddler="$:/config/BitmapEditor/Colour" tag="input" type="color"/> From 4ee277f41bd89a8c848d701f2d59f228674ddcdb Mon Sep 17 00:00:00 2001 From: Jermolene Date: Fri, 21 Feb 2014 14:27:49 +0000 Subject: [PATCH 2/2] Fix some missing translateables --- core/language/en-GB/Misc.multids | 4 ++++ core/ui/EditTemplate/fields.tid | 2 +- core/ui/SideBar/Open.tid | 3 ++- core/wiki/recentchanges.tid | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 core/language/en-GB/Misc.multids diff --git a/core/language/en-GB/Misc.multids b/core/language/en-GB/Misc.multids new file mode 100644 index 000000000..4ef066f63 --- /dev/null +++ b/core/language/en-GB/Misc.multids @@ -0,0 +1,4 @@ +title: $:/language/ + +RecentChanges/DateFormat: DDth MMM YYYY +CloseAll/Button: close all diff --git a/core/ui/EditTemplate/fields.tid b/core/ui/EditTemplate/fields.tid index 8f3c31af2..07ffb339a 100644 --- a/core/ui/EditTemplate/fields.tid +++ b/core/ui/EditTemplate/fields.tid @@ -10,6 +10,6 @@ tags: $:/tags/EditTemplate -
<> <$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/> <$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class="">add
+
<> <$edit-text tiddler="$:/temp/NewFieldName" tag="input" default="" placeholder={{$:/language/EditTemplate/Fields/Add/Name/Placeholder}} class="tw-edit-texteditor"/> <$button message="tw-add-field" param={{$:/temp/NewFieldName}} set="$:/temp/NewFieldName" setTo="" class=""><>
diff --git a/core/ui/SideBar/Open.tid b/core/ui/SideBar/Open.tid index 0629c4854..000d850c2 100644 --- a/core/ui/SideBar/Open.tid +++ b/core/ui/SideBar/Open.tid @@ -2,10 +2,11 @@ title: $:/core/ui/SideBar/Open tags: $:/tags/SideBar caption: {{$:/language/SideBar/Open/Caption}} +\define lingo-base() $:/language/CloseAll/ <$list filter="[list[$:/StoryList]]" history="$:/HistoryList" storyview="pop"> <$button message="tw-close-tiddler" class="btn-invisible btn-mini">× <$link to={{!!title}}><$view field="title"/> -<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini">close all +<$button message="tw-close-all-tiddlers" class="btn-invisible btn-mini"><> diff --git a/core/wiki/recentchanges.tid b/core/wiki/recentchanges.tid index e65c4afd1..e9999902f 100644 --- a/core/wiki/recentchanges.tid +++ b/core/wiki/recentchanges.tid @@ -2,7 +2,7 @@ title: $:/snippets/recentchanges <$list filter="[!is[system]has[modified]!sort[modified]limit[100]eachday[modified]]">
-<$view field="modified" format="date" template="DDth MMM YYYY"/> +<$view field="modified" format="date" template={{$:/language/RecentChanges/DateFormat}}/> <$list filter="[sameday{!!modified}!is[system]!sort[modified]]">
<$link to={{!!title}}>