Thread: [Amis-vcs] SF.net SVN: amis: [2305] branches/amis3 (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 2305
          http://amis.svn.sourceforge.net/amis/?rev=2305&view=rev
Author:   marisademeglio
Date:     2008-02-02 22:07:11 -0800 (Sat, 02 Feb 2008)

Log Message:
-----------
Removed some Visual Studio-generated TODO's (which aren't really "TODO"s)

Updated some of our TODO's so that they appear on one line and can be picked up by the todo-scraper

More adjustments to the GUI; preparing new XML file too

Removed AudioPromptReader files since it hasn't been used for several versions now.

Added and implemented a preference to disable the screensaver if AMIS is reading.  This had been a user request.

Modified Paths:
--------------
    branches/amis3/AmisAudio/StdAfx.cpp
    branches/amis3/AmisAudio/StdAfx.h
    branches/amis3/AmisCore/src/dtb/nav/NavMap.cpp
    branches/amis3/AmisCore/src/dtb/nav/NavPoint.cpp
    branches/amis3/AmisCore/src/io/NccFileReader.cpp
    branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
    branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
    branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj
    branches/amis3/AmisGuiMFC2/include/Preferences.h
    branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h
    branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h
    branches/amis3/AmisGuiMFC2/include/gui/dialogs/PublicationSummaryDialog.h
    branches/amis3/AmisGuiMFC2/resource.h
    branches/amis3/AmisGuiMFC2/src/Preferences.cpp
    branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
    branches/amis3/AmisGuiMFC2/src/gui/ChildFrm.cpp
    branches/amis3/AmisGuiMFC2/src/gui/HtmlDoc.cpp
    branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp
    branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp
    branches/amis3/AmisGuiMFC2/src/gui/MmDoc.cpp
    branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
    branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
    branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
    branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp
    branches/amis3/bin/settings/amisPrefs.xml.default

Removed Paths:
-------------
    branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp
    branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h

Modified: branches/amis3/AmisAudio/StdAfx.cpp
===================================================================

--- branches/amis3/AmisAudio/StdAfx.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisAudio/StdAfx.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -4,5 +4,5 @@
 
 #include "stdafx.h"
 
-// TODO: reference any additional headers you need in STDAFX.H
+// reference any additional headers you need in STDAFX.H
 // and not in this file

Modified: branches/amis3/AmisAudio/StdAfx.h
===================================================================
--- branches/amis3/AmisAudio/StdAfx.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisAudio/StdAfx.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -105,7 +105,7 @@
 
 #include <windows.h>
 
-// TODO: reference additional headers your program requires here
+// reference additional headers your program requires here
 
 //{{AFX_INSERT_LOCATION}}
 // Microsoft Visual C++ will insert additional declarations immediately before the previous line.

Modified: branches/amis3/AmisCore/src/dtb/nav/NavMap.cpp
===================================================================
--- branches/amis3/AmisCore/src/dtb/nav/NavMap.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisCore/src/dtb/nav/NavMap.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -62,8 +62,7 @@
 	int cnt;
 	int i;
 
-	//@todo
-	//move level and parent data printouts to NavPoint eventually
+	//@todo: move level and parent data printouts to NavPoint eventually
 
 	// print out the correct number of tabs
 	for (i = 0; i<level; i++)

Modified: branches/amis3/AmisCore/src/dtb/nav/NavPoint.cpp
===================================================================
--- branches/amis3/AmisCore/src/dtb/nav/NavPoint.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisCore/src/dtb/nav/NavPoint.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -96,8 +96,7 @@
 }
 
 
-//@todo
-//complete this function
+//@todo: complete this function
 amis::dtb::nav::NavPoint* amis::dtb::nav::NavPoint::previous()
 {
 	return NULL;

Modified: branches/amis3/AmisCore/src/io/NccFileReader.cpp
===================================================================
--- branches/amis3/AmisCore/src/io/NccFileReader.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisCore/src/io/NccFileReader.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -161,8 +161,7 @@
 			p_text->setTextString(mTempChars);
 			p_media_label->setText(p_text);
 		
-			//@todo
-			//set other text properties (RTL, lang, etc)
+			//@todo: set other text properties (RTL, lang, etc)
 		}
 	}
 }

Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
===================================================================
(Binary files differ)

Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc	2008-02-03 06:07:11 UTC (rev 2305)
@@ -141,7 +141,7 @@
         LEFTMARGIN, 7
         RIGHTMARGIN, 249
         TOPMARGIN, 7
-        BOTTOMMARGIN, 199
+        BOTTOMMARGIN, 216
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -178,10 +178,13 @@
         , CHECKED
         MENUITEM "&Basic View Mode\tF11",       ID_MENU_VIEW_BASIC
         MENUITEM SEPARATOR
-        MENUITEM "High &Contrast\tCtrl+S",      ID_MENU_VIEW_CONTRAST
-        , CHECKED
+        POPUP "&Page Style"
+        BEGIN
+            MENUITEM "Empty",                       ID_PAGESTYLES_EMPTY
+            , INACTIVE
+        END
         MENUITEM "&Increase Font Size",         ID_MENU_VIEW_LARGEFONT
-        MENUITEM "&Reset Font Size",            ID_MENU_VIEW_RESETFONT
+        MENUITEM "&Decrease Font Size",         ID_MENU_VIEW_DECREASEFONT
     END
     POPUP "&Play"
     BEGIN
