[dasher: 165/217] More control boxes and named settings.
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 165/217] More control boxes and named settings.
- Date: Sat, 27 Feb 2016 12:14:11 +0000 (UTC)
commit 122c189b8bbf2d31a4c034a02107552e1bc2a604
Author: Ada Majorek <amajorek google com>
Date: Thu Jan 7 16:09:06 2016 -0800
More control boxes and named settings.
fixes https://github.com/ipomoena/dasher/issues/65 and
https://github.com/ipomoena/dasher/issues/66
Data/Makefile.am | 2 +-
Data/control/Makefile.am | 10 ++-
Data/control/control.prepared_speech.xml | 86 ++++++++++++++++++++++++++++
Data/settings/Makefile.am | 5 ++
Data/settings/settings.direct.xml | 11 ++++
Data/settings/settings.edit.xml | 11 ++++
Data/settings/settings.prepared_speech.xml | 9 +++
Data/settings/settings.speak.xml | 13 ++++
8 files changed, 143 insertions(+), 4 deletions(-)
---
diff --git a/Data/Makefile.am b/Data/Makefile.am
index d56cc17..da4de15 100644
--- a/Data/Makefile.am
+++ b/Data/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = training alphabets colours control GUI Help
+SUBDIRS = training alphabets colours control settings GUI Help
desktopdir = $(datadir)/applications
desktop_in_files = dasher.desktop.in
diff --git a/Data/control/Makefile.am b/Data/control/Makefile.am
index 370d0f3..7c4de42 100644
--- a/Data/control/Makefile.am
+++ b/Data/control/Makefile.am
@@ -1,3 +1,7 @@
-pkgdata_DATA = control.xml control.411.xml control.speak.xml control.edit.xml control.all.xml control.dtd
-
-EXTRA_DIST = control.xml control.411.xml control.speak.xml control.edit.xml control.all.xml control.dtd
+dist_pkgdata_DATA = control.dtd \
+ control.xml \
+ control.411.xml \
+ control.all.xml \
+ control.edit.xml \
+ control.speak.xml \
+ control.prepared_speech.xml
diff --git a/Data/control/control.prepared_speech.xml b/Data/control/control.prepared_speech.xml
new file mode 100644
index 0000000..f2f3757
--- /dev/null
+++ b/Data/control/control.prepared_speech.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<nodes>
+
+ <node name="CTL_SPEAK" label="🗣" color="241">
+ <alph/>
+
+ <node label="¶" color="-1">
+ <speak what="paragraph"/>
+ <ref name="CTL_SPEAK"/>
+ <node label="⇨¶" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <ref name="CTL_SPEAK"/>
+ <root/>
+ </node>
+ </node>
+ <node label=".⁉" color="-1">
+ <speak what="sentence"/>
+ <ref name="CTL_SPEAK"/>
+ <node label="⇨.⁉" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <ref name="CTL_SPEAK"/>
+ <root/>
+ </node>
+ </node>
+
+ <node label="🔃" color="241">
+ <speak what="repeat"/>
+ <ref name="CTL_SPEAK"/>
+ <root/>
+ </node>
+ <node label="🛇" color="241">
+ <speak what="cancel"/>
+ <ref name="CTL_SPEAK"/>
+ <root/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE" label="✢" color="-1">
+ <node name="CTL_MOVE_BACKWARD" label="⇦" color="-1">
+ <node label="🗐" color="-1">
+ <move forward="no" dist="all"/>
+ <ref name="CTL_SPEAK"/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="¶" color="-1">
+ <move forward="no" dist="paragraph"/>
+ <ref name="CTL_SPEAK"/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label=".⁉" color="-1">
+ <move forward="no" dist="sentence"/>
+ <ref name="CTL_SPEAK"/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+ <node name="CTL_MOVE_FORWARD" label="⇨" color="-1">
+
+ <node label=".⁉" color="-1">
+ <move forward="yes" dist="sentence"/>
+ <ref name="CTL_SPEAK"/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="¶" color="-1">
+ <move forward="yes" dist="paragraph"/>
+ <ref name="CTL_SPEAK"/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ <node label="🗐" color="-1">
+ <move forward="yes" dist="all"/>
+ <ref name="CTL_SPEAK"/>
+ <ref name="CTL_MOVE_BACKWARD"/>
+ <ref name="CTL_MOVE_FORWARD"/>
+ </node>
+ </node>
+
+
+ </node>
+
+</nodes>
+
diff --git a/Data/settings/Makefile.am b/Data/settings/Makefile.am
new file mode 100644
index 0000000..8879642
--- /dev/null
+++ b/Data/settings/Makefile.am
@@ -0,0 +1,5 @@
+dist_pkgdata_DATA = settings.dtd \
+ settings.direct.xml \
+ settings.edit.xml \
+ settings.prepared_speech.xml \
+ settings.speak.xml
diff --git a/Data/settings/settings.direct.xml b/Data/settings/settings.direct.xml
new file mode 100644
index 0000000..d9d052a
--- /dev/null
+++ b/Data/settings/settings.direct.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE settings SYSTEM "settings.dtd">
+<settings>
+<long name="AppStyle" value="2"/>
+<bool name="ConfirmUnsavedFiles" value="False"/>
+<bool name="ControlMode" value="False"/>
+<bool name="CopyOnStop" value="False"/>
+<bool name="TimeStampNewFiles" value="False"/>
+ <string name="ControlBoxID" value="direct"/>
+ <string name="ToolbarID" value="direct"/>
+</settings>
diff --git a/Data/settings/settings.edit.xml b/Data/settings/settings.edit.xml
new file mode 100644
index 0000000..201d601
--- /dev/null
+++ b/Data/settings/settings.edit.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE settings SYSTEM "settings.dtd">
+<settings>
+<long name="AppStyle" value="1"/>
+<bool name="ConfirmUnsavedFiles" value="True"/>
+<bool name="ControlMode" value="True"/>
+<bool name="CopyOnStop" value="True"/>
+<bool name="TimeStampNewFiles" value="True"/>
+<string name="ControlBoxID" value="edit"/>
+<string name="ToolbarID" value="edit"/>
+</settings>
diff --git a/Data/settings/settings.prepared_speech.xml b/Data/settings/settings.prepared_speech.xml
new file mode 100644
index 0000000..caf3d31
--- /dev/null
+++ b/Data/settings/settings.prepared_speech.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE settings SYSTEM "settings.dtd">
+<settings>
+<long name="AppStyle" value="1"/>
+<bool name="ConfirmUnsavedFiles" value="True"/>
+<bool name="ControlMode" value="True"/>
+<string name="ControlBoxID" value="prepared_speech"/>
+<string name="ToolbarID" value="prepared_speech"/>
+</settings>
diff --git a/Data/settings/settings.speak.xml b/Data/settings/settings.speak.xml
new file mode 100644
index 0000000..98ce661
--- /dev/null
+++ b/Data/settings/settings.speak.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!DOCTYPE settings SYSTEM "settings.dtd">
+<settings>
+<long name="AppStyle" value="0"/>
+<long name="EditFontSize" value="20"/>
+<long name="EditHeight" value="200"/>
+<bool name="ConfirmUnsavedFiles" value="False"/>
+<bool name="ControlMode" value="True"/>
+<bool name="CopyOnStop" value="True"/>
+<bool name="TimeStampNewFiles" value="False"/>
+<string name="ControlBoxID" value="speak"/>
+<string name="ToolbarID" value="speak"/>
+</settings>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]