[dasher] Tweaks to control boxes.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher] Tweaks to control boxes.
- Date: Thu, 21 Apr 2016 14:07:46 +0000 (UTC)
commit 15cd0b6c9af3c6a83ac54542d41eb2ae9d11a39f
Author: Ada Majorek <amajorek google com>
Date: Tue Mar 8 23:02:45 2016 -0800
Tweaks to control boxes.
Shorter names in ASCII boxes. Made delete previous paragraph in speak
box work better on windows
Data/control/control.all.txt.xml | 38 +++++++++++-----------
Data/control/control.edit.txt.xml | 24 +++++++-------
Data/control/control.prepared_speech.txt.xml | 12 ++++----
Data/control/control.speak.txt.xml | 42 +++++++++++++------------
Data/control/control.speak.xml | 14 +++++----
Data/control/control.xml | 30 +++++++++---------
Data/control/text-control.sh | 6 ++--
7 files changed, 85 insertions(+), 81 deletions(-)
---
diff --git a/Data/control/control.all.txt.xml b/Data/control/control.all.txt.xml
index d448458..a77137a 100644
--- a/Data/control/control.all.txt.xml
+++ b/Data/control/control.all.txt.xml
@@ -23,13 +23,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -47,7 +47,7 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="no" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -57,7 +57,7 @@
<node name="CTL_MOVE_FORWARD" label="=>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="yes" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -75,13 +75,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -105,13 +105,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -129,7 +129,7 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="no" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -139,7 +139,7 @@
<node name="CTL_DELETE_FORWARD" label="x>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="yes" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -157,13 +157,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -206,12 +206,12 @@
<alph/>
<root/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<copy what="sentence"/>
<alph/>
<root/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<copy what="paragraph"/>
<alph/>
<root/>
@@ -251,13 +251,13 @@
<alph/>
<root/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<speak what="sentence"/>
<move forward="yes" dist="sentence"/>
<alph/>
<root/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<alph/>
@@ -281,7 +281,7 @@
<!--
<node label="utf symbols" color="241">
- <node label="🔇💬🔊🔉🔈↻┅Line╍⭙Sentence"
color="242">
+ <node label="🔇💬🔊🔉🔈↻┅Line╍⭙Sent."
color="242">
<alph/>
<root/>
</node>
@@ -293,11 +293,11 @@
<alph/>
<root/>
</node>
- <node label="Copy📁💾✘✂⚠☰┅Word●Letter" color="242">
+ <node label="Copy📁💾✘✂⚠☰┅Word●Char" color="242">
<alph/>
<root/>
</node>
- <node label="Copy📁💾✘✂⚠☰┅Word●Letter" color="242">
+ <node label="Copy📁💾✘✂⚠☰┅Word●Char" color="242">
<alph/>
<root/>
</node>
diff --git a/Data/control/control.edit.txt.xml b/Data/control/control.edit.txt.xml
index f943c66..19f172b 100644
--- a/Data/control/control.edit.txt.xml
+++ b/Data/control/control.edit.txt.xml
@@ -17,13 +17,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -35,7 +35,7 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="no" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -45,7 +45,7 @@
<node name="CTL_MOVE_FORWARD" label="=>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="yes" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -57,13 +57,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -87,13 +87,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -105,7 +105,7 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="no" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -115,7 +115,7 @@
<node name="CTL_DELETE_FORWARD" label="x>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="yes" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -127,13 +127,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
diff --git a/Data/control/control.prepared_speech.txt.xml b/Data/control/control.prepared_speech.txt.xml
index 8424ead..fc04262 100644
--- a/Data/control/control.prepared_speech.txt.xml
+++ b/Data/control/control.prepared_speech.txt.xml
@@ -10,12 +10,12 @@
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="no" dist="paragraph"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="no" dist="sentence"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
@@ -24,12 +24,12 @@
<node name="CTL_MOVE_FORWARD" label="=>" color="-1">
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="yes" dist="sentence"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="yes" dist="paragraph"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
@@ -54,13 +54,13 @@
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<speak what="sentence"/>
<move forward="yes" dist="sentence"/>
<ref name="CTL_MOVE"/>
<ref name="CTL_SPEAK"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<ref name="CTL_MOVE"/>
diff --git a/Data/control/control.speak.txt.xml b/Data/control/control.speak.txt.xml
index 603d2e6..3fe2fac 100644
--- a/Data/control/control.speak.txt.xml
+++ b/Data/control/control.speak.txt.xml
@@ -12,13 +12,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -30,7 +30,7 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="no" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -40,7 +40,7 @@
<node name="CTL_MOVE_FORWARD" label="=>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="yes" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -52,13 +52,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -83,13 +83,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -101,7 +101,7 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="no" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -111,7 +111,7 @@
<node name="CTL_DELETE_FORWARD" label="x>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="yes" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -123,13 +123,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -168,23 +168,25 @@
<alph/>
<root/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<alph/>
- <node label="ClearParagraph" color="242">
- <delete forward="no" dist="paragraph"/>
- <delete forward="no" dist="char"/>
- <alph/>
- <root/>
- </node>
- <node name="CTL_SPEAK_PARAGRAPH2" label="SpeakParagraph" color="-1">
+ <node name="CTL_SPEAK_PARAGRAPH2" label="SpeakPara." color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_SPEAK_PARAGRAPH2"/>
<ref name="CTL_SPEAK"/>
</node>
+ <node label="ClearPara." color="242">
+ <!--Delete previous paragraph and CRLF characters. -->
+ <delete forward="no" dist="paragraph"/>
+ <delete forward="no" dist="char"/>
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <root/>
+ </node>
<ref name="CTL_SPEAK"/>
</node>
<node label="All" color="-1">
diff --git a/Data/control/control.speak.xml b/Data/control/control.speak.xml
index c9f4c47..5a8c989 100644
--- a/Data/control/control.speak.xml
+++ b/Data/control/control.speak.xml
@@ -172,12 +172,6 @@
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<alph/>
- <node label="⎚¶" color="242">
- <delete forward="no" dist="paragraph"/>
- <delete forward="no" dist="char"/>
- <alph/>
- <root/>
- </node>
<node name="CTL_SPEAK_PARAGRAPH2" label="🗣¶" color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
@@ -185,6 +179,14 @@
<ref name="CTL_SPEAK_PARAGRAPH2"/>
<ref name="CTL_SPEAK"/>
</node>
+ <node label="⎚¶" color="242">
+ <!--Delete previous paragraph and CRLF characters. -->
+ <delete forward="no" dist="paragraph"/>
+ <delete forward="no" dist="char"/>
+ <delete forward="no" dist="char"/>
+ <alph/>
+ <root/>
+ </node>
<ref name="CTL_SPEAK"/>
</node>
<node label="🗐" color="-1">
diff --git a/Data/control/control.xml b/Data/control/control.xml
index fd199f1..1ea2526 100644
--- a/Data/control/control.xml
+++ b/Data/control/control.xml
@@ -24,13 +24,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -42,7 +42,7 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="no" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -52,7 +52,7 @@
<node name="CTL_MOVE_FORWARD" label="=>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<move forward="yes" dist="char"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -64,13 +64,13 @@
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<move forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
<ref name="CTL_MOVE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<move forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_MOVE_BACKWARD"/>
@@ -95,13 +95,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="no" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="no" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -113,7 +113,7 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="no" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -123,7 +123,7 @@
<node name="CTL_DELETE_FORWARD" label="x>" color="-1">
- <node label="Letter" color="-1">
+ <node label="Char" color="-1">
<delete forward="yes" dist="char"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -135,13 +135,13 @@
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Sentence" color="-1">
+ <node label="Sent." color="-1">
<delete forward="yes" dist="sentence"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
<ref name="CTL_DELETE_FORWARD"/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<delete forward="yes" dist="paragraph"/>
<alph/>
<ref name="CTL_DELETE_BACKWARD"/>
@@ -180,17 +180,17 @@
<alph/>
<root/>
</node>
- <node label="Paragraph" color="-1">
+ <node label="Para." color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<alph/>
- <node label="ClearParagraph" color="242">
+ <node label="ClearPara." color="242">
<delete forward="no" dist="paragraph"/>
<delete forward="no" dist="char"/>
<alph/>
<root/>
</node>
- <node name="CTL_SPEAK_PARAGRAPH2" label="SpeakParagraph" color="-1">
+ <node name="CTL_SPEAK_PARAGRAPH2" label="SpeakPara." color="-1">
<speak what="paragraph"/>
<move forward="yes" dist="paragraph"/>
<alph/>
diff --git a/Data/control/text-control.sh b/Data/control/text-control.sh
index 4b1ed59..de42b6a 100644
--- a/Data/control/text-control.sh
+++ b/Data/control/text-control.sh
@@ -10,11 +10,11 @@
s/⇨/=\>/g
s/🗐/All/g
s/🗏/Page/g
- s/¶/Paragraph/g
- s/.⁉/Sentence/g
+ s/¶/Para./g
+ s/.⁉/Sent./g
s/━/Line/g
s/⬬/Word/g
- s/•/Letter/g
+ s/•/Char/g
s/⦻/Delete/g
s/⌫/\<x/g
s/⌦/x\>/g
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