@@ -369,10 +372,10 @@
     PUSHBUTTON      "Cancel",IDCANCEL,127,49,50,14
 END
 
-IDD_PREFERENCES DIALOGEX 0, 0, 256, 206
+IDD_PREFERENCES DIALOGEX 0, 0, 256, 223
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
-CAPTION "Preferences"
+CAPTION "d"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
     CONTROL         "Use self-voicing",IDC_ISSELFVOICING,"Button",
@@ -380,23 +383,26 @@
     LTEXT           "Select TTS voice:",IDC_SELTTSLABEL,7,22,242,8
     COMBOBOX        IDC_TTSVOICES,7,35,108,88,CBS_DROPDOWNLIST | CBS_SORT | 
                     WS_VSCROLL | WS_TABSTOP
-    CONTROL         "Pause audio when switching applications",
-                    IDC_PAUSEONLOSTFOCUS,"Button",BS_AUTOCHECKBOX | 
-                    WS_TABSTOP,7,59,242,10
     CONTROL         "Highlight text as it is read aloud",IDC_HIGHLIGHTTEXT,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,78,242,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,242,10
     CONTROL         "Load the most recently read book on startup",
                     IDC_LOADLASTBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,
-                    98,242,10
+                    76,242,10
     CONTROL         "Start in basic view mode",IDC_STARTINBASICVIEW,"Button",
-                    BS_AUTOCHECKBOX | WS_TABSTOP,7,117,242,10
-    LTEXT           "You are currently using AMIS in:",IDC_CURRLANG,7,140,
+                    BS_AUTOCHECKBOX | WS_TABSTOP,7,94,242,10
+    CONTROL         "Pause audio when switching applications",
+                    IDC_PAUSEONLOSTFOCUS,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,7,112,242,10
+    CONTROL         "Disable the screensaver while reading",
+                    IDC_DISABLESCREENSAVER,"Button",BS_AUTOCHECKBOX | 
+                    WS_TABSTOP,7,130,242,10
+    LTEXT           "You are currently using AMIS in:",IDC_CURRLANG,7,153,
                     242,8
-    ICON            IDI_LANGICON,IDC_LANGICON,127,151,21,20
-    DEFPUSHBUTTON   "OK",IDOK,57,185,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,112,185,50,14
-    COMBOBOX        IDC_INSTALLEDLANGUAGES,7,153,108,88,CBS_DROPDOWNLIST | 
+    COMBOBOX        IDC_INSTALLEDLANGUAGES,7,166,108,88,CBS_DROPDOWNLIST | 
                     CBS_SORT | WS_VSCROLL | WS_TABSTOP
+    ICON            IDI_LANGICON,IDC_LANGICON,127,164,20,20
+    DEFPUSHBUTTON   "OK",IDOK,57,202,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,112,202,50,14
 END
 
 
@@ -634,6 +640,7 @@
 BEGIN
     ID_MENU_PLAYPAUSE       "Start synchronized playback."
     ID_MENU_FILE_CLOSE      "Close the publication."
+    ID_MENU_VIEW_DECREASEFONT "Decrease the font size"
 END
 
 #endif    // English (U.S.) resources

Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj	2008-02-03 06:07:11 UTC (rev 2305)
@@ -877,24 +877,6 @@
 					RelativePath=".\AmisSelfVoicing\AccessibleUI\AudioPrompt.h">
 				</File>
 				<File
-					RelativePath=".\AmisSelfVoicing\AccessibleUI\AudioPromptReader.cpp">
-					<FileConfiguration
-						Name="Debug|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"/>
-					</FileConfiguration>
-					<FileConfiguration
-						Name="Release|Win32">
-						<Tool
-							Name="VCCLCompilerTool"
-							UsePrecompiledHeader="0"/>
-					</FileConfiguration>
-				</File>
-				<File
-					RelativePath=".\AmisSelfVoicing\AccessibleUI\AudioPromptReader.h">
-				</File>
-				<File
 					RelativePath=".\AmisSelfVoicing\AccessibleUI\Container.cpp">
 					<FileConfiguration
 						Name="Debug|Win32">

