amis-cvs Mailing List for AMIS
Brought to you by:
julienq,
marisademeglio
Menu
▾
▴
amis-cvs — list for tracking version control activity
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(184) |
Sep
(89) |
Oct
(185) |
Nov
(71) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(45) |
Feb
(125) |
Mar
(138) |
Apr
(135) |
May
(72) |
Jun
(68) |
Jul
(23) |
Aug
(14) |
Sep
(39) |
Oct
(131) |
Nov
(43) |
Dec
(5) |
| 2007 |
Jan
(13) |
Feb
(16) |
Mar
(5) |
Apr
(28) |
May
(44) |
Jun
(63) |
Jul
(109) |
Aug
(19) |
Sep
(48) |
Oct
(35) |
Nov
(16) |
Dec
(27) |
| 2008 |
Jan
(40) |
Feb
(56) |
Mar
(97) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <mar...@us...> - 2008-03-29 02:52:36
|
Revision: 2454
http://amis.svn.sourceforge.net/amis/?rev=2454&view=rev
Author: marisademeglio
Date: 2008-03-28 19:52:41 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
small change
Modified Paths:
--------------
trunk/Langpacks/tools/projectplan08.txt
Modified: trunk/Langpacks/tools/projectplan08.txt
===================================================================
--- trunk/Langpacks/tools/projectplan08.txt 2008-03-28 23:07:58 UTC (rev 2453)
+++ trunk/Langpacks/tools/projectplan08.txt 2008-03-29 02:52:41 UTC (rev 2454)
@@ -42,3 +42,5 @@
mnemonicgroup: NOT USED BY OBI
Redo "DB" module without actual passwords; template per installation
+
+Enforce capital letters for Mnemonic entries on the webform
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-28 23:07:52
|
Revision: 2453
http://amis.svn.sourceforge.net/amis/?rev=2453&view=rev
Author: marisademeglio
Date: 2008-03-28 16:07:58 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
cleaned up issues file
Modified Paths:
--------------
branches/amis3/amis_issues.txt
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-28 23:07:03 UTC (rev 2452)
+++ branches/amis3/amis_issues.txt 2008-03-28 23:07:58 UTC (rev 2453)
@@ -25,7 +25,6 @@
AMBULANT ISSUES (some of these are repeated from the above "Known Issues" list)
--
* How to stop ambulant when closing a book
-* review skippability across document boundaries (need reading options dialog to work)
* memory leaks
* book in a japanese folder can't be opened (ambulant::net::url problem?)
@@ -41,12 +40,9 @@
* Open URL Dialog
- no dialog definition in AccessibleUi.xml (only OK / CANCEL). The text field says "text" for now, to give minimum feedback.
* Text Style Dialog: only OK / CANCEL buttons
- [MARISA: does this mean that the self-voicing is incomplete, or the XML definition is incomplete?]
NEW FEATURES and IMPROVEMENTS
---
-* Parse CSS for font info, contrast info
-* Don't start reading when browsing the TOC - just announce the label for the item
* AmisCore's "Find in text" needs a faster algorithm
* find in text dialog
* AMIS should remember its last window size and reuse it on startup
@@ -91,6 +87,8 @@
* Support DAISY resource files (need an example!)
* Bookshare books are slow and don't load if a bookmark file exists for them; eventually this error appears 12:35:27 TRACE dx_html_renderer: programmer error: attempt to start() again.
* Drag & drop book-ncc to program icon
+* change the playback highlight color based on semantics.
+
ADDED AFTER ALPHA 2
===================
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-28 23:06:57
|
Revision: 2452
http://amis.svn.sourceforge.net/amis/?rev=2452&view=rev
Author: marisademeglio
Date: 2008-03-28 16:07:03 -0700 (Fri, 28 Mar 2008)
Log Message:
-----------
Made a few adjustments to work with VC8
Fixed crash-once-but-never-again bug
Modified Paths:
--------------
branches/amis3/AmisCore/AmisCore.vcproj
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/pdtb.cpp
Added Paths:
-----------
branches/amis3/VC8/
Removed Paths:
-------------
branches/amis3/VC7/
Modified: branches/amis3/AmisCore/AmisCore.vcproj
===================================================================
--- branches/amis3/AmisCore/AmisCore.vcproj 2008-03-27 17:41:50 UTC (rev 2451)
+++ branches/amis3/AmisCore/AmisCore.vcproj 2008-03-28 23:07:03 UTC (rev 2452)
@@ -21,6 +21,7 @@
IntermediateDirectory="Debug"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="2"
CharacterSet="1"
>
<Tool
@@ -89,6 +90,7 @@
IntermediateDirectory="Release"
ConfigurationType="4"
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="2"
CharacterSet="1"
>
<Tool
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-27 17:41:50 UTC (rev 2451)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-28 23:07:03 UTC (rev 2452)
@@ -247,8 +247,10 @@
if (b_open_from_cmdline == false
&& Preferences::Instance()->getLoadLastBook() == true
&& mbWasLastExitClean == true)
- book_to_open = mpHistory->getLastRead()->mPath;
-
+ {
+ if (mpHistory->getLastRead() != NULL)
+ book_to_open = mpHistory->getLastRead()->mPath;
+ }
//open a book if we decided to either open the command line parameter or last-read book
if (!book_to_open.is_empty_path()) openBook(&book_to_open);
Modified: branches/amis3/AmisGuiMFC2/src/pdtb.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/pdtb.cpp 2008-03-27 17:41:50 UTC (rev 2451)
+++ branches/amis3/AmisGuiMFC2/src/pdtb.cpp 2008-03-28 23:07:03 UTC (rev 2452)
@@ -1,6 +1,6 @@
#include "pdtb.h"
#include "stdafx.h"
-//for string transformations
+//for string transformations
#include <algorithm>
#include "util/Log.h"
@@ -89,8 +89,8 @@
bool isUserKeyFile(string filename)
{
- string file_ext = amis::util::FilePathTools::getExtension(filename);
- //convert the string to lower case before doing a comparison
+ string file_ext = amis::util::FilePathTools::getExtension(filename);
+ //convert the string to lower case before doing a comparison
std::transform(file_ext.begin(), file_ext.end(), file_ext.begin(), (int(*)(int))tolower);
if (file_ext == "uak") return true;
else return false;
Copied: branches/amis3/VC8 (from rev 2450, branches/amis3/VC7)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-27 17:41:44
|
Revision: 2451
http://amis.svn.sourceforge.net/amis/?rev=2451&view=rev
Author: marisademeglio
Date: 2008-03-27 10:41:50 -0700 (Thu, 27 Mar 2008)
Log Message:
-----------
alpha 2 installer
Modified Paths:
--------------
branches/amis3/installer/main/setup-amis3.nsi
Modified: branches/amis3/installer/main/setup-amis3.nsi
===================================================================
--- branches/amis3/installer/main/setup-amis3.nsi 2008-03-27 08:17:37 UTC (rev 2450)
+++ branches/amis3/installer/main/setup-amis3.nsi 2008-03-27 17:41:50 UTC (rev 2451)
@@ -2,7 +2,7 @@
; HM NIS Edit Wizard helper defines
!define PRODUCT_NAME "AMIS"
-!define PRODUCT_VERSION "3.0 Alpha"
+!define PRODUCT_VERSION "3.0 Alpha 2"
!define PRODUCT_PUBLISHER "DAISY for All Project"
!define PRODUCT_WEB_SITE "http://amisproject.org"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\AMIS.exe"
@@ -68,7 +68,7 @@
Name "${PRODUCT_NAME} ${PRODUCT_VERSION} (${LANG_NAME})"
;this is the name of the installer that gets created.
;for some reason, i vaguely remember that it shouldn't have spaces in the filename.
-OutFile "Setup-amis-3-alpha-${DEFAULT_LANGPACK}.exe"
+OutFile "Setup-amis3-alpha2-${DEFAULT_LANGPACK}.exe"
InstallDir "$PROGRAMFILES\AMIS"
InstallDirRegKey HKLM "${PRODUCT_DIR_REGKEY}" ""
ShowInstDetails show
@@ -98,7 +98,7 @@
;copy the default settings
SetOutPath "$INSTDIR\settings"
File "${BIN_DIR}\settings\amisPrefs.xml"
- File "${BIN_DIR}\settings\amisRecentBooks.xml"
+ File "${BIN_DIR}\settings\amisHistory.xml"
File "${BIN_DIR}\settings\defaultToolbar.xml"
File "${BIN_DIR}\settings\basicToolbar.xml"
File "${BIN_DIR}\settings\resource.h.ini"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-27 08:23:29
|
Revision: 2450
http://amis.svn.sourceforge.net/amis/?rev=2450&view=rev
Author: daniel_weck
Date: 2008-03-27 01:17:37 -0700 (Thu, 27 Mar 2008)
Log Message:
-----------
- brutal transition to Visual Studio 2005 (v8.0) from 2003 (v7.1).
To compile, AMIS (and any other 2005 C++ project) now requires a bunch of changes in sphelper.h, which is part of the SAPI SDK. The corrections are mostly trivial and are due to differences in the C++ compiler, like the lack of default-int for variables declared without a type.
Another VERY important aspect is that ALL libraries used (Xerces, Ambulant, LibJPEG, Expat, etc.) as well as AMIS itself need to be re-compiled using the /Zc:wchar_t- option, which is exposed as "treat wchar_t as built-in type == NO" under Project -> Properties -> C/C++ -> Language
Finally, this upgrade requires using the latest Xerces 2.8 (AMIS was using 2.7, which did not have VS2005/8 projcet files).
Good luck ! (works fine here in DEBUG and RELEASE modes)
Modified Paths:
--------------
branches/amis3/AmisCore/AmisCore.vcproj
branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj
branches/amis3/DefaultLangpack/AmisLangpack/AmisLangpack.vcproj
branches/amis3/VC7/amis.sln
Modified: branches/amis3/AmisCore/AmisCore.vcproj
===================================================================
--- branches/amis3/AmisCore/AmisCore.vcproj 2008-03-27 02:44:35 UTC (rev 2449)
+++ branches/amis3/AmisCore/AmisCore.vcproj 2008-03-27 08:17:37 UTC (rev 2450)
@@ -1,99 +1,151 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="AmisCore"
ProjectGUID="{E0F81CE5-9C15-4E36-BC71-42BE1C0F2406}"
RootNamespace="AmisCore"
- Keyword="Win32Proj">
+ Keyword="Win32Proj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../lib"
IntermediateDirectory="Debug"
ConfigurationType="4"
- CharacterSet="1">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="./include; ../../../../xerces-c-src/src;../../../../ambulant/include;c:\program files\visual leak detector;"
- PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS; AMIS_COMPILER_MSVC; AMIS_PLATFORM_WINDOWS;"
- MinimalRebuild="TRUE"
+ PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS; WIN32;_DEBUG;_WINDOWS; AMIS_COMPILER_MSVC; AMIS_PLATFORM_WINDOWS;"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLibrarianTool"
OutputFile="$(OutDir)/$(ProjectName)D.lib"
AdditionalLibraryDirectories=""
- IgnoreDefaultLibraryNames=""/>
+ IgnoreDefaultLibraryNames=""
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
- <Tool
- Name="VCWebServiceProxyGeneratorTool"/>
- <Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../lib"
IntermediateDirectory="Release"
ConfigurationType="4"
- CharacterSet="1">
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ CharacterSet="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ />
+ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="./include; ../../../../xerces-c-src/src;../../../../ambulant/include"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS; AMIS_COMPILER_MSVC; AMIS_PLATFORM_WINDOWS;"
RuntimeLibrary="2"
- EnableFunctionLevelLinking="TRUE"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="FALSE"
- DebugInformationFormat="0"/>
+ Detect64BitPortabilityProblems="false"
+ DebugInformationFormat="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
- Name="VCLibrarianTool"
- AdditionalLibraryDirectories=""/>
+ Name="VCResourceCompilerTool"
+ />
<Tool
- Name="VCMIDLTool"/>
+ Name="VCPreLinkEventTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCLibrarianTool"
+ AdditionalLibraryDirectories=""
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -101,538 +153,701 @@
<Files>
<Filter
Name="src"
- Filter="">
+ >
<File
- RelativePath=".\src\AmisCore.cpp">
+ RelativePath=".\src\AmisCore.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\BookList.cpp">
+ RelativePath=".\src\BookList.cpp"
+ >
</File>
<File
- RelativePath=".\src\Error.cpp">
+ RelativePath=".\src\Error.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\Media.cpp">
+ RelativePath=".\src\Media.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\ModuleDescData.cpp">
+ RelativePath=".\src\ModuleDescData.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<Filter
Name="io"
- Filter="">
+ >
<File
- RelativePath=".\src\io\BookListFileIO.cpp">
+ RelativePath=".\src\io\BookListFileIO.cpp"
+ >
</File>
<File
- RelativePath=".\src\io\BookmarksFileIO.cpp">
+ RelativePath=".\src\io\BookmarksFileIO.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\io\ModuleDescReader.cpp">
+ RelativePath=".\src\io\ModuleDescReader.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\io\NavFileReader.cpp">
+ RelativePath=".\src\io\NavFileReader.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\io\NccFileReader.cpp">
+ RelativePath=".\src\io\NccFileReader.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\io\NcxFileReader.cpp">
+ RelativePath=".\src\io\NcxFileReader.cpp"
+ >
</File>
<File
- RelativePath=".\src\io\OpfFileReader.cpp">
+ RelativePath=".\src\io\OpfFileReader.cpp"
+ >
</File>
<File
- RelativePath=".\src\io\QuickDataSmilFileReader.cpp">
+ RelativePath=".\src\io\QuickDataSmilFileReader.cpp"
+ >
</File>
<File
- RelativePath=".\src\io\SmilFileReader.cpp">
+ RelativePath=".\src\io\SmilFileReader.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\io\TextSearch.cpp">
+ RelativePath=".\src\io\TextSearch.cpp"
+ >
</File>
<File
- RelativePath=".\src\io\UrlInputSource.cpp">
+ RelativePath=".\src\io\UrlInputSource.cpp"
+ >
</File>
<File
- RelativePath=".\src\io\XercesSaxParseBase.cpp">
+ RelativePath=".\src\io\XercesSaxParseBase.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="dtb"
- Filter="">
+ >
<File
- RelativePath=".\src\dtb\Bookmarks.cpp">
+ RelativePath=".\src\dtb\Bookmarks.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\CustomTest.cpp">
+ RelativePath=".\src\dtb\CustomTest.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\Dtb.cpp">
+ RelativePath=".\src\dtb\Dtb.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\DtbFileSet.cpp">
+ RelativePath=".\src\dtb\DtbFileSet.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\Metadata.cpp">
+ RelativePath=".\src\dtb\Metadata.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\Spine.cpp">
+ RelativePath=".\src\dtb\Spine.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<Filter
Name="nav"
- Filter="">
+ >
<File
- RelativePath=".\src\dtb\nav\NavContainer.cpp">
+ RelativePath=".\src\dtb\nav\NavContainer.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavList.cpp">
+ RelativePath=".\src\dtb\nav\NavList.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavMap.cpp">
+ RelativePath=".\src\dtb\nav\NavMap.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavModel.cpp">
+ RelativePath=".\src\dtb\nav\NavModel.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavNode.cpp">
+ RelativePath=".\src\dtb\nav\NavNode.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavPoint.cpp">
+ RelativePath=".\src\dtb\nav\NavPoint.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavTarget.cpp">
+ RelativePath=".\src\dtb\nav\NavTarget.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\NavVisitor.cpp">
+ RelativePath=".\src\dtb\nav\NavVisitor.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\PageList.cpp">
+ RelativePath=".\src\dtb\nav\PageList.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\nav\PageTarget.cpp">
+ RelativePath=".\src\dtb\nav\PageTarget.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="smil"
- Filter="">
+ >
<File
- RelativePath=".\src\dtb\smil\ContentNode.cpp">
+ RelativePath=".\src\dtb\smil\ContentNode.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\Node.cpp">
+ RelativePath=".\src\dtb\smil\Node.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\NodeFactory.cpp">
+ RelativePath=".\src\dtb\smil\NodeFactory.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\ParNode.cpp">
+ RelativePath=".\src\dtb\smil\ParNode.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\SeqNode.cpp">
+ RelativePath=".\src\dtb\smil\SeqNode.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\SmilMediaGroup.cpp">
+ RelativePath=".\src\dtb\smil\SmilMediaGroup.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\SmilTree.cpp">
+ RelativePath=".\src\dtb\smil\SmilTree.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\SmilVisitor.cpp">
+ RelativePath=".\src\dtb\smil\SmilVisitor.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\dtb\smil\TimeContainerNode.cpp">
+ RelativePath=".\src\dtb\smil\TimeContainerNode.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
</Filter>
</Filter>
<Filter
Name="util"
- Filter="">
+ >
<File
- RelativePath=".\src\util\FilePathTools.cpp">
+ RelativePath=".\src\util\FilePathTools.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\util\Log.cpp">
+ RelativePath=".\src\util\Log.cpp"
+ >
</File>
<File
- RelativePath=".\src\util\SearchForFiles.cpp">
+ RelativePath=".\src\util\SearchForFiles.cpp"
+ >
</File>
</Filter>
</Filter>
<Filter
Name="include"
- Filter="">
+ >
<File
- RelativePath=".\include\AmisCore.h">
+ RelativePath=".\include\AmisCore.h"
+ >
</File>
<File
- RelativePath=".\include\BookList.h">
+ RelativePath=".\include\BookList.h"
+ >
</File>
<File
- RelativePath=".\include\Error.h">
+ RelativePath=".\include\Error.h"
+ >
</File>
<File
- RelativePath=".\include\Media.h">
+ RelativePath=".\include\Media.h"
+ >
</File>
<File
- RelativePath=".\include\ModuleDescData.h">
+ RelativePath=".\include\ModuleDescData.h"
+ >
</File>
<Filter
Name="io"
- Filter="">
+ >
<File
- RelativePath=".\include\io\BookListFileIO.h">
+ RelativePath=".\include\io\BookListFileIO.h"
+ >
</File>
<File
- RelativePath=".\include\io\BookmarksFileIO.h">
+ RelativePath=".\include\io\BookmarksFileIO.h"
+ >
</File>
<File
- RelativePath=".\include\io\ModuleDescReader.h">
+ RelativePath=".\include\io\ModuleDescReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\NavFileReader.h">
+ RelativePath=".\include\io\NavFileReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\NccFileReader.h">
+ RelativePath=".\include\io\NccFileReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\NcxFileReader.h">
+ RelativePath=".\include\io\NcxFileReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\OpfFileReader.h">
+ RelativePath=".\include\io\OpfFileReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\QuickDataSmilFileReader.h">
+ RelativePath=".\include\io\QuickDataSmilFileReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\SmilFileReader.h">
+ RelativePath=".\include\io\SmilFileReader.h"
+ >
</File>
<File
- RelativePath=".\include\io\TextSearch.h">
+ RelativePath=".\include\io\TextSearch.h"
+ >
</File>
<File
- RelativePath=".\include\io\UrlInputSource.h">
+ RelativePath=".\include\io\UrlInputSource.h"
+ >
</File>
<File
- RelativePath=".\include\io\XercesSaxParseBase.h">
+ RelativePath=".\include\io\XercesSaxParseBase.h"
+ >
</File>
</Filter>
<Filter
Name="dtb"
- Filter="">
+ >
<File
- RelativePath=".\include\dtb\Bookmarks.h">
+ RelativePath=".\include\dtb\Bookmarks.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\CustomTest.h">
+ RelativePath=".\include\dtb\CustomTest.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\Dtb.h">
+ RelativePath=".\include\dtb\Dtb.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\DtbFileSet.h">
+ RelativePath=".\include\dtb\DtbFileSet.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\Metadata.h">
+ RelativePath=".\include\dtb\Metadata.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\Spine.h">
+ RelativePath=".\include\dtb\Spine.h"
+ >
</File>
<Filter
Name="nav"
- Filter="">
+ >
<File
- RelativePath=".\include\dtb\nav\NavContainer.h">
+ RelativePath=".\include\dtb\nav\NavContainer.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavList.h">
+ RelativePath=".\include\dtb\nav\NavList.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavMap.h">
+ RelativePath=".\include\dtb\nav\NavMap.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavModel.h">
+ RelativePath=".\include\dtb\nav\NavModel.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavNode.h">
+ RelativePath=".\include\dtb\nav\NavNode.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavPoint.h">
+ RelativePath=".\include\dtb\nav\NavPoint.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavTarget.h">
+ RelativePath=".\include\dtb\nav\NavTarget.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\NavVisitor.h">
+ RelativePath=".\include\dtb\nav\NavVisitor.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\PageList.h">
+ RelativePath=".\include\dtb\nav\PageList.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\nav\PageTarget.h">
+ RelativePath=".\include\dtb\nav\PageTarget.h"
+ >
</File>
</Filter>
<Filter
Name="smil"
- Filter="">
+ >
<File
- RelativePath=".\include\dtb\smil\ContentNode.h">
+ RelativePath=".\include\dtb\smil\ContentNode.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\Node.h">
+ RelativePath=".\include\dtb\smil\Node.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\NodeFactory.h">
+ RelativePath=".\include\dtb\smil\NodeFactory.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\ParNode.h">
+ RelativePath=".\include\dtb\smil\ParNode.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\SeqNode.h">
+ RelativePath=".\include\dtb\smil\SeqNode.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\SmilMediaGroup.h">
+ RelativePath=".\include\dtb\smil\SmilMediaGroup.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\SmilTree.h">
+ RelativePath=".\include\dtb\smil\SmilTree.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\SmilVisitor.h">
+ RelativePath=".\include\dtb\smil\SmilVisitor.h"
+ >
</File>
<File
- RelativePath=".\include\dtb\smil\TimeContainerNode.h">
+ RelativePath=".\include\dtb\smil\TimeContainerNode.h"
+ >
</File>
</Filter>
</Filter>
<Filter
Name="util"
- Filter="">
+ >
<File
- RelativePath=".\include\util\FilePathTools.h">
+ RelativePath=".\include\util\FilePathTools.h"
+ >
</File>
<File
- RelativePath=".\include\util\Log.h">
+ RelativePath=".\include\util\Log.h"
+ >
</File>
<File
- RelativePath=".\include\util\SearchForFiles.h">
+ RelativePath=".\include\util\SearchForFiles.h"
+ >
</File>
<File
- RelativePath=".\include\util\xercesutils.h">
+ RelativePath=".\include\util\xercesutils.h"
+ >
</File>
</Filter>
</Filter>
Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj 2008-03-27 02:44:35 UTC (rev 2449)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj 2008-03-27 08:17:37 UTC (rev 2450)
@@ -1,133 +1,197 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="AmisGuiMFC2"
ProjectGUID="{A7A37247-BAAC-4376-8354-96A8C09F926A}"
- Keyword="MFCProj">
+ Keyword="MFCProj"
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="../bin"
IntermediateDirectory="Debug"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="_DEBUG"
+ MkTypLibCompatible="false"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="include;../AmisAudio/include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Include";"$(VSInstallDir)\..\Visual Leak Detector";"
- PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;AMIS_COMPILER_MSVC;AMIS_PLATFORM_WINDOWS;WITH_EXTERNAL_SMIL_PLAYER;"
- MinimalRebuild="TRUE"
+ PreprocessorDefinitions="_CRT_SECURE_NO_WARNINGS;WIN32;_WINDOWS;_DEBUG;AMIS_COMPILER_MSVC;AMIS_PLATFORM_WINDOWS;WITH_EXTERNAL_SMIL_PLAYER;"
+ MinimalRebuild="true"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
- TreatWChar_tAsBuiltInType="FALSE"
- UsePrecompiledHeader="3"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="2"
PrecompiledHeaderThrough="stdafx.h"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="4"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="4"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
- AdditionalDependencies="AmisCoreD.lib xerces-c_2D.lib libambulant_shwin32_D.lib strmiids.lib uuid.lib"
+ AdditionalDependencies="xerces-c_2D.lib AmisCoreD.lib libambulant_shwin32_D.lib strmiids.lib uuid.lib"
OutputFile="$(OutDir)/AMISD.exe"
LinkIncremental="2"
AdditionalLibraryDirectories="../lib;../../../../ambulant/lib/win32;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Lib\i386";"$(VSInstallDir)\..\Visual Leak Detector""
IgnoreDefaultLibraryNames="uafxcwd.lib"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
SubSystem="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="_DEBUG"
- MkTypLibCompatible="FALSE"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"
- CommandLine="..\bin\copyAmbulantDll.bat"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ CommandLine="..\bin\copyAmbulantDll.bat"
+ />
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="../bin"
IntermediateDirectory="Release"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="2"
- CharacterSet="1">
+ CharacterSet="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ PreprocessorDefinitions="NDEBUG"
+ MkTypLibCompatible="false"
+ />
+ <Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="include;../AmisAudio/include;../../../../ambulant/include/;"../../../../ambulant-private/pdtbplugin";"../../../../ambulant-private/pdtbplugin/PdtbIePlugin";../AmisCore/include;"../../../../xerces-c-src/src";"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Include""
PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;AMIS_COMPILER_MSVC;AMIS_PLATFORM_WINDOWS;WITH_EXTERNAL_SMIL_PLAYER;"
- MinimalRebuild="FALSE"
+ MinimalRebuild="false"
RuntimeLibrary="2"
- TreatWChar_tAsBuiltInType="FALSE"
- UsePrecompiledHeader="3"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="2"
WarningLevel="3"
- Detect64BitPortabilityProblems="TRUE"
- DebugInformationFormat="0"/>
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ AdditionalIncludeDirectories="$(IntDir)"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalDependencies="xerces-c_2.lib AmisCore.lib libambulant_shwin32.lib strmiids.lib uuid.lib"
OutputFile="$(OutDir)/AMIS.exe"
LinkIncremental="1"
AdditionalLibraryDirectories="../lib;../../../../ambulant/lib/win32;"$(VSInstallDir)\..\Microsoft Speech SDK 5.1\Lib\i386""
- IgnoreAllDefaultLibraries="FALSE"
+ IgnoreAllDefaultLibraries="false"
IgnoreDefaultLibraryNames="uafxcw.lib"
- GenerateDebugInformation="FALSE"
+ GenerateDebugInformation="false"
SubSystem="2"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- TargetMachine="1"/>
+ TargetMachine="1"
+ />
<Tool
- Name="VCMIDLTool"
- PreprocessorDefinitions="NDEBUG"
- MkTypLibCompatible="FALSE"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- AdditionalIncludeDirectories="$(IntDir)"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
@@ -135,1005 +199,1312 @@
<Files>
<Filter
Name="include"
- Filter="">
+ >
<File
- RelativePath=".\include\DtbWithHooks.h">
+ RelativePath=".\include\DtbWithHooks.h"
+ >
</File>
<File
- RelativePath=".\include\pdtb.h">
+ RelativePath=".\include\pdtb.h"
+ >
</File>
<File
- RelativePath=".\include\Preferences.h">
+ RelativePath=".\include\Preferences.h"
+ >
</File>
<File
- RelativePath=".\include\stdafx.h">
+ RelativePath=".\include\stdafx.h"
+ >
</File>
<File
- RelativePath=".\include\UrlInputSource.h">
+ RelativePath=".\include\UrlInputSource.h"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
</FileConfiguration>
</File>
<Filter
Name="io"
- Filter="">
+ >
<File
- RelativePath=".\include\io\PreferencesFileIO.h">
+ RelativePath=".\include\io\PreferencesFileIO.h"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCCustomBuildTool"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\include\io\ToolbarIO.h">
+ RelativePath=".\include\io\ToolbarIO.h"
+ >
</File>
</Filter>
<Filter
Name="gui"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\AmisApp.h">
+ RelativePath=".\include\gui\AmisApp.h"
+ >
</File>
<File
- RelativePath=".\include\gui\ChildFrm.h">
+ RelativePath=".\include\gui\ChildFrm.h"
+ >
</File>
<File
- RelativePath=".\include\gui\HtmlDoc.h">
+ RelativePath=".\include\gui\HtmlDoc.h"
+ >
</File>
<File
- RelativePath=".\include\gui\HtmlView.h">
+ RelativePath=".\include\gui\HtmlView.h"
+ >
</File>
<File
- RelativePath=".\include\gui\MainFrm.h">
+ RelativePath=".\include\gui\MainFrm.h"
+ >
</File>
<File
- RelativePath=".\include\gui\MainWndParts.h">
+ RelativePath=".\include\gui\MainWndParts.h"
+ >
</File>
<File
- RelativePath=".\include\gui\MenuManip.h">
+ RelativePath=".\include\gui\MenuManip.h"
+ >
</File>
<File
- RelativePath=".\include\gui\MmDoc.h">
+ RelativePath=".\include\gui\MmDoc.h"
+ >
</File>
<File
- RelativePath=".\include\gui\MmView.h">
+ RelativePath=".\include\gui\MmView.h"
+ >
</File>
<File
- RelativePath=".\include\gui\TextRenderBrain.h">
+ RelativePath=".\include\gui\TextRenderBrain.h"
+ >
</File>
<Filter
Name="dialogs"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\dialogs\AboutDialog.h">
+ RelativePath=".\include\gui\dialogs\AboutDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\AmisDialogBase.h">
+ RelativePath=".\include\gui\dialogs\AmisDialogBase.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\AmisFileDialog.h">
+ RelativePath=".\include\gui\dialogs\AmisFileDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\GoToPageDialog.h">
+ RelativePath=".\include\gui\dialogs\GoToPageDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\MultipleBooksOnVolumeDialog.h">
+ RelativePath=".\include\gui\dialogs\MultipleBooksOnVolumeDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\OpenUrlDialog.h">
+ RelativePath=".\include\gui\dialogs\OpenUrlDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\PreferencesDialog.h">
+ RelativePath=".\include\gui\dialogs\PreferencesDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\PublicationSummaryDialog.h">
+ RelativePath=".\include\gui\dialogs\PublicationSummaryDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\SearchForBooksDialog.h">
+ RelativePath=".\include\gui\dialogs\SearchForBooksDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\SkipDialog.h">
+ RelativePath=".\include\gui\dialogs\SkipDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\dialogs\TextStyleDialog.h">
+ RelativePath=".\include\gui\dialogs\TextStyleDialog.h"
+ >
</File>
</Filter>
<Filter
Name="sidebar"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\sidebar\AmisSidebar.h">
+ RelativePath=".\include\gui\sidebar\AmisSidebar.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\AmisSidebarLoader.h">
+ RelativePath=".\include\gui\sidebar\AmisSidebarLoader.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\cdxCDynamicBar.h">
+ RelativePath=".\include\gui\sidebar\cdxCDynamicBar.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\cdxCDynamicControlsManager.h">
+ RelativePath=".\include\gui\sidebar\cdxCDynamicControlsManager.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\cdxCDynamicDialog.h">
+ RelativePath=".\include\gui\sidebar\cdxCDynamicDialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\cdxCDynamicWnd.h">
+ RelativePath=".\include\gui\sidebar\cdxCDynamicWnd.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\cdxCDynamicWndEx.h">
+ RelativePath=".\include\gui\sidebar\cdxCDynamicWndEx.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\cdxCSizeIconCtrl.h">
+ RelativePath=".\include\gui\sidebar\cdxCSizeIconCtrl.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\NavListControl.h">
+ RelativePath=".\include\gui\sidebar\NavListControl.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\scbarcf.h">
+ RelativePath=".\include\gui\sidebar\scbarcf.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\scbarg.h">
+ RelativePath=".\include\gui\sidebar\scbarg.h"
+ >
</File>
<File
- RelativePath=".\include\gui\sidebar\SizeCBar.h">
+ RelativePath=".\include\gui\sidebar\SizeCBar.h"
+ >
</File>
</Filter>
<Filter
Name="toolbar"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\toolbar\Toolbar.h">
+ RelativePath=".\include\gui\toolbar\Toolbar.h"
+ >
</File>
</Filter>
<Filter
Name="self-voicing"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\self-voicing\AudioSequence.h">
+ RelativePath=".\include\gui\self-voicing\AudioSequence.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\AudioSequenceComponent.h">
+ RelativePath=".\include\gui\self-voicing\AudioSequenceComponent.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\AudioSequencePlayer.h">
+ RelativePath=".\include\gui\self-voicing\AudioSequencePlayer.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\PreTranslateMessageHandler.h">
+ RelativePath=".\include\gui\self-voicing\PreTranslateMessageHandler.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\Prompt.h">
+ RelativePath=".\include\gui\self-voicing\Prompt.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\PromptResolver.h">
+ RelativePath=".\include\gui\self-voicing\PromptResolver.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\TTSPlayer.h">
+ RelativePath=".\include\gui\self-voicing\TTSPlayer.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\UiMediaTypes.h">
+ RelativePath=".\include\gui\self-voicing\UiMediaTypes.h"
+ >
</File>
<Filter
Name="datamodel"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\self-voicing\datamodel\AccessibleUiDataReader.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\AccessibleUiDataReader.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\Action.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\Action.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\Container.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\Container.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\DataTree.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\DataTree.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\Dialog.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\Dialog.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\DialogControl.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\DialogControl.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\IniFile.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\IniFile.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\Label.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\Label.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\LabelList.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\LabelList.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\Switch.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\Switch.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\datamodel\UiItem.h">
+ RelativePath=".\include\gui\self-voicing\datamodel\UiItem.h"
+ >
</File>
</Filter>
<Filter
Name="dialogs"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\self-voicing\dialogs\MenuVoicing.h">
+ RelativePath=".\include\gui\self-voicing\dialogs\MenuVoicing.h"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\dialogs\SkipDialogVoicing.h">
+ RelativePath=".\include\gui\self-voicing\dialogs\SkipDialogVoicing.h"
+ >
</File>
</Filter>
<Filter
Name="directshow"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\self-voicing\directshow\dx_audio_player.h">
+ RelativePath=".\include\gui\self-voicing\directshow\dx_audio_player.h"
+ >
</File>
</Filter>
<Filter
Name="mffmTimeCode"
- Filter="">
+ >
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\counter.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\counter.H"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\field.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\field.H"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\masterCounter.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\masterCounter.H"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\masterCounterArray.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\masterCounterArray.H"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\SmilTimeCode.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\SmilTimeCode.H"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\timeCode.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\timeCode.H"
+ >
</File>
<File
- RelativePath=".\include\gui\self-voicing\mffmTimeCode\win32fix.H">
+ RelativePath=".\include\gui\self-voicing\mffmTimeCode\win32fix.H"
+ >
</File>
</Filter>
</Filter>
</Filter>
<Filter
Name="util"
- Filter="">
+ >
<File
- RelativePath=".\include\util\Color.h">
+ RelativePath=".\include\util\Color.h"
+ >
</File>
<File
- RelativePath=".\include\util\SearchForFilesMFC.h">
+ RelativePath=".\include\util\SearchForFilesMFC.h"
+ >
</File>
<File
- RelativePath=".\include\util\VolMaster.h">
+ RelativePath=".\include\util\VolMaster.h"
+ >
</File>
</Filter>
</Filter>
<Filter
Name="src"
- Filter="">
+ >
<File
- RelativePath=".\src\DtbWithHooks.cpp">
+ RelativePath=".\src\DtbWithHooks.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\pdtb.cpp">
+ RelativePath=".\src\pdtb.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\Preferences.cpp">
+ RelativePath=".\src\Preferences.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\stdafx.cpp">
+ RelativePath=".\src\stdafx.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"/>
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="1"/>
+ UsePrecompiledHeader="1"
+ />
</FileConfiguration>
</File>
<Filter
Name="io"
- Filter="">
+ >
<File
- RelativePath=".\src\io\PreferencesFileIO.cpp">
+ RelativePath=".\src\io\PreferencesFileIO.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\io\ToolbarIO.cpp">
+ RelativePath=".\src\io\ToolbarIO.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
</Filter>
<Filter
Name="gui"
- Filter="">
+ >
<File
- RelativePath=".\src\gui\AmisApp.cpp">
+ RelativePath=".\src\gui\AmisApp.cpp"
+ >
</File>
<File
- RelativePath=".\src\gui\ChildFrm.cpp">
+ RelativePath=".\src\gui\ChildFrm.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\HtmlDoc.cpp">
+ RelativePath=".\src\gui\HtmlDoc.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\HtmlView.cpp">
+ RelativePath=".\src\gui\HtmlView.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\MainFrm.cpp">
+ RelativePath=".\src\gui\MainFrm.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\MainWndParts.cpp">
+ RelativePath=".\src\gui\MainWndParts.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\MenuManip.cpp">
+ RelativePath=".\src\gui\MenuManip.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\MmDoc.cpp">
+ RelativePath=".\src\gui\MmDoc.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\MmView.cpp">
+ RelativePath=".\src\gui\MmView.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\TextRenderBrain.cpp">
+ RelativePath=".\src\gui\TextRenderBrain.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<Filter
Name="dialogs"
- Filter="">
+ >
<File
- RelativePath=".\src\gui\dialogs\AboutDialog.cpp">
+ RelativePath=".\src\gui\dialogs\AboutDialog.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\dialogs\AmisDialogBase.cpp">
+ RelativePath=".\src\gui\dialogs\AmisDialogBase.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\dialogs\AmisFileDialog.cpp">
+ RelativePath=".\src\gui\dialogs\AmisFileDialog.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\dialogs\GoToPageDialog.cpp">
+ RelativePath=".\src\gui\dialogs\GoToPageDialog.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\dialogs\MultipleBooksOnVolumeDialog.cpp">
+ RelativePath=".\src\gui\dialogs\MultipleBooksOnVolumeDialog.cpp"
+ >
</File>
<File
- RelativePath=".\src\gui\dialogs\OpenUrlDialog.cpp">
+ RelativePath=".\src\gui\dialogs\OpenUrlDialog.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\dialogs\PreferencesDialog.cpp">
+ RelativePath=".\src\gui\dialogs\PreferencesDialog.cpp"
+ >
</File>
<File
- RelativePath=".\src\gui\dialogs\PublicationSummaryDialog.cpp">
+ RelativePath=".\src\gui\dialogs\PublicationSummaryDialog.cpp"
+ >
</File>
<File
- RelativePath=".\src\gui\dialogs\SearchForBooksDialog.cpp">
+ RelativePath=".\src\gui\dialogs\SearchForBooksDialog.cpp"
+ >
</File>
<File
- RelativePath=".\src\gui\dialogs\SkipDialog.cpp">
+ RelativePath=".\src\gui\dialogs\SkipDialog.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\dialogs\TextStyleDialog.cpp">
+ RelativePath=".\src\gui\dialogs\TextStyleDialog.cpp"
+ >
</File>
</Filter>
<Filter
Name="sidebar"
- Filter="">
+ >
<File
- RelativePath=".\src\gui\sidebar\AmisSidebar.cpp">
+ RelativePath=".\src\gui\sidebar\AmisSidebar.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\sidebar\AmisSidebarLoader.cpp">
+ RelativePath=".\src\gui\sidebar\AmisSidebarLoader.cpp"
+ >
<FileConfiguration
- Name="Debug|Win32">
+ Name="Debug|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\sidebar\cdxCDynamicBar.cpp">
+ RelativePath=".\src\gui\sidebar\cdxCDynamicBar.cpp"
+ >
<FileConfiguration
- Name="Release|Win32">
+ Name="Release|Win32"
+ >
<Tool
Name="VCCLCompilerTool"
- UsePrecompiledHeader="0"/>
+ UsePrecompiledHeader="0"
+ />
</FileConfiguration>
</File>
<File
- RelativePath=".\src\gui\sidebar\cdxCDynamicControlsManager.cpp">
+ Relati...
[truncated message content] |
|
From: <dan...@us...> - 2008-03-27 02:45:00
|
Revision: 2449
http://amis.svn.sourceforge.net/amis/?rev=2449&view=rev
Author: daniel_weck
Date: 2008-03-26 19:44:35 -0700 (Wed, 26 Mar 2008)
Log Message:
-----------
- fixed a few C++ compatibility bugs so that AMIS can compile with VS 2005
Modified Paths:
--------------
branches/amis3/AmisCore/include/io/BookListFileIO.h
branches/amis3/AmisCore/include/io/BookmarksFileIO.h
branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h
branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h
branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h
branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h
branches/amis3/AmisGuiMFC2/src/Preferences.cpp
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp
branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp
branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp
branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp
branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp
branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp
Modified: branches/amis3/AmisCore/include/io/BookListFileIO.h
===================================================================
--- branches/amis3/AmisCore/include/io/BookListFileIO.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisCore/include/io/BookListFileIO.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -71,7 +71,7 @@
amis::BookList* mpBookList;
amis::BookEntry* mpCurrentEntry;
//The DOM document pointer
- xercesc_2_7::DOMDocument* mpDoc;
+ xercesc_2_8::DOMDocument* mpDoc;
};
}
}
Modified: branches/amis3/AmisCore/include/io/BookmarksFileIO.h
===================================================================
--- branches/amis3/AmisCore/include/io/BookmarksFileIO.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisCore/include/io/BookmarksFileIO.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -80,7 +80,7 @@
vector<string> mElementStack;
//The DOM document pointer (for saving the file)
- xercesc_2_7::DOMDocument* mpDoc;
+ xercesc_2_8::DOMDocument* mpDoc;
//the title element
amis::MediaGroup* mpTitle;
Modified: branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/gui/sidebar/SizeCBar.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -169,7 +169,12 @@
afx_msg int OnCreate(LPCREATESTRUCT lpCreateStruct);
afx_msg void OnNcPaint();
afx_msg void OnNcCalcSize(BOOL bCalcValidRects, NCCALCSIZE_PARAMS FAR* lpncsp);
+
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
afx_msg UINT OnNcHitTest(CPoint point);
+#else // Later than VS.NET 2003
+ afx_msg LRESULT OnNcHitTest(CPoint point);
+#endif
afx_msg void OnCaptureChanged(CWnd *pWnd);
afx_msg void OnSettingChange(UINT uFlags, LPCTSTR lpszSection);
afx_msg void OnLButtonUp(UINT nFlags, CPoint point);
Modified: branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/gui/sidebar/cdxCDynamicControlsManager.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -193,7 +193,7 @@
// (used by Add())
// Note that the window is not need to be already created
//
- private:
+ public:
struct ControlEntry
{
private:
Modified: branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/gui/sidebar/scbarg.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -107,7 +107,11 @@
// Generated message map functions
protected:
//{{AFX_MSG(CSizingControlBarG)
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
afx_msg UINT OnNcHitTest(CPoint point);
+#else // Later than VS.NET 2003
+ afx_msg LRESULT OnNcHitTest(CPoint point);
+#endif
afx_msg void OnNcLButtonUp(UINT nHitTest, CPoint point);
//}}AFX_MSG
Modified: branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/include/io/PreferencesFileIO.h 2008-03-27 02:44:35 UTC (rev 2449)
@@ -66,7 +66,7 @@
void addEntry(std::string, std::string);
amis::Preferences* mpPrefs;
- xercesc_2_7::DOMDocument* mpDoc;
+ xercesc_2_8::DOMDocument* mpDoc;
};
}
}
Modified: branches/amis3/AmisGuiMFC2/src/Preferences.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/Preferences.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/Preferences.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -363,10 +363,10 @@
}
amis::ModuleDescData* Preferences::getCurrentLanguageData()
-{
- amis::ModuleDescData* p_data = mInstalledLanguages[mUiLangId];
- return p_data;
-}
+{
+ amis::ModuleDescData* p_data = mInstalledLanguages[mUiLangId];
+ return p_data;
+}
void Preferences::setHighlightBGColor(amis::util::Color value)
{
mHighlightBG = value;
@@ -390,9 +390,9 @@
std::string Preferences::getSidebarFontName()
{
return mSidebarFontName;
-}
-void Preferences::logAllPreferences()
-{
+}
+void Preferences::logAllPreferences()
+{
amis::util::Log* p_log = amis::util::Log::Instance();
p_log->writeMessage("__Preferences (all)__");
@@ -467,18 +467,18 @@
p_log->writeMessage("\tCustom CSS files:");
- for (i = 0; i<mCustomCssFiles.size(); i++)
- p_log->writeMessage("\t\t", &mCustomCssFiles[i]);
-}
-
-void Preferences::logUserControllablePreferences()
-{
+ for (int i = 0; i<mCustomCssFiles.size(); i++)
+ p_log->writeMessage("\t\t", &mCustomCssFiles[i]);
+}
+
+void Preferences::logUserControllablePreferences()
+{
amis::util::Log* p_log = amis::util::Log::Instance();
- p_log->writeMessage("__Preferences (user-controllable only)__");
-
+ p_log->writeMessage("__Preferences (user-controllable only)__");
+
string log_msg = "\tLanguage pack = " + getUiLangId();
- p_log->writeMessage(log_msg);
-
+ p_log->writeMessage(log_msg);
+
log_msg = "\tStartup view = ";
if (getStartInBasicView()) log_msg += "Basic";
else log_msg += "Default";
@@ -497,8 +497,8 @@
log_msg = "\tIs self-voicing? ";
if (getIsSelfVoicing()) log_msg += "Yes";
else log_msg += "No";
- p_log->writeMessage(log_msg);
-
+ p_log->writeMessage(log_msg);
+
log_msg = "\tHighlight text? ";
if (getHighlightText()) log_msg += "Yes";
else log_msg += "No";
@@ -507,5 +507,5 @@
log_msg = "\tDisable screensaver? ";
if (getDisableScreensaver()) log_msg += "Yes";
else log_msg += "No";
- p_log->writeMessage(log_msg);
+ p_log->writeMessage(log_msg);
}
\ No newline at end of file
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -476,14 +476,14 @@
if (view->isPlaying() == true)
{
amis::util::Log::Instance()->writeMessage("Pausing", "CAmisApp::OnPlayPause", "AmisGuiMFC2");
- MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(true);
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(true);
MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(true);
view->OnFilePause();
}
else
{
amis::util::Log::Instance()->writeMessage("Playing", "CAmisApp::OnPlayPause", "AmisGuiMFC2");
- MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(false);
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(false);
MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(false);
view->OnFilePlay();
}
@@ -569,57 +569,57 @@
}
void CAmisApp::OnVolumeUp()
-{
- amis::util::Log::Instance()->writeMessage("Volume increase", "CAmisApp::OnVolumeUp", "AmisGuiMFC2");
- //amis::audio::AmisAudio::Instance()->adjustVolume(1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
+{
+ amis::util::Log::Instance()->writeMessage("Volume increase", "CAmisApp::OnVolumeUp", "AmisGuiMFC2");
+ //amis::audio::AmisAudio::Instance()->adjustVolume(1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
ambulant::gui::dx::change_global_level(1.2);
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_VOLUP, true, NULL);
}
void CAmisApp::OnVolumeDown()
-{
- amis::util::Log::Instance()->writeMessage("Volume decrease", "CAmisApp::OnVolumeDown", "AmisGuiMFC2");
- //amis::audio::AmisAudio::Instance()->adjustVolume(1.0/1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
+{
+ amis::util::Log::Instance()->writeMessage("Volume decrease", "CAmisApp::OnVolumeDown", "AmisGuiMFC2");
+ //amis::audio::AmisAudio::Instance()->adjustVolume(1.0/1.2); REMOVED because it makes more sense to allow book volume control than the whole application: otherwise users would use their OS-level volume control.
ambulant::gui::dx::change_global_level(1.0/1.2);
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_VOLDOWN, true, NULL);
}
void CAmisApp::OnSpeedUp()
-{
- amis::util::Log::Instance()->writeMessage("Speed increase", "CAmisApp::OnSpeedUp", "AmisGuiMFC2");
-
- long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
- amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate+1);
-
- double rate = ambulant::gui::dx::change_global_rate(0.7);
- ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
- updateSpeedButtons();
+{
+ amis::util::Log::Instance()->writeMessage("Speed increase", "CAmisApp::OnSpeedUp", "AmisGuiMFC2");
+
+ long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
+ amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate+1);
+
+ double rate = ambulant::gui::dx::change_global_rate(0.7);
+ ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
+ updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_FASTER, true, NULL);
}
void CAmisApp::OnSpeedDown()
-{
- amis::util::Log::Instance()->writeMessage("Speed decrease", "CAmisApp::OnSpeedDown", "AmisGuiMFC2");
-
- long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
- amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate-1);
-
- //TODO: Doesn't seem to affect the playback speed at all
- double rate = ambulant::gui::dx::change_global_rate(-0.7);
- ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
- updateSpeedButtons();
+{
+ amis::util::Log::Instance()->writeMessage("Speed decrease", "CAmisApp::OnSpeedDown", "AmisGuiMFC2");
+
+ long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
+ amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate-1);
+
+ //TODO: Doesn't seem to affect the playback speed at all
+ double rate = ambulant::gui::dx::change_global_rate(-0.7);
+ ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
+ updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_SLOWER, true, NULL);
}
void CAmisApp::OnSpeedNormal()
-{
- amis::util::Log::Instance()->writeMessage("Speed reset to normal", "CAmisApp::OnSpeedNormal", "AmisGuiMFC2");
-
- amis::tts::TTSPlayer::Instance()->SetSpeechRate(0);
-
- ambulant::gui::dx::set_global_rate(1.0);
- ambulantX::gui::dx::audio_playerX::Instance()->set_rate(1.0);
- updateSpeedButtons();
+{
+ amis::util::Log::Instance()->writeMessage("Speed reset to normal", "CAmisApp::OnSpeedNormal", "AmisGuiMFC2");
+
+ amis::tts::TTSPlayer::Instance()->SetSpeechRate(0);
+
+ ambulant::gui::dx::set_global_rate(1.0);
+ ambulantX::gui::dx::audio_playerX::Instance()->set_rate(1.0);
+ updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_NORMALSPEED, true, NULL);
}
@@ -735,12 +735,12 @@
{
amis::util::Log::Instance()->writeMessage("Loading from CD", "CAmisApp::OnLoadCd", "AmisGuiMFC2");
amis::util::SearchForFilesMFC searcher;
- //prepare the search tool
- searcher.clearAll();
- searcher.addSearchCriteria("ncc.htm");
- searcher.addSearchCriteria(".opf");
- //sometimes I see these temp files on my drive .. excluding them just to be safe
- searcher.addSearchExclusionCriteria("_ncc.html");
+ //prepare the search tool
+ searcher.clearAll();
+ searcher.addSearchCriteria("ncc.htm");
+ searcher.addSearchCriteria(".opf");
+ //sometimes I see these temp files on my drive .. excluding them just to be safe
+ searcher.addSearchExclusionCriteria("_ncc.html");
searcher.setRecursiveSearch(true);
int num_books = searcher.startSearchOnCdRom();
@@ -856,8 +856,8 @@
{
amis::gui::MenuManip::Instance()->setPauseState(pauseState);
MainWndParts::Instance()->updateTitlePlayState(!pauseState);
-
- MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(pauseState);
+
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(pauseState);
MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(pauseState);
}
@@ -918,11 +918,11 @@
}
void CAmisApp::updateFontSizeButtons()
-{
- bool can_increase = TextRenderBrain::Instance()->canIncreaseFontSize();
- bool can_decrease = TextRenderBrain::Instance()->canDecreaseFontSize();
- MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
- MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
+{
+ bool can_increase = TextRenderBrain::Instance()->canIncreaseFontSize();
+ bool can_decrease = TextRenderBrain::Instance()->canDecreaseFontSize();
+ MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
+ MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_BIGGER_FONT, can_increase);
MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_SMALLER_FONT, can_decrease);
MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_SMALLER_FONT, can_decrease);
}
@@ -930,9 +930,9 @@
void CAmisApp::updateSpeedButtons()
{
bool can_increase = canIncreasePlaybackSpeed();
- bool can_decrease = canDecreasePlaybackSpeed();
- MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_FASTER, can_increase);
- MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_FASTER, can_increase);
+ bool can_decrease = canDecreasePlaybackSpeed();
+ MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_FASTER, can_increase);
+ MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_FASTER, can_increase);
MainWndParts::Instance()->mpDefaultToolbar->enable(ID_AMIS_SLOWER, can_decrease);
MainWndParts::Instance()->mpBasicToolbar->enable(ID_AMIS_SLOWER, can_decrease);
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/MenuManip.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -90,7 +90,7 @@
int max = AMIS_MAX_RECENT_BOOKS;
if (num_entries < max) max = num_entries;
//get the last X entries
- for (i=num_entries-1; i>=num_entries-max; i--)
+ for (int i=num_entries-1; i>=num_entries-max; i--)
{
p_entry = theApp.getHistory()->getEntry(i);
string filepath = p_entry->mPath.get_url();
Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -178,7 +178,7 @@
}
static dg_or_dx_player *player = 0;
-static needs_done_redraw = false;
+static bool needs_done_redraw = false;
CWnd* topView = NULL;
@@ -419,7 +419,7 @@
void MmView::OnFilePlay()
{
- /*DBG*/static in_here = 0;
+ /*DBG*/static int in_here = 0;
/*DBG*/assert(!in_here);
/*DBG*/in_here++;
if(player)
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/AccessibleUIDataReader.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -22,7 +22,7 @@
#include "Preferences.h"
#include "util/FilePathTools.h"
-
+
#include "util/xercesutils.h"
using namespace amis::gui::spoken;
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/directshow/dx_audio_player.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -30,7 +30,7 @@
//#include "ambulant/lib/logger.h"
//#include "ambulant/lib/textptr.h"
#include <math.h>
-#include <vfwmsgs.h>
+//#include <vfwmsgs.h>
// CLSID_FilterGraph
//#include <uuids.h>
#include <dshow.h>
Modified: branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/sidebar/SizeCBar.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -573,7 +573,11 @@
CPaintDC dc(this);
}
-UINT CSizingControlBar::OnNcHitTest(CPoint point)
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
+ UINT CSizingControlBar::OnNcHitTest(CPoint point)
+#else // Later than VS.NET 2003
+ LRESULT CSizingControlBar::OnNcHitTest(CPoint point)
+#endif
{
CRect rcBar, rcEdge;
GetWindowRect(rcBar);
@@ -1008,7 +1012,7 @@
}
// make all the bars the same width
- for (i = 0; i < nNumBars; i++)
+ for (int i = 0; i < nNumBars; i++)
if (bHorz)
arrSCBars[i]->m_szHorz.cy = nWidthMax;
else
@@ -1019,7 +1023,7 @@
while (nDelta != 0)
{
int nDeltaOld = nDelta;
- for (i = 0; i < nNumBars; i++)
+ for (int i = 0; i < nNumBars; i++)
{
pBar = arrSCBars[i];
int nLMin = bHorz ?
@@ -1039,7 +1043,7 @@
}
// clear m_bKeepSize flags
if ((nDeltaOld == nDelta) || (nDelta == 0))
- for (i = 0; i < nNumBars; i++)
+ for (int i = 0; i < nNumBars; i++)
arrSCBars[i]->m_bKeepSize = FALSE;
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/gui/sidebar/scbarg.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -144,13 +144,20 @@
m_biHide.Paint(pDC);
}
-
-UINT CSizingControlBarG::OnNcHitTest(CPoint point)
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
+ UINT CSizingControlBarG::OnNcHitTest(CPoint point)
+#else // Later than VS.NET 2003
+ LRESULT CSizingControlBarG::OnNcHitTest(CPoint point)
+#endif
{
CRect rcBar;
GetWindowRect(rcBar);
+#if _MSC_VER <= 1300 // VS.NET 2003 or earlier
UINT nRet = baseCSizingControlBarG::OnNcHitTest(point);
+#else // Later than VS.NET 2003
+ LRESULT nRet = baseCSizingControlBarG::OnNcHitTest(point);
+#endif
if (nRet != HTCLIENT)
return nRet;
Modified: branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/io/PreferencesFileIO.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -229,7 +229,7 @@
DOMImplementation* pImpl = NULL;
DOMWriter* pWriter = NULL;
- xercesc_2_7::DOMDocument* pDoc = NULL;
+ xercesc_2_8::DOMDocument* pDoc = NULL;
XMLFormatTarget* pFormTarget = NULL;
try
@@ -246,7 +246,7 @@
pDoc = pImpl->createDocument(
X("http://amisproject.org"),
X("preferences"),
- (xercesc_2_7::DOMDocumentType*)0);
+ (xercesc_2_8::DOMDocumentType*)0);
mpDoc = pDoc;
writeData();
Modified: branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp 2008-03-19 11:56:58 UTC (rev 2448)
+++ branches/amis3/AmisGuiMFC2/src/util/VolMaster.cpp 2008-03-27 02:44:35 UTC (rev 2449)
@@ -14,7 +14,7 @@
//
int CVolumeMaster::GetLogicalDriveStrings(CStringArray& ar)
{
- const BUFLEN = 26*4;
+ const int BUFLEN = 26*4;
TCHAR buf[BUFLEN+1];
::GetLogicalDriveStrings(BUFLEN, buf);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-19 11:56:55
|
Revision: 2448
http://amis.svn.sourceforge.net/amis/?rev=2448&view=rev
Author: daniel_weck
Date: 2008-03-19 04:56:58 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
fixed bug where publication summary list was out of sync with self-voicing audio
actually fixed a crash bug as well (null pointer exception)
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp 2008-03-19 11:38:47 UTC (rev 2447)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp 2008-03-19 11:56:58 UTC (rev 2448)
@@ -270,6 +270,8 @@
appendToList(p_list, features, mNavigableItems);
if (mpCurrentPage != NULL)
appendToList(p_list, curr_page, mpCurrentPage->getText()->getTextString());
+ else
+ appendToList(p_list, curr_page, L"");
wvalue = L"TODO";
appendToList(p_list, curr_time, wvalue);
if (mpSectionName != NULL)
@@ -278,6 +280,9 @@
value.Format(_T("%d subsections and %d pages"), mNumSubsections, mNumPagesForSection);
wvalue = value;
appendToList(p_list, section_contents, wvalue);
+ } else {
+ appendToList(p_list, curr_section, L"");
+ appendToList(p_list, section_contents, L"");
}
value.Format(_T("%d"), mTocs);
wvalue = value;
@@ -527,9 +532,11 @@
else if (p_var->getName().compare("CURRENT_PAGE") == 0)
{
- amis::AudioNode * node = mpCurrentPage->getAudio(0);
if (mpCurrentPage != NULL) {
+ amis::AudioNode * node = mpCurrentPage->getAudio(0);
p_var->setContents(mpCurrentPage->getText()->getTextString(), (node != NULL ? node->clone() : NULL));
+ } else if (promptNotAvailable != NULL) {
+ p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
else if (p_var->getName().compare("CURRENT_TIME") == 0)
@@ -539,10 +546,12 @@
else if (p_var->getName().compare("CURRENT_SECTION_TITLE") == 0)
{
- amis::AudioNode * node = mpSectionName->getAudio(0);
if (mpSectionName != NULL)
{
+ amis::AudioNode * node = mpSectionName->getAudio(0);
p_var->setContents(mpSectionName->getText()->getTextString(), (node != NULL ? node->clone() : NULL));
+ } else if (promptNotAvailable != NULL) {
+ p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-19 11:38:41
|
Revision: 2447
http://amis.svn.sourceforge.net/amis/?rev=2447&view=rev
Author: daniel_weck
Date: 2008-03-19 04:38:47 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
added automatic support for talking numerics (0..9) as real audio from XML rather than as text with TTS
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h 2008-03-19 11:16:59 UTC (rev 2446)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h 2008-03-19 11:38:47 UTC (rev 2447)
@@ -36,6 +36,8 @@
AudioSequence* clone();
CAtlList<AudioSequenceComponent*> m_AudioSequence;
private:
+
+ void append_prepend(CString strTTS, bool prepend) ;
};
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp 2008-03-19 11:16:59 UTC (rev 2446)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp 2008-03-19 11:38:47 UTC (rev 2447)
@@ -1,4 +1,5 @@
#include "gui/self-voicing/AudioSequence.h"
+#include "gui/self-voicing/datamodel/DataTree.h"
using namespace amis::gui::spoken;
@@ -28,15 +29,71 @@
void AudioSequence::AddTail(AudioSequenceComponent* comp) {
m_AudioSequence.AddTail(comp);
}
-void AudioSequence::append(CString strTTS) {
+
+void AudioSequence::append(CString strTTS)
+{
+ append_prepend(strTTS, false);
+}
+
+void AudioSequence::append_prepend(CString strTTS, bool prepend) {
if (strTTS.IsEmpty()) {
return;
}
+
+ string strPrompt = "";
+ if (strTTS.Compare(L"1") == 0) {
+ strPrompt = "numeric_one";
+ } else if (strTTS.Compare(L"2") == 0) {
+ strPrompt = "numeric_two";
+ } else if (strTTS.Compare(L"3") == 0) {
+ strPrompt = "numeric_three";
+ } else if (strTTS.Compare(L"4") == 0) {
+ strPrompt = "numeric_four";
+ } else if (strTTS.Compare(L"5") == 0) {
+ strPrompt = "numeric_five";
+ } else if (strTTS.Compare(L"6") == 0) {
+ strPrompt = "numeric_six";
+ } else if (strTTS.Compare(L"7") == 0) {
+ strPrompt = "numeric_seven";
+ } else if (strTTS.Compare(L"8") == 0) {
+ strPrompt = "numeric_eight";
+ } else if (strTTS.Compare(L"9") == 0) {
+ strPrompt = "numeric_nine";
+ } else if (strTTS.Compare(L"0") == 0) {
+ strPrompt = "numeric_zero";
+ }
+ if (strPrompt.length() != 0) {
+ PromptItem* pi = DataTree::Instance()->findPromptItem(strPrompt);
+
+ if (pi != NULL)
+ {
+
+ TextAudioPair* pair = pi->getContents();
+ if (pair != NULL) {
+ amis::AudioNode* audio = pair->getAudio();
+ TextNodeSV * textN = pair->getText();
+
+ if (audio != NULL && audio->getSrc().length() != 0)
+ {
+ //seq->append(audio->clone(), (textN != NULL ? textN->getTextString().c_str() : L""));
+
+ AudioSequenceComponent* comp = new AudioSequenceComponent;
+ comp->m_isAudioClip = true;
+ comp->m_AudioClip = audio->clone();
+ comp->m_String = strTTS;
+ m_AudioSequence.AddHead(comp);
+ return;
+ }
+ }
+ }
+ }
+
AudioSequenceComponent* comp = new AudioSequenceComponent;
comp->m_isAudioClip = false;
comp->m_AudioClip = 0;
comp->m_String = strTTS;
- m_AudioSequence.AddHead(comp);
+ if (prepend) m_AudioSequence.AddTail(comp); else m_AudioSequence.AddHead(comp);
+
}
void AudioSequence::appendAll(AudioSequence * seq)
@@ -48,14 +105,8 @@
}
void AudioSequence::prepend(CString strTTS) {
- if (strTTS.IsEmpty()) {
- return;
- }
- AudioSequenceComponent* comp = new AudioSequenceComponent;
- comp->m_isAudioClip = false;
- comp->m_AudioClip = 0;
- comp->m_String = strTTS;
- m_AudioSequence.AddTail(comp);
+
+ append_prepend(strTTS, true);
}
void AudioSequence::append(amis::AudioNode* audioClip, CString strTTS) {
if (audioClip->getSrc().length() == 0) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-19 11:17:18
|
Revision: 2446
http://amis.svn.sourceforge.net/amis/?rev=2446&view=rev
Author: daniel_weck
Date: 2008-03-19 04:16:59 -0700 (Wed, 19 Mar 2008)
Log Message:
-----------
minor improvements of self-voicing for ReadingOptionsDialog and SearchForBooksDialog
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h
branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/dialogs/SkipDialogVoicing.h
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/dialogs/SkipDialogVoicing.cpp
branches/amis3/DefaultLangpack/amisAccessibleUi.xml
Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h 2008-03-19 11:16:59 UTC (rev 2446)
@@ -51,6 +51,7 @@
afx_msg void OnBrowse();
afx_msg void OnStartsearch();
afx_msg void OnStopsearch();
+ afx_msg void OnSelchangeFilelist();
DECLARE_MESSAGE_MAP()
private:
Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h 2008-03-19 11:16:59 UTC (rev 2446)
@@ -19,6 +19,7 @@
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 SKIPDIALOG_H
#define SKIPDIALOG_H
@@ -48,17 +49,13 @@
//Dialog Data
enum { IDD = IDD_READING_OPTIONS };
+
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
virtual BOOL OnInitDialog();
- afx_msg void OnSelchangeSkips();
virtual BOOL PreTranslateMessage(MSG* pMsg);
-protected:
- afx_msg void OnPaint();
- DECLARE_MESSAGE_MAP()
- CCheckListBox m_ListSkips;
private:
void fillListBox();
void saveChanges();
@@ -67,6 +64,13 @@
CButton m_Ok;
void setDescriptiveText(bool);
+
+protected:
+ CCheckListBox m_ListSkips;
+public:
+ afx_msg void OnSelchangeSkips();
+ afx_msg void OnPaint();
+ DECLARE_MESSAGE_MAP()
};
}
}
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequence.h 2008-03-19 11:16:59 UTC (rev 2446)
@@ -27,14 +27,15 @@
~AudioSequence();
UINT GetCount();
bool IsEmpty();
+ void appendAll(AudioSequence * seq);
AudioSequenceComponent* RemoveTail();
void AddTail(AudioSequenceComponent* comp);
void append(CString strTTS);
void prepend(CString strTTS);
void append(amis::AudioNode* audioClip, CString strTTS);
AudioSequence* clone();
+ CAtlList<AudioSequenceComponent*> m_AudioSequence;
private:
- CAtlList<AudioSequenceComponent*> m_AudioSequence;
};
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/dialogs/SkipDialogVoicing.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/dialogs/SkipDialogVoicing.h 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/dialogs/SkipDialogVoicing.h 2008-03-19 11:16:59 UTC (rev 2446)
@@ -1,3 +1,4 @@
+
#include "gui/dialogs/SkipDialog.h";
#include "gui/self-voicing/datamodel/DataTree.h"
@@ -19,9 +20,13 @@
private:
amis::gui::dialogs::SkipDialog * mpDialog;
void appendSeqListContent(AudioSequence* seq, amis::dtb::CustomTest* p_custom_test, int i);
+
public:
void OnSelchangeSkips();
SkipDialogVoicing(amis::gui::dialogs::SkipDialog * dlg);
~SkipDialogVoicing(void);
+
+ static amis::gui::spoken::PromptItem* getPromptItemForReadingOptionName(string item_id);
+
};
}}}
\ No newline at end of file
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -591,7 +591,7 @@
long currentRate = amis::tts::TTSPlayer::Instance()->GetSpeechRate();
amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate+1);
- double rate = ambulant::gui::dx::change_global_rate(0.5);
+ double rate = ambulant::gui::dx::change_global_rate(0.7);
ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_FASTER, true, NULL);
@@ -605,7 +605,7 @@
amis::tts::TTSPlayer::Instance()->SetSpeechRate(currentRate-1);
//TODO: Doesn't seem to affect the playback speed at all
- double rate = ambulant::gui::dx::change_global_rate(-0.5);
+ double rate = ambulant::gui::dx::change_global_rate(-0.7);
ambulantX::gui::dx::audio_playerX::Instance()->set_rate(rate);
updateSpeedButtons();
//amis::gui::spoken::AudioSequencePlayer::Instance()->playPromptFromUiId(ID_MENU_PLAY_SLOWER, true, NULL);
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -32,15 +32,40 @@
using namespace amis::gui::dialogs;
BEGIN_MESSAGE_MAP(SearchForBooksDialog, CDialog)
+ //{{AFX_MSG_MAP(SearchForBooksDialog)
ON_WM_PAINT()
ON_BN_CLICKED(IDC_BROWSE, OnBrowse)
ON_BN_CLICKED(IDC_STARTSEARCH, OnStartsearch)
ON_BN_CLICKED(IDC_STOPSEARCH, OnStopsearch)
ON_LBN_DBLCLK(IDC_FILESFOUND, OnDblclkFilelist)
ON_BN_CLICKED(IDC_OPENBOOK, OnOpenbook)
+ ON_LBN_SELCHANGE(IDC_FILESFOUND, OnSelchangeFilelist)
+ //}}AFX_MSG_MAP
END_MESSAGE_MAP()
+void SearchForBooksDialog::OnSelchangeFilelist()
+{
+ if (amis::Preferences::Instance()->getIsSelfVoicing() == true)
+ {
+ //TODO: this list treatment removes the default XML prompts, needs improvement
+ CListBox* p_filelist = NULL;
+ p_filelist = (CListBox*)this->GetDlgItem(IDC_FILESFOUND);
+
+ int sel = p_filelist->GetCurSel();
+ if (sel >= 0) {
+ amis::UrlList* p_search_results = mSearcher.getSearchResults();
+ if (sel > -1 && sel < p_search_results->size()) {
+ //mLoadBookOnDialogClose = (*p_search_results)[sel];
+ AudioSequence * seq = new AudioSequence();
+ CString str;
+ p_filelist->GetText(sel, str);
+ seq->append(str);
+ AudioSequencePlayer::Instance()->Play(seq);
+ }
+ }
+ }
+}
void SearchForBooksDialog::resolvePromptVariables(Prompt* pPrompt) {
PromptVar* p_var = NULL;
@@ -123,12 +148,37 @@
if (mpCaptionSearchCompleteNoFilesFound.Compare(status) == 0) {
AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchCompleteNoFilesFound");
} else
- if (mpCaptionSearchCompleteOneFileFound.Compare(status) == 0) {
- AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchCompleteOneFileFound");
+ if (mpCaptionSearchCompleteOneFileFound.Compare(status) == 0 || mpCaptionSearchCompleteFilesFound.Compare(status) == 0) {
+ CListBox* p_filelist = NULL;
+ p_filelist = (CListBox*)this->GetDlgItem(IDC_FILESFOUND);
+ p_filelist->SetCurSel(0);
+
+ AudioSequence * seq = NULL;
+ if (mpCaptionSearchCompleteOneFileFound.Compare(status) == 0) {
+ seq = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, false, "SearchCompleteOneFileFound");
+ } else {
+ seq = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, false, "SearchCompleteFilesFound");
+ }
+ AudioSequence * seq2 = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_FILESFOUND, this, false, "default");
+ seq->appendAll(seq2);
+ delete seq2;
+
+ int sel = p_filelist->GetCurSel();
+ if (sel >= 0) {
+ amis::UrlList* p_search_results = mSearcher.getSearchResults();
+ if (sel > -1 && sel < p_search_results->size()) {
+ //mLoadBookOnDialogClose = (*p_search_results)[sel];
+
+ CString str;
+ p_filelist->GetText(sel, str);
+ seq->append(str);
+ }
+ }
+ AudioSequencePlayer::Instance()->Play(seq);
+
+
} else
- if (mpCaptionSearchCompleteFilesFound.Compare(status) == 0) {
- AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchCompleteFilesFound");
- } else
+
if (mpCaptionSearchAborted.Compare(status) == 0) {
AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchAborted");
}
@@ -294,30 +344,14 @@
if (pMsg->message == WM_KEYDOWN || pMsg->message == WM_KEYUP)
{
CWnd* p_wnd = this->GetFocus();
+
if (p_wnd)
- {
+ {
int id = p_wnd->GetDlgCtrlID();
- if (amis::Preferences::Instance()->getIsSelfVoicing() == true && id == IDC_FILESFOUND && pMsg->message == WM_KEYUP && (pMsg->wParam == VK_UP || pMsg->wParam == VK_DOWN|| pMsg->wParam == VK_RIGHT || pMsg->wParam == VK_LEFT))
+ if (id = IDC_FILESFOUND && (pMsg->wParam == VK_UP || pMsg->wParam == VK_DOWN))
{
- //TODO: this list treatment removes the default XML prompts, needs improvement
- CListBox* p_filelist = NULL;
- p_filelist = (CListBox*)this->GetDlgItem(IDC_FILESFOUND);
-
- int sel = p_filelist->GetCurSel();
- if (sel >= 0) {
- amis::UrlList* p_search_results = mSearcher.getSearchResults();
- if (sel > -1 && sel < p_search_results->size()) {
- //mLoadBookOnDialogClose = (*p_search_results)[sel];
- AudioSequence * seq = new AudioSequence();
- CString str;
- p_filelist->GetText(sel, str);
- seq->append(str);
- AudioSequencePlayer::Instance()->Play(seq);
- }
- }
-
- return CDialog::PreTranslateMessage(pMsg);
+ return CDialog::PreTranslateMessage(pMsg);
}
//inexplicably, the default behavior for pressing enter in a dialog is to close it.
@@ -341,5 +375,5 @@
}
}
}
- return AmisDialogBase::PreTranslateMessageTextField(pMsg ,IDC_SEARCHPATH);
+ return AmisDialogBase::PreTranslateMessageTextField(pMsg, IDC_SEARCHPATH);
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -19,8 +19,11 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "stdafx.h"
+
#include "gui/dialogs/SkipDialog.h"
+
#include "../resource.h"
#include "Preferences.h"
@@ -38,8 +41,73 @@
amis::gui::dialogs::SkipDialogVoicing * mpSkipDialogVoicing = NULL;
+BEGIN_MESSAGE_MAP(SkipDialog, CDialog)
+ ON_LBN_SELCHANGE(IDC_OPTIONS_LIST, OnSelchangeSkips)
+ ON_WM_PAINT()
+END_MESSAGE_MAP()
+
void SkipDialog::resolvePromptVariables(Prompt* pPrompt) {
- return;
+
+ PromptVar* p_var = NULL;
+ PromptItem* promptNotAvailable = DataTree::Instance()->findPromptItem("not_available");
+
+ for (int i=0; i<pPrompt->getNumberOfItems(); i++)
+ {
+ if (pPrompt->getItem(i)->getPromptItemType() == PROMPT_VARIABLE)
+ {
+ p_var = (PromptVar*)pPrompt->getItem(i);
+
+ if (p_var->getName().compare("SKIPPABLE_ITEM") == 0)
+ {
+ int i = m_ListSkips.GetCurSel();
+ if (i < 0) { i = 0; }
+
+ amis::dtb::CustomTest* p_custom_test = (amis::dtb::CustomTest*)m_ListSkips.GetItemData(i);
+
+ if (p_custom_test != NULL)
+ {
+ string item_id = p_custom_test->getId();
+ amis::gui::spoken::PromptItem* pi = SkipDialogVoicing::getPromptItemForReadingOptionName(item_id);
+ if (pi != NULL)
+ {
+ p_var->setContents(pi->getContents()->clone());
+ }
+ }
+ } else if (p_var->getName().compare("WILL_SKIP_OR_NOT") == 0)
+ {
+ //SKIPPABLE_ITEM_ID
+
+ int i = m_ListSkips.GetCurSel();
+ if (i < 0) { i = 0; }
+
+ amis::dtb::CustomTest* p_custom_test = (amis::dtb::CustomTest*)m_ListSkips.GetItemData(i);
+
+ if (p_custom_test != NULL)
+ {
+ string strSelect;
+
+ //false = skip this item
+ if (m_ListSkips.GetCheck(i) == 1) //p_custom_test->getCurrentState() == false)
+ {
+ strSelect = "item_selected";
+ }
+ else
+ {
+ strSelect = "item_deselected";
+ }
+
+ amis::gui::spoken::PromptItem* pi = NULL;
+
+ pi = amis::gui::spoken::DataTree::Instance()->findPromptItem(strSelect);
+ if (pi != NULL)
+ {
+ p_var->setContents(pi->getContents()->clone());
+ }
+ }
+ }
+ }
+ }
+ AmisDialogBase::resolvePromptVariables(pPrompt);
}
SkipDialog::SkipDialog(CWnd* pParent /*=NULL*/)
@@ -75,7 +143,7 @@
if (cwnd)
{
int id = cwnd->GetDlgCtrlID();
- mCommonPreTranslateMessageHandler->handle(this, pMsg, (cwnd == NULL ? -1 : id), (id == IDC_OPTIONS_LIST ? true : false), (id == IDC_OPTIONS_LIST ? true : false), L"", L"", (id == IDC_OPTIONS_LIST ? true : false));
+ mCommonPreTranslateMessageHandler->handle(this, pMsg, id, (id == IDC_OPTIONS_LIST ? true : false), (id == IDC_OPTIONS_LIST ? true : false), L"", L"", (id == IDC_OPTIONS_LIST ? true : false));
if (pMsg->message == WM_KEYUP)
{
@@ -84,10 +152,11 @@
OnSelchangeSkips();
}
}
+ return CDialog::PreTranslateMessage(pMsg);
}
}
- return CDialog::PreTranslateMessage(pMsg);
+ return AmisDialogBase::PreTranslateMessage(pMsg);
}
void SkipDialog::DoDataExchange(CDataExchange* pDX)
@@ -160,7 +229,7 @@
p_test = (amis::dtb::CustomTest*)m_ListSkips.GetItemData(i);
if (p_test == NULL) return;
- if (Preferences::Instance()->getIsSelfVoicing() == true)
+ if (amis::Preferences::Instance()->getIsSelfVoicing() == true)
{
mpSkipDialogVoicing->OnSelchangeSkips();
}
@@ -170,12 +239,6 @@
else p_test->setCurrentState(false);
}
-BEGIN_MESSAGE_MAP(SkipDialog, CDialog)
- ON_LBN_SELCHANGE(IDC_OPTIONS_LIST, OnSelchangeSkips)
- //{{AFX_MSG_MAP(SkipDialog)
- ON_WM_PAINT()
- //}}AFX_MSG_MAP
-END_MESSAGE_MAP()
void SkipDialog::OnPaint()
{
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequence.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -39,6 +39,14 @@
m_AudioSequence.AddHead(comp);
}
+void AudioSequence::appendAll(AudioSequence * seq)
+{
+ for (size_t i = 0; i < seq->m_AudioSequence.GetCount(); i++) {
+ AudioSequenceComponent* comp = seq->m_AudioSequence.GetAt(seq->m_AudioSequence.FindIndex(i))->clone();
+ m_AudioSequence.AddHead(comp);
+ }
+}
+
void AudioSequence::prepend(CString strTTS) {
if (strTTS.IsEmpty()) {
return;
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -1054,22 +1054,6 @@
if (-1 == find) {
fillSequenceCaptionAndDescription(seq, control, presolver, "default");
}
-
- LabelList* p_list = control->getLabelList();
- if (p_list != NULL)
- {
-
- fillSequenceContentAndPrompt(seq, p_list, presolver);
- /*
- for (int i = 0; i<p_list->getNumberOfLabels(); i++)
- {
- Prompt* p_prompt = p_list->getLabel(i)->getPrompt();
- if (p_prompt != NULL)
- {
- fillSequencePrompt(seq, p_prompt, presolver);
- }
- }*/
- }
}
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -105,8 +105,6 @@
mpContents->setAudio(p_audio);
}
-
-
}
//**
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/dialogs/SkipDialogVoicing.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/dialogs/SkipDialogVoicing.cpp 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/dialogs/SkipDialogVoicing.cpp 2008-03-19 11:16:59 UTC (rev 2446)
@@ -16,58 +16,50 @@
mpDialog = NULL;
}
-void SkipDialogVoicing::appendSeqListContent(AudioSequence* seq, amis::dtb::CustomTest* p_custom_test, int i)
+amis::gui::spoken::PromptItem* SkipDialogVoicing::getPromptItemForReadingOptionName(string item_id)
{
amis::gui::spoken::PromptItem* pi = NULL;
-
- string item_id = p_custom_test->getId();
+
if (item_id.compare("prodnote") == 0 ||
- item_id.compare("optional-prodnote") == 0 )
+ item_id.compare("optional-prodnote") == 0)
{
pi = amis::gui::spoken::DataTree::Instance()->findPromptItem("prodnotes");
- if (pi != NULL)
- {
- AudioSequencePlayer::fillSequenceContents(seq, pi);
- }
+
}
else if (item_id.compare("pages") == 0 || item_id.compare("pagenumber") == 0)
{
pi = amis::gui::spoken::DataTree::Instance()->findPromptItem("pages");
- if (pi != NULL)
- {
- AudioSequencePlayer::fillSequenceContents(seq, pi);
- }
+
}
else if (item_id.compare("sections") == 0)
{
pi = amis::gui::spoken::DataTree::Instance()->findPromptItem("sections");
- if (pi != NULL)
- {
- AudioSequencePlayer::fillSequenceContents(seq, pi);
- }
+
}
else if (item_id.compare("sidebar") == 0)
{
pi = amis::gui::spoken::DataTree::Instance()->findPromptItem("sidebars");
- if (pi != NULL)
- {
- AudioSequencePlayer::fillSequenceContents(seq, pi);
- }
+
}
else if (item_id.compare("footnote") == 0 ||
item_id.compare("noteref") == 0)
{
pi = amis::gui::spoken::DataTree::Instance()->findPromptItem("noterefs");
- if (pi != NULL)
+
+ }
+ return pi;
+}
+void SkipDialogVoicing::appendSeqListContent(AudioSequence* seq, amis::dtb::CustomTest* p_custom_test, int i)
+{
+ string item_id = p_custom_test->getId();
+ amis::gui::spoken::PromptItem* pi = getPromptItemForReadingOptionName(item_id);
+ if (pi != NULL)
{
AudioSequencePlayer::fillSequenceContents(seq, pi);
}
- }
- //seq->append(str);
-
string strSelect;
if (p_custom_test != NULL)
@@ -82,7 +74,7 @@
strSelect = "item_deselected";
}
}
- //AudioSequence* seq = AudioSequencePlayer::playPromptItemFromStringId("thisItemIsCurrently");
+
pi = amis::gui::spoken::DataTree::Instance()->findPromptItem("thisItemIsCurrently");
if (pi != NULL)
{
Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml
===================================================================
--- branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 21:31:43 UTC (rev 2445)
+++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-19 11:16:59 UTC (rev 2446)
@@ -1165,8 +1165,7 @@
</caption>
<description>
<prompt>
- <promptVar name="SKIPPABLE_ITEM"/>
- <promptItem refid="thisItem"/>
+ <promptItem refid="thisItemIsCurrently"/>
<promptVar name="WILL_SKIP_OR_NOT" param="SKIPPABLE_ITEM_ID"/>
</prompt>
</description>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 21:32:39
|
Revision: 2445
http://amis.svn.sourceforge.net/amis/?rev=2445&view=rev
Author: marisademeglio
Date: 2008-03-18 14:31:43 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
updated issues and release notes again
Modified Paths:
--------------
branches/amis3/alpha-2-release-notes.txt
branches/amis3/amis_issues.txt
Modified: branches/amis3/alpha-2-release-notes.txt
===================================================================
--- branches/amis3/alpha-2-release-notes.txt 2008-03-18 21:23:29 UTC (rev 2444)
+++ branches/amis3/alpha-2-release-notes.txt 2008-03-18 21:31:43 UTC (rev 2445)
@@ -36,4 +36,4 @@
* Not all dialogs are fully self-voicing
* Audio for some user interface items might not be an exact match for the text
* "Browse" button in the Search for Books dialog doesn't work
-
+* It crashes the first time you run it but will be ok after that
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 21:23:29 UTC (rev 2444)
+++ branches/amis3/amis_issues.txt 2008-03-18 21:31:43 UTC (rev 2445)
@@ -11,6 +11,7 @@
ISSUES
---
+* It crashes the first time you run it but will be ok after that
* shows □□ for <br /> in the list of bookmarks
* a book won't close all the way
* Zed stylesheet doesn't work
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 21:23:50
|
Revision: 2443
http://amis.svn.sourceforge.net/amis/?rev=2443&view=rev
Author: marisademeglio
Date: 2008-03-18 14:23:14 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
updated issues to have a task list for beta 1
Modified Paths:
--------------
branches/amis3/amis_issues.txt
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 21:13:40 UTC (rev 2442)
+++ branches/amis3/amis_issues.txt 2008-03-18 21:23:14 UTC (rev 2443)
@@ -1,4 +1,4 @@
-ALPHA 2 (MARCH 17)
+BETA 1 (April 10)
==========
CODE ORGANIZATION
---
@@ -9,29 +9,17 @@
* review TODOs, remove if resolved, address if needed
* remove commented-out code unless there is a good reason to keep it in (say why)
-NEW FEATURES (things to add)
+ISSUES
---
-
-* finish self-voicing for all dialogs
-[DANIEL: SEARCH_CD, READING_OPTIONS, and TXT_STYLE dialogs are incomplete]
-
-ISSUES and BUGS (things to address)
----
-
-
-
-KNOWN ISSUES (not going to change for alpha 2; should be listed as bugs to work on for beta 1)
----
-* Load CD shows more titles than the ones on discinfo.html
- ==>is this really a bug?
-* japanese characters not shown in sidebar in win2k
- ==>not known if this is still an issue in alpha 2; you can set the sidebar font so maybe that will help
* shows □□ for <br /> in the list of bookmarks
* a book won't close all the way
* Zed stylesheet doesn't work
==>problem reproduced in a test app: applying CSS to XML in an HtmlView doesn't work
* Page styles overlap a bit when applied in sequence
* book in a japanese folder can't be opened (ambulant::net::url problem?)
+* Browse button doesn't work in "Search for books" dialog
+* Fill in relevant text from accessible UI xml file to ensure localization
+* Make sure audio and text match up for all GUI items
AMBULANT ISSUES (some of these are repeated from the above "Known Issues" list)
--
@@ -40,43 +28,21 @@
* memory leaks
* book in a japanese folder can't be opened (ambulant::net::url problem?)
-SELF VOICING
+SELF VOICING ISSUES
--
-
-* Menu-related
-
+* Menus
- Not all shortcuts are displayed in the menu items. They are active though. (i.e. open URL: CTRL+U).
+ [MARISA: Is this related to self-voicing or resource file generation?]
- While inside menu, CTRL key hit does not stop self-voicing playback. Only works when within main window and inside modal dialogs.
- Top-menu hover (mouse or keyboard) does not work (no self-voicing) once a menu popup has been displayed. Solution: pressing ESCAPE several times until the menu mode is left, then go back to menu using ALT+arrow keys or using mouse click on menu header.
-- "Open URL" and "Close" use TTS because there is no valid audio clips to play yet.
-- Smaller font uses TTS instead of pre-recorded audio (no mp3 clip yet in XML).
-- Smaller and Bigger font text in the menu item does not match the TTS audio (text from XML). Mnemonic is therefore missleading too.
-- Text-Style uses TTS, no audio clip is available.
- Page Style sub menu is largely incomplete and troublesome (overlaps the play menu)
-- Reading options plays "skippable items"
-- publication summary has no audio in XML
-- Speed up / down only available when book is open (despite affecting the UI speed too, regardeless of the book)
-* Dialogs self-voicing
+* Open URL Dialog
+- no dialog definition in AccessibleUi.xml (only OK / CANCEL). The text field says "text" for now, to give minimum feedback.
+* Text Style Dialog: only OK / CANCEL buttons
+ [MARISA: does this mean that the self-voicing is incomplete, or the XML definition is incomplete?]
-** About
-
- - AMIS version and release data audio clip very loud. Also not matching the text displayed
-
-** Open URL
-
- - no dialog definition in AccessibleUi.xml (only OK / CANCEL). The text field says "text" for now, to give minimum feedback.
-
-** Search for books: no file browser (manual path entry, copy+paste from file explorer works fine)
-
-** Text Style: only OK / CANCEL buttons
-
-** Skippable Items: crash !! (unexplained)
-
-
-BETA (APRIL 1)
-=================
-NEW FEATURES
+NEW FEATURES and IMPROVEMENTS
---
* Parse CSS for font info, contrast info
* Don't start reading when browsing the TOC - just announce the label for the item
@@ -90,30 +56,25 @@
ID_AMIS_FOCUS_ON_TEXT
ID_AMIS_RESET_HIGHLIGHT_COLORS
ID_AMIS_TOGGLE_AUDIO_CONTENT_PLAYBACK
-* add commands to increase/decrease specific volumes [DANIEL: don't think it's necessary, volume control currently for book only, which is nice as the UI can be controled by OS-wide levels]
+* add commands to increase/decrease specific volumes
+ [DANIEL: don't think it's necessary, volume control currently for book only, which is nice as the UI can be controled by OS-wide levels]
+ [MARISA: think it's a good idea since UI recordings can be variable in quality]
* highlight current section (in sidebar) in same color as page highlight
-* opening URLs from the command line (add a new command line parameter: http://www.codeguru.com/forum/showthread.php?t=386406)
* add navlists to view menu
* re-add tooltips
* next/previous page/phrase/section should be enabled or disabled according to the book state
-
-IMPROVEMENTS
----
-* select TTS based on language of book/UI. or take an educated guess. [DANIEL: voice selection currently default to the first one found in SAPI]
-* Right/left arrow means something different (conceptually) in nav window
+* finish self-voicing for all dialogs
+ [DANIEL: SEARCH_CD, READING_OPTIONS, and TXT_STYLE dialogs are incomplete]
+* select TTS based on language of book/UI. or take an educated guess.
+ [DANIEL: voice selection currently default to the first one found in SAPI]
* how do we count pages? does the page number appear at the bottom or top of the page?
* resource.h.ini needs to be kept in-sync with a post-build batch process
-* memory leaks in ambulant::logger, UrlInputSource, plugin_engine
* installer prompts about Thai encoding support
-
-LANGUAGE PACKS
----
-* update RC template
+* update RC template for language pack generation
* Re-add Language pack support
* review widget types in AmisAccessibleUI (we can't say which will be toolbar items)
* harmonize icon refs with toolbar xml
-
POSTPONED FOR CANDIDATE RELEASE (MAY 1)
===============================
* One installer per language
@@ -130,25 +91,5 @@
* Bookshare books are slow and don't load if a bookmark file exists for them; eventually this error appears 12:35:27 TRACE dx_html_renderer: programmer error: attempt to start() again.
* Drag & drop book-ncc to program icon
-ADDED AFTER ALPHA 1
+ADDED AFTER ALPHA 2
===================
-* Loads last book on startup
-* Loads from command line
-* Supports an unlimited number of font size CSS files. The default is still 4.
-* If no dc:identifier or the bookmark file can't be created, it no longer crashes
-* publication summary dialog not getting current section for zed books
-* "previous section" works as it should
-* bookmarking for books with non-ascii dc:identifiers
-* dialog to adjust highlight colors and font type
-* font and fontsize control in the sidebar
-* phrase arrow keys work when the focus is in the sidebar
-* page navigation bug fixed
-* navigation cursor synchronized
-* bookmarks cleared when closing a book
-* IE7 right-click menu doesn't appear
-* Navigation text not cut off in nav lists
-* stabilized self-voicing for menus
-* audio changes speed
-* play/pause buttons show the correct state
-* can open a URL from the command line
-* reading options dialog works
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 21:23:42
|
Revision: 2444
http://amis.svn.sourceforge.net/amis/?rev=2444&view=rev
Author: marisademeglio
Date: 2008-03-18 14:23:29 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
stupid reading options dialog works!
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h
branches/amis3/AmisGuiMFC2/resource.h
branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
branches/amis3/DefaultLangpack/amisAccessibleUi.xml
branches/amis3/bin/settings/resource.h.ini
Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
===================================================================
(Binary files differ)
Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc 2008-03-18 21:23:14 UTC (rev 2443)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc 2008-03-18 21:23:29 UTC (rev 2444)
@@ -67,14 +67,6 @@
#ifdef APSTUDIO_INVOKED
GUIDELINES DESIGNINFO
BEGIN
- IDD_SKIP, DIALOG
- BEGIN
- LEFTMARGIN, 7
- RIGHTMARGIN, 231
- TOPMARGIN, 7
- BOTTOMMARGIN, 179
- END
-
IDD_SIDEBAR, DIALOG
BEGIN
RIGHTMARGIN, 86
@@ -152,6 +144,14 @@
TOPMARGIN, 7
BOTTOMMARGIN, 142
END
+
+ IDD_READING_OPTIONS, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 229
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 184
+ END
END
#endif // APSTUDIO_INVOKED
@@ -252,18 +252,6 @@
// Dialog
//
-IDD_SKIP DIALOGEX 0, 0, 238, 186
-STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Reading options"
-FONT 8, "MS Sans Serif", 0, 0, 0x0
-BEGIN
- LTEXT "This book contains the following special types of items. Checked items will be played. Unchecked items will be skipped.",
- IDC_SKIP_INSTRUCTIONS,7,7,224,21
- LISTBOX IDC_SKIPS,7,32,224,123,LBS_HASSTRINGS |
- LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
- DEFPUSHBUTTON "OK",IDOK,94,165,50,14
-END
-
IDD_SIDEBAR DIALOGEX 0, 0, 175, 183
STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE |
WS_CLIPCHILDREN | WS_BORDER
@@ -431,7 +419,21 @@
PUSHBUTTON "Cancel",IDCANCEL,94,128,50,14
END
+IDD_READING_OPTIONS DIALOGEX 0, 0, 236, 191
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION |
+ WS_SYSMENU
+CAPTION "Reading Options"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+ DEFPUSHBUTTON "OK",IDOK,94,170,50,14
+ LTEXT "This book contains the following special types of items. Checked items will be played. Unchecked items will be skipped.",
+ IDC_READING_OPTIONS_INSTRUCTIONS,7,7,222,31
+ LISTBOX IDC_OPTIONS_LIST,7,31,222,134,LBS_OWNERDRAWFIXED |
+ LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL |
+ WS_TABSTOP
+END
+
/////////////////////////////////////////////////////////////////////////////
//
// Bitmap
Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h 2008-03-18 21:23:14 UTC (rev 2443)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/SkipDialog.h 2008-03-18 21:23:29 UTC (rev 2444)
@@ -46,7 +46,7 @@
~SkipDialog();
void initializeData(amis::dtb::CustomTestSet*);
//Dialog Data
- enum { IDD = IDD_SKIP };
+ enum { IDD = IDD_READING_OPTIONS };
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support
@@ -58,7 +58,7 @@
protected:
afx_msg void OnPaint();
DECLARE_MESSAGE_MAP()
-CCheckListBox m_ListSkips;
+ CCheckListBox m_ListSkips;
private:
void fillListBox();
void saveChanges();
Modified: branches/amis3/AmisGuiMFC2/resource.h
===================================================================
--- branches/amis3/AmisGuiMFC2/resource.h 2008-03-18 21:23:14 UTC (rev 2443)
+++ branches/amis3/AmisGuiMFC2/resource.h 2008-03-18 21:23:29 UTC (rev 2444)
@@ -16,7 +16,6 @@
#define ID_AMIS_TOGGLE_AUDIO_SELFVOICING_PLAYBACK 134
#define IDD_FIND 147
#define AMIS_VIEW_MENU_BASE_ID 150
-#define IDD_SKIP 153
#define IDI_AMIS 164
#define IDD_SEARCHDAISY 177
#define IDD_GOTOPAGE 180
@@ -27,6 +26,7 @@
#define IDD_OPENURL 190
#define IDD_PREFERENCES 191
#define IDD_TEXTSTYLE 192
+#define IDD_READING_OPTIONS 193
#define AMIS_RECENT_BOOK_BASE_ID 200
#define AMIS_SECTION_DEPTH_BASE_ID 250
#define AMIS_NAVLIST_BASE_ID 300
@@ -49,7 +49,6 @@
#define IDC_PICTURE 1050
#define IDC_SEARCHING 1051
#define IDC_FILESFOUND 1052
-#define IDC_SKIPS 1054
#define IDC_PAGENUM 1055
#define IDC_SEARCHPATH 1056
#define IDC_BOOKLIST 1058
@@ -68,7 +67,6 @@
#define IDC_INSTALLEDLANGUAGES 1097
#define IDC_PUBLICATIONSUMMARYCAPTION 1100
#define IDC_AMISICON 1101
-#define IDC_SKIP_INSTRUCTIONS 1102
#define IDC_MULTIVOLCD_INSTRUCTIONS 1103
#define IDC_GOTOPAGE_CAPTION 1104
#define IDC_OPENURL_CAPTION 1105
@@ -81,6 +79,9 @@
#define IDC_TEXTSTYLEPREVIEW 1112
#define IDC_TEXTPREVIEW 1113
#define IDC_EDIT1 1114
+#define IDC_READING_OPTIONS_INSTRUCTIONS 1115
+#define IDC_LIST1 1116
+#define IDC_OPTIONS_LIST 1116
#define SELF_VOICING_PLAY_NEXT 6969
#define IDC_CURRLANG 9002
#define IDC_VERSION 9006
@@ -132,9 +133,9 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 193
+#define _APS_NEXT_RESOURCE_VALUE 194
#define _APS_NEXT_COMMAND_VALUE 32955
-#define _APS_NEXT_CONTROL_VALUE 1115
+#define _APS_NEXT_CONTROL_VALUE 1117
#define _APS_NEXT_SYMED_VALUE 143
#endif
#endif
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp 2008-03-18 21:23:14 UTC (rev 2443)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp 2008-03-18 21:23:29 UTC (rev 2444)
@@ -75,11 +75,11 @@
if (cwnd)
{
int id = cwnd->GetDlgCtrlID();
- mCommonPreTranslateMessageHandler->handle(this, pMsg, (cwnd == NULL ? -1 : id), (id == IDC_SKIPS ? true : false), (id == IDC_SKIPS ? true : false), L"", L"", (id == IDC_SKIPS ? true : false));
+ mCommonPreTranslateMessageHandler->handle(this, pMsg, (cwnd == NULL ? -1 : id), (id == IDC_OPTIONS_LIST ? true : false), (id == IDC_OPTIONS_LIST ? true : false), L"", L"", (id == IDC_OPTIONS_LIST ? true : false));
if (pMsg->message == WM_KEYUP)
{
- if (id == IDC_SKIPS && (pMsg->wParam == ' ' || pMsg->wParam == VK_SPACE))
+ if (id == IDC_OPTIONS_LIST && (pMsg->wParam == ' ' || pMsg->wParam == VK_SPACE))
{
OnSelchangeSkips();
}
@@ -94,7 +94,7 @@
{
CDialog::DoDataExchange(pDX);
//{{AFX_DATA_MAP(CSkipDialog)
- DDX_Control(pDX, IDC_SKIPS, m_ListSkips);
+ DDX_Control(pDX, IDC_OPTIONS_LIST, m_ListSkips);
DDX_Control(pDX, IDOK, m_Ok);
//}}AFX_DATA_MAP
}
@@ -108,6 +108,7 @@
BOOL SkipDialog::OnInitDialog()
{
+
CDialog::OnInitDialog();
//clear the list box
@@ -170,7 +171,7 @@
}
BEGIN_MESSAGE_MAP(SkipDialog, CDialog)
- ON_LBN_SELCHANGE(IDC_SKIPS, OnSelchangeSkips)
+ ON_LBN_SELCHANGE(IDC_OPTIONS_LIST, OnSelchangeSkips)
//{{AFX_MSG_MAP(SkipDialog)
ON_WM_PAINT()
//}}AFX_MSG_MAP
Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml
===================================================================
--- branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 21:23:14 UTC (rev 2443)
+++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 21:23:29 UTC (rev 2444)
@@ -1125,14 +1125,14 @@
</mnemonic>
</control>
</dialog>
- <dialog mfcid="IDD_SKIP">
+ <dialog mfcid="IDD_READING_OPTIONS">
<note>This dialog lets the user control rendering of skippable structures.</note>
<caption>
<!--changed text-->
<text id="t187">Reading Options</text>
<audio src="./audio/speechgen0191.mp3" from="file:///Users/marisa/amisxml/narrated/daisy202/speechgen0191.smil#txtd1334e9"/>
</caption>
- <description mfcid="IDC_SKIP_INSTRUCTIONS">
+ <description mfcid="IDC_READING_OPTIONS_INSTRUCTIONS">
<text id="t188">This book contains the following special types of items. Checked items will be played. Unchecked items will be skipped.</text>
<audio src="./audio/speechgen0192.mp3" from="file:///Users/marisa/amisxml/narrated/daisy202/speechgen0192.smil#txtd1341e15"/>
</description>
@@ -1150,7 +1150,7 @@
<promptItem refid="ok_button_description"/>
</description>
</control>
- <control mfcid="IDC_SKIPS" widget="list">
+ <control mfcid="IDC_OPTIONS_LIST" widget="list">
<caption>
<text id="t190">Skippable items</text>
<audio src="./audio/speechgen0193.mp3" from="file:///Users/marisa/amisxml/narrated/daisy202/speechgen0193.smil#txtd1350e9"/>
Modified: branches/amis3/bin/settings/resource.h.ini
===================================================================
--- branches/amis3/bin/settings/resource.h.ini 2008-03-18 21:23:14 UTC (rev 2443)
+++ branches/amis3/bin/settings/resource.h.ini 2008-03-18 21:23:29 UTC (rev 2444)
@@ -1,6 +1,9 @@
;
[resources]
+
+
+
IDD_ABOUTBOX=100
IDS_PROPSHT_CAPTION=102
IDD_SIDEBAR=103
@@ -15,7 +18,6 @@
ID_AMIS_TOGGLE_AUDIO_SELFVOICING_PLAYBACK=134
IDD_FIND=147
AMIS_VIEW_MENU_BASE_ID=150
-IDD_SKIP=153
IDI_AMIS=164
IDD_SEARCHDAISY=177
IDD_GOTOPAGE=180
@@ -26,6 +28,7 @@
IDD_OPENURL=190
IDD_PREFERENCES=191
IDD_TEXTSTYLE=192
+IDD_READING_OPTIONS=193
AMIS_RECENT_BOOK_BASE_ID=200
AMIS_SECTION_DEPTH_BASE_ID=250
AMIS_NAVLIST_BASE_ID=300
@@ -48,7 +51,6 @@
IDC_PICTURE=1050
IDC_SEARCHING=1051
IDC_FILESFOUND=1052
-IDC_SKIPS=1054
IDC_PAGENUM=1055
IDC_SEARCHPATH=1056
IDC_BOOKLIST=1058
@@ -67,7 +69,6 @@
IDC_INSTALLEDLANGUAGES=1097
IDC_PUBLICATIONSUMMARYCAPTION=1100
IDC_AMISICON=1101
-IDC_SKIP_INSTRUCTIONS=1102
IDC_MULTIVOLCD_INSTRUCTIONS=1103
IDC_GOTOPAGE_CAPTION=1104
IDC_OPENURL_CAPTION=1105
@@ -80,6 +81,9 @@
IDC_TEXTSTYLEPREVIEW=1112
IDC_TEXTPREVIEW=1113
IDC_EDIT1=1114
+IDC_READING_OPTIONS_INSTRUCTIONS=1115
+IDC_LIST1=1116
+IDC_OPTIONS_LIST=1116
SELF_VOICING_PLAY_NEXT=6969
IDC_CURRLANG=9002
IDC_VERSION=9006
@@ -94,7 +98,6 @@
ID_AMIS_EXIT=32925
ID_AMIS_TOGGLE_SIDEBAR=32926
ID_AMIS_TOGGLE_VIEW=32927
-ID_AMIS_NO_PAGE_STYLES=32928
ID_AMIS_BIGGER_FONT=32929
ID_AMIS_SMALLER_FONT=32930
ID_AMIS_PLAYPAUSE=32931
@@ -119,9 +122,22 @@
ID_AMIS_SHOW_HELP_CONTENTS=32950
ID_AMIS_ABOUT=32951
ID_AMIS_SHOW_TEXTSTYLE=32953
+ID_AMIS_NO_PAGE_STYLES=32954
IDS_SELFOLDER_TITLE=61258
IDS_SELFOLDER_INSTR=61259
IDS_FOLDERDOESNOTEXIST=61279
IDS_FOLDERINVALID=61280
IDS_FOLDERCANTBECREATED=61281
IDS_FILE_OPEN_DAISY_BOOKS=61288
+
+
+
+
+
+_APS_3D_CONTROLS=1
+_APS_NEXT_RESOURCE_VALUE=194
+_APS_NEXT_COMMAND_VALUE=32955
+_APS_NEXT_CONTROL_VALUE=1117
+_APS_NEXT_SYMED_VALUE=143
+
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 21:13:57
|
Revision: 2442
http://amis.svn.sourceforge.net/amis/?rev=2442&view=rev
Author: marisademeglio
Date: 2008-03-18 14:13:40 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
updated features and issues
Modified Paths:
--------------
branches/amis3/alpha-2-release-notes.txt
branches/amis3/amis_issues.txt
Modified: branches/amis3/alpha-2-release-notes.txt
===================================================================
--- branches/amis3/alpha-2-release-notes.txt 2008-03-18 20:33:17 UTC (rev 2441)
+++ branches/amis3/alpha-2-release-notes.txt 2008-03-18 21:13:40 UTC (rev 2442)
@@ -22,6 +22,7 @@
* audio changes speed
* play/pause buttons show the correct state
* can open a URL from the command line
+* reading options dialog works
KNOWN ISSUES
-------
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 20:33:17 UTC (rev 2441)
+++ branches/amis3/amis_issues.txt 2008-03-18 21:13:40 UTC (rev 2442)
@@ -17,10 +17,9 @@
ISSUES and BUGS (things to address)
---
-* READING_OPTIONS dialog crashes...very strange unexplained bug, probably some internal MFC conflict.
-[MARISA + DANIEL on it for next release]
+
KNOWN ISSUES (not going to change for alpha 2; should be listed as bugs to work on for beta 1)
---
* Load CD shows more titles than the ones on discinfo.html
@@ -151,4 +150,5 @@
* stabilized self-voicing for menus
* audio changes speed
* play/pause buttons show the correct state
-* can open a URL from the command line
\ No newline at end of file
+* can open a URL from the command line
+* reading options dialog works
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 20:33:12
|
Revision: 2441
http://amis.svn.sourceforge.net/amis/?rev=2441&view=rev
Author: marisademeglio
Date: 2008-03-18 13:33:17 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
new release and version audio files; new release notes
Modified Paths:
--------------
branches/amis3/amis_features.txt
branches/amis3/amis_issues.txt
branches/amis3/bin/settings/lang/releasedate.mp3
branches/amis3/bin/settings/lang/version.mp3
Added Paths:
-----------
branches/amis3/alpha-2-release-notes.txt
Added: branches/amis3/alpha-2-release-notes.txt
===================================================================
--- branches/amis3/alpha-2-release-notes.txt (rev 0)
+++ branches/amis3/alpha-2-release-notes.txt 2008-03-18 20:33:17 UTC (rev 2441)
@@ -0,0 +1,38 @@
+ALPHA 2 Release Notes
+March 18, 2008
+
+FEATURES AND FIXES ADDED AFTER ALPHA 1
+-------
+* Loads last book on startup
+* Loads from command line
+* Supports an unlimited number of font size CSS files. The default is still 4.
+* If no dc:identifier or the bookmark file can't be created, it no longer crashes
+* publication summary dialog not getting current section for zed books
+* "previous section" works as it should
+* bookmarking for books with non-ascii dc:identifiers
+* dialog to adjust highlight colors and font type
+* font and fontsize control in the sidebar
+* phrase arrow keys work when the focus is in the sidebar
+* page navigation bug fixed
+* navigation cursor synchronized
+* bookmarks cleared when closing a book
+* IE7 right-click menu doesn't appear
+* Navigation text not cut off in nav lists
+* stabilized self-voicing for menus
+* audio changes speed
+* play/pause buttons show the correct state
+* can open a URL from the command line
+
+KNOWN ISSUES
+-------
+* Load CD shows more titles than the ones on discinfo.htm. However, we don't think this is really a bug.
+* Shows □□ for <br /> in the list of bookmarks
+* A book won't close all the way
+* Zed stylesheet doesn't work
+* Page styles overlap a bit when applied in sequence
+* Book in a japanese folder can't be opened
+* Not all shortcuts are displayed in the menu items. They are active though. (i.e. open URL: CTRL+U).
+* Not all dialogs are fully self-voicing
+* Audio for some user interface items might not be an exact match for the text
+* "Browse" button in the Search for Books dialog doesn't work
+
Modified: branches/amis3/amis_features.txt
===================================================================
--- branches/amis3/amis_features.txt 2008-03-18 20:18:17 UTC (rev 2440)
+++ branches/amis3/amis_features.txt 2008-03-18 20:33:17 UTC (rev 2441)
@@ -43,7 +43,7 @@
Open a recently-read book
Automatically open your last-read book on startup
-Open a local book from the command line
+Open a book from the command line
Open the contents of a CD-ROM containing a single book or containing multiple books
Open a book from your local file system
Open a book from a remote URL
@@ -59,6 +59,7 @@
Move the navigation sidebar around the screen
Change the style of the page
Make the font bigger up to X times (and go back and forth between sizes)
+Adjust highlight colors and change the sidebar font through the Text Style dialog
Customization
Toolbars
@@ -68,12 +69,11 @@
Fontsize
- font size is defined using css files in settings\css\font\*.css
- - You can put anything in here up to X files.
+ - You can put any number of files in here. They will be applied in alphabetical order, so put the smallest increase in font size first in the list of files, and the largest increase last.
Page styles
- page styles are defined using css files in settings\css\customStyles\*.css
- You can put anything in here and it will show up in the Page Styles submenu.
- Each will be applied in turn when the user presses the Page Style button.
- AMIS own highlight settings are defined in settings\css\amis.css . See the notes there about how the file is set up.
-
\ No newline at end of file
+ User-defined default styles should be added to settings\css\amis.css .
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 20:18:17 UTC (rev 2440)
+++ branches/amis3/amis_issues.txt 2008-03-18 20:33:17 UTC (rev 2441)
@@ -31,7 +31,8 @@
* a book won't close all the way
* Zed stylesheet doesn't work
==>problem reproduced in a test app: applying CSS to XML in an HtmlView doesn't work
-* Page styles overlap a bit when applyed in sequence
+* Page styles overlap a bit when applied in sequence
+* book in a japanese folder can't be opened (ambulant::net::url problem?)
AMBULANT ISSUES (some of these are repeated from the above "Known Issues" list)
--
Modified: branches/amis3/bin/settings/lang/releasedate.mp3
===================================================================
(Binary files differ)
Modified: branches/amis3/bin/settings/lang/version.mp3
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 20:18:11
|
Revision: 2440
http://amis.svn.sourceforge.net/amis/?rev=2440&view=rev
Author: marisademeglio
Date: 2008-03-18 13:18:17 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
new audio files made by the Pipeline
Modified Paths:
--------------
branches/amis3/DefaultLangpack/amisAccessibleUi.xml
Added Paths:
-----------
branches/amis3/DefaultLangpack/audio/
branches/amis3/DefaultLangpack/audio/speechgen0001.mp3
branches/amis3/DefaultLangpack/audio/speechgen0002.mp3
branches/amis3/DefaultLangpack/audio/speechgen0003.mp3
branches/amis3/DefaultLangpack/audio/speechgen0004.mp3
branches/amis3/DefaultLangpack/audio/speechgen0005.mp3
branches/amis3/DefaultLangpack/audio/speechgen0006.mp3
branches/amis3/DefaultLangpack/audio/speechgen0007.mp3
branches/amis3/DefaultLangpack/audio/speechgen0008.mp3
branches/amis3/DefaultLangpack/audio/speechgen0009.mp3
branches/amis3/DefaultLangpack/audio/speechgen0010.mp3
branches/amis3/DefaultLangpack/audio/speechgen0011.mp3
branches/amis3/DefaultLangpack/audio/speechgen0012.mp3
branches/amis3/DefaultLangpack/audio/speechgen0013.mp3
branches/amis3/DefaultLangpack/audio/speechgen0014.mp3
branches/amis3/DefaultLangpack/audio/speechgen0015.mp3
branches/amis3/DefaultLangpack/audio/speechgen0016.mp3
branches/amis3/DefaultLangpack/audio/speechgen0017.mp3
branches/amis3/DefaultLangpack/audio/speechgen0018.mp3
branches/amis3/DefaultLangpack/audio/speechgen0019.mp3
branches/amis3/DefaultLangpack/audio/speechgen0020.mp3
branches/amis3/DefaultLangpack/audio/speechgen0021.mp3
branches/amis3/DefaultLangpack/audio/speechgen0022.mp3
branches/amis3/DefaultLangpack/audio/speechgen0023.mp3
branches/amis3/DefaultLangpack/audio/speechgen0024.mp3
branches/amis3/DefaultLangpack/audio/speechgen0025.mp3
branches/amis3/DefaultLangpack/audio/speechgen0026.mp3
branches/amis3/DefaultLangpack/audio/speechgen0027.mp3
branches/amis3/DefaultLangpack/audio/speechgen0028.mp3
branches/amis3/DefaultLangpack/audio/speechgen0029.mp3
branches/amis3/DefaultLangpack/audio/speechgen0030.mp3
branches/amis3/DefaultLangpack/audio/speechgen0031.mp3
branches/amis3/DefaultLangpack/audio/speechgen0032.mp3
branches/amis3/DefaultLangpack/audio/speechgen0033.mp3
branches/amis3/DefaultLangpack/audio/speechgen0034.mp3
branches/amis3/DefaultLangpack/audio/speechgen0035.mp3
branches/amis3/DefaultLangpack/audio/speechgen0036.mp3
branches/amis3/DefaultLangpack/audio/speechgen0037.mp3
branches/amis3/DefaultLangpack/audio/speechgen0038.mp3
branches/amis3/DefaultLangpack/audio/speechgen0039.mp3
branches/amis3/DefaultLangpack/audio/speechgen0040.mp3
branches/amis3/DefaultLangpack/audio/speechgen0041.mp3
branches/amis3/DefaultLangpack/audio/speechgen0042.mp3
branches/amis3/DefaultLangpack/audio/speechgen0043.mp3
branches/amis3/DefaultLangpack/audio/speechgen0044.mp3
branches/amis3/DefaultLangpack/audio/speechgen0045.mp3
branches/amis3/DefaultLangpack/audio/speechgen0046.mp3
branches/amis3/DefaultLangpack/audio/speechgen0047.mp3
branches/amis3/DefaultLangpack/audio/speechgen0048.mp3
branches/amis3/DefaultLangpack/audio/speechgen0049.mp3
branches/amis3/DefaultLangpack/audio/speechgen0050.mp3
branches/amis3/DefaultLangpack/audio/speechgen0051.mp3
branches/amis3/DefaultLangpack/audio/speechgen0052.mp3
branches/amis3/DefaultLangpack/audio/speechgen0053.mp3
branches/amis3/DefaultLangpack/audio/speechgen0054.mp3
branches/amis3/DefaultLangpack/audio/speechgen0055.mp3
branches/amis3/DefaultLangpack/audio/speechgen0056.mp3
branches/amis3/DefaultLangpack/audio/speechgen0057.mp3
branches/amis3/DefaultLangpack/audio/speechgen0058.mp3
branches/amis3/DefaultLangpack/audio/speechgen0059.mp3
branches/amis3/DefaultLangpack/audio/speechgen0060.mp3
branches/amis3/DefaultLangpack/audio/speechgen0061.mp3
branches/amis3/DefaultLangpack/audio/speechgen0062.mp3
branches/amis3/DefaultLangpack/audio/speechgen0063.mp3
branches/amis3/DefaultLangpack/audio/speechgen0064.mp3
branches/amis3/DefaultLangpack/audio/speechgen0065.mp3
branches/amis3/DefaultLangpack/audio/speechgen0066.mp3
branches/amis3/DefaultLangpack/audio/speechgen0067.mp3
branches/amis3/DefaultLangpack/audio/speechgen0068.mp3
branches/amis3/DefaultLangpack/audio/speechgen0069.mp3
branches/amis3/DefaultLangpack/audio/speechgen0070.mp3
branches/amis3/DefaultLangpack/audio/speechgen0071.mp3
branches/amis3/DefaultLangpack/audio/speechgen0072.mp3
branches/amis3/DefaultLangpack/audio/speechgen0073.mp3
branches/amis3/DefaultLangpack/audio/speechgen0074.mp3
branches/amis3/DefaultLangpack/audio/speechgen0075.mp3
branches/amis3/DefaultLangpack/audio/speechgen0076.mp3
branches/amis3/DefaultLangpack/audio/speechgen0077.mp3
branches/amis3/DefaultLangpack/audio/speechgen0078.mp3
branches/amis3/DefaultLangpack/audio/speechgen0079.mp3
branches/amis3/DefaultLangpack/audio/speechgen0080.mp3
branches/amis3/DefaultLangpack/audio/speechgen0081.mp3
branches/amis3/DefaultLangpack/audio/speechgen0082.mp3
branches/amis3/DefaultLangpack/audio/speechgen0083.mp3
branches/amis3/DefaultLangpack/audio/speechgen0084.mp3
branches/amis3/DefaultLangpack/audio/speechgen0085.mp3
branches/amis3/DefaultLangpack/audio/speechgen0086.mp3
branches/amis3/DefaultLangpack/audio/speechgen0087.mp3
branches/amis3/DefaultLangpack/audio/speechgen0088.mp3
branches/amis3/DefaultLangpack/audio/speechgen0089.mp3
branches/amis3/DefaultLangpack/audio/speechgen0090.mp3
branches/amis3/DefaultLangpack/audio/speechgen0091.mp3
branches/amis3/DefaultLangpack/audio/speechgen0092.mp3
branches/amis3/DefaultLangpack/audio/speechgen0093.mp3
branches/amis3/DefaultLangpack/audio/speechgen0094.mp3
branches/amis3/DefaultLangpack/audio/speechgen0095.mp3
branches/amis3/DefaultLangpack/audio/speechgen0096.mp3
branches/amis3/DefaultLangpack/audio/speechgen0097.mp3
branches/amis3/DefaultLangpack/audio/speechgen0098.mp3
branches/amis3/DefaultLangpack/audio/speechgen0099.mp3
branches/amis3/DefaultLangpack/audio/speechgen0100.mp3
branches/amis3/DefaultLangpack/audio/speechgen0101.mp3
branches/amis3/DefaultLangpack/audio/speechgen0102.mp3
branches/amis3/DefaultLangpack/audio/speechgen0103.mp3
branches/amis3/DefaultLangpack/audio/speechgen0104.mp3
branches/amis3/DefaultLangpack/audio/speechgen0105.mp3
branches/amis3/DefaultLangpack/audio/speechgen0106.mp3
branches/amis3/DefaultLangpack/audio/speechgen0107.mp3
branches/amis3/DefaultLangpack/audio/speechgen0108.mp3
branches/amis3/DefaultLangpack/audio/speechgen0109.mp3
branches/amis3/DefaultLangpack/audio/speechgen0110.mp3
branches/amis3/DefaultLangpack/audio/speechgen0111.mp3
branches/amis3/DefaultLangpack/audio/speechgen0112.mp3
branches/amis3/DefaultLangpack/audio/speechgen0113.mp3
branches/amis3/DefaultLangpack/audio/speechgen0114.mp3
branches/amis3/DefaultLangpack/audio/speechgen0115.mp3
branches/amis3/DefaultLangpack/audio/speechgen0116.mp3
branches/amis3/DefaultLangpack/audio/speechgen0117.mp3
branches/amis3/DefaultLangpack/audio/speechgen0118.mp3
branches/amis3/DefaultLangpack/audio/speechgen0119.mp3
branches/amis3/DefaultLangpack/audio/speechgen0120.mp3
branches/amis3/DefaultLangpack/audio/speechgen0121.mp3
branches/amis3/DefaultLangpack/audio/speechgen0122.mp3
branches/amis3/DefaultLangpack/audio/speechgen0123.mp3
branches/amis3/DefaultLangpack/audio/speechgen0124.mp3
branches/amis3/DefaultLangpack/audio/speechgen0125.mp3
branches/amis3/DefaultLangpack/audio/speechgen0126.mp3
branches/amis3/DefaultLangpack/audio/speechgen0127.mp3
branches/amis3/DefaultLangpack/audio/speechgen0128.mp3
branches/amis3/DefaultLangpack/audio/speechgen0129.mp3
branches/amis3/DefaultLangpack/audio/speechgen0130.mp3
branches/amis3/DefaultLangpack/audio/speechgen0131.mp3
branches/amis3/DefaultLangpack/audio/speechgen0132.mp3
branches/amis3/DefaultLangpack/audio/speechgen0133.mp3
branches/amis3/DefaultLangpack/audio/speechgen0134.mp3
branches/amis3/DefaultLangpack/audio/speechgen0135.mp3
branches/amis3/DefaultLangpack/audio/speechgen0136.mp3
branches/amis3/DefaultLangpack/audio/speechgen0137.mp3
branches/amis3/DefaultLangpack/audio/speechgen0138.mp3
branches/amis3/DefaultLangpack/audio/speechgen0139.mp3
branches/amis3/DefaultLangpack/audio/speechgen0140.mp3
branches/amis3/DefaultLangpack/audio/speechgen0141.mp3
branches/amis3/DefaultLangpack/audio/speechgen0142.mp3
branches/amis3/DefaultLangpack/audio/speechgen0143.mp3
branches/amis3/DefaultLangpack/audio/speechgen0144.mp3
branches/amis3/DefaultLangpack/audio/speechgen0145.mp3
branches/amis3/DefaultLangpack/audio/speechgen0146.mp3
branches/amis3/DefaultLangpack/audio/speechgen0147.mp3
branches/amis3/DefaultLangpack/audio/speechgen0148.mp3
branches/amis3/DefaultLangpack/audio/speechgen0149.mp3
branches/amis3/DefaultLangpack/audio/speechgen0150.mp3
branches/amis3/DefaultLangpack/audio/speechgen0151.mp3
branches/amis3/DefaultLangpack/audio/speechgen0152.mp3
branches/amis3/DefaultLangpack/audio/speechgen0153.mp3
branches/amis3/DefaultLangpack/audio/speechgen0154.mp3
branches/amis3/DefaultLangpack/audio/speechgen0155.mp3
branches/amis3/DefaultLangpack/audio/speechgen0156.mp3
branches/amis3/DefaultLangpack/audio/speechgen0157.mp3
branches/amis3/DefaultLangpack/audio/speechgen0158.mp3
branches/amis3/DefaultLangpack/audio/speechgen0159.mp3
branches/amis3/DefaultLangpack/audio/speechgen0160.mp3
branches/amis3/DefaultLangpack/audio/speechgen0161.mp3
branches/amis3/DefaultLangpack/audio/speechgen0162.mp3
branches/amis3/DefaultLangpack/audio/speechgen0163.mp3
branches/amis3/DefaultLangpack/audio/speechgen0164.mp3
branches/amis3/DefaultLangpack/audio/speechgen0165.mp3
branches/amis3/DefaultLangpack/audio/speechgen0166.mp3
branches/amis3/DefaultLangpack/audio/speechgen0167.mp3
branches/amis3/DefaultLangpack/audio/speechgen0168.mp3
branches/amis3/DefaultLangpack/audio/speechgen0169.mp3
branches/amis3/DefaultLangpack/audio/speechgen0170.mp3
branches/amis3/DefaultLangpack/audio/speechgen0171.mp3
branches/amis3/DefaultLangpack/audio/speechgen0172.mp3
branches/amis3/DefaultLangpack/audio/speechgen0173.mp3
branches/amis3/DefaultLangpack/audio/speechgen0174.mp3
branches/amis3/DefaultLangpack/audio/speechgen0175.mp3
branches/amis3/DefaultLangpack/audio/speechgen0176.mp3
branches/amis3/DefaultLangpack/audio/speechgen0177.mp3
branches/amis3/DefaultLangpack/audio/speechgen0178.mp3
branches/amis3/DefaultLangpack/audio/speechgen0179.mp3
branches/amis3/DefaultLangpack/audio/speechgen0180.mp3
branches/amis3/DefaultLangpack/audio/speechgen0181.mp3
branches/amis3/DefaultLangpack/audio/speechgen0182.mp3
branches/amis3/DefaultLangpack/audio/speechgen0183.mp3
branches/amis3/DefaultLangpack/audio/speechgen0184.mp3
branches/amis3/DefaultLangpack/audio/speechgen0185.mp3
branches/amis3/DefaultLangpack/audio/speechgen0186.mp3
branches/amis3/DefaultLangpack/audio/speechgen0187.mp3
branches/amis3/DefaultLangpack/audio/speechgen0188.mp3
branches/amis3/DefaultLangpack/audio/speechgen0189.mp3
branches/amis3/DefaultLangpack/audio/speechgen0190.mp3
branches/amis3/DefaultLangpack/audio/speechgen0191.mp3
branches/amis3/DefaultLangpack/audio/speechgen0192.mp3
branches/amis3/DefaultLangpack/audio/speechgen0193.mp3
branches/amis3/DefaultLangpack/audio/speechgen0194.mp3
branches/amis3/DefaultLangpack/audio/speechgen0195.mp3
branches/amis3/DefaultLangpack/audio/speechgen0196.mp3
branches/amis3/DefaultLangpack/audio/speechgen0197.mp3
branches/amis3/DefaultLangpack/audio/speechgen0198.mp3
branches/amis3/DefaultLangpack/audio/speechgen0199.mp3
branches/amis3/DefaultLangpack/audio/speechgen0200.mp3
branches/amis3/DefaultLangpack/audio/speechgen0201.mp3
branches/amis3/DefaultLangpack/audio/speechgen0202.mp3
branches/amis3/DefaultLangpack/audio/speechgen0203.mp3
branches/amis3/DefaultLangpack/audio/speechgen0204.mp3
branches/amis3/DefaultLangpack/audio/speechgen0205.mp3
branches/amis3/DefaultLangpack/audio/speechgen0206.mp3
branches/amis3/DefaultLangpack/audio/speechgen0207.mp3
branches/amis3/DefaultLangpack/audio/speechgen0208.mp3
branches/amis3/DefaultLangpack/audio/speechgen0209.mp3
branches/amis3/DefaultLangpack/audio/speechgen0210.mp3
branches/amis3/DefaultLangpack/audio/speechgen0211.mp3
branches/amis3/DefaultLangpack/audio/speechgen0212.mp3
branches/amis3/DefaultLangpack/audio/speechgen0213.mp3
branches/amis3/DefaultLangpack/audio/speechgen0214.mp3
branches/amis3/DefaultLangpack/audio/speechgen0215.mp3
branches/amis3/DefaultLangpack/audio/speechgen0216.mp3
branches/amis3/DefaultLangpack/audio/speechgen0217.mp3
branches/amis3/DefaultLangpack/audio/speechgen0218.mp3
branches/amis3/DefaultLangpack/audio/speechgen0219.mp3
branches/amis3/DefaultLangpack/audio/speechgen0220.mp3
branches/amis3/DefaultLangpack/audio/speechgen0221.mp3
branches/amis3/DefaultLangpack/audio/speechgen0222.mp3
branches/amis3/DefaultLangpack/audio/speechgen0223.mp3
branches/amis3/DefaultLangpack/audio/speechgen0224.mp3
branches/amis3/DefaultLangpack/audio/speechgen0225.mp3
branches/amis3/DefaultLangpack/audio/speechgen0226.mp3
branches/amis3/DefaultLangpack/audio/speechgen0227.mp3
branches/amis3/DefaultLangpack/audio/speechgen0228.mp3
branches/amis3/DefaultLangpack/audio/speechgen0229.mp3
branches/amis3/DefaultLangpack/audio/speechgen0230.mp3
branches/amis3/DefaultLangpack/audio/speechgen0231.mp3
branches/amis3/DefaultLangpack/audio/speechgen0232.mp3
branches/amis3/DefaultLangpack/audio/speechgen0233.mp3
branches/amis3/DefaultLangpack/audio/speechgen0234.mp3
branches/amis3/DefaultLangpack/audio/speechgen0235.mp3
branches/amis3/DefaultLangpack/audio/speechgen0236.mp3
branches/amis3/DefaultLangpack/audio/speechgen0237.mp3
branches/amis3/DefaultLangpack/audio/speechgen0238.mp3
branches/amis3/DefaultLangpack/audio/speechgen0239.mp3
branches/amis3/DefaultLangpack/audio/speechgen0240.mp3
branches/amis3/DefaultLangpack/audio/speechgen0241.mp3
branches/amis3/DefaultLangpack/audio/speechgen0242.mp3
branches/amis3/DefaultLangpack/audio/speechgen0243.mp3
branches/amis3/DefaultLangpack/audio/speechgen0244.mp3
branches/amis3/DefaultLangpack/audio/speechgen0245.mp3
branches/amis3/DefaultLangpack/audio/speechgen0246.mp3
branches/amis3/DefaultLangpack/audio/speechgen0247.mp3
branches/amis3/DefaultLangpack/audio/speechgen0248.mp3
branches/amis3/DefaultLangpack/audio/speechgen0249.mp3
branches/amis3/DefaultLangpack/audio/speechgen0250.mp3
branches/amis3/DefaultLangpack/audio/speechgen0251.mp3
branches/amis3/DefaultLangpack/audio/speechgen0252.mp3
branches/amis3/DefaultLangpack/audio/speechgen0253.mp3
branches/amis3/DefaultLangpack/audio/speechgen0254.mp3
branches/amis3/DefaultLangpack/audio/speechgen0255.mp3
branches/amis3/DefaultLangpack/audio/speechgen0256.mp3
branches/amis3/DefaultLangpack/audio/speechgen0257.mp3
branches/amis3/DefaultLangpack/audio/speechgen0258.mp3
branches/amis3/DefaultLangpack/audio/speechgen0259.mp3
branches/amis3/DefaultLangpack/audio/speechgen0260.mp3
branches/amis3/DefaultLangpack/audio/speechgen0261.mp3
branches/amis3/DefaultLangpack/audio/speechgen0262.mp3
branches/amis3/DefaultLangpack/audio/speechgen0263.mp3
branches/amis3/DefaultLangpack/audio/speechgen0264.mp3
branches/amis3/DefaultLangpack/audio/speechgen0265.mp3
branches/amis3/DefaultLangpack/audio/speechgen0266.mp3
branches/amis3/DefaultLangpack/audio/speechgen0267.mp3
branches/amis3/DefaultLangpack/audio/speechgen0268.mp3
branches/amis3/DefaultLangpack/audio/speechgen0269.mp3
branches/amis3/DefaultLangpack/audio/speechgen0270.mp3
branches/amis3/DefaultLangpack/audio/speechgen0271.mp3
branches/amis3/DefaultLangpack/audio/speechgen0272.mp3
branches/amis3/DefaultLangpack/audio/speechgen0273.mp3
branches/amis3/DefaultLangpack/audio/speechgen0274.mp3
branches/amis3/DefaultLangpack/audio/speechgen0275.mp3
branches/amis3/DefaultLangpack/audio/speechgen0276.mp3
branches/amis3/DefaultLangpack/audio/speechgen0277.mp3
branches/amis3/DefaultLangpack/audio/speechgen0278.mp3
branches/amis3/DefaultLangpack/audio/speechgen0279.mp3
branches/amis3/DefaultLangpack/audio/speechgen0280.mp3
branches/amis3/DefaultLangpack/audio/speechgen0281.mp3
branches/amis3/DefaultLangpack/audio/speechgen0282.mp3
branches/amis3/DefaultLangpack/audio/speechgen0283.mp3
branches/amis3/DefaultLangpack/audio/speechgen0284.mp3
branches/amis3/DefaultLangpack/audio/speechgen0285.mp3
branches/amis3/DefaultLangpack/audio/speechgen0286.mp3
branches/amis3/DefaultLangpack/audio/speechgen0287.mp3
branches/amis3/DefaultLangpack/audio/speechgen0288.mp3
branches/amis3/DefaultLangpack/audio/speechgen0289.mp3
branches/amis3/DefaultLangpack/audio/speechgen0290.mp3
branches/amis3/DefaultLangpack/audio/speechgen0291.mp3
branches/amis3/DefaultLangpack/audio/speechgen0292.mp3
branches/amis3/DefaultLangpack/audio/speechgen0293.mp3
branches/amis3/DefaultLangpack/audio/speechgen0294.mp3
branches/amis3/DefaultLangpack/audio/speechgen0295.mp3
branches/amis3/DefaultLangpack/audio/speechgen0296.mp3
branches/amis3/DefaultLangpack/audio/speechgen0297.mp3
branches/amis3/DefaultLangpack/audio/speechgen0298.mp3
branches/amis3/DefaultLangpack/audio/speechgen0299.mp3
branches/amis3/DefaultLangpack/audio/speechgen0300.mp3
branches/amis3/DefaultLangpack/audio/speechgen0301.mp3
branches/amis3/DefaultLangpack/audio/speechgen0302.mp3
branches/amis3/DefaultLangpack/audio/speechgen0303.mp3
branches/amis3/DefaultLangpack/audio/speechgen0304.mp3
branches/amis3/DefaultLangpack/audio/speechgen0305.mp3
branches/amis3/DefaultLangpack/audio/speechgen0306.mp3
branches/amis3/DefaultLangpack/audio/speechgen0307.mp3
branches/amis3/DefaultLangpack/audio/speechgen0308.mp3
branches/amis3/DefaultLangpack/audio/speechgen0309.mp3
branches/amis3/DefaultLangpack/audio/speechgen0310.mp3
branches/amis3/DefaultLangpack/audio/speechgen0311.mp3
branches/amis3/DefaultLangpack/audio/speechgen0312.mp3
branches/amis3/DefaultLangpack/audio/speechgen0313.mp3
branches/amis3/DefaultLangpack/audio/speechgen0314.mp3
branches/amis3/DefaultLangpack/audio/speechgen0315.mp3
branches/amis3/DefaultLangpack/audio/speechgen0316.mp3
branches/amis3/DefaultLangpack/audio/speechgen0317.mp3
branches/amis3/DefaultLangpack/audio/speechgen0318.mp3
branches/amis3/DefaultLangpack/audio/speechgen0319.mp3
Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml
===================================================================
--- branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 20:12:26 UTC (rev 2439)
+++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 20:18:17 UTC (rev 2440)
@@ -1,2021 +1,2021 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<ui xmlns="http://amisproject.org" next-id="t327" xml:lang="en">
- <containers>
- <container id="file">
- <note>This is the menu header "File"</note>
- <caption>
- <text id="t1">File</text>
- <audio src="./audio/002_File.mp3"/>
- </caption>
- <action mfcid="ID_AMIS_OPEN_FILE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and a toolbar item</note>
- <icon src="./open.png" type="smallIcon"/>
- <caption>
- <text id="t2">Open...</text>
- <audio src="./audio/003_Open.mp3"/>
- </caption>
- <description>
- <text id="t3">Open a Daisy book from the local file system</text>
- <audio src="./audio/004_Open_a_Daisy_book_from_the_loc.mp3"/>
- </description>
- <!--keys = the actual keys; text = the name of the keys-->
- <accelerator keys="Ctrl+O">
- <text id="t4">Ctrl+O</text>
- <audio src="./audio/005_CtrlO.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t5">O</text>
- <audio src="./audio/006_O.mp3"/>
- </mnemonic>
- </action>
- <!--new action-->
- <action mfcid="ID_AMIS_OPEN_URL" widget="menuItem">
- <note>This is going to be a menu item</note>
- <icon src="./open.png" type="smallIcon"/>
- <caption>
- <text id="xx">Open URL...</text>
- <audio src="./audio/openurl.mp3"/>
- </caption>
- <description>
- <text id="xx">Open a DAISY publication from a URL</text>
- <audio src="./audio/openurl_desc.mp3"/>
- </description>
- <accelerator>
- <text id="xx">Ctrl+U</text>
- <audio src="./audio/openurl_ctrlu.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="xx">U</text>
- <audio src="./audio/openurl_u.mp3"/>
- </mnemonic>
- </action>
- <!--new action-->
- <action mfcid="ID_AMIS_CLOSE_BOOK" widget="menuItem">
- <note>This is going to be a menu item</note>
- <icon src="./close.png" type="smallIcon"/>
- <caption>
- <text id="xx">Close</text>
- <audio src="./audio/close.mp3"/>
- </caption>
- <description>
- <text id="xx">Close the DAISY publication.</text>
- <audio src="./audio/close_desc.mp3"/>
- </description>
- <mnemonic>
- <text id="xx">C</text>
- <audio src="./audio/close_c.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_LOAD_CD" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and a toolbar item</note>
- <icon src="./settings/img/cd3.ico" type="smallIcon"/>
- <icon src="./settings/img/cd_big.ico" type="largeIcon"/>
- <caption>
- <text id="t6">Load CD</text>
- <audio src="./audio/007_Load_CD.mp3"/>
- </caption>
- <description>
- <text id="t7">Load a DAISY book from CD ROM</text>
- <audio src="./audio/008_Load_a_DAISY_book_from_CD_ROM.mp3"/>
- </description>
- <accelerator keys="Ctrl+L">
- <text id="t8">Ctrl+L</text>
- <audio src="./audio/009_CtrlL.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t9">L</text>
- <audio src="./audio/010_L.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_SEARCH_LOCAL_DRIVES" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <!--changed text-->
- <text id="t10">Search drives...</text>
- <audio src="./audio/011_Search.mp3"/>
- </caption>
- <description>
- <text id="t11">Search local drives for DAISY books</text>
- <audio src="./audio/012_Search_local_drives_for_DAISY_.mp3"/>
- </description>
- <mnemonic>
- <text id="t12">S</text>
- <audio src="./audio/013_S.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_SHOW_PREFERENCES" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t13">Preferences...</text>
- <audio src="./audio/014_Preferences.mp3"/>
- </caption>
- <description>
- <text id="t14">This is the application preferences dialog.</text>
- <audio src="./audio/015_This_is_the_application_prefer.mp3"/>
- </description>
- <mnemonic>
- <text id="t15">P</text>
- <audio src="./audio/016_P.mp3"/>
- </mnemonic>
- </action>
- <container id="recentBooksList">
- <note>This is the menu header for the recent books sub-menu.</note>
- <caption>
- <text id="t16">Recent</text>
- <audio src="./audio/017_Recent.mp3"/>
- </caption>
- <switch element="action">
- <action condition="ID_AMIS_RECENT_BOOKS_EMPTY" mfcid="ID_AMIS_RECENT_BOOKS_EMPTY" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t17">Empty</text>
- <audio src="./audio/018_Empty.mp3"/>
- </caption>
- <description>
- <text id="t18">There are no recently read books.</text>
- <audio src="./audio/019_There_are_no_recently_read_boo.mp3"/>
- </description>
- </action>
- <action condition="AMIS_RECENT_BOOK_BASE_ID" mfcid="AMIS_RECENT_BOOK_BASE_ID" widget="menuItem">
- <note>This is going to be a menu item</note>
- <list repeat="yes">
- <caption>
- <promptVar name="RECENT_BOOK_TITLE"/>
- </caption>
- </list>
- </action>
- </switch>
- <mnemonic>
- <text id="t19">R</text>
- <audio src="./audio/020_R.mp3"/>
- </mnemonic>
- </container>
- <action mfcid="ID_AMIS_EXIT" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t20">Exit</text>
- <audio src="./audio/021_Exit.mp3"/>
- </caption>
- <description>
- <text id="t21">Exit AMIS</text>
- <audio src="./audio/022_Exit_AMIS.mp3"/>
- </description>
- <accelerator keys="Alt+F4">
- <text id="t22">Alt+F4</text>
- <audio src="./audio/023_AltF4.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t23">x</text>
- <audio src="./audio/024_x.mp3"/>
- </mnemonic>
- </action>
- <accelerator keys="Alt+F">
- <text id="t24">Alt+F</text>
- <audio src="./audio/025_AltF.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t25">F</text>
- <audio src="./audio/026_F.mp3"/>
- </mnemonic>
- </container>
- <container id="view">
- <note>This is the menu header "View"</note>
- <caption>
- <text id="t26">View</text>
- <audio src="./audio/027_View.mp3"/>
- </caption>
- <action mfcid="ID_AMIS_TOGGLE_SIDEBAR" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t27">Sidebar</text>
- <audio src="./audio/028_Sidebar.mp3"/>
- </caption>
- <description>
- <text id="t28">Turn the sidebar on or off.</text>
- <audio src="./audio/029_Turn_the_sidebar_on_or_off.mp3"/>
- </description>
- <mnemonic>
- <text id="t29">S</text>
- <audio src="./audio/030_S.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_TOGGLE_VIEW" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <!--changed text-->
- <text id="t30">Basic View</text>
- <audio src="./audio/031_Basic_View_Mode.mp3"/>
- </caption>
- <description>
- <text id="t31">Switch the view to basic mode.</text>
- <audio src="./audio/032_Switch_the_view_to_basic_mode.mp3"/>
- </description>
- <accelerator keys="F11">
- <text id="t32">F11</text>
- <audio src="./audio/033_F11.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t33">B</text>
- <audio src="./audio/034_B.mp3"/>
- </mnemonic>
- </action>
- <!--new item-->
- <container id="pageStylesList">
- <note>This is the menu header for the list of styles available for this page.</note>
- <caption>
- <text id="xx">Page Style</text>
- <audio src=""/>
- </caption>
- <action mfcid="ID_AMIS_NO_PAGE_STYLES" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="xx">None</text>
- <audio src=""/>
- </caption>
- </action>
- <action mfcid="AMIS_PAGE_STYLE_BASE_ID" widget="menuItem">
- <note>This is going to be a menu item</note>
- <list repeat="yes">
- <caption>
- <promptVar name="PAGE_STYLE_NAME"/>
- </caption>
- </list>
- </action>
- <mnemonic>
- <text id="xx">P</text>
- <audio src=""/>
- </mnemonic>
- </container>
- <action mfcid="ID_AMIS_BIGGER_FONT" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/font.ico" type="smallIcon"/>
- <caption>
- <!--changed text-->
- <text id="t38">Bigger Font</text>
- <audio src="./audio/039_Increase_Font_Size.mp3"/>
- </caption>
- <description>
- <text id="t39">Gradually increase the font size.</text>
- <audio src="./audio/040_Gradually_increase_the_font_si.mp3"/>
- </description>
- <mnemonic>
- <!--changed text-->
- <text id="t40">G</text>
- <audio src="./audio/041_I.mp3"/>
- </mnemonic>
- </action>
- <!--new item-->
- <action mfcid="ID_AMIS_SMALLER_FONT" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/font.ico" type="smallIcon"/>
- <caption>
- <text id="xx">Smaller Font</text>
- <audio src=""/>
- </caption>
- <description>
- <text id="xx">Gradually decrease the font size.</text>
- <audio src=""/>
- </description>
- <mnemonic>
- <text id="xx">M</text>
- <audio src=""/>
- </mnemonic>
- </action>
- <!--new item-->
- <action mfcid="ID_AMIS_SHOW_TEXTSTYLE" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="xx">Text style...</text>
- <audio src=""/>
- </caption>
- <description>
- <text id="xx">Change the text style properties.</text>
- <audio src=""/>
- </description>
- <mnemonic>
- <text id="xx">T</text>
- <audio src=""/>
- </mnemonic>
- </action>
- <action mfcid="AMIS_NAVLIST_BASE_ID" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <promptVar name="NAVLIST_NAME"/>
- </caption>
- <description>
- <promptVar name="NAVLIST_DESCRIPTION"/>
- </description>
- </action>
- <accelerator keys="Alt+V">
- <text id="t44">Alt+V</text>
- <audio src="./audio/045_AltV.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t45">V</text>
- <audio src="./audio/046_V.mp3"/>
- </mnemonic>
- </container>
- <container id="play">
- <note>This is the menu header "Play"</note>
- <caption>
- <text id="t46">Play</text>
- <audio src="./audio/047_Play.mp3"/>
- </caption>
- <switch element="action">
- <action condition="canPlay" mfcid="ID_AMIS_PLAYPAUSE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/play-big.ico" type="smallIcon"/>
- <icon src="./settings/img/play_big.ico" type="largeIcon"/>
- <caption>
- <text id="t47">Play</text>
- <audio src="./audio/048_Play.mp3"/>
- </caption>
- <description>
- <text id="t48">Start synchronized playback.</text>
- <audio src="./audio/049_Start_synchronized_playback.mp3"/>
- </description>
- <accelerator keys="Space">
- <text id="t49">Space</text>
- <audio src="./audio/050_Space.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t50">P</text>
- <audio src="./audio/051_P.mp3"/>
- </mnemonic>
- </action>
- <action condition="canPause" mfcid="ID_AMIS_PLAYPAUSE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/pause.ico" type="smallIcon"/>
- <icon src="./settings/img/pause_big.ico" type="largeIcon"/>
- <caption>
- <text id="t51">Pause</text>
- <audio src="./audio/052_Pause.mp3"/>
- </caption>
- <description>
- <text id="t52">Pause playback of this DAISY book.</text>
- <audio src="./audio/053_Pause_playback_of_this_DAISY_b.mp3"/>
- </description>
- <accelerator keys="Space">
- <text id="t53">Space</text>
- <audio src="./audio/054_Space.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t54">a</text>
- <audio src="./audio/055_a.mp3"/>
- </mnemonic>
- </action>
- </switch>
- <action mfcid="ID_AMIS_ESCAPE" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t55">Escape</text>
- <audio src="./audio/056_Escape.mp3"/>
- </caption>
- <description>
- <text id="t56">Jump out of the currently playing item or structure.</text>
- <audio src="./audio/057_Jump_out_of_the_currently_play.mp3"/>
- </description>
- <accelerator keys="Esc">
- <text id="t57">Esc</text>
- <audio src="./audio/058_Esc.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t58">E</text>
- <audio src="./audio/059_E.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_FASTER" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/fullspeedahead.ico" type="smallIcon"/>
- <caption>
- <text id="t59">Faster</text>
- <audio src="./audio/060_Faster.mp3"/>
- </caption>
- <description>
- <text id="t60">Increase the playback rate.</text>
- <audio src="./audio/061_Increase_the_playback_rate.mp3"/>
- </description>
- <accelerator keys="Ctrl++">
- <text id="t61">Ctrl++</text>
- <audio src="./audio/062_Ctrl.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t62">F</text>
- <audio src="./audio/063_F.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_SLOWER" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/slowdown.ico" type="smallIcon"/>
- <caption>
- <text id="t63">Slower</text>
- <audio src="./audio/064_Slower.mp3"/>
- </caption>
- <description>
- <text id="t64">Slow down the playback rate.</text>
- <audio src="./audio/065_Slow_down_the_playback_rate.mp3"/>
- </description>
- <accelerator keys="Ctrl+-">
- <text id="t65">Ctrl+-</text>
- <audio src="./audio/066_Ctrl.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t66">S</text>
- <audio src="./audio/067_S.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_RESET_SPEED" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/normalspeed.ico" type="smallIcon"/>
- <caption>
- <text id="t67">Normal Speed</text>
- <audio src="./audio/068_Normal_Speed.mp3"/>
- </caption>
- <description>
- <text id="t68">Reset the playback rate to normal.</text>
- <audio src="./audio/069_Reset_the_playback_rate_to_nor.mp3"/>
- </description>
- <accelerator keys="Ctrl+0">
- <text id="t69">Ctrl+0</text>
- <audio src="./audio/070_Ctrl0.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t70">N</text>
- <audio src="./audio/071_N.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_INCREASE_VOLUME" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t71">Increase Volume</text>
- <audio src="./audio/072_Increase_Volume.mp3"/>
- </caption>
- <description>
- <text id="t72">Gradually raise the volume.</text>
- <audio src="./audio/073_Gradually_raise_the_volume.mp3"/>
- </description>
- <accelerator keys="Ctrl+Up">
- <text id="t73">Ctrl+Up</text>
- <audio src="./audio/074_CtrlUp.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t74">I</text>
- <audio src="./audio/075_I.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_DECREASE_VOLUME" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t75">Decrease Volume</text>
- <audio src="./audio/076_Decrease_Volume.mp3"/>
- </caption>
- <description>
- <text id="t76">Gradually lower the volume.</text>
- <audio src="./audio/077_Gradually_lower_the_volume.mp3"/>
- </description>
- <accelerator keys="Ctrl+Down">
- <text id="t77">Ctrl+Down</text>
- <audio src="./audio/078_CtrlDown.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t78">D</text>
- <audio src="./audio/079_D.mp3"/>
- </mnemonic>
- </action>
- <accelerator keys="Alt+P">
- <text id="t79">Alt+P</text>
- <audio src="./audio/080_AltP.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t80">P</text>
- <audio src="./audio/081_P.mp3"/>
- </mnemonic>
- </container>
- <container id="navigate">
- <note>This is the menu header "Navigate"</note>
- <caption>
- <text id="t81">Navigate</text>
- <audio src="./audio/082_Navigate.mp3"/>
- </caption>
- <action mfcid="ID_AMIS_PREVIOUS_SECTION" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/prevsection.ico" type="smallIcon"/>
- <icon src="./settings/img/prevsection_big.ico" type="largeIcon"/>
- <caption>
- <text id="t82">Previous Section</text>
- <audio src="./audio/083_Previous_Section.mp3"/>
- </caption>
- <description>
- <text id="t83">Go to the previous section.</text>
- <audio src="./audio/084_Go_to_the_previous_section.mp3"/>
- </description>
- <accelerator keys="Up">
- <text id="t84">Up</text>
- <audio src="./audio/085_Up.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t85">P</text>
- <audio src="./audio/086_P.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_NEXT_SECTION" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/nextsection.ico" type="smallIcon"/>
- <icon src="./settings/img/nextsection_big.ico" type="largeIcon"/>
- <caption>
- <text id="t86">Next Section</text>
- <audio src="./audio/087_Next_Section.mp3"/>
- </caption>
- <description>
- <text id="t87">Go to the next section.</text>
- <audio src="./audio/088_Go_to_the_next_section.mp3"/>
- </description>
- <accelerator keys="Down">
- <text id="t88">Down</text>
- <audio src="./audio/089_Down.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t89">N</text>
- <audio src="./audio/090_N.mp3"/>
- </mnemonic>
- </action>
- <container id="sectiondepth">
- <note>This is the "show section depth" sub-menu pop-up</note>
- <caption>
- <text id="t90">Show Section Depth</text>
- <audio src="./audio/091_Show_Section_Depth.mp3"/>
- </caption>
- <switch element="action">
- <action condition="ID_AMIS_SECTION_DEPTH_EMPTY" mfcid="ID_AMIS_SECTION_DEPTH_EMPTY" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t91">Empty</text>
- <audio src="./audio/092_Empty.mp3"/>
- </caption>
- <description>
- <text id="t92">There are no section levels.</text>
- <audio src="./audio/093_There_are_no_section_levels.mp3"/>
- </description>
- </action>
- <action condition="AMIS_SECTION_DEPTH_BASE_ID" mfcid="AMIS_SECTION_DEPTH_BASE_ID" widget="menuItem">
- <note>This is going to be a menu item</note>
- <list repeat="yes">
- <caption>
- <promptVar name="SECTION_DEPTH_OPTION"/>
- </caption>
- </list>
- </action>
- </switch>
- <mnemonic>
- <text id="t93">S</text>
- <audio src="./audio/094_S.mp3"/>
- </mnemonic>
- </container>
- <action mfcid="ID_AMIS_PREVIOUS_PHRASE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/prevphasecirc.ico" type="smallIcon"/>
- <caption>
- <text id="t94">Previous Phrase</text>
- <audio src="./audio/095_Previous_Phrase.mp3"/>
- </caption>
- <description>
- <text id="t95">Go to the previous phrase.</text>
- <audio src="./audio/096_Go_to_the_previous_phrase.mp3"/>
- </description>
- <accelerator keys="Left">
- <text id="t96">Left</text>
- <audio src="./audio/097_Left.mp3"/>
- </accelerator>
- </action>
- <action mfcid="ID_AMIS_NEXT_PHRASE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/nextphrasecirc.ico" type="smallIcon"/>
- <caption>
- <text id="t97">Next Phrase</text>
- <audio src="./audio/098_Next_Phrase.mp3"/>
- </caption>
- <description>
- <text id="t98">Go to the next phrase.</text>
- <audio src="./audio/099_Go_to_the_next_phrase.mp3"/>
- </description>
- <accelerator keys="Right">
- <text id="t99">Right</text>
- <audio src="./audio/100_Right.mp3"/>
- </accelerator>
- </action>
- <action mfcid="ID_AMIS_PREVIOUS_PAGE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/prevpage.ico" type="smallIcon"/>
- <caption>
- <text id="t100">Previous Page</text>
- <audio src="./audio/101_Previous_Page.mp3"/>
- </caption>
- <description>
- <text id="t101">Go to the previous page.</text>
- <audio src="./audio/102_Go_to_the_previous_page.mp3"/>
- </description>
- <accelerator keys="Ctrl+Left">
- <text id="t102">Ctrl+Left</text>
- <audio src="./audio/103_CtrlLeft.mp3"/>
- </accelerator>
- </action>
- <action mfcid="ID_AMIS_NEXT_PAGE" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/nextpage.ico" type="smallIcon"/>
- <caption>
- <text id="t103">Next Page</text>
- <audio src="./audio/104_Next_Page.mp3"/>
- </caption>
- <description>
- <text id="t104">Go to the next page.</text>
- <audio src="./audio/105_Go_to_the_next_page.mp3"/>
- </description>
- <accelerator keys="Ctrl+Right">
- <text id="t105">Ctrl+Right</text>
- <audio src="./audio/106_CtrlRight.mp3"/>
- </accelerator>
- </action>
- <action mfcid="ID_AMIS_GOTO_PAGE" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t106">Go to Page...</text>
- <audio src="./audio/107_Go_to_Page.mp3"/>
- </caption>
- <description>
- <text id="t107">Go to a specific page.</text>
- <audio src="./audio/108_Go_to_a_specific_page.mp3"/>
- </description>
- <accelerator keys="Ctrl+G">
- <text id="t108">Ctrl+G</text>
- <audio src="./audio/109_CtrlG.mp3"/>
- </accelerator>
- </action>
- <action mfcid="ID_AMIS_FIND_IN_TEXT" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t109">Find in Text</text>
- <audio src="./audio/110_Find_in_Text.mp3"/>
- </caption>
- <description>
- <text id="t110">Search for a word or phrase in the text.</text>
- <audio src="./audio/111_Search_for_a_word_or_phrase_in.mp3"/>
- </description>
- <accelerator keys="Ctrl+F">
- <text id="t111">Ctrl+F</text>
- <audio src="./audio/112_CtrlF.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t112">F</text>
- <audio src="./audio/113_F.mp3"/>
- </mnemonic>
- </action>
- <accelerator keys="Alt+N">
- <text id="t113">Alt+N</text>
- <audio src="./audio/114_AltN.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t114">N</text>
- <audio src="./audio/115_N.mp3"/>
- </mnemonic>
- </container>
- <container id="bookmarks">
- <note>This is the menu header "Bookmarks"</note>
- <caption>
- <text id="t115">Bookmarks</text>
- <audio src="./audio/116_Bookmarks.mp3"/>
- </caption>
- <action mfcid="ID_AMIS_ADD_BOOKMARK" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/adbookmark.ico" type="smallIcon"/>
- <caption>
- <text id="t116">Add Bookmark</text>
- <audio src="./audio/117_Add_Bookmark.mp3"/>
- </caption>
- <description>
- <text id="t117">Bookmark your current position.</text>
- <audio src="./audio/118_Bookmark_your_current_position.mp3"/>
- </description>
- <accelerator keys="Ctrl+D">
- <text id="t118">Ctrl+D</text>
- <audio src="./audio/119_CtrlD.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t119">A</text>
- <audio src="./audio/120_A.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="AMIS_BOOKMARK_BASE_ID" widget="menuItem">
- <note>This is going to be a menu item</note>
- <list repeat="yes">
- <caption>
- <promptVar name="BOOKMARK_TITLE"/>
- </caption>
- </list>
- </action>
- <accelerator keys="Alt+B">
- <text id="t120">Alt+B</text>
- <audio src="./audio/121_AltB.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t121">B</text>
- <audio src="./audio/122_B.mp3"/>
- </mnemonic>
- </container>
- <container id="info">
- <note>This is the menu header "Info"</note>
- <caption>
- <text id="t122">Info</text>
- <audio src="./audio/123_Info.mp3"/>
- </caption>
- <action mfcid="ID_AMIS_SHOW_READING_OPTIONS" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <!--changed text-->
- <text id="t123">Reading Options...</text>
- <audio src="./audio/124_Skippable_Items.mp3"/>
- </caption>
- <description>
- <!--changed text-->
- <text id="t124">View the reading options for this publication.</text>
- <audio src="./audio/125_View_the_skippable_items_for_t.mp3"/>
- </description>
- <mnemonic>
- <!--changed text-->
- <text id="t125">R</text>
- <audio src="./audio/126_S.mp3"/>
- </mnemonic>
- </action>
- <!--new item-->
- <action mfcid="ID_AMIS_SHOW_PUBLICATION_SUMMARY" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="xx">Publication Summary</text>
- <audio src=""/>
- </caption>
- <description>
- <text id="xx">View information about this publication.</text>
- <audio src=""/>
- </description>
- <mnemonic>
- <text id="xx">P</text>
- <audio src=""/>
- </mnemonic>
- </action>
- <accelerator keys="Alt+I">
- <text id="t135">Alt+I</text>
- <audio src="./audio/136_AltI.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t136">I</text>
- <audio src="./audio/137_I.mp3"/>
- </mnemonic>
- </container>
- <container id="help">
- <note>This is the menu header "Help"</note>
- <caption>
- <text id="t137">Help</text>
- <audio src="./audio/138_Help.mp3"/>
- </caption>
- <action mfcid="ID_AMIS_SHOW_HELP_CONTENTS" widget="menuItem toolbarItem">
- <note>This is going to be a menu item and toolbar item</note>
- <icon src="./settings/img/help.ico" type="smallIcon"/>
- <icon src="./settings/img/help_big.ico" type="largeIcon"/>
- <caption>
- <text id="t138">Contents</text>
- <audio src="./audio/139_Contents.mp3"/>
- </caption>
- <description>
- <text id="t139">Get help using AMIS</text>
- <audio src="./audio/140_Get_help_using_AMIS.mp3"/>
- </description>
- <mnemonic>
- <text id="t140">C</text>
- <audio src="./audio/141_C.mp3"/>
- </mnemonic>
- </action>
- <action mfcid="ID_AMIS_ABOUT" widget="menuItem">
- <note>This is going to be a menu item</note>
- <caption>
- <text id="t141">About AMIS</text>
- <audio src="./audio/142_About_AMIS.mp3"/>
- </caption>
- <description>
- <text id="t142">Find out about AMIS and DAISY-for-All.</text>
- <audio src="./audio/143_Find_out_about_AMIS_and_DAISYf.mp3"/>
- </description>
- <mnemonic>
- <text id="t143">A</text>
- <audio src="./audio/144_A.mp3"/>
- </mnemonic>
- </action>
- <accelerator keys="Alt+H">
- <text id="t144">Alt+H</text>
- <audio src="./audio/145_AltH.mp3"/>
- </accelerator>
- <mnemonic>
- <text id="t145">H</text>
- <audio src="./audio/146_H.mp3"/>
- </mnemonic>
- </container>
- </containers>
- <dialogs>
- <dialog mfcid="IDD_FIND">
- <note>This is the find in text dialog</note>
- <caption>
- <text id="t146">Find in Text</text>
- <audio src="./audio/147_Find_in_Text.mp3"/>
- </caption>
- <description>
- <text id="t147">Here you can search the full text in either direction.</text>
- <audio src="./audio/148_Here_you_can_search_the_full_t.mp3"/>
- </description>
- <prompt type="instructions">
- <promptItem refid="tabAround"/>
- <promptItem>
- <text id="t148">After typing in your search, press enter to begin searching.</text>
- <audio src="./audio/149_After_typing_in_your_search_pr.mp3"/>
- </promptItem>
- <promptItem refid="altC_to_cancel"/>
- <promptItem refid="repeatLastPromptInstr"/>
- <promptItem refid="hearDlgInstructions"/>
- </prompt>
- <control mfcid="IDOK" widget="button">
- <caption>
- <promptItem refid="ok_button_caption"/>
- </caption>
- <description>
- <text id="t149">Press to begin searching for text in the file.</text>
- <audio src="./audio/150_Press_to_begin_searching_for_t.mp3"/>
- </description>
- </control>
- <control mfcid="IDCANCEL" widget="button">
- <caption>
- <promptItem refid="cancel_button_caption"/>
- </caption>
- <description>
- <promptItem refid="cancel_button_description"/>
- </description>
- <mnemonic>
- <text id="t150">C</text>
- <audio src="./audio/038_C.mp3"/>
- </mnemonic>
- </control>
- <control mfcid="IDC_SEARCHSTRING" widget="textfield">
- <description>
- <text id="t151">Type the text to search for.</text>
- <audio src="./audio/151_Type_the_text_to_search_for.mp3"/>
- </description>
- </control>
- <control mfcid="IDC_FINDNEXT" widget="radiobutton">
- <note>This indicates the direction of the search</note>
- <caption>
- <text id="t152">Find Next</text>
- <audio src="./audio/152_Find_Next.mp3"/>
- </caption>
- <description>
- <prompt>
- <promptItem refid="thisItemIsCurrently"/>
- <promptVar name="SELECTED_OR_DESELECTED" param="FIND_NEXT_IN_TEXT"/>
- </prompt>
- </description>
- </control>
- <control mfcid="IDC_FINDPREV" widget="radiobutton">
- <note>This indicates the direction of the search</note>
- <caption>
- <text id="t153">Find Previous</text>
- <audio src="./audio/153_Find_Previous.mp3"/>
- </caption>
- <description>
- <prompt>
- <promptItem refid="thisItemIsCurrently"/>
- <promptName name="SELECTED_OR_DESELECTED" param="FIND_PREV_IN_TEXT"/>
- </prompt>
- </description>
- </control>
- </dialog>
- <dialog mfcid="IDD_CDSEARCH">
- <note>This dialog appears when more than one book is on a CD-ROM</note>
- <caption>
- <text id="t154">Multiple books found</text>
- <audio src="./audio/154_Multiple_books_found.mp3"/>
- </caption>
- <description mfcid="IDC_MULTIVOLCD_INSTRUCTIONS">
- <text id="t155">More than one book was found on this CD. Please select a book from the list below and press Alt + O to open.</text>
- <audio src="./audio/155_More_than_one_book_was_found_o.mp3"/>
- </description>
- <prompt type="instructions">
- <promptItem refid="tabAround"/>
- <promptItem refid="altC_to_cancel"/>
- <promptItem refid="repeatLastPromptInstr"/>
- <promptItem refid="hearDlgInstructions"/>
- </prompt>
- <control mfcid="IDCANCEL" widget="button">
- <caption>
- <promptItem refid="cancel_button_caption"/>
- </caption>
- <description>
- <promptItem refid="cancel_button_description"/>
- </description>
- <mnemonic>
- <text id="t156">C</text>
- <audio src="./audio/038_C.mp3"/>
- </mnemonic>
- </control>
- <control mfcid="IDC_OPENBOOK" widget="button">
- <caption>
- <text id="t157">Open</text>
- <audio src="./audio/156_Open.mp3"/>
- </caption>
- <description>
- <text id="t158">Press to close this dialog and open the selected book.</text>
- <audio src="./audio/157_Press_to_close_this_dialog_and.mp3"/>
- </description>
- <mnemonic>
- <text id="t159">O</text>
- <audio src="./audio/158_O.mp3"/>
- </mnemonic>
- </control>
- <control mfcid="IDC_BOOKLIST" widget="list">
- <description>
- <text id="t160">Use the arrow keys to move around this list of titles.</text>
- <audio src="./audio/159_Use_the_arrow_keys_to_move_aro.mp3"/>
- </description>
- <list repeat="yes">
- <caption>
- <promptVar name="BOOK_TITLE"/>
- </caption>
- </list>
- </control>
- </dialog>
- <dialog mfcid="IDD_ABOUTBOX">
- <note>This dialog gives some basic information about AMIS.</note>
- <caption>
- <text id="t161">About AMIS</text>
- <audio src="./audio/160_About_AMIS.mp3"/>
- </caption>
- <description>
- <text id="t162">Dialog with information about AMIS software.</text>
- <audio src="./audio/161_Dialog_with_information_about_.mp3"/>
- </description>
- <prompt type="instructions">
- <promptItem refid="enter_to_close"/>
- <promptItem refid="repeatLastPromptInstr"/>
- <promptItem refid="hearDlgInstructions"/>
- </prompt>
- <control mfcid="IDC_AMISNAME" widget="textlabel">
- <caption>
- <text id="t163">AMIS: \nAdaptive Multimedia Information System</text>
- <audio src="./audio/162_AMIS_nAdaptive_Multimedia_Info.mp3"/>
- </caption>
- </control>
- <control mfcid="IDC_VERSION" translate="no">
- <caption>
- <text id="t164">Version 2.6</text>
- <audio src="../version.mp3"/>
- </caption>
- </control>
- <control mfcid="IDC_VERSIONNOTE" translate="no">
- <caption>
- <text id="t165">Release Date: 08 June 2007</text>
- <audio src="../releasedate.mp3"/>
- </caption>
- </control>
- <control mfcid="IDC_COPYRIGHT" translate="no" widget="textlabel">
- <caption>
- <text id="t166">Copyright (c) 2006 DAISY for All</text>
- <audio src="./audio/165_Copyright__2006_DAISY_for_All.mp3"/>
- </caption>
- </control>
- <control mfcid="IDOK" widget="button">
- <caption>
- <promptItem refid="ok_button_caption"/>
- </caption>
- <description>
- <promptItem refid="ok_button_description"/>
- </description>
- </control>
- </dialog>
- <dialog mfcid="IDD_SEARCHDAISY">
- <note>This dialog is for searching your hard drive for DAISY books.</note>
- <caption>
- <text id="t167">Search for DAISY Books</text>
- <audio src="./audio/166_Search_for_DAISY_Books.mp3"/>
- </caption>
- <description mfcid="IDC_SEARCHINSTRUCTIONS">
- <text id="t168">You can search your computer for DAISY books. Enter a path or browse for a folder to search, then press Search to begin searching.</text>
- <audio src="./audio/167_You_can_search_your_computer_f.mp3"/>
- </description>
- <prompt type="instructions">
- <promptItem refid="tabAround"/>
- <promptItem refid="altC_to_close"/>
- <promptItem refid="repeatLastPromptInstr"/>
- <promptItem refid="hearDlgInstructions"/>
- </prompt>
- <control mfcid="IDC_SEARCHPATH" widget="textfield">
- <description>
- <text id="t169">Type the path to the folder in this field.</text>
- <audio src="./audio/168_Type_the_path_to_the_folder_in.mp3"/>
- </description>
- </control>
- <control mfcid="IDC_BROWSE" widget="button">
- <caption>
- <promptItem refid="browse_button_caption"/>
- </caption>
- <description>
- <promptItem refid="browse_button_description"/>
- </description>
- </control>
- <control mfcid="IDC_STARTSEARCH" widget="button">
- <caption>
- <text id="t170">Search</text>
- <audio src="./audio/169_Search.mp3"/>
- </caption>
- <description>
- <text id="t171">Press to start searching.</text>
- <audio src="./audio/170_Press_to_start_searching.mp3"/>
- </description>
- <mnemonic>
- <text id="t172">S</text>
- <audio src="./audio/171_S.mp3"/>
- </mnemonic>
- </control>
- <control mfcid="IDC_STOPSEARCH" widget="button">
- <caption>
- <text id="t173">Stop</text>
- <audio src="./audio/172_Stop.mp3"/>
- </caption>
- <description>
- <text id="t174">Press to stop searching.</text>
- <audio src="./audio/173_Press_to_stop_searching.mp3"/>
- </description>
- <mnemonic>
- <text id="t175">t</text>
- <audio src="./audio/174_t.mp3"/>
- </mnemonic>
- </control>
- <control mfcid="IDC_SEARCHING" widget="textlabel">
- <switch element="caption">
- <caption condition="default">
- <text id="t176">Ready</text>
- <audio src="./audio/175_Ready.mp3"/>
- </caption>
- <caption condition="WhileSearching">
- <text id="t177">Searching...</text>
- <audio src="./audio/176_Searching.mp3"/>
- </caption>
- <caption condition="SearchAborted">
- <text id="t178">Search stopped.</text>
- <audio src="./audio/177_Search_stopped.mp3"/>
- </caption>
- <caption condition="SearchCompleteNoFilesFound">
- <text id="t179">Search complete: No files found.</text>
- <audio src="./audio/178_Search_complete_No_files_found.mp3"/>
- </caption>
- <caption condition="SearchCompleteOneFileFound">
- <text id="t180">Search complete: One file found.</text>
- <audio src="./audio/179_Search_complete_One_file_found.mp3"/>
- </caption>
- <caption condition="SearchCompleteFilesFound">
- <prompt>
- <promptVar name="NUM_FILES_FOUND"/>
- <promptItem>
- <note>This is used in the sentence "7 files were found"</note>
- <text id="t181">files were found.</text>
- <audio src="./audio/180_files_were_found.mp3"/>
- </promptItem>
- </prompt>
- </caption>
- </switch>
- </control>
- <control mfcid="IDC_FILESFOUND" widget="list">
- <description>
- <text id="t182">Use the arrow keys to move around this list of titles.</text>
- <audio src="./audio/181_Use_the_arrow_keys_to_move_aro.mp3"/>
- </description>
- <list repeat="yes">
- <caption>
- <promptVar name="BOOK_TITLE"/>
- </caption>
- </list>
- </control>
- <control mfcid="IDC_OPENBOOK" widget="button">
- <caption>
- <text id="t183">Open</text>
- <audio src="./audio/182_Open.mp3"/>
- </caption>
- <description>
- <text id="t184">Press to open the selected title.</text>
- <audio src="./audio/183_Press_to_open_the_selected_tit.mp3"/>
- </description>
- <mnemonic>
- <text id="t185">O</text>
- <audio src="./audio/184_O.mp3"/>
- </mnemonic>
- </control>
- <control mfcid="IDCANCEL">
- <caption>
- <promptItem refid="cancel_button_caption"/>
- </caption>
- <description>
- <promptItem refid="cancel_button_description"/>
- </description>
- <mnemonic>
- <text id="t186">C</text>
- <audio src="./audio/038_C.mp3"/>
- </mnemonic>
- </control>
- </dialog>
- <dialog mfcid="IDD_SKIP">
- <note>This dialog lets the user control rendering of skippable structures.</note>
- <caption>
- <!--changed text-->
- <text id="t187">Reading Options</text>
- <audio src="./audio/185_Skippable_Items.mp3"/>
- </caption>
- <description mfcid="IDC_SKIP_INSTRUCTIONS">
- <text id="t188">This book contains the following special types of items. Checked items will be played. Unchecked items will be skipped.</text>
- <audio src="./audio/186_This_book_contains_the_followi.mp3"/>
- </description>
- <prompt type="instructions">
- <promptItem refid="tabAround"/>
- <promptItem refid="altC_to_close"/>
- <promptItem refid="repeatLastPromptInstr"/>
- <promptItem refid="hearDlgInstructions"/>
- </prompt>
- <control mfcid="IDOK" widget="button">
- <caption>
- <promptItem refid="ok_button_caption"/>
- </caption>
- <description>
- <promptItem refid="ok_button_description"/>
- </description>
- </control>
- <control mfcid="IDC_SKIPS" widget="list">
- <caption>
- <text id="t190">Skippable items</text>
- <audio src="./audio/188_Skippable_items.mp3"/>
- </caption>
- <description>
- <text id="t191">Use the arrow keys to move around this list of skippable items.</text>
- <audio src="./audio/189_Use_the_arrow_keys_to_move_aro.mp3"/>
- </description>
- <list repeat="yes">
- <caption>
- <promptVar name="SKIPPABLE_ITEM"/>
- </caption>
- <description>
- <prompt>
- <promptVar name="SKIPPABLE_ITEM"/>
- <promptItem refid="thisItem"/>
- <promptVar name="WILL_SKIP_OR_NOT" param="SKIPPABLE_ITEM_ID"/>
- </prompt>
- </description>
- </list>
- </control>
- </dialog>
- <!--new item; copied some old stuff (see which already have text ids)-->
- <dialog mfcid="IDD_PREFERENCES">
- <note>This dialog lets the user set some basic preferences for AMIS.</note>
- <caption>
- <!--changed text-->
- <text id="t218">Preferences</text>
- <audio src=""/>
- </caption>
- <description>
- <text id="t219">Here you can set general preferences for AMIS.</text>
- <audio src="./audio/217_Here_you_can_set_general_prefe.mp3"/>
- </description>
- <prompt type="instructions">
- <prom...
[truncated message content] |
|
From: <mar...@us...> - 2008-03-18 20:12:52
|
Revision: 2439
http://amis.svn.sourceforge.net/amis/?rev=2439&view=rev
Author: marisademeglio
Date: 2008-03-18 13:12:26 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
removed old audio files
Removed Paths:
-------------
branches/amis3/DefaultLangpack/audio/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-18 17:51:04
|
Revision: 2438
http://amis.svn.sourceforge.net/amis/?rev=2438&view=rev
Author: daniel_weck
Date: 2008-03-18 10:50:58 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
updated report
Modified Paths:
--------------
branches/amis3/amis_issues.txt
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 17:32:37 UTC (rev 2437)
+++ branches/amis3/amis_issues.txt 2008-03-18 17:50:58 UTC (rev 2438)
@@ -2,6 +2,8 @@
==========
CODE ORGANIZATION
---
+[DANIEL must continue making progress with these tasks]
+
* code cleanup to follow conventions/style of existing code regarding folder locations, indentation, variables
* use meaningful trace messages and delete old ones
* review TODOs, remove if resolved, address if needed
@@ -9,11 +11,14 @@
NEW FEATURES (things to add)
---
-* finish self-voicing for all dialogs
+* finish self-voicing for all dialogs
+[DANIEL: SEARCH_CD, READING_OPTIONS, and TXT_STYLE dialogs are incomplete]
+
ISSUES and BUGS (things to address)
---
-* new audio backend makes reading options dialog crash
+* READING_OPTIONS dialog crashes...very strange unexplained bug, probably some internal MFC conflict.
+[MARISA + DANIEL on it for next release]
KNOWN ISSUES (not going to change for alpha 2; should be listed as bugs to work on for beta 1)
@@ -24,15 +29,6 @@
==>not known if this is still an issue in alpha 2; you can set the sidebar font so maybe that will help
* shows □□ for <br /> in the list of bookmarks
* a book won't close all the way
-* speed buttons reset when you open a new book
- 1. open a book
- 2. play
- 3. select "faster"
- 4. make sure that the button for "faster" is not active
- 5. close the book
- 6. open the same book
- 7. see the buttons for speed
- ==>want to wait and see what happens when the audio speed itself is working again
* Zed stylesheet doesn't work
==>problem reproduced in a test app: applying CSS to XML in an HtmlView doesn't work
* Page styles overlap a bit when applyed in sequence
@@ -43,7 +39,41 @@
* review skippability across document boundaries (need reading options dialog to work)
* memory leaks
* book in a japanese folder can't be opened (ambulant::net::url problem?)
-
+
+SELF VOICING
+--
+
+* Menu-related
+
+- Not all shortcuts are displayed in the menu items. They are active though. (i.e. open URL: CTRL+U).
+- While inside menu, CTRL key hit does not stop self-voicing playback. Only works when within main window and inside modal dialogs.
+- Top-menu hover (mouse or keyboard) does not work (no self-voicing) once a menu popup has been displayed. Solution: pressing ESCAPE several times until the menu mode is left, then go back to menu using ALT+arrow keys or using mouse click on menu header.
+- "Open URL" and "Close" use TTS because there is no valid audio clips to play yet.
+- Smaller font uses TTS instead of pre-recorded audio (no mp3 clip yet in XML).
+- Smaller and Bigger font text in the menu item does not match the TTS audio (text from XML). Mnemonic is therefore missleading too.
+- Text-Style uses TTS, no audio clip is available.
+- Page Style sub menu is largely incomplete and troublesome (overlaps the play menu)
+- Reading options plays "skippable items"
+- publication summary has no audio in XML
+- Speed up / down only available when book is open (despite affecting the UI speed too, regardeless of the book)
+
+* Dialogs self-voicing
+
+** About
+
+ - AMIS version and release data audio clip very loud. Also not matching the text displayed
+
+** Open URL
+
+ - no dialog definition in AccessibleUi.xml (only OK / CANCEL). The text field says "text" for now, to give minimum feedback.
+
+** Search for books: no file browser (manual path entry, copy+paste from file explorer works fine)
+
+** Text Style: only OK / CANCEL buttons
+
+** Skippable Items: crash !! (unexplained)
+
+
BETA (APRIL 1)
=================
NEW FEATURES
@@ -60,7 +90,7 @@
ID_AMIS_FOCUS_ON_TEXT
ID_AMIS_RESET_HIGHLIGHT_COLORS
ID_AMIS_TOGGLE_AUDIO_CONTENT_PLAYBACK
-* add commands to increase/decrease specific volumes
+* add commands to increase/decrease specific volumes [DANIEL: don't think it's necessary, volume control currently for book only, which is nice as the UI can be controled by OS-wide levels]
* highlight current section (in sidebar) in same color as page highlight
* opening URLs from the command line (add a new command line parameter: http://www.codeguru.com/forum/showthread.php?t=386406)
* add navlists to view menu
@@ -69,7 +99,7 @@
IMPROVEMENTS
---
-* select TTS based on language of book/UI. or take an educated guess.
+* select TTS based on language of book/UI. or take an educated guess. [DANIEL: voice selection currently default to the first one found in SAPI]
* Right/left arrow means something different (conceptually) in nav window
* how do we count pages? does the page number appear at the bottom or top of the page?
* resource.h.ini needs to be kept in-sync with a post-build batch process
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-18 17:32:32
|
Revision: 2437
http://amis.svn.sourceforge.net/amis/?rev=2437&view=rev
Author: daniel_weck
Date: 2008-03-18 10:32:37 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
* Search for books is self-voiced now
* a few fixes
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h
branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/UiItem.cpp
Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/SearchForBooksDialog.h 2008-03-18 17:32:37 UTC (rev 2437)
@@ -54,6 +54,7 @@
DECLARE_MESSAGE_MAP()
private:
+ int mFiles_found;
void announceStatus(CString); //should be AccessibleUi::Label* as the parameter
void populateListControl();
void loadBook();
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h 2008-03-18 17:32:37 UTC (rev 2437)
@@ -76,12 +76,12 @@
static void playPromptItemFromStringId(string);
static void playDialogInstructionsFromUiId(int nItemID);
static void playDialogTextControlsFromUiId(int nItemID, PromptResolver* pResolver);
- static AudioSequence * playDialogControlFromUiIds(int dlgID, int ctrlId, PromptResolver* pResolver, bool playNow = true);
+ static AudioSequence * playDialogControlFromUiIds(int dlgID, int ctrlId, PromptResolver* pResolver, bool playNow, string switchCondition);
static void fillSequenceContainerPromptFromId(AudioSequence* seq, string id);
static void fillSequencePrompt(AudioSequence* seq, Prompt* prompt, PromptResolver* pResolver);
- static void fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver);
- static void fillSequenceSwitch(AudioSequence* seq, UiItem* uiItem, string switchCondition = "");
+ static void fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver, string switchCondition);
+ static void fillSequenceSwitch(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver, string switchCondition);
static void fillSequenceContentAndPrompt(AudioSequence* seq, Label* label, PromptResolver * pResolver);
static void fillSequenceContentAndPrompt(AudioSequence* seq, LabelList * p_list, PromptResolver * pResolver);
Modified: branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -494,14 +494,14 @@
}
void CMainFrame::OnUpdateCmdUiPlaySlower(CCmdUI* pCmdUi)
{
- if (theApp.isBookOpen() && theApp.canDecreasePlaybackSpeed())
+ if (theApp.canDecreasePlaybackSpeed())
updateUiCommandState(pCmdUi, true);
else
updateUiCommandState(pCmdUi, false);
}
void CMainFrame::OnUpdateCmdUiPlayFaster(CCmdUI* pCmdUi)
{
- if (theApp.isBookOpen() && theApp.canIncreasePlaybackSpeed())
+ if (theApp.canIncreasePlaybackSpeed())
updateUiCommandState(pCmdUi, true);
else
updateUiCommandState(pCmdUi, false);
@@ -590,16 +590,9 @@
{
bool b_is_book_open = theApp.isBookOpen();
//audio rate
- if (b_is_book_open)
- {
pToolbar->enable(ID_AMIS_SLOWER, theApp.canDecreasePlaybackSpeed());
pToolbar->enable(ID_AMIS_FASTER, theApp.canIncreasePlaybackSpeed());
- }
- else
- {
- pToolbar->enable(ID_AMIS_SLOWER, false);
- pToolbar->enable(ID_AMIS_FASTER, false);
- }
+
//page navigation
if (b_is_book_open)
{
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -339,7 +339,11 @@
}
void PreferencesDialog::triggerVirtualKeyStroke() {
-
+
+ if (amis::Preferences::Instance()->getIsSelfVoicing() == false) {
+
+ return;
+ }
CWnd* cwnd = this->GetFocus();
MSG * msg = new MSG();
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -32,6 +32,7 @@
#include "util/FilePathTools.h"
#include "util/Log.h"
#include "gui/self-voicing/datamodel/DataTree.h"
+#include "Preferences.h"
using namespace amis::gui::dialogs;
@@ -215,8 +216,6 @@
}
//TODO: figure out current timestamp
- //TODO: get max TOC depth
- //TODO: get number of TOC items
return true;
}
@@ -307,6 +306,12 @@
void PublicationSummaryDialog::OnLvnItemchangedSummary(NMHDR *pNMHDR, LRESULT *pResult)
{
+
+ if (amis::Preferences::Instance()->getIsSelfVoicing() == false) {
+
+ *pResult = 0;
+ return;
+ }
LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
if (pNMLV->iItem != -1) {
if (pNMLV->uNewState == 3) {
@@ -353,7 +358,7 @@
{
p_var = (PromptVar*)pPrompt->getItem(i);
- if (p_var->getName() == "META_TITLE")
+ if (p_var->getName().compare("META_TITLE") == 0)
{
amis::AudioNode * node = mpTitle->getAudio(0);
@@ -372,7 +377,7 @@
p_var->setContents(str, node->clone());
}
}
- else if (p_var->getName() == "META_CREATOR")
+ else if (p_var->getName().compare("META_CREATOR") == 0)
{
wstring str;
str = computeAuthor();
@@ -385,7 +390,7 @@
}
}
- else if (p_var->getName() == "META_PUBLISHER")
+ else if (p_var->getName().compare("META_PUBLISHER") == 0)
{
if (mPublisher.length() != 0) {
p_var->setContents(mPublisher, "");
@@ -395,7 +400,7 @@
p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
- else if (p_var->getName() == "META_DESC")
+ else if (p_var->getName().compare("META_DESC") == 0)
{
if (mDescription.length() != 0) {
p_var->setContents(mDescription, "");
@@ -405,7 +410,7 @@
p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
- else if (p_var->getName() == "META_NARRATOR")
+ else if (p_var->getName().compare("META_NARRATOR") == 0)
{
if (mNarrator.length() != 0) {
p_var->setContents(mNarrator, "");
@@ -415,7 +420,7 @@
p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
- else if (p_var->getName() == "META_TOTALTIME")
+ else if (p_var->getName().compare("META_TOTALTIME") == 0)
{
if (mTotalTime.length() != 0) {
p_var->setContents(mTotalTime, "");
@@ -425,7 +430,7 @@
p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
- else if (p_var->getName() == "META_NUMPAGES")
+ else if (p_var->getName().compare("META_NUMPAGES") == 0)
{
CString value;
value.Format(_T("%d"), mTotalNumPages);
@@ -433,7 +438,7 @@
str = value;
p_var->setContents(str, "");
}
- else if (p_var->getName() == "META_DATE")
+ else if (p_var->getName().compare("META_DATE") == 0)
{
if (mDate.length() != 0) {
p_var->setContents(mDate, "");
@@ -443,7 +448,7 @@
p_var->setContents(promptNotAvailable->getContents()->clone());
}
}
- else if (p_var->getName() == "META_FORMAT")
+ else if (p_var->getName().compare("META_FORMAT") == 0)
{
if (mFormat.length() != 0) {
p_var->setContents(mFormat, "");
@@ -454,7 +459,7 @@
}
}
- else if (p_var->getName() == "META_TOCITEMS")
+ else if (p_var->getName().compare("META_TOCITEMS") == 0)
{
amis::dtb::nav::NavModel* p_nav = mpBook->getNavModel();
int max = p_nav->getNavMap()->getNumberOfNavPoints();
@@ -465,7 +470,7 @@
p_var->setContents(str, "");
//p_var->setContents(promptNotAvailable->getContents()->clone());
}
- else if (p_var->getName() == "META_DEPTH")
+ else if (p_var->getName().compare("META_DEPTH") == 0)
{
amis::dtb::nav::NavModel* p_nav = mpBook->getNavModel();
int max = p_nav->getNavMap()->getMaxDepth();
@@ -476,7 +481,7 @@
p_var->setContents(str, "");
//p_var->setContents(promptNotAvailable->getContents()->clone());
}
- else if (p_var->getName() == "TOC_CATEGORIES")
+ else if (p_var->getName().compare("TOC_CATEGORIES") == 0)
{
if (mNavigableItems.length() != 0) {
@@ -520,19 +525,19 @@
} */
}
- else if (p_var->getName() == "CURRENT_PAGE")
+ else if (p_var->getName().compare("CURRENT_PAGE") == 0)
{
amis::AudioNode * node = mpCurrentPage->getAudio(0);
if (mpCurrentPage != NULL) {
p_var->setContents(mpCurrentPage->getText()->getTextString(), (node != NULL ? node->clone() : NULL));
}
}
- else if (p_var->getName() == "CURRENT_TIME")
+ else if (p_var->getName().compare("CURRENT_TIME") == 0)
{
p_var->setContents(promptNotAvailable->getContents()->clone());
}
- else if (p_var->getName() == "CURRENT_SECTION_TITLE")
+ else if (p_var->getName().compare("CURRENT_SECTION_TITLE") == 0)
{
amis::AudioNode * node = mpSectionName->getAudio(0);
if (mpSectionName != NULL)
@@ -541,7 +546,7 @@
}
}
- else if (p_var->getName() == "CURRENT_SECTION_NUM_SUBSECTIONS")
+ else if (p_var->getName().compare("CURRENT_SECTION_NUM_SUBSECTIONS") == 0)
{
CString value;
value.Format(_T("%d"), mNumSubsections);
@@ -550,7 +555,7 @@
p_var->setContents(str, "");
}
- else if (p_var->getName() == "CURRENT_SECTION_NUM_PAGES")
+ else if (p_var->getName().compare("CURRENT_SECTION_NUM_PAGES") == 0)
{
CString value;
value.Format(_T("%d"), mNumPagesForSection);
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SearchForBooksDialog.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -25,7 +25,10 @@
#include "../resource.h"
#include "util/SearchForFilesMFC.h"
#include "AmisCore.h"
+#include "Preferences.h"
+#include "gui/self-voicing/datamodel/DataTree.h"
+
using namespace amis::gui::dialogs;
BEGIN_MESSAGE_MAP(SearchForBooksDialog, CDialog)
@@ -39,7 +42,27 @@
void SearchForBooksDialog::resolvePromptVariables(Prompt* pPrompt) {
- return;
+
+ PromptVar* p_var = NULL;
+ PromptItem* promptNotAvailable = DataTree::Instance()->findPromptItem("not_available");
+
+ for (int i=0; i<pPrompt->getNumberOfItems(); i++)
+ {
+ if (pPrompt->getItem(i)->getPromptItemType() == PROMPT_VARIABLE)
+ {
+ p_var = (PromptVar*)pPrompt->getItem(i);
+
+ if (p_var->getName().compare("NUM_FILES_FOUND") == 0)
+ {
+ CString value;
+ value.Format(_T("%d"), mFiles_found);
+ wstring str;
+ str = value;
+ p_var->setContents(str, "");
+ }
+ }
+ }
+ AmisDialogBase::resolvePromptVariables(pPrompt);
}
SearchForBooksDialog::SearchForBooksDialog(CWnd* pParent /*=NULL*/)
@@ -52,6 +75,7 @@
mpCaptionSearchCompleteNoFilesFound = _T("No files found");
mpCaptionSearchCompleteOneFileFound = _T("1 file found");
mpCaptionSearchCompleteFilesFound = _T("files found");
+ mFiles_found = 0;
mbShouldStopSearching = false;
}
@@ -92,6 +116,23 @@
p_label_widget->SetWindowText(status);
p_label_widget->ShowWindow(SW_SHOW);
}
+ if (amis::Preferences::Instance()->getIsSelfVoicing() == true) {
+ if (mpCaptionWhileSearching.Compare(status) == 0) {
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "WhileSearching");
+ } else
+ if (mpCaptionSearchCompleteNoFilesFound.Compare(status) == 0) {
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchCompleteNoFilesFound");
+ } else
+ if (mpCaptionSearchCompleteOneFileFound.Compare(status) == 0) {
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchCompleteOneFileFound");
+ } else
+ if (mpCaptionSearchCompleteFilesFound.Compare(status) == 0) {
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchCompleteFilesFound");
+ } else
+ if (mpCaptionSearchAborted.Compare(status) == 0) {
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(IDD_SEARCHDAISY, IDC_SEARCHING, this, true, "SearchAborted");
+ }
+ }
}
//TODO: fill in titles, not URLs
@@ -215,11 +256,11 @@
mSearcher.addSearchExclusionCriteria("_ncc.html");
mSearcher.setRecursiveSearch(true);
//start the search
- int files_found = mSearcher.startSearch(T2A(search_string));
+ mFiles_found = mSearcher.startSearch(T2A(search_string));
populateListControl();
- if (files_found == 0) announceStatus(this->mpCaptionSearchCompleteNoFilesFound);
- else if (files_found == 1) announceStatus(this->mpCaptionSearchCompleteOneFileFound);
+ if (mFiles_found == 0) announceStatus(this->mpCaptionSearchCompleteNoFilesFound);
+ else if (mFiles_found == 1) announceStatus(this->mpCaptionSearchCompleteOneFileFound);
else announceStatus(this->mpCaptionSearchCompleteFilesFound);
//reverse the gray-out button states
@@ -256,6 +297,29 @@
if (p_wnd)
{
int id = p_wnd->GetDlgCtrlID();
+
+ if (amis::Preferences::Instance()->getIsSelfVoicing() == true && id == IDC_FILESFOUND && pMsg->message == WM_KEYUP && (pMsg->wParam == VK_UP || pMsg->wParam == VK_DOWN|| pMsg->wParam == VK_RIGHT || pMsg->wParam == VK_LEFT))
+ {
+ //TODO: this list treatment removes the default XML prompts, needs improvement
+ CListBox* p_filelist = NULL;
+ p_filelist = (CListBox*)this->GetDlgItem(IDC_FILESFOUND);
+
+ int sel = p_filelist->GetCurSel();
+ if (sel >= 0) {
+ amis::UrlList* p_search_results = mSearcher.getSearchResults();
+ if (sel > -1 && sel < p_search_results->size()) {
+ //mLoadBookOnDialogClose = (*p_search_results)[sel];
+ AudioSequence * seq = new AudioSequence();
+ CString str;
+ p_filelist->GetText(sel, str);
+ seq->append(str);
+ AudioSequencePlayer::Instance()->Play(seq);
+ }
+ }
+
+ return CDialog::PreTranslateMessage(pMsg);
+ }
+
//inexplicably, the default behavior for pressing enter in a dialog is to close it.
//we're overriding this here.
if (pMsg->wParam == VK_RETURN)
@@ -265,12 +329,14 @@
{
pMsg->wParam = NULL;
OnStartsearch();
+ return CDialog::PreTranslateMessage(pMsg);
}
//if the files list has focus, open the selected book
else if (id == IDC_FILESFOUND)
{
pMsg->wParam = NULL;
loadBook();
+ return CDialog::PreTranslateMessage(pMsg);
}
}
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -956,7 +956,7 @@
Container* p_container = DataTree::Instance()->findContainer(id);
if (p_container != NULL) {
- fillSequenceCaptionAndDescription(seq, p_container, NULL);
+ fillSequenceCaptionAndDescription(seq, p_container, NULL, "default");
Label* keyboardShortcutAccelerator = p_container->getKeyboardAccelerator();
if (keyboardShortcutAccelerator != NULL) {
@@ -1043,8 +1043,8 @@
Dialog* p_dialog = DataTree::Instance()->findDialog(nItemID);
if (p_dialog != NULL) {
- fillSequenceCaptionAndDescription(seq, p_dialog, NULL);
- fillSequenceSwitch(seq, p_dialog);
+ fillSequenceCaptionAndDescription(seq, p_dialog, presolver, "default");
+ fillSequenceSwitch(seq, p_dialog, presolver, "default");
int count = p_dialog->getNumChildControls();
for (int i = 0 ; i < count; i++) {
@@ -1052,7 +1052,7 @@
string strCat = control->getWidgetCategories();
int find = strCat.find("button");
if (-1 == find) {
- fillSequenceCaptionAndDescription(seq, control, presolver);
+ fillSequenceCaptionAndDescription(seq, control, presolver, "default");
}
LabelList* p_list = control->getLabelList();
@@ -1127,7 +1127,7 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
// This works for Dialogs
-AudioSequence * AudioSequencePlayer::playDialogControlFromUiIds(int dlgID, int ctrlId, PromptResolver* pResolver, bool playNow) {
+AudioSequence * AudioSequencePlayer::playDialogControlFromUiIds(int dlgID, int ctrlId, PromptResolver* pResolver, bool playNow, string switchCondition) {
if (
(dlgID != -1 && ctrlId != -1)
@@ -1144,10 +1144,7 @@
DialogControl* control = p_dialog->findControl(ctrlId);
if (control != NULL) {
- if (ctrlId == IDC_TTSVOICES) {
- int i = 0;
- }
- fillSequenceCaptionAndDescription(seq, control, pResolver);
+ fillSequenceCaptionAndDescription(seq, control, pResolver, switchCondition);
}
} else {
fillOK_CANCEL(seq, ctrlId);
@@ -1199,7 +1196,7 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
-void AudioSequencePlayer::fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver) {
+void AudioSequencePlayer::fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver, string switchCondition) {
Label* label = uiItem->getCaption();
if (label != NULL) {
@@ -1210,6 +1207,9 @@
if (label != NULL) {
fillSequenceContentAndPrompt(seq, label, pResolver);
}
+
+ fillSequenceSwitch(seq, uiItem, pResolver, switchCondition);
+
LabelList * p_list = uiItem->getLabelList();
if (p_list != NULL)
@@ -1229,7 +1229,7 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
-void AudioSequencePlayer::fillSequenceSwitch(AudioSequence* seq, UiItem* uiItem, string switchCondition) {
+void AudioSequencePlayer::fillSequenceSwitch(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver, string switchCondition) {
Switch* zwitch;
if ((zwitch = uiItem->getSwitch()) != NULL) {
@@ -1238,7 +1238,7 @@
case ACTIONSWITCH: {
Action* action = zwitch->getAction(switchCondition);
if (action != NULL) {
- fillSequenceCaptionAndDescription(seq, action, NULL);
+ fillSequenceCaptionAndDescription(seq, action, pResolver, switchCondition);
}
break;
}
@@ -1246,7 +1246,7 @@
case DESCRIPTIONSWITCH: {
Label* label = zwitch->getLabel(switchCondition);
if (label != NULL) {
- fillSequenceContentAndPrompt(seq, label, NULL);
+ fillSequenceContentAndPrompt(seq, label, pResolver);
}
break;
}
@@ -1399,7 +1399,7 @@
{
p_var = (PromptVar*)pPrompt->getItem(i);
- if (p_var->getName() == "BOOK_PATH")
+ if (p_var->getName().compare("BOOK_PATH") == 0)
{
//CString file_path = A2CW(mFilePath.c_str());
//p_var->setContents(LPCTSTR(file_path), "");
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -307,17 +307,17 @@
if (idUiFocus == IDOK)
{
- AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDOK, pResolver);
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDOK, pResolver, true, "default");
return;
}
else if (idUiFocus == IDCANCEL)
{
- AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDCANCEL, pResolver);
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDCANCEL, pResolver, true, "default");
return;
} else if (idUiFocus >= 0) {
- AudioSequence * mSeq = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, idUiFocus, pResolver, false);
+ AudioSequence * mSeq = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, idUiFocus, pResolver, false, "default");
if (mSeq == NULL) {
@@ -334,6 +334,7 @@
}
}
+
if (! strTextField.IsEmpty()) {
if (strTextField.GetLength() == 1) {
strTextField = convertKeystrokeToSpeakableString(strTextField.GetAt(0));
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/UiItem.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/UiItem.cpp 2008-03-18 15:36:16 UTC (rev 2436)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/datamodel/UiItem.cpp 2008-03-18 17:32:37 UTC (rev 2437)
@@ -33,7 +33,6 @@
if ((uiItem = zwitch->getAction(switchCondition)) != NULL) {
return uiItem;
}
-
}
return NULL;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-18 15:36:25
|
Revision: 2436
http://amis.svn.sourceforge.net/amis/?rev=2436&view=rev
Author: daniel_weck
Date: 2008-03-18 08:36:16 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
- PreferencesDialog:
* TTS Voice selection is now self-voiced, with the ability to preview the voice without saving the preferences (voice selection only saved for good when pressing OK)
* The language selection combo is also voiced now, with the proper audio title rather than just "eng-US".
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h
branches/amis3/AmisGuiMFC2/src/Preferences.cpp
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/TTSPlayer.cpp
branches/amis3/DefaultLangpack/amisAccessibleUi.xml
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h 2008-03-18 15:36:16 UTC (rev 2436)
@@ -82,9 +82,12 @@
static void fillSequencePrompt(AudioSequence* seq, Prompt* prompt, PromptResolver* pResolver);
static void fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver);
static void fillSequenceSwitch(AudioSequence* seq, UiItem* uiItem, string switchCondition = "");
+
static void fillSequenceContentAndPrompt(AudioSequence* seq, Label* label, PromptResolver * pResolver);
+ static void fillSequenceContentAndPrompt(AudioSequence* seq, LabelList * p_list, PromptResolver * pResolver);
+
static void fillSequenceContents(AudioSequence* seq, PromptItemBase* pi);
-
+
static void resolvePromptVariables(Prompt*, PromptResolver* pResolver);
private:
Modified: branches/amis3/AmisGuiMFC2/src/Preferences.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/Preferences.cpp 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/src/Preferences.cpp 2008-03-18 15:36:16 UTC (rev 2436)
@@ -51,7 +51,7 @@
setUseTTSNotAudio(false);
setLoadLastBook(false);
setStartInBasicView(false);
- setTTSVoiceIndex(-1);
+ setTTSVoiceIndex(0);
setWasExitClean(true);
setDisableScreensaver(true);
mFontsizeCssFiles.clear();
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 15:36:16 UTC (rev 2436)
@@ -779,6 +779,7 @@
amis::util::Log::Instance()->writeMessage("Showing preferences dialog", "CAmisApp::OnPreferences", "AmisGuiMFC2");
if (prefs.do_modal() == IDOK)
{
+ Preferences::Instance()->setTTSVoiceIndex(prefs.mTTSVoiceIndex);
Preferences::Instance()->setIsSelfVoicing(prefs.mbIsSelfVoicing);
Preferences::Instance()->setPauseOnLostFocus(prefs.mbPauseOnLostFocus);
Preferences::Instance()->setStartInBasicView(prefs.mbStartInBasicView);
@@ -800,8 +801,12 @@
prefs_io.writeToFile(Preferences::Instance()->getSourceUrl()->get_file(), Preferences::Instance());
Preferences::Instance()->logUserControllablePreferences();
}
- else
+ else {
amis::util::Log::Instance()->writeMessage("Dialog cancelled", "CAmisApp::OnPreferences", "AmisGuiMFC2");
+
+ // make sure to restore the original voice (which may have been changed in the preference dialog)
+ amis::tts::TTSPlayer::Instance()->ChangeVoice(Preferences::Instance()->getTTSVoiceIndex());
+ }
}
void CAmisApp::OnPublicationSummary()
{
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 15:36:16 UTC (rev 2436)
@@ -163,22 +163,52 @@
}
}
}else if (p_var->getName().compare("LANGUAGE_NAME") == 0)
- {
+ {
+
+ CComboBox* lang_combo = (CComboBox*)GetDlgItem(IDC_INSTALLEDLANGUAGES);
+ int sel = lang_combo->GetCurSel();
+ amis::StringModuleMap* p_langs = Preferences::Instance()->getInstalledLanguages();
+ amis::StringModuleMap::iterator it = p_langs->begin();
+ //increment the iterator to go to the same number as the combo selection
+ for (int i = 0; i<sel; i++) it++;
+ mUiLanguageSelection = it->first;
+
+
wstring str;
CString cstr(mUiLanguageSelection.c_str());
str = cstr;
p_var->setContents(str, "");
+
+ amis::ModuleDescData* p_data = Preferences::Instance()->getCurrentLanguageData();
+ if (p_data != NULL || p_data->getLabel() != NULL) {
+
+ amis::MediaGroup* p_media = p_data->getLabel();
+ //p_media->getText()->getTextString().c_str();
+
+ p_var->setContents(p_media);
+
+ }
+
+
}else if (p_var->getName().compare("TTS_VOICE_NAME") == 0)
- {
-
- CComboBox* list = (CComboBox*)GetDlgItem(IDC_TTSVOICES);
+ {
+ CComboBox* list = (CComboBox*)GetDlgItem(IDC_TTSVOICES);
- wstring str = L"Daniel";
- p_var->setContents(str, "");
+ int selected = list->GetCurSel();
+ mTTSVoiceIndex = selected;
+
+ amis::tts::TTSPlayer::Instance()->ChangeVoice(selected);
+
+ CString cstr;
+ list->GetWindowText(cstr);
+ wstring str = L"Daniel";
+ str = cstr.GetBuffer();
+ p_var->setContents(str, "");
+
}
-
+
}
}
AmisDialogBase::resolvePromptVariables(pPrompt);
@@ -209,6 +239,7 @@
}
BOOL PreferencesDialog::OnInitDialog()
{
+
mbIsSelfVoicing = Preferences::Instance()->getIsSelfVoicing();
mbPauseOnLostFocus = Preferences::Instance()->getPauseOnLostFocus();
mbLoadLastBook = Preferences::Instance()->getLoadLastBook();
@@ -225,13 +256,17 @@
void PreferencesDialog::initializeTTSVoiceOption()
{
+ // Make sure to initialize the voice (just in case TTSPlayer has been unused until now)
+ amis::tts::TTSPlayer::Instance()->ChangeVoice(Preferences::Instance()->getTTSVoiceIndex());
+
+ mTTSVoiceIndex = 0;
//fill the combo box for the tts voices, and return an index to the voice we are currently using
- //TODO: need this "initVoiceList" function
int index = amis::tts::TTSPlayer::Instance()->initVoiceList(this->GetSafeHwnd());
if (index != -1)
{
CComboBox* list = (CComboBox*)GetDlgItem(IDC_TTSVOICES);
list->SetCurSel(index);
+ mTTSVoiceIndex = index;
}
}
void PreferencesDialog::initializeUiLanguageOption()
@@ -334,9 +369,16 @@
}
void PreferencesDialog::OnCbnSelchangeTTSVoices()
{
+ CComboBox* list = (CComboBox*)GetDlgItem(IDC_TTSVOICES);
+
+ int selected = list->GetCurSel();
+ mTTSVoiceIndex = selected;
+
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnCbnSetfocusTTSVoices()
{
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnBnClickedStartInBasicView()
{
@@ -367,10 +409,13 @@
amis::StringModuleMap::iterator it = p_langs->begin();
//increment the iterator to go to the same number as the combo selection
for (int i = 0; i<sel; i++) it++;
- mUiLanguageSelection = it->first;
+ mUiLanguageSelection = it->first;
+
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnCbnSetfocusInstalledLanguages()
-{
+{
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnBnSetfocusDisableScreensaver()
{
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 15:36:16 UTC (rev 2436)
@@ -890,7 +890,10 @@
if (label != NULL) {
fillSequenceContentAndPrompt(seq, label, NULL);
}
-
+ LabelList * list = p_uiItem->getLabelList();
+ if (list != NULL) {
+ fillSequenceContentAndPrompt(seq, list, NULL);
+ }
}
else {
@@ -1055,6 +1058,9 @@
LabelList* p_list = control->getLabelList();
if (p_list != NULL)
{
+
+ fillSequenceContentAndPrompt(seq, p_list, presolver);
+ /*
for (int i = 0; i<p_list->getNumberOfLabels(); i++)
{
Prompt* p_prompt = p_list->getLabel(i)->getPrompt();
@@ -1062,7 +1068,7 @@
{
fillSequencePrompt(seq, p_prompt, presolver);
}
- }
+ }*/
}
}
}
@@ -1138,6 +1144,9 @@
DialogControl* control = p_dialog->findControl(ctrlId);
if (control != NULL) {
+ if (ctrlId == IDC_TTSVOICES) {
+ int i = 0;
+ }
fillSequenceCaptionAndDescription(seq, control, pResolver);
}
} else {
@@ -1201,6 +1210,21 @@
if (label != NULL) {
fillSequenceContentAndPrompt(seq, label, pResolver);
}
+ LabelList * p_list = uiItem->getLabelList();
+
+ if (p_list != NULL)
+ {
+ fillSequenceContentAndPrompt(seq, p_list, pResolver);
+ /*
+ for (int i = 0; i<p_list->getNumberOfLabels(); i++)
+ {
+ Prompt* p_prompt = p_list->getLabel(i)->getPrompt();
+ if (p_prompt != NULL)
+ {
+ fillSequencePrompt(seq, p_prompt, pResolver);
+ }
+ }*/
+ }
}
////////////////////////////////////////////////////////////////////////////////////
@@ -1232,6 +1256,19 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
+void AudioSequencePlayer::fillSequenceContentAndPrompt(AudioSequence* seq, LabelList * p_list, PromptResolver * pResolver)
+{
+ for (int i = 0; i<p_list->getNumberOfLabels(); i++)
+ {
+ Prompt* p_prompt = p_list->getLabel(i)->getPrompt();
+ if (p_prompt != NULL)
+ {
+ fillSequencePrompt(seq, p_prompt, pResolver);
+ }
+ }
+}
+////////////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////////
void AudioSequencePlayer::fillSequenceContentAndPrompt(AudioSequence* seq, Label* label, PromptResolver * pResolver)
{
TextAudioPair* pair = label->getContents();
@@ -1256,6 +1293,9 @@
Prompt* prompt = label->getPrompt();
if (prompt != NULL)
{
+ fillSequencePrompt(seq, prompt, pResolver);
+
+ /*
resolvePromptVariables(prompt, pResolver);
int count = prompt->getNumberOfItems();
@@ -1317,6 +1357,7 @@
}
}
}
+ */
}
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 15:36:16 UTC (rev 2436)
@@ -323,7 +323,7 @@
mSeq = new AudioSequence();
- if (idUiFocus == IDC_URL) {
+ if (idUiFocus == IDC_URL) { // TODO: this is a temporary hack until there is XML data for the URL open dialog
Prompt* p_prompt_ = DataTree::Instance()->findPrompt("textFieldEntry");
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/TTSPlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/TTSPlayer.cpp 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/TTSPlayer.cpp 2008-03-18 15:36:16 UTC (rev 2436)
@@ -233,6 +233,7 @@
ChangeVoice(amis::Preferences::Instance()->getTTSVoiceIndex());
+
//ChangeVoice(FALSE);
m_iV->SetVolume(50); //TODO: this value works well on my laptop/configuration...but how about other machines ??
Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml
===================================================================
--- branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 12:16:56 UTC (rev 2435)
+++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 15:36:16 UTC (rev 2436)
@@ -1204,7 +1204,7 @@
</prompt>
</description>
</control>
- <control mfcid="IDC_TTSVOICE" widget="list">
+ <control mfcid="IDC_TTSVOICES" widget="list">
<caption mfcid="IDC_SELTTSLABEL">
<text id="t221">Select TTS voice:</text>
<audio src="./audio/219_Select_TTS_voice.mp3"/>
@@ -1290,7 +1290,7 @@
</description>
</control>
<!--new item (except for t197)-->
- <control mfcid="IDC_LANGLIST" widget="list">
+ <control mfcid="IDC_INSTALLEDLANGUAGES" widget="list">
<caption mfcid="IDC_CURRLANG">
<text id="xx">You are currently using AMIS in:</text>
<audio src=""/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-18 12:16:51
|
Revision: 2435
http://amis.svn.sourceforge.net/amis/?rev=2435&view=rev
Author: daniel_weck
Date: 2008-03-18 05:16:56 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
- added self-voicing for (un)ticking check boxes in preference panel (using SPACE or MOUSE_CLICK or whatever)
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp
Modified: branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h 2008-03-18 07:43:05 UTC (rev 2434)
+++ branches/amis3/AmisGuiMFC2/include/gui/dialogs/PreferencesDialog.h 2008-03-18 12:16:56 UTC (rev 2435)
@@ -75,6 +75,8 @@
virtual void DoDataExchange(CDataExchange*);
DECLARE_MESSAGE_MAP()
private:
+
+ void triggerVirtualKeyStroke();
void initializeTTSVoiceOption();
void initializeUiLanguageOption();
void setCurrentLanguageLabel();
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 07:43:05 UTC (rev 2434)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 12:16:56 UTC (rev 2435)
@@ -31,6 +31,7 @@
#include "ambulant/net/url.h"
#include "gui/self-voicing/TTSPlayer.h"
#include "gui/self-voicing/datamodel/DataTree.h"
+#include "gui/MainWndParts.h"
using namespace amis::gui::dialogs;
@@ -302,9 +303,31 @@
return AmisDialogBase::PreTranslateMessage(pMsg);
}
+void PreferencesDialog::triggerVirtualKeyStroke() {
+
+ CWnd* cwnd = this->GetFocus();
+ MSG * msg = new MSG();
+
+ msg->message = WM_KEYDOWN;
+ msg->hwnd = cwnd->GetSafeHwnd();
+ msg->lParam = 0;
+ msg->wParam = VK_UP;
+
+ //PreTranslateMessage(msg);
+ mCommonPreTranslateMessageHandler->handle(this, msg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
+
+ msg->message = WM_KEYUP;
+
+ //PreTranslateMessage(msg);
+ mCommonPreTranslateMessageHandler->handle(this, msg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
+
+ delete msg;
+}
+
//widget event handlers
void PreferencesDialog::OnBnClickedIsSelfVoicing()
{
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnBnSetfocusIsSelfVoicing()
{
@@ -317,12 +340,14 @@
}
void PreferencesDialog::OnBnClickedStartInBasicView()
{
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnBnSetfocusStartInBasicView()
{
}
void PreferencesDialog::OnBnClickedLoadLastBook()
{
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnBnSetfocusLoadLastBook()
{
@@ -332,6 +357,7 @@
}
void PreferencesDialog::OnBnClickedHighlightText()
{
+ triggerVirtualKeyStroke();
}
void PreferencesDialog::OnCbnSelchangeInstalledLanguages()
{
@@ -351,4 +377,5 @@
}
void PreferencesDialog::OnBnClickedDisableScreensaver()
{
+ triggerVirtualKeyStroke();
}
\ No newline at end of file
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 07:43:05 UTC (rev 2434)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 12:16:56 UTC (rev 2435)
@@ -334,17 +334,19 @@
}
}
- if (! strTextFieldFULL.IsEmpty()) {
- if (strTextFieldFULL.GetLength() == 1) {
- strTextFieldFULL = convertKeystrokeToSpeakableString(strTextFieldFULL.GetAt(0));
- }
- mSeq->append(strTextFieldFULL);
- } else if (! strTextField.IsEmpty()) {
+ if (! strTextField.IsEmpty()) {
if (strTextField.GetLength() == 1) {
strTextField = convertKeystrokeToSpeakableString(strTextField.GetAt(0));
}
mSeq->append(strTextField);
}
+
+ if (! strTextFieldFULL.IsEmpty() && strTextField.Compare(strTextFieldFULL) != 0) {
+ if (strTextFieldFULL.GetLength() == 1) {
+ strTextFieldFULL = convertKeystrokeToSpeakableString(strTextFieldFULL.GetAt(0));
+ }
+ mSeq->append(strTextFieldFULL);
+ }
if (mSeq->GetCount() == 0) {
delete mSeq;
} else {
@@ -359,8 +361,16 @@
if (!(pMsg->wParam == VK_HOME || pMsg->wParam == VK_END || pMsg->wParam == VK_UP || pMsg->wParam == VK_DOWN || pMsg->wParam == VK_LEFT || pMsg->wParam == VK_RIGHT))
{
-
+ if (pMsg->wParam == VK_SPACE)
+ {
+ if (! strTextField.IsEmpty()) {
+ mSeq->append(convertKeystrokeToSpeakableString(pMsg, false, true, false));
+ }
+ }
+ else
+ {
mSeq->append(convertKeystrokeToSpeakableString(pMsg, false, true, false));
+ }
}
if (! strTextField.IsEmpty()) {
if (strTextField.GetLength() == 1) {
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp 2008-03-18 07:43:05 UTC (rev 2434)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/Prompt.cpp 2008-03-18 12:16:56 UTC (rev 2435)
@@ -32,6 +32,9 @@
void PromptItemBase::setContents(TextAudioPair* pContents)
{
+ if (mpContents != NULL)
+ delete mpContents;
+
mpContents = pContents;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 07:43:02
|
Revision: 2434
http://amis.svn.sourceforge.net/amis/?rev=2434&view=rev
Author: marisademeglio
Date: 2008-03-18 00:43:05 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
update to issues file
Modified Paths:
--------------
branches/amis3/amis_issues.txt
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 07:42:39 UTC (rev 2433)
+++ branches/amis3/amis_issues.txt 2008-03-18 07:43:05 UTC (rev 2434)
@@ -24,7 +24,6 @@
==>not known if this is still an issue in alpha 2; you can set the sidebar font so maybe that will help
* shows □□ for <br /> in the list of bookmarks
* a book won't close all the way
-* can't open a URL from the command line
* speed buttons reset when you open a new book
1. open a book
2. play
@@ -120,4 +119,5 @@
* Navigation text not cut off in nav lists
* stabilized self-voicing for menus
* audio changes speed
-* play/pause buttons show the correct state
\ No newline at end of file
+* play/pause buttons show the correct state
+* can open a URL from the command line
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 07:42:34
|
Revision: 2433
http://amis.svn.sourceforge.net/amis/?rev=2433&view=rev
Author: marisademeglio
Date: 2008-03-18 00:42:39 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
Modified default Preferences
Opening URLs from the command line now supported
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/bin/settings/amisPrefs.xml.default
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 07:27:33 UTC (rev 2432)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 07:42:39 UTC (rev 2433)
@@ -77,7 +77,6 @@
using namespace amis::gui;
-
BEGIN_MESSAGE_MAP(CAmisApp, CWinApp)
ON_COMMAND(ID_AMIS_OPEN_FILE, OnFileOpen)
ON_COMMAND(ID_AMIS_PLAYPAUSE, OnPlayPause)
@@ -117,6 +116,8 @@
ON_COMMAND(ID_AMIS_SHOW_TEXTSTYLE, OnShowTextStyle)
END_MESSAGE_MAP()
+
+
CAmisApp::CAmisApp()
{
mpHistory = NULL;
@@ -196,24 +197,34 @@
//command parameters want to open a document.
//our workaround is the mbShouldIgnoreOpenDoc event flag
mbShouldIgnoreOpenDocEvent = true;
+ //save the value in cmdInfo
+ CString cmd_file_name = cmdInfo.m_strFileName;
+ bool b_open_from_cmdline = false;
+ ambulant::net::url book_to_open;
+ if (cmd_file_name.GetLength() > 0)
+ {
+ b_open_from_cmdline = true;
+ if (cmd_file_name.Find(_T(":")) != 1)
+ {
+ //override the cmd info data; otherwise MFC will do something clever with this URL and crash
+ cmdInfo.m_strFileName.Empty();
+ cmdInfo.m_nShellCommand = CCommandLineInfo::FileNew;
+ book_to_open = ambulant::net::url::from_url(T2A(cmd_file_name));
+ }
+ //else it's a local file and there shouldn't be any problems
+ else
+ {
+ book_to_open = ambulant::net::url::from_filename(T2A(cmd_file_name));
+ }
+ amis::util::Log::Instance()->writeMessage("Command line parameter: ", &book_to_open, "CAmisApp::InitInstance", "AmisGuiMFC2");
+ }
if (!ProcessShellCommand(cmdInfo))
{
amis::util::Log::Instance()->writeError("Error processing shell command info", "CAmisApp::InitInstance", "AmisGuiMFC2");
return FALSE;
}
mbShouldIgnoreOpenDocEvent = false;
- bool b_open_from_cmdline = false;
- ambulant::net::url book_to_open;
- if (cmdInfo.m_nShellCommand == CCommandLineInfo::FileOpen)
- {
- //we have to assume that command line parameters are local files
- //TODO: introduce a command line parameter to identify URLs
- //if we get the two mixed up, then the path gets mangled
- b_open_from_cmdline = true;
- book_to_open = ambulant::net::url::from_filename(T2A(cmdInfo.m_strFileName));
- amis::util::Log::Instance()->writeMessage("Command line parameter: ", &book_to_open, "CAmisApp::InitInstance", "AmisGuiMFC2");
- }
-
+ //done with command line stuff .. phew
// try to load shared MDI menus and accelerator table
HINSTANCE hInst = AfxGetResourceHandle();
@@ -375,11 +386,6 @@
//this function is used by all functions here that lead to a book being opened
void CAmisApp::openBook(const ambulant::net::url* filename)
{
- //TODO: AMIS says "TITLE" Playing etc even if the book couldn't be opened
- MainWndParts::Instance()->updateTitleBar(MainWndParts::TITLEBAR_APPNAME, CString(L"Amis"));
- MainWndParts::Instance()->updateTitleViewMode();
- MainWndParts::Instance()->updateTitleSelfVoicing(Preferences::Instance()->getIsSelfVoicing());
-
bool b_a_book_was_open = false;
//close the open book
if (mbBookIsOpen == true)
@@ -393,6 +399,11 @@
if (amis::dtb::DtbWithHooks::Instance()->open
(filename, amis::Preferences::Instance()->getUserBmkDir()))
{
+ //update the status in the title bar
+ MainWndParts::Instance()->updateTitleBar(MainWndParts::TITLEBAR_APPNAME, CString(L"Amis"));
+ MainWndParts::Instance()->updateTitleViewMode();
+ MainWndParts::Instance()->updateTitleSelfVoicing(Preferences::Instance()->getIsSelfVoicing());
+
mbBookIsOpen = true;
MainWndParts::Instance()->mpMainFrame->updateToolbarState
(MainWndParts::Instance()->mpBasicToolbar);
@@ -552,6 +563,8 @@
MainWndParts::Instance()->mpMmView->OnDestroy();
amis::gui::MainWndParts::Instance()->mpSidebar->m_wndDlg.clearAll();
amis::gui::MenuManip::Instance()->clearBookmarks();
+ //update the status in the title bar
+ amis::gui::MainWndParts::Instance()->updateTitleBar(amis::gui::MainWndParts::TITLEBAR_BOOKTITLE, _T(""));
}
}
Modified: branches/amis3/bin/settings/amisPrefs.xml.default
===================================================================
--- branches/amis3/bin/settings/amisPrefs.xml.default 2008-03-18 07:27:33 UTC (rev 2432)
+++ branches/amis3/bin/settings/amisPrefs.xml.default 2008-03-18 07:42:39 UTC (rev 2433)
@@ -4,8 +4,8 @@
<section name="general">
<entry id="ui-lang-id" value="eng-US"/>
<entry id="start-in-basic-view" value="no"/>
-<entry id="load-last-book" value="no"/>
-<entry id="is-self-voicing" value="no"/>
+<entry id="load-last-book" value="yes"/>
+<entry id="is-self-voicing" value="yes"/>
<entry id="tts-voice-index" value="0"/>
<entry id="pause-on-lost-focus" value="no"/>
<entry id="use-tts-not-audio" value="no"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <dan...@us...> - 2008-03-18 07:27:27
|
Revision: 2432
http://amis.svn.sourceforge.net/amis/?rev=2432&view=rev
Author: daniel_weck
Date: 2008-03-18 00:27:33 -0700 (Tue, 18 Mar 2008)
Log Message:
-----------
improvements in Preferences dialog, more to come.
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h
branches/amis3/AmisGuiMFC2/include/gui/self-voicing/PreTranslateMessageHandler.h
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/AmisDialogBase.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
branches/amis3/DefaultLangpack/amisAccessibleUi.xml
Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
===================================================================
(Binary files differ)
Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc 2008-03-18 07:27:33 UTC (rev 2432)
@@ -384,12 +384,10 @@
FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
CONTROL "Use self-voicing",IDC_ISSELFVOICING,"Button",
- BS_AUTOCHECKBOX | BS_NOTIFY | WS_DISABLED | WS_TABSTOP,7,
- 7,241,10
- LTEXT "Select TTS voice:",IDC_SELTTSLABEL,7,22,242,8,
- WS_DISABLED
+ BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,7,241,10
+ LTEXT "Select TTS voice:",IDC_SELTTSLABEL,7,22,242,8
COMBOBOX IDC_TTSVOICES,7,35,108,88,CBS_DROPDOWNLIST | CBS_SORT |
- WS_DISABLED | WS_VSCROLL | WS_TABSTOP
+ WS_VSCROLL | WS_TABSTOP
CONTROL "Highlight text as it is read aloud",IDC_HIGHLIGHTTEXT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,59,242,10
CONTROL "Load the most recently read book on startup",
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/AudioSequencePlayer.h 2008-03-18 07:27:33 UTC (rev 2432)
@@ -76,16 +76,16 @@
static void playPromptItemFromStringId(string);
static void playDialogInstructionsFromUiId(int nItemID);
static void playDialogTextControlsFromUiId(int nItemID, PromptResolver* pResolver);
- static AudioSequence * playDialogControlFromUiIds(int dlgID, int ctrlId, bool playNow = true);
+ static AudioSequence * playDialogControlFromUiIds(int dlgID, int ctrlId, PromptResolver* pResolver, bool playNow = true);
static void fillSequenceContainerPromptFromId(AudioSequence* seq, string id);
static void fillSequencePrompt(AudioSequence* seq, Prompt* prompt, PromptResolver* pResolver);
- static void fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem);
+ static void fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver);
static void fillSequenceSwitch(AudioSequence* seq, UiItem* uiItem, string switchCondition = "");
- static void fillSequenceContentAndPrompt(AudioSequence* seq, Label* label);
+ static void fillSequenceContentAndPrompt(AudioSequence* seq, Label* label, PromptResolver * pResolver);
static void fillSequenceContents(AudioSequence* seq, PromptItemBase* pi);
- static void resolvePromptVariables(Prompt*);
+ static void resolvePromptVariables(Prompt*, PromptResolver* pResolver);
private:
static void fillOK_CANCEL(AudioSequence * seq, UINT ctrlId);
Modified: branches/amis3/AmisGuiMFC2/include/gui/self-voicing/PreTranslateMessageHandler.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/gui/self-voicing/PreTranslateMessageHandler.h 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/include/gui/self-voicing/PreTranslateMessageHandler.h 2008-03-18 07:27:33 UTC (rev 2432)
@@ -1,8 +1,8 @@
#pragma once
#include "AudioSequencePlayer.h"
+#include "promptresolver.h"
-
namespace amis
{
namespace gui
@@ -19,7 +19,7 @@
~PreTranslateMessageHandler(void);
CString normalizeTextEntry(CString str, int nStartChar, int nEndChar);
- void handle(
+ void handle(PromptResolver * pResolver,
MSG* pMsg,
int idUiFocus,
bool ignoreSpaceKey = false,
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -818,7 +818,7 @@
void CAmisApp::OnShowTextStyle()
{
amis::gui::dialogs::TextStyleDialog dlg;
- if (dlg.DoModal() == IDOK)
+ if (dlg.do_modal() == IDOK)
{
TextRenderBrain::Instance()->redoPageColors();
MainWndParts::Instance()->mpSidebar->m_wndDlg.setFontName(Preferences::Instance()->getSidebarFontName());
Modified: branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -393,7 +393,7 @@
(pMsg->message == WM_KEYDOWN || pMsg->message == WM_KEYUP))
{
CWnd* cwnd = this->GetFocus();
- if (cwnd) mCommonPreTranslateMessageHandler->handle(pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
+ if (cwnd) mCommonPreTranslateMessageHandler->handle(NULL, pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
}
if (pMsg->message == WM_CANCELMODE) {
//TRACE("\n---------------DANOUL2\n\n");
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/AmisDialogBase.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/AmisDialogBase.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/AmisDialogBase.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -63,13 +63,13 @@
str = mCommonPreTranslateMessageHandler->normalizeTextEntry(str, nStartChar, nEndChar);
if (!str.IsEmpty()) { // && (pMsg->wParam == VK_UP || pMsg->wParam == VK_DOWN || pMsg->wParam == VK_LEFT || pMsg->wParam == VK_RIGHT)) {
- mCommonPreTranslateMessageHandler->handle(pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()),false,true,str, strFULL, false);
+ mCommonPreTranslateMessageHandler->handle(this, pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()),false,true,str, strFULL, false);
return CDialog::PreTranslateMessage(pMsg);
}
}
}
- mCommonPreTranslateMessageHandler->handle(pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
+ mCommonPreTranslateMessageHandler->handle(this, pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
}
}
@@ -86,7 +86,7 @@
if (cwnd)
{
mCommonPreTranslateMessageHandler->handle
- (pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
+ (this, pMsg, (cwnd == NULL ? -1 : cwnd->GetDlgCtrlID()));
}
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PreferencesDialog.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -29,6 +29,8 @@
#include "io/ModuleDescReader.h"
#include "ModuleDescData.h"
#include "ambulant/net/url.h"
+#include "gui/self-voicing/TTSPlayer.h"
+#include "gui/self-voicing/datamodel/DataTree.h"
using namespace amis::gui::dialogs;
@@ -53,7 +55,132 @@
END_MESSAGE_MAP()
void PreferencesDialog::resolvePromptVariables(Prompt* pPrompt) {
- return;
+
+
+ CButton* p_button = NULL;
+
+ PromptVar* p_var = NULL;
+ PromptItem* promptNotAvailable = DataTree::Instance()->findPromptItem("not_available");
+
+ PromptItem* promptSelected = DataTree::Instance()->findPromptItem("item_selected");
+ PromptItem* promptDeSelected = DataTree::Instance()->findPromptItem("item_deselected");
+
+ for (int i=0; i<pPrompt->getNumberOfItems(); i++)
+ {
+ if (pPrompt->getItem(i)->getPromptItemType() == PROMPT_VARIABLE)
+ {
+ p_var = (PromptVar*)pPrompt->getItem(i);
+
+ if (p_var->getName().compare("ON_OR_OFF") == 0)
+ {
+
+
+ if (p_var->getParam().compare("SELF_VOICING_FEATURE") == 0)
+ {
+ p_button = (CButton*)this->GetDlgItem(IDC_ISSELFVOICING);
+ if (p_button != NULL)
+ {
+ if (p_button->GetCheck() == 1)
+ {
+ p_var->setContents(promptSelected->getContents()->clone());
+ }
+ else
+ {
+ p_var->setContents(promptDeSelected->getContents()->clone());
+ }
+ }
+ } else if (p_var->getParam().compare("HIGHLIGHTTEXT_FEATURE") == 0)
+ {
+
+ p_button = (CButton*)this->GetDlgItem(IDC_HIGHLIGHTTEXT);
+ if (p_button != NULL)
+ {
+ if (p_button->GetCheck() == 1)
+ {
+ p_var->setContents(promptSelected->getContents()->clone());
+ }
+ else
+ {
+ p_var->setContents(promptDeSelected->getContents()->clone());
+ }
+ }
+ } else if (p_var->getParam().compare("LOAD_LAST_READ_FEATURE") == 0)
+ {
+ p_button = (CButton*)this->GetDlgItem(IDC_LOADLASTBOOK);
+ if (p_button != NULL)
+ {
+ if (p_button->GetCheck() == 1)
+ {
+ p_var->setContents(promptSelected->getContents()->clone());
+ }
+ else
+ {
+ p_var->setContents(promptDeSelected->getContents()->clone());
+ }
+ }
+ } else if (p_var->getParam().compare("BASIC_VIEW_FEATURE") == 0)
+ {
+ p_button = (CButton*)this->GetDlgItem(IDC_STARTINBASICVIEW);
+ if (p_button != NULL)
+ {
+ if (p_button->GetCheck() == 1)
+ {
+ p_var->setContents(promptSelected->getContents()->clone());
+ }
+ else
+ {
+ p_var->setContents(promptDeSelected->getContents()->clone());
+ }
+ }
+ } else if (p_var->getParam().compare("PAUSEONLOSTFOCUS_FEATURE") == 0)
+ {
+ p_button = (CButton*)this->GetDlgItem(IDC_PAUSEONLOSTFOCUS);
+ if (p_button != NULL)
+ {
+ if (p_button->GetCheck() == 1)
+ {
+ p_var->setContents(promptSelected->getContents()->clone());
+ }
+ else
+ {
+ p_var->setContents(promptDeSelected->getContents()->clone());
+ }
+ }
+ } else if (p_var->getParam().compare("DISABLESCREENSAVER_FEATURE") == 0)
+ {
+ p_button = (CButton*)this->GetDlgItem(IDC_DISABLESCREENSAVER);
+ if (p_button != NULL)
+ {
+ if (p_button->GetCheck() == 1)
+ {
+ p_var->setContents(promptSelected->getContents()->clone());
+ }
+ else
+ {
+ p_var->setContents(promptDeSelected->getContents()->clone());
+ }
+ }
+ }
+ }else if (p_var->getName().compare("LANGUAGE_NAME") == 0)
+ {
+ wstring str;
+ CString cstr(mUiLanguageSelection.c_str());
+ str = cstr;
+ p_var->setContents(str, "");
+
+ }else if (p_var->getName().compare("TTS_VOICE_NAME") == 0)
+ {
+
+ CComboBox* list = (CComboBox*)GetDlgItem(IDC_TTSVOICES);
+
+ wstring str = L"Daniel";
+ p_var->setContents(str, "");
+
+ }
+
+ }
+ }
+ AmisDialogBase::resolvePromptVariables(pPrompt);
}
PreferencesDialog::PreferencesDialog(CWnd* pParent /*=NULL*/)
@@ -99,13 +226,12 @@
{
//fill the combo box for the tts voices, and return an index to the voice we are currently using
//TODO: need this "initVoiceList" function
- /*int index = TTSPlayer::Instance()->initVoiceList(this->GetSafeHwnd());
+ int index = amis::tts::TTSPlayer::Instance()->initVoiceList(this->GetSafeHwnd());
if (index != -1)
{
CComboBox* list = (CComboBox*)GetDlgItem(IDC_TTSVOICES);
list->SetCurSel(index);
}
- */
}
void PreferencesDialog::initializeUiLanguageOption()
{
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/PublicationSummaryDialog.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -329,7 +329,7 @@
if (p_prompt != NULL)
{
AudioSequence* seq = new AudioSequence();
- AudioSequencePlayer::Instance()->fillSequencePrompt(seq, p_prompt, NULL);
+ AudioSequencePlayer::Instance()->fillSequencePrompt(seq, p_prompt, this);
if (seq->IsEmpty()) {delete seq;}else{
AudioSequencePlayer::Instance()->Play(seq);
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -75,7 +75,7 @@
if (cwnd)
{
int id = cwnd->GetDlgCtrlID();
- mCommonPreTranslateMessageHandler->handle(pMsg, (cwnd == NULL ? -1 : id), (id == IDC_SKIPS ? true : false), (id == IDC_SKIPS ? true : false), L"", L"", (id == IDC_SKIPS ? true : false));
+ mCommonPreTranslateMessageHandler->handle(this, pMsg, (cwnd == NULL ? -1 : id), (id == IDC_SKIPS ? true : false), (id == IDC_SKIPS ? true : false), L"", L"", (id == IDC_SKIPS ? true : false));
if (pMsg->message == WM_KEYUP)
{
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/AudioSequencePlayer.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -878,17 +878,17 @@
Label* label = p_uiItem->getCaption();
if (label != NULL) {
- fillSequenceContentAndPrompt(seq, label);
+ fillSequenceContentAndPrompt(seq, label, NULL);
}
if (mnemonic != NULL) {
- fillSequenceContentAndPrompt(seq, mnemonic);
+ fillSequenceContentAndPrompt(seq, mnemonic, NULL);
}
if (keyboardShortcutAccelerator != NULL) {
- fillSequenceContentAndPrompt(seq, keyboardShortcutAccelerator);
+ fillSequenceContentAndPrompt(seq, keyboardShortcutAccelerator, NULL);
}
label = p_uiItem->getDescription();
if (label != NULL) {
- fillSequenceContentAndPrompt(seq, label);
+ fillSequenceContentAndPrompt(seq, label, NULL);
}
}
@@ -953,11 +953,11 @@
Container* p_container = DataTree::Instance()->findContainer(id);
if (p_container != NULL) {
- fillSequenceCaptionAndDescription(seq, p_container);
+ fillSequenceCaptionAndDescription(seq, p_container, NULL);
Label* keyboardShortcutAccelerator = p_container->getKeyboardAccelerator();
if (keyboardShortcutAccelerator != NULL) {
- fillSequenceContentAndPrompt(seq, keyboardShortcutAccelerator);
+ fillSequenceContentAndPrompt(seq, keyboardShortcutAccelerator, NULL);
}
}
}
@@ -1040,7 +1040,7 @@
Dialog* p_dialog = DataTree::Instance()->findDialog(nItemID);
if (p_dialog != NULL) {
- fillSequenceCaptionAndDescription(seq, p_dialog);
+ fillSequenceCaptionAndDescription(seq, p_dialog, NULL);
fillSequenceSwitch(seq, p_dialog);
int count = p_dialog->getNumChildControls();
@@ -1049,7 +1049,7 @@
string strCat = control->getWidgetCategories();
int find = strCat.find("button");
if (-1 == find) {
- fillSequenceCaptionAndDescription(seq, control);
+ fillSequenceCaptionAndDescription(seq, control, presolver);
}
LabelList* p_list = control->getLabelList();
@@ -1121,7 +1121,7 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
// This works for Dialogs
-AudioSequence * AudioSequencePlayer::playDialogControlFromUiIds(int dlgID, int ctrlId, bool playNow) {
+AudioSequence * AudioSequencePlayer::playDialogControlFromUiIds(int dlgID, int ctrlId, PromptResolver* pResolver, bool playNow) {
if (
(dlgID != -1 && ctrlId != -1)
@@ -1138,7 +1138,7 @@
DialogControl* control = p_dialog->findControl(ctrlId);
if (control != NULL) {
- fillSequenceCaptionAndDescription(seq, control);
+ fillSequenceCaptionAndDescription(seq, control, pResolver);
}
} else {
fillOK_CANCEL(seq, ctrlId);
@@ -1165,10 +1165,7 @@
////////////////////////////////////////////////////////////////////////////////////
void AudioSequencePlayer::fillSequencePrompt(AudioSequence* seq, Prompt* prompt, PromptResolver* pResolver) {
- resolvePromptVariables(prompt);
- if (pResolver != NULL) {
- pResolver->resolvePromptVariables(prompt);
- }
+ resolvePromptVariables(prompt, pResolver);
int sz = prompt->getNumberOfItems();
for (int i=0; i<sz; i++)
@@ -1193,16 +1190,16 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
-void AudioSequencePlayer::fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem) {
+void AudioSequencePlayer::fillSequenceCaptionAndDescription(AudioSequence* seq, UiItem* uiItem, PromptResolver * pResolver) {
Label* label = uiItem->getCaption();
if (label != NULL) {
- fillSequenceContentAndPrompt(seq, label);
+ fillSequenceContentAndPrompt(seq, label, pResolver);
}
label = uiItem->getDescription();
if (label != NULL) {
- fillSequenceContentAndPrompt(seq, label);
+ fillSequenceContentAndPrompt(seq, label, pResolver);
}
}
@@ -1217,7 +1214,7 @@
case ACTIONSWITCH: {
Action* action = zwitch->getAction(switchCondition);
if (action != NULL) {
- fillSequenceCaptionAndDescription(seq, action);
+ fillSequenceCaptionAndDescription(seq, action, NULL);
}
break;
}
@@ -1225,7 +1222,7 @@
case DESCRIPTIONSWITCH: {
Label* label = zwitch->getLabel(switchCondition);
if (label != NULL) {
- fillSequenceContentAndPrompt(seq, label);
+ fillSequenceContentAndPrompt(seq, label, NULL);
}
break;
}
@@ -1235,7 +1232,7 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
-void AudioSequencePlayer::fillSequenceContentAndPrompt(AudioSequence* seq, Label* label)
+void AudioSequencePlayer::fillSequenceContentAndPrompt(AudioSequence* seq, Label* label, PromptResolver * pResolver)
{
TextAudioPair* pair = label->getContents();
if (pair != NULL) {
@@ -1259,6 +1256,8 @@
Prompt* prompt = label->getPrompt();
if (prompt != NULL)
{
+ resolvePromptVariables(prompt, pResolver);
+
int count = prompt->getNumberOfItems();
for (int i=0; i<count; i++)
{
@@ -1346,8 +1345,8 @@
////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////
-//the new one
-void AudioSequencePlayer::resolvePromptVariables(Prompt* pPrompt)
+
+void AudioSequencePlayer::resolvePromptVariables(Prompt* pPrompt, PromptResolver* pResolver)
{
USES_CONVERSION;
@@ -1368,6 +1367,9 @@
}
}
}
+ if (pResolver != NULL) {
+ pResolver->resolvePromptVariables(pPrompt);
+ }
}
Modified: branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/AmisGuiMFC2/src/gui/self-voicing/PreTranslateMessageHandler.cpp 2008-03-18 07:27:33 UTC (rev 2432)
@@ -212,7 +212,7 @@
AudioSequencePlayer::Instance()->playNext(true);
}
}
-void PreTranslateMessageHandler::handle(MSG* pMsg, int idUiFocus, bool ignoreSpaceKey, bool ignoreArrowKeys, CString strTextField, CString strTextFieldFULL, bool ignoreCharKeys) {
+void PreTranslateMessageHandler::handle(PromptResolver * pResolver, MSG* pMsg, int idUiFocus, bool ignoreSpaceKey, bool ignoreArrowKeys, CString strTextField, CString strTextFieldFULL, bool ignoreCharKeys) {
if (pMsg->message == WM_KEYDOWN)
@@ -286,7 +286,7 @@
if (p_prompt_ != NULL)
{
- AudioSequencePlayer::Instance()->fillSequencePrompt(mSeq, p_prompt_, NULL);
+ AudioSequencePlayer::Instance()->fillSequencePrompt(mSeq, p_prompt_, pResolver);
}
if (!strTextFieldFULL.IsEmpty()) {
@@ -307,17 +307,17 @@
if (idUiFocus == IDOK)
{
- AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDOK);
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDOK, pResolver);
return;
}
else if (idUiFocus == IDCANCEL)
{
- AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDCANCEL);
+ AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, IDCANCEL, pResolver);
return;
} else if (idUiFocus >= 0) {
- AudioSequence * mSeq = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, idUiFocus, false);
+ AudioSequence * mSeq = AudioSequencePlayer::Instance()->playDialogControlFromUiIds(m_instructionsDialogID, idUiFocus, pResolver, false);
if (mSeq == NULL) {
@@ -329,7 +329,7 @@
if (p_prompt_ != NULL)
{
- AudioSequencePlayer::Instance()->fillSequencePrompt(mSeq, p_prompt_, NULL);
+ AudioSequencePlayer::Instance()->fillSequencePrompt(mSeq, p_prompt_, pResolver);
}
}
}
@@ -373,7 +373,7 @@
if (p_prompt_ != NULL)
{
- AudioSequencePlayer::Instance()->fillSequencePrompt(mSeq, p_prompt_, NULL);
+ AudioSequencePlayer::Instance()->fillSequencePrompt(mSeq, p_prompt_, pResolver);
}
mSeq->append(strTextFieldFULL);
}
Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml
===================================================================
--- branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 05:58:51 UTC (rev 2431)
+++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-18 07:27:33 UTC (rev 2432)
@@ -1200,6 +1200,7 @@
<prompt>
<promptItem refid="thisItemIsCurrently"/>
<promptVar name="ON_OR_OFF" param="SELF_VOICING_FEATURE"/>
+ <promptItem refid="spaceToToggle"/>
</prompt>
</description>
</control>
@@ -1246,7 +1247,7 @@
</prompt>
</description>
</control>
- <control mfcid="IDC_STARTINBASICVIEWBASIC" widget="checkbox">
+ <control mfcid="IDC_STARTINBASICVIEW" widget="checkbox">
<caption>
<!--changed text-->
<text id="t223">Start in basic view mode</text>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 05:58:46
|
Revision: 2431
http://amis.svn.sourceforge.net/amis/?rev=2431&view=rev
Author: marisademeglio
Date: 2008-03-17 22:58:51 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
update to issues file
Modified Paths:
--------------
branches/amis3/amis_issues.txt
Modified: branches/amis3/amis_issues.txt
===================================================================
--- branches/amis3/amis_issues.txt 2008-03-18 05:58:25 UTC (rev 2430)
+++ branches/amis3/amis_issues.txt 2008-03-18 05:58:51 UTC (rev 2431)
@@ -13,13 +13,7 @@
ISSUES and BUGS (things to address)
---
-* stabilize self-voicing for menus
* new audio backend makes reading options dialog crash
-* Zed stylesheet doesn't work
- ==>problem reproduced in a test app: applying CSS to XML in an HtmlView doesn't work
-* Listviews have more than one column, cutting off text
-* window resizing problems with HTML view
-* audio does not change speed
KNOWN ISSUES (not going to change for alpha 2; should be listed as bugs to work on for beta 1)
@@ -29,8 +23,6 @@
* japanese characters not shown in sidebar in win2k
==>not known if this is still an issue in alpha 2; you can set the sidebar font so maybe that will help
* shows □□ for <br /> in the list of bookmarks
-* play/pause state doesn't toggle correctly on startup
-* IE7 right-click menu appears although, ideally, it shouldn't
* a book won't close all the way
* can't open a URL from the command line
* speed buttons reset when you open a new book
@@ -42,6 +34,9 @@
6. open the same book
7. see the buttons for speed
==>want to wait and see what happens when the audio speed itself is working again
+* Zed stylesheet doesn't work
+ ==>problem reproduced in a test app: applying CSS to XML in an HtmlView doesn't work
+* Page styles overlap a bit when applyed in sequence
AMBULANT ISSUES (some of these are repeated from the above "Known Issues" list)
--
@@ -120,4 +115,9 @@
* phrase arrow keys work when the focus is in the sidebar
* page navigation bug fixed
* navigation cursor synchronized
-* bookmarks cleared when closing a book
\ No newline at end of file
+* bookmarks cleared when closing a book
+* IE7 right-click menu doesn't appear
+* Navigation text not cut off in nav lists
+* stabilized self-voicing for menus
+* audio changes speed
+* play/pause buttons show the correct state
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <mar...@us...> - 2008-03-18 05:58:23
|
Revision: 2430
http://amis.svn.sourceforge.net/amis/?rev=2430&view=rev
Author: marisademeglio
Date: 2008-03-17 22:58:25 -0700 (Mon, 17 Mar 2008)
Log Message:
-----------
play/pause button state fixed
Modified Paths:
--------------
branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 05:38:31 UTC (rev 2429)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-18 05:58:25 UTC (rev 2430)
@@ -838,6 +838,9 @@
{
amis::gui::MenuManip::Instance()->setPauseState(pauseState);
MainWndParts::Instance()->updateTitlePlayState(!pauseState);
+
+ MainWndParts::Instance()->mpDefaultToolbar->togglePlayPause(pauseState);
+ MainWndParts::Instance()->mpBasicToolbar->togglePlayPause(pauseState);
}
bool CAmisApp::beforeModalBox()
Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-18 05:38:31 UTC (rev 2429)
+++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp 2008-03-18 05:58:25 UTC (rev 2430)
@@ -867,7 +867,7 @@
{
TRACE(_T("MmView::document_started()\n"));
CAmisApp* pApp = (CAmisApp *) AfxGetApp();
-// pApp->setPlayPauseState(true);
+ pApp->setPauseState(false);
}
void MmView::document_stopped()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
1 message has been excluded from this view by a project administrator.