From 120203a8e0bfec4d3ec9678febf81ed6f33de34d Mon Sep 17 00:00:00 2001
From: Jermolene <jeremy@osmosoft.com>
Date: Sat, 2 Aug 2014 11:58:55 +0100
Subject: [PATCH] Refactor sidebar tools tab
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It’s going to be like the tools tab of tiddler info
---
 core/ui/PageControls/language.tid  |  6 +++++-
 core/ui/SideBar/Tools.tid          | 29 ++++++++++++++++++++++++++++-
 themes/tiddlywiki/vanilla/base.tid | 11 ++++++++++-
 3 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/core/ui/PageControls/language.tid b/core/ui/PageControls/language.tid
index 1360a297c..b6afd1f7e 100644
--- a/core/ui/PageControls/language.tid
+++ b/core/ui/PageControls/language.tid
@@ -5,7 +5,9 @@ description: {{$:/language/Buttons/Language/Hint}}
 
 <$button popup=<<qualify "$:/state/popup/language">> title={{$:/language/Buttons/Language/Hint}} aria-label={{$:/language/Buttons/Language/Caption}} class=<<tw-config-toolbar-class>> selectedClass="tw-selected">
 <$list filter="[<tw-config-toolbar-icons>prefix[yes]]">
-<$transclude tiddler="$:/language/Flag"/>
+<span class="tw-image-button">
+<$image source="$:/language/Flag"/>
+</span>
 </$list>
 <$list filter="[<tw-config-toolbar-text>prefix[yes]]">
 <$text text={{$:/language/Buttons/Language/Caption}}/>
@@ -24,11 +26,13 @@ description: {{$:/language/Buttons/Language/Hint}}
 &nbsp;
 </$reveal>
 </span>
+<span class="tw-image-button">
 <$transclude subtiddler="$:/language/Flag">
 <$list filter="[all[current]field:title[$:/languages/en-GB]]">
 <$transclude tiddler="$:/core" subtiddler="$:/language/Flag"/>
 </$list>
 </$transclude>
+</span>
 <$view field="description">
 <$view field="name">
 <$view field="title"/>
diff --git a/core/ui/SideBar/Tools.tid b/core/ui/SideBar/Tools.tid
index 515bafed0..7e68c3935 100644
--- a/core/ui/SideBar/Tools.tid
+++ b/core/ui/SideBar/Tools.tid
@@ -3,6 +3,34 @@ tags: $:/tags/SideBar
 caption: {{$:/language/SideBar/Tools/Caption}}
 
 \define lingo-base() $:/language/ControlPanel/
+\define config-title()
+$:/config/PageControlButtons/Visibility/$(listItem)$
+\end
+
+<<lingo Basics/Version/Prompt>> <<version>>
+
+---
+
+<$set name="tw-config-toolbar-icons" value="yes">
+
+<$set name="tw-config-toolbar-text" value="yes">
+
+<$set name="tw-config-toolbar-class" value="">
+
+<$list filter="[all[shadows+tiddlers]tag[$:/tags/PageControls]!has[draft.of]]" variable="listItem">
+
+<$checkbox tiddler=<<config-title>> field="text" checked="show" unchecked="hide" default="show"> <$transclude tiddler=<<listItem>>/> <i class="tw-muted"><$transclude tiddler=<<listItem>> field="description"/></i></$checkbox>
+
+</$list>
+
+</$set>
+
+</$set>
+
+</$set>
+
+---
+
 <<lingo Tools/Import/Prompt>> <$browse/>
 
 ---
@@ -11,7 +39,6 @@ caption: {{$:/language/SideBar/Tools/Caption}}
 
 ---
 
-<<lingo Basics/Version/Prompt>> <<version>>
 
 ---
 
diff --git a/themes/tiddlywiki/vanilla/base.tid b/themes/tiddlywiki/vanilla/base.tid
index a98b533fd..9aa2b7255 100644
--- a/themes/tiddlywiki/vanilla/base.tid
+++ b/themes/tiddlywiki/vanilla/base.tid
@@ -282,7 +282,7 @@ button svg, button img {
 	color: <<colour sidebar-muted-foreground-hover>>;
 }
 
-.tw-image-button {
+button svg.tw-image-button, button .tw-image-button img {
 	height: 1em;
 	width: 1em;
 }
@@ -872,6 +872,15 @@ canvas.tw-edit-bitmapeditor  {
 	padding: 0 14px 0 14px;
 }
 
+.tw-drop-down svg {
+	width: 1em;
+	height: 1em;
+}
+
+.tw-drop-down img {
+	width: 1em;
+}
+
 .tw-drop-down a, .tw-drop-down button {
 	display: block;
 	padding: 0 14px 0 14px;