Deleted: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -1,328 +0,0 @@
-/* 
-AmisGuiMFC: AMIS executable module and primary UI
-Copyright (C) 2004  DAISY for All Project 
-
-This library is free software; you can redistribute it and/or 
-modify it under the terms of the GNU Lesser General Public 
-License as published by the Free Software Foundation; either 
-version 2.1 of the License, or (at your option) any later version. 
-
-This library is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-Lesser General Public License for more details. 
-
-You should have received a copy of the GNU Lesser General Public 
-License along with this library; if not, write to the Free Software 
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-*/
-
-/*!
-This module was adapted to read audio prompts that are either a single clip
-or made up of a sequence of clips and TTS renderings of variables
-*/
-
-//SYSTEM INCLUDES
-#include <string>
-#include <vector>
-
-#include "afxpriv.h"
-
-//PROJECT INCLUDES
-#include <xercesc/util/XMLString.hpp>
-#include <xercesc/sax2/Attributes.hpp>
-#include <xercesc/sax/SAXParseException.hpp>
-#include <xercesc/sax/SAXException.hpp>
-#include <xercesc/sax/HandlerBase.hpp>
-
-#include <xercesc/util/PlatformUtils.hpp>
-#include <xercesc/util/TransService.hpp>
-#include <xercesc/sax2/SAX2XMLReader.hpp>
-#include <xercesc/sax2/XMLReaderFactory.hpp>
-
-//LOCAL INCLUDES
-#include "AudioPromptReader.h"
-
-using namespace std;
-using namespace amis::gui::spoken;
-
-AudioPromptReader::AudioPromptReader()
-{
-	
-}
-
-AudioPromptReader::~AudioPromptReader()
-{
-
-}
-
-
-void AudioPromptReader::loadFile(string filepath)
-{
-	const char* cp_file = NULL;
-	char* xerces_msg = NULL;
-	SAX2XMLReader* parser = NULL;
-
-	
-	cp_file = filepath.c_str();
-
-	//clear any existing data
-	AudioPromptCol::Instance()->clearAll();
-
-	AudioPromptCol::Instance()->mFilePath = filepath;
-
-	//try-catch block for Xerces platform utilities
-	try
-	{
-		 XMLPlatformUtils::Initialize();
-	}
-	catch (const XMLException& toCatch)
-	{
-		xerces_msg = XMLString::transcode(toCatch.getMessage()); //DANIEL MEMORY LEAK VERIFIED	
-	//	cout<<"Xerces said: "<<xerces_msg<<endl;
-		XMLString::release(&xerces_msg); //DANIEL MEMORY LEAK VERIFIED
-		return;
-	}
-
-	//assuming we've made it this far, create a new parser
-	parser = XMLReaderFactory::createXMLReader();
-
-	//set these parser features to turn off DTD loading and validation
-	parser->setFeature(XMLUni::fgXercesLoadExternalDTD, false);
-	parser->setFeature(XMLUni::fgSAX2CoreValidation, false);
-
-
-	//try-catch block for Xerces parsing
-	try 
-	{
-		parser->setContentHandler(this);
-		parser->setErrorHandler(this);
-		//parser begins fileparse.  expect SAX Events soon.  
-		parser->parse(cp_file);
-	}
-	catch (const XMLException& toCatch)
-	{	
-		xerces_msg = XMLString::transcode(toCatch.getMessage()); //DANIEL MEMORY LEAK VERIFIED
-		//cout<<"Xerces said: "<<xerces_msg<<endl;
-		XMLString::release(&xerces_msg); //DANIEL MEMORY LEAK VERIFIED
-		 //terminate the platform utilities
-		delete parser;
-		XMLPlatformUtils::Terminate();
-		return;
-	 }
-
-	//we're done with the parser so delete it and terminate the XML platform utilities
-	delete parser;
-	XMLPlatformUtils::Terminate();
-}
-
-//--------------------------------------------------
-//! (SAX Event) analyze the element type and build a gui
-//--------------------------------------------------
-void AudioPromptReader::startElement(const   XMLCh* const    uri,
-				const   XMLCh* const    localname,
-				const   XMLCh* const    qname,
-				const   Attributes&	attributes)
-{
-	
-	USES_CONVERSION;
-
-	//local variables
-	char* element_name = NULL;
-	string tmp_string;
-
-	//get the element name as a string
-	element_name = XMLString::transcode(qname); //DANIEL MEMORY LEAK VERIFIED
-
-	if (strcmp(element_name, "prompt") == 0)
-	{
-		mpCurrentPrompt = new AudioPrompt();
-
-		XMLCh* txt_NAME = XMLString::transcode("name"); //DANIEL MEMORY LEAK VERIFIED
-		char* name = XMLString::transcode(attributes.getValue(txt_NAME)); //DANIEL MEMORY LEAK VERIFIED
-		XMLString::release(&txt_NAME); //DANIEL MEMORY LEAK VERIFIED
-		
-		mpCurrentPrompt->mName.assign(name);
-		XMLString::release(&name); //DANIEL MEMORY LEAK VERIFIED
-	}
-
-	else if(strcmp(element_name, "var")==0)
-	{
-		AudioPromptComponent* p_prompt_var = NULL;
-		p_prompt_var = new AudioPromptComponent;
-
-		
-		XMLCh* txt_NAME = XMLString::transcode("name"); //DANIEL MEMORY LEAK VERIFIED
-		char* name = XMLString::transcode(attributes.getValue(txt_NAME)); //DANIEL MEMORY LEAK VERIFIED
-		XMLString::release(&txt_NAME); //DANIEL MEMORY LEAK VERIFIED
-	
-		p_prompt_var->mVarName.assign(name);
-		XMLString::release(&name); //DANIEL MEMORY LEAK VERIFIED
-
-		p_prompt_var->mRuntimeValue = L"";
-		p_prompt_var->mbIsVar = true;
-
-		p_prompt_var->mTextAlternative = L"";
-
-		mpCurrentPrompt->mSequence.push_back(p_prompt_var);
-	}
-
-
-	else if (strcmp(element_name, "audio") == 0)
-	{
-		amis::AudioNode* p_audio = NULL;
-		p_audio = new amis::AudioNode();
-
-		AudioPromptComponent* p_pc = NULL;
-		p_pc = new AudioPromptComponent;
-
-		char* src = NULL;
-		XMLCh* txt_SRC = XMLString::transcode("src"); //DANIEL MEMORY LEAK VERIFIED
-		src = XMLString::transcode(attributes.getValue(txt_SRC)); //DANIEL MEMORY LEAK VERIFIED
-		XMLString::release(&txt_SRC); //DANIEL MEMORY LEAK VERIFIED
-		
-		char* clipBegin = NULL;
-		XMLCh* txt_CLIPBEGIN = XMLString::transcode("clipBegin"); //DANIEL MEMORY LEAK VERIFIED
-		clipBegin = XMLString::transcode(attributes.getValue(txt_CLIPBEGIN)); //DANIEL MEMORY LEAK VERIFIED
-		XMLString::release(&txt_CLIPBEGIN); //DANIEL MEMORY LEAK VERIFIED
-		
-		char* clipEnd = NULL;
-		XMLCh* txt_CLIPEND = XMLString::transcode("clipEnd"); //DANIEL MEMORY LEAK VERIFIED
-		clipEnd = XMLString::transcode(attributes.getValue(txt_CLIPEND)); //DANIEL MEMORY LEAK VERIFIED
-		XMLString::release(&txt_CLIPEND); //DANIEL MEMORY LEAK VERIFIED
-
-		if (src != NULL) {
-			string str;
-			str.assign(src);
-			XMLString::release(&src); //DANIEL MEMORY LEAK VERIFIED
-			p_audio->setSrc(str);
-		}
-		if (clipBegin != NULL) {
-			string str;
-			str.assign(clipBegin);
-			XMLString::release(&clipBegin); //DANIEL MEMORY LEAK VERIFIED
-			p_audio->setClipBegin(str);
-		}
-		if (clipEnd != NULL) {
-			string str;
-			str.assign(clipEnd);
-			XMLString::release(&clipEnd); //DANIEL MEMORY LEAK VERIFIED
-			p_audio->setClipEnd(str);
-		}
-
-		p_pc->mbIsVar = false;
-		p_pc->mRuntimeValue = L"";
-		p_pc->mVarName = "";
-		p_pc->mpMedia = p_audio;
-
-		char* alt_text = NULL;
-		
-		XMLCh* txt_TXT = XMLString::transcode("txt"); //DANIEL MEMORY LEAK VERIFIED
-		alt_text =
-			XMLString::transcode(attributes.getValue(txt_TXT)); //DANIEL MEMORY LEAK VERIFIED
-		XMLString::release(&txt_TXT); //DANIEL MEMORY LEAK VERIFIED
-
-		if (alt_text != NULL) {
-			p_pc->mTextAlternative.assign(A2CW(alt_text));
-			XMLString::release(&alt_text); //DANIEL MEMORY LEAK VERIFIED
-		}
-
-		mpCurrentPrompt->mSequence.push_back(p_pc);
-	}
-
-	else
-	{
-		//empty
-	}
-	
-	XMLString::release(&element_name); //DANIEL MEMORY LEAK VERIFIED
-	
-	
-
-} //end startElement function
-
-//--------------------------------------------------
-//! (SAX Event) close this element 
-//--------------------------------------------------
-void AudioPromptReader::endElement( const XMLCh* const uri,
-					const XMLCh* const localname,
-					 const XMLCh* const qname)
-{
-	//local variable
-	char* element_name = XMLString::transcode(qname); //DANIEL MEMORY LEAK VERIFIED
-
-
-	if (strcmp(element_name, "prompt") == 0)
-	{
-		AudioPromptCol::Instance()->addPrompt(mpCurrentPrompt);
-	}
-	else
-	{
-		//empty
-	}
-
-	XMLString::release(&element_name); //DANIEL MEMORY LEAK VERIFIED
-
-}
-
-
-
-//--------------------------------------------------
-//! (SAX Event) error
-//:TODO: handle SAX error properly
-//--------------------------------------------------
-void AudioPromptReader::error(const SAXParseException& e)
-{
-	char* xerces_msg;
-	xerces_msg = XMLString::transcode(e.getMessage()); //DANIEL MEMORY LEAK VERIFIED
-//	cout<<"Xerces error: "<<xerces_msg<<endl;
-	XMLString::release(&xerces_msg); //DANIEL MEMORY LEAK VERIFIED
-}
-
-//--------------------------------------------------
-//! (SAX Event) fatal error
-//:TODO: handle SAX error properly
-//--------------------------------------------------
-void AudioPromptReader::fatalError(const SAXParseException& e)
-{
-	char* xerces_msg;
-	xerces_msg = XMLString::transcode(e.getMessage()); //DANIEL MEMORY LEAK VERIFIED
-//	cout<<"Xerces fatal: "<<xerces_msg<<endl;
-	XMLString::release(&xerces_msg); //DANIEL MEMORY LEAK VERIFIED
-}
-
-//--------------------------------------------------
-//! (SAX Event) warning
-//:TODO: handle SAX warning properly
-//--------------------------------------------------
-void AudioPromptReader::warning(const SAXParseException& e)
-{
-	char* xerces_msg;
-	xerces_msg = XMLString::transcode(e.getMessage()); //DANIEL MEMORY LEAK VERIFIED
-//	cout<<"Xerces warning: "<<xerces_msg<<endl;
-	XMLString::release(&xerces_msg); //DANIEL MEMORY LEAK VERIFIED
-}
-
-//useful function
-//replace all occurances of searchStr with replaceStr in sourceStr
-string AudioPromptReader::stringReplaceAll(string sourceStr, string searchStr, string replaceStr)
-{
-//	cout<<"Replacing "<<searchStr<<" with "<<replaceStr<<" in "<<sourceStr<<endl;
-
-	int pos = 0;
-	string source_str = sourceStr;
-
-	while (pos > -1)
-	{
-		pos = source_str.find(searchStr);
-
-		if (pos > -1)
-		{
-			source_str.replace(pos, searchStr.length(), replaceStr);
-		}
-
-	}
-
-	return source_str;
-
-}		

