[dasher: 195/217] Tuning settings for specific usage profiles.

[Patrick Welche <pwelche src gnome org>]

commit fbda251a852e016df1522d69817ef5f2a2b691d4
Author: Ada Majorek <amajorek google com>
Date:   Thu Jan 28 15:42:58 2016 -0800

    Tuning settings for specific usage profiles.

 Data/settings/settings.direct.xml          |    6 +++---
 Data/settings/settings.edit.xml            |    7 ++++---
 Data/settings/settings.prepared_speech.xml |    7 ++++---
 Data/settings/settings.speak.xml           |    7 ++++---
 Src/DasherCore/XmlSettingsStore.cpp        |    2 +-
 5 files changed, 16 insertions(+), 13 deletions(-)
---
diff --git a/Data/settings/settings.direct.xml b/Data/settings/settings.direct.xml
index d9d052a..8076d51 100644
--- a/Data/settings/settings.direct.xml
+++ b/Data/settings/settings.direct.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE settings SYSTEM "settings.dtd">
 <settings>
 <long name="AppStyle" value="2"/>
@@ -6,6 +6,6 @@
 <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"/>
+  <string name="ControlBoxID" value="Direct Entry"/>
+  <string name="ToolbarID" value="Direct Entry"/>
 </settings>
diff --git a/Data/settings/settings.edit.xml b/Data/settings/settings.edit.xml
index 201d601..e03f590 100644
--- a/Data/settings/settings.edit.xml
+++ b/Data/settings/settings.edit.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!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="FullScreen" value="True"/>
 <bool name="TimeStampNewFiles" value="True"/>
-<string name="ControlBoxID" value="edit"/>
-<string name="ToolbarID" value="edit"/>
+<string name="ControlBoxID" value="Edit Larger Document"/>
+<string name="ToolbarID" value="Edit Larger Document"/>
 </settings>
diff --git a/Data/settings/settings.prepared_speech.xml b/Data/settings/settings.prepared_speech.xml
index caf3d31..fe3779e 100644
--- a/Data/settings/settings.prepared_speech.xml
+++ b/Data/settings/settings.prepared_speech.xml
@@ -1,9 +1,10 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!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"/>
+<bool name="FullScreen" value="True"/>
+<string name="ControlBoxID" value="Speak From Prepared Document"/>
+<string name="ToolbarID" value="Speak From Prepared Document"/>
 </settings>
diff --git a/Data/settings/settings.speak.xml b/Data/settings/settings.speak.xml
index 98ce661..b01df0e 100644
--- a/Data/settings/settings.speak.xml
+++ b/Data/settings/settings.speak.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE settings SYSTEM "settings.dtd">
 <settings>
 <long name="AppStyle" value="0"/>
@@ -7,7 +7,8 @@
 <bool name="ConfirmUnsavedFiles" value="False"/>
 <bool name="ControlMode" value="True"/>
 <bool name="CopyOnStop" value="True"/>
+<bool name="FullScreen" value="True"/>
 <bool name="TimeStampNewFiles" value="False"/>
-<string name="ControlBoxID" value="speak"/>
-<string name="ToolbarID" value="speak"/>
+<string name="ControlBoxID" value="Conversation"/>
+<string name="ToolbarID" value="Conversation"/>
 </settings>
diff --git a/Src/DasherCore/XmlSettingsStore.cpp b/Src/DasherCore/XmlSettingsStore.cpp
index 713a286..0af68d1 100644
--- a/Src/DasherCore/XmlSettingsStore.cpp
+++ b/Src/DasherCore/XmlSettingsStore.cpp
@@ -78,7 +78,7 @@ bool XmlSettingsStore::Save() {
   
     modified_ = false;
     std::stringstream out;
-    out << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n";
+    out << "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n";
     out << "<!DOCTYPE settings SYSTEM \"settings.dtd\">\n";
 
     out << "<settings>\n";