Deleted: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/AudioPromptReader.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -1,96 +0,0 @@
-/* 
-AmisGtkGuiExe: AMIS executable module and primary UI
-Copyright (C) 2004  DAISY for All Project 
-
-This library is free software; you can redistribute it and/or 
-modify it under the terms of the GNU Lesser General Public 
-License as published by the Free Software Foundation; either 
-version 2.1 of the License, or (at your option) any later version. 
-
-This library is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-Lesser General Public License for more details. 
-
-You should have received a copy of the GNU Lesser General Public 
-License along with this library; if not, write to the Free Software 
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-*/
-
-#ifndef AUDIOPROMPTREADER_H
-#define AUDIOPROMPTREADER_H
-
-//SYSTEM INCLUDES
-#include <string>
-#include <vector>
-
-//XERCES INCLUDES
-#include <xercesc/sax2/DefaultHandler.hpp>
-
-#include "Media.h"
-
-#include "AudioPrompt.h"
-
-//NAMESPACES
-XERCES_CPP_NAMESPACE_USE
-
-XERCES_CPP_NAMESPACE_BEGIN
-class Attributes;
-XERCES_CPP_NAMESPACE_END
-
-using namespace std;
-
-
-namespace amis
-{
-namespace gui
-{
-namespace spoken
-{
-
-
-//!Get an action list from a prompts XML file
-/*!
-	Processing steps are:
-	1. make new entry for each prompt, with appropriate name
-	2. reserve space for variables
-	3. add playable items to prompt "sequence"
-	4. at runtime, resolve variables and return completed action strings
-
-*/
-class AudioPromptReader: public DefaultHandler
-{
-public:
-	//!constructor
-	AudioPromptReader();
-
-	//!destructor
-	~AudioPromptReader();
-
-	//MEMBER FUNCTIONS
-	//!set the file to be processed
-	void loadFile(string);
-
-	//Xerces SAX methods
-	//!start tag of an element
-	void startElement(const XMLCh* const, const XMLCh* const, const XMLCh* const,
-		const Attributes&);
-	//!end tag of an element
-    void endElement(const XMLCh* const,	const XMLCh* const,	const XMLCh* const);
-	//!parse error (non-fatal)
-	void error(const SAXParseException&);
-	//!parse fatal error
-	void fatalError(const SAXParseException&);
-	//!parse warning
-	void warning(const SAXParseException&);
-
-private:
-	string stringReplaceAll(string, string, string);
-
-	AudioPrompt* mpCurrentPrompt;
-
-
-
-};
-}}}
-#endif
\ No newline at end of file

Modified: branches/amis3/AmisGuiMFC2/include/Preferences.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/Preferences.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/include/Preferences.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -80,6 +80,9 @@
 
 	void setHighlightText(bool);
 	bool getHighlightText();
+	
+	void setDisableScreensaver(bool);
+	bool getDisableScreensaver();
 
 	void setUserBmkDir(const ambulant::net::url*);
 	const ambulant::net::url* getUserBmkDir();
@@ -121,6 +124,7 @@
 	bool mbUseTTSNotAudio;
 	bool mbWasExitClean;
 	bool mbHighlightText;
+	bool mbDisableScreensaver;
 	ambulant::net::url mUserBmkDir;
 	ambulant::net::url mLangpacksDir;
 	ambulant::net::url mFontsizeCssDir;

Modified: branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/include/gui/MainFrm.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -83,9 +83,8 @@
 	afx_msg void OnEnterMenuLoop(BOOL bIsTrackPopupMenu);
 	afx_msg void OnExitMenuLoop(BOOL bIsTrackPopupMenu);
 	afx_msg void OnInitMenu(CMenu* pMenu);
-
 	afx_msg void OnActivate( UINT nState, CWnd* pWndOther, BOOL bMinimized ); 
-
+	afx_msg void OnSysCommand(UINT nID, LPARAM lParam); 
 	//}}AFX_MSG
 	DECLARE_MESSAGE_MAP()
 };

Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -48,7 +48,7 @@
 	BOOL mbLoadLastBook;
 	BOOL mbStartInBasicView;
 	BOOL mbHighlightText;
-
+	BOOL mbDisableScreensaver;
 	int	mTTSVoiceIndex;
 	string mUiLanguageSelection;
 
@@ -65,7 +65,8 @@
 	afx_msg void OnBnClickedHighlightText();
 	afx_msg void OnCbnSelchangeInstalledLanguages();
 	afx_msg void OnCbnSetfocusInstalledLanguages();
-
+	afx_msg void OnBnClickedDisableScreensaver();
+	afx_msg void OnBnSetfocusDisableScreensaver();
 protected:
 	virtual BOOL OnInitDialog();
 	afx_msg void OnPaint();

Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/PublicationSummaryDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/PublicationSummaryDialog.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/PublicationSummaryDialog.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -67,6 +67,7 @@
 	wstring mDescription;
 	wstring mDate;
 	wstring mFormat;
+	wstring mNarrator;
 };
 }
 }

Modified: branches/amis3/AmisGuiMFC2/resource.h
===================================================================
--- branches/amis3/AmisGuiMFC2/resource.h	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/resource.h	2008-02-03 06:07:11 UTC (rev 2305)
@@ -88,6 +88,7 @@
 #define IDC_LISTCAPTION                 1075
 #define IDC_PHRASEPREVIEW               1075
 #define IDC_PAUSEONLOSTFOCUS2           1075
+#define IDC_DISABLESCREENSAVER          1075
 #define IDC_CONTRASTPREVIEW             1076
 #define IDC_AMISNAME                    1076
 #define IDC_PAGEFG                      1077
@@ -153,6 +154,8 @@
 #define ID_MENU_FILE_OPENFROMURL        32870
 #define ID_MENU_FILE_CLOSE              32871
 #define ID_MENU_INFO_PUBLICATION_SUMMARY 32876
+#define ID_PAGESTYLES_EMPTY             32877
+#define ID_MENU_VIEW_DECREASEFONT       32878
 #define IDS_NOSKIP                      61245
 #define IDS_SELFOLDER_TITLE             61258
 #define IDS_SELFOLDER_INSTR             61259
@@ -167,7 +170,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        192
-#define _APS_NEXT_COMMAND_VALUE         32877
+#define _APS_NEXT_COMMAND_VALUE         32879
 #define _APS_NEXT_CONTROL_VALUE         1098
 #define _APS_NEXT_SYMED_VALUE           141
 #endif

Modified: branches/amis3/AmisGuiMFC2/src/Preferences.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/Preferences.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/Preferences.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -53,6 +53,7 @@
 	setStartInBasicView(false);
 	setTTSVoiceIndex(-1);
 	setWasExitClean(true);
+	setDisableScreensaver(true);
 	mFontsizeCssFiles.clear();
 	mContrastCssFiles.clear();
 	//note that file paths here are hardcoded relative to the application directory
@@ -250,6 +251,14 @@
 {
 	return mbHighlightText;
 }
+void Preferences::setDisableScreensaver(bool value)
+{
+	mbDisableScreensaver = value;
+}
+bool Preferences::getDisableScreensaver()
+{
+	return mbDisableScreensaver;
+}
 void Preferences::setUserBmkDir(const ambulant::net::url* value)
 {
 	mUserBmkDir = *value;

Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -656,6 +656,7 @@
 		Preferences::Instance()->setPauseOnLostFocus(prefs.mbPauseOnLostFocus);
 		Preferences::Instance()->setStartInBasicView(prefs.mbStartInBasicView);
 		Preferences::Instance()->setLoadLastBook(prefs.mbLoadLastBook);
+		Preferences::Instance()->setDisableScreensaver(prefs.mbDisableScreensaver);
 		if (prefs.mbHighlightText != Preferences::Instance()->getHighlightText())
 		{
 			Preferences::Instance()->setHighlightText(prefs.mbHighlightText);
@@ -692,7 +693,7 @@
 void CAmisApp::setPauseState(bool pauseState)
 {
 
-	//DanToDo: I don't think Amis3 has a toolbar, so for now the following code is useless (should be removed definitely ?).
+	//TODO: re-add toolbar
 	//if (MainWndParts::Instance()->mpMainFrame->m_wndDefaultToolbar)
 	{
 		//MainWndParts::Instance()->mpMainFrame->m_wndDefaultToolbar.setPauseState(pauseState);

Modified: branches/amis3/AmisGuiMFC2/src/gui/ChildFrm.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/ChildFrm.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/ChildFrm.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -50,7 +50,7 @@
 
 CChildFrame::CChildFrame()
 {
-	// TODO: add member initialization code here
+	// add member initialization code here
 	
 }
 
@@ -60,7 +60,7 @@
 
 BOOL CChildFrame::PreCreateWindow(CREATESTRUCT& cs)
 {
-	// TODO: Modify the Window class or styles here by modifying
+	// Modify the Window class or styles here by modifying
 	//  the CREATESTRUCT cs
 
 	if( !CMDIChildWnd::PreCreateWindow(cs) )

Modified: branches/amis3/AmisGuiMFC2/src/gui/HtmlDoc.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/HtmlDoc.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/HtmlDoc.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -33,25 +33,13 @@
 
 using namespace amis::gui;
 
-/////////////////////////////////////////////////////////////////////////////
-// CAmisHtmlDoc
-
 IMPLEMENT_DYNCREATE(CAmisHtmlDoc, CDocument)
 
 BEGIN_MESSAGE_MAP(CAmisHtmlDoc, CDocument)
-	//{{AFX_MSG_MAP(CAmisHtmlDoc)
-		// NOTE - the ClassWizard will add and remove mapping macros here.
-		//    DO NOT EDIT what you see in these blocks of generated code!
-	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
 
-/////////////////////////////////////////////////////////////////////////////
-// CAmisHtmlDoc construction/destruction
-
 CAmisHtmlDoc::CAmisHtmlDoc()
 {
-	// TODO: add one-time construction code here
-
 }
 
 CAmisHtmlDoc::~CAmisHtmlDoc()
@@ -62,33 +50,22 @@
 {
 	if (!CDocument::OnNewDocument())
 		return FALSE;
-
-	// TODO: add reinitialization code here
-	// (SDI documents will reuse this document)
-
+	// add reinitialization code here (SDI documents will reuse this document)
 	return TRUE;
 }
 
-
-
-/////////////////////////////////////////////////////////////////////////////
-// CAmisHtmlDoc serialization
-
 void CAmisHtmlDoc::Serialize(CArchive& ar)
 {
 	if (ar.IsStoring())
 	{
-		// TODO: add storing code here
+		// add storing code here
 	}
 	else
 	{
-		// TODO: add loading code here
+		// add loading code here
 	}
 }
 
-/////////////////////////////////////////////////////////////////////////////
-// CAmisHtmlDoc diagnostics
-
 #ifdef _DEBUG
 void CAmisHtmlDoc::AssertValid() const
 {
@@ -100,6 +77,3 @@
 	CDocument::Dump(dc);
 }
 #endif //_DEBUG
-
-/////////////////////////////////////////////////////////////////////////////
-// CAmisHtmlDoc commands

Modified: branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/HtmlView.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -496,8 +496,6 @@
 
 void CAmisHtmlView::OnNavigateComplete2(LPCTSTR strURL)
 {
-	// TODO: Add your specialized code here and/or call the base class
-
 	CHtmlView::OnNavigateComplete2(strURL);
 }
 void CAmisHtmlView::OnNavigateError(

Modified: branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -55,6 +55,7 @@
 	ON_WM_ENTERMENULOOP()
 	ON_WM_EXITMENULOOP()
 	//ON_WM_KEYDOWN()
+	ON_WM_SYSCOMMAND()
 
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()
@@ -112,8 +113,7 @@
 		return -1;      // fail to create
 	}
 
-	// TODO: Delete	these three	lines if you don't want	the	toolbar	to
-	//	be dockable
+	// Delete these three lines if you don't want the toolbar to be dockable
 	EnableDocking(CBRS_ALIGN_ANY);
 	#ifdef _SCB_REPLACE_MINIFRAME
 		m_pFloatingFrameClass =	RUNTIME_CLASS(CSCBMiniDockFrameWnd);
@@ -132,8 +132,6 @@
 {
 	if( !CMDIFrameWnd::PreCreateWindow(cs) )
 		return FALSE;
-	// TODO: Modify the Window class or styles here by modifying
-	//  the CREATESTRUCT cs
 
 	cs.style = WS_OVERLAPPED | WS_CAPTION | FWS_ADDTOTITLE
 		 | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_MAXIMIZE | WS_SYSMENU;
@@ -725,7 +723,6 @@
 		CWnd* cwnd = this->GetFocus();
 		if (cwnd) mCommonPreTranslateMessageHandler->handle(true, NULL,	pMsg, (cwnd	== NULL	? -1 : cwnd->GetDlgCtrlID()));
 	}
-	
 	return CFrameWnd::PreTranslateMessage(pMsg);
 }
 
@@ -858,4 +855,16 @@
 		mbWasPlayingWhenLostFocus =	false;
 	}
 	}
+}
+//stop the screensaver from starting
+void CMainFrame::OnSysCommand(UINT nID, LPARAM lParam)
+{
+	if(Preferences::Instance()->getDisableScreensaver() == true 
+		&& MainWndParts::Instance()->mpMmView->isPlaying() == true
+		&& (nID & 0xFFF0) == SC_SCREENSAVE)
+	{
+		TRACE(_T("SC_SCREENSAVE, nID = %d, lParam = %d\n"), nID, lParam);
+		return;
+	}
+	CMDIFrameWnd::OnSysCommand(nID, lParam);
 }
\ No newline at end of file

Modified: branches/amis3/AmisGuiMFC2/src/gui/MmDoc.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MmDoc.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/MmDoc.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -98,11 +98,11 @@
 {
 	if (ar.IsStoring())
 	{
-		// TODO: add storing code here
+		// add storing code here
 	}
 	else
 	{
-		// TODO: add loading code here
+		// add loading code here
 	}
 }
 

Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -264,7 +264,7 @@
 	ASSERT_VALID(pDoc);
 	if (!pDoc) return;
 
-	// TODO: add draw code for native data here
+	// add draw code for native data here
 	if(player) player->redraw(m_hWnd, pDC->m_hDC);
 }
 

Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -47,6 +47,8 @@
 	ON_BN_SETFOCUS(IDC_HIGHLIGHTTEXT, OnBnSetfocusHighlightText)
 	ON_CBN_SELCHANGE(IDC_INSTALLEDLANGUAGES, OnCbnSelchangeInstalledLanguages)
 	ON_CBN_SETFOCUS(IDC_INSTALLEDLANGUAGES, OnCbnSetfocusInstalledLanguages)
+	ON_BN_CLICKED(IDC_DISABLESCREENSAVER, OnBnClickedDisableScreensaver)
+	ON_BN_SETFOCUS(IDC_DISABLESCREENSAVER, OnBnSetfocusDisableScreensaver)
 	ON_WM_PAINT()
 END_MESSAGE_MAP()
 
@@ -71,6 +73,7 @@
 	DDX_Check(pDX, IDC_LOADLASTBOOK, mbLoadLastBook);
 	DDX_Check(pDX, IDC_STARTINBASICVIEW, mbStartInBasicView);
 	DDX_Check(pDX, IDC_HIGHLIGHTTEXT, mbHighlightText);
+	DDX_Check(pDX, IDC_DISABLESCREENSAVER, mbDisableScreensaver);
 }
 BOOL PreferencesDialog::OnInitDialog() 
 {	
@@ -80,6 +83,7 @@
 	mbStartInBasicView = Preferences::Instance()->getStartInBasicView();
 	mbHighlightText = Preferences::Instance()->getHighlightText();
 	mUiLanguageSelection = Preferences::Instance()->getUiLangId();
+	mbDisableScreensaver = Preferences::Instance()->getDisableScreensaver();
 
 	initializeTTSVoiceOption();
 	initializeUiLanguageOption();
@@ -209,4 +213,10 @@
 }
 void PreferencesDialog::OnCbnSetfocusInstalledLanguages()
 {
+}
+void PreferencesDialog::OnBnSetfocusDisableScreensaver()
+{
+}
+void PreferencesDialog::OnBnClickedDisableScreensaver()
+{
 }
\ No newline at end of file

Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -127,9 +127,15 @@
 	mCreator = p_meta->getMetadataContent("dc:creator");
 	
 	if (version == amis::dtb::DAISY_202)
+	{
 		mTotalTime = p_meta->getMetadataContent("ncc:totalTime");
+		mNarrator = p_meta->getMetadataContent("ncc:narrator");
+	}
 	else if (version == amis::dtb::ZED_2002 || version == amis::dtb::ZED_2005)
+	{
 		mTotalTime = p_meta->getMetadataContent("dtb:totalTime");
+		mNarrator = p_meta->getMetadataContent("dc:Narrator");
+	}
 
 	mPublisher = p_meta->getMetadataContent("dc:Publisher");
 	mDescription = p_meta->getMetadataContent("dc:Description");
@@ -185,7 +191,9 @@
 	CListBox* p_current_pos = (CListBox*)GetDlgItem(IDC_CURRENTPOSITION);
 	CListBox* p_pub_info = (CListBox*)GetDlgItem(IDC_PUBLICATIONINFO);
 
-	CString caption, title, author;
+	CString caption, title, author, current_page, current_time, current_section, 
+		publisher, description, total_time, date, format, narrator;
+
 	if (mpTitle != NULL) 
 		title.Format(_T("About: \"%s\""), mpTitle->getText()->getTextString().c_str());
 	else 
@@ -199,8 +207,6 @@
 	caption.Append(author);
 	p_caption->SetWindowText(caption);
 
-	CString current_page, current_time, current_section, publisher, description, total_time, date, format;
-
 	if (mpCurrentPage != NULL)
 	{
 		current_page.Format(_T("On page %s of %d total pages"), 
@@ -229,6 +235,11 @@
 		description.Format(_T("Description: %s"), mDescription.c_str());
 		p_pub_info->AddString(description);
 	}
+	if (mNarrator.size() > 0)
+	{
+		narrator.Format(_T("Narrated by: %s"), mNarrator.c_str());
+		p_pub_info->AddString(narrator);
+	}
 	if (mTotalTime.size() > 0)
 	{
 		total_time.Format(_T("Total length (time): %s"), mTotalTime.c_str());

Modified: branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp	2008-02-03 06:07:11 UTC (rev 2305)
@@ -166,6 +166,13 @@
 		else
 			mpPrefs->setWasExitClean(false);
 	}
+	else if (id.compare("disable-screensaver") == 0)
+	{
+		if (value.compare("yes") == 0)
+			mpPrefs->setDisableScreensaver(true);
+		else
+			mpPrefs->setDisableScreensaver(false);
+	}
 	else if (id.compare("user-css-file") == 0)
 	{
 		ambulant::net::url file = ambulant::net::url::from_filename(value);
@@ -286,6 +293,9 @@
 	pEntry = createEntry("highlight-text", mpPrefs->getHighlightText());
 	pGeneralSection->appendChild((DOMNode*)pEntry);
 	
+	pEntry = createEntry("disable-screensaver", mpPrefs->getDisableScreensaver());
+	pGeneralSection->appendChild((DOMNode*)pEntry);
+
 	std::string voice;
 	char buff[5];
 	itoa(mpPrefs->getTTSVoiceIndex(), buff, 10);

Modified: branches/amis3/bin/settings/amisPrefs.xml.default
===================================================================
--- branches/amis3/bin/settings/amisPrefs.xml.default	2008-02-02 17:53:35 UTC (rev 2304)
+++ branches/amis3/bin/settings/amisPrefs.xml.default	2008-02-03 06:07:11 UTC (rev 2305)
@@ -11,6 +11,7 @@
 <entry id="use-tts-not-audio" value="no"/>
 <entry id="highlight-text" value="yes"/>
 <entry id="was-exit-clean" value="yes"/>
+<entry id="disable-screensaver" value="yes"/>
 <entry id="user-bmk-dir" value="./bmk/"/>
 <entry id="langpacks-dir" value="./lang/"/>
 <entry id="fontsize-css-dir" value="./css/font/"/>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [Amis-vcs] SF.net SVN: amis: [2305] branches/amis3 (Page 3)

amis-cvs