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

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

Revision: 2223
          http://amis.svn.sourceforge.net/amis/?rev=2223&view=rev
Author:   marisademeglio
Date:     2007-11-08 11:33:31 -0800 (Thu, 08 Nov 2007)

Log Message:
-----------
Debugging skippability (aka "Reading options") problems.
Looking at an easy way to store prompt variables (formerly we did this by using a prompt variable resolver, but this is ugly)

Modified Paths:
--------------
    branches/amis3/AmisCore/include/AmisCore.h
    branches/amis3/AmisCore/src/dtb/Dtb.cpp
    branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps
    branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
    branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj
    branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/DataTree.cpp
    branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp
    branches/amis3/AmisGuiMFC2/resource.h
    branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp
    branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
    branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
    branches/amis3/DefaultLangpack/AmisLangpack/AmisLangpack.rc
    branches/amis3/DefaultLangpack/amisAccessibleUi.xml

Added Paths:
-----------
    branches/amis3/AmisGuiMFC2/include/UiVariables.h
    branches/amis3/AmisGuiMFC2/src/UiVariables.cpp

Modified: branches/amis3/AmisCore/include/AmisCore.h
===================================================================

--- branches/amis3/AmisCore/include/AmisCore.h	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisCore/include/AmisCore.h	2007-11-08 19:33:31 UTC (rev 2223)
@@ -76,9 +76,11 @@
 	//putting hash_map in stdext:: is MSVC-specific
 	typedef stdext::hash_map<std::string, std::string> StringMap;
 	typedef stdext::hash_map<std::string, ambulant::net::url> UrlMap;
+	typedef stdext::hash_map<std::string, bool> BooleanMap;
 #elif defined(AMIS_COMPILER_GCC)
 	typedef __gnu_cxx::hash_map<std::string, std::string> StringMap;
 	typedef __gnu_cxx::hash_map<std::string, ambulant::net::url> UrlMap;
+	typedef __gnu_cxx::hash_map<std::string, bool> BooleanMap;
 #endif
 
 	class MediaNode;

Modified: branches/amis3/AmisCore/src/dtb/Dtb.cpp
===================================================================
--- branches/amis3/AmisCore/src/dtb/Dtb.cpp	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisCore/src/dtb/Dtb.cpp	2007-11-08 19:33:31 UTC (rev 2223)
@@ -283,11 +283,11 @@
 	mpTitle->setText(p_title_text);
 
 	mpAuthor = new amis::MediaGroup();
-	amis::TextNode p_author_text = new amis::TextNode();
+	amis::TextNode* p_author_text = new amis::TextNode();
 	p_author_text->setTextString(mpMetadata->getMetadata("dc:creator"));
 	mpAuthor->setText(p_author_text);
 
-	//TODO: get the audio for the title and author
+	//TODO: get the audio for the title (author audio not available in Daisy 202)
 
 	mpFiles->setAdditionalDataAfterInitialParse(this->mUid, NULL, NULL);
 	amis::dtb::nav::ResolveSmilDataVisitor resolve_smil_visitor;

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

Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc	2007-11-08 19:33:31 UTC (rev 2223)
@@ -229,7 +229,7 @@
     END
     POPUP "&Info"
     BEGIN
-        MENUITEM "&Skippable Items...",         ID_MENU_INFO_SKIP
+        MENUITEM "&Reading Options...",         ID_MENU_INFO_SKIP
         MENUITEM SEPARATOR
         MENUITEM "&Full Summary",               ID_MENU_INFO_SUMMARY
         MENUITEM "&Current Position",           ID_MENU_INFO_CURRENTPOSITION
@@ -250,15 +250,15 @@
 
 IDD_SKIP DIALOGEX 0, 0, 238, 186
 STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
-CAPTION "Skippable Items"
+CAPTION "Reading options"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    LTEXT           "This book contains the following special structures. Check the ones you want skipped.",
+    LTEXT           "This book contains the following special types of items. Checked items will be played.  Unchecked items will be skipped.",
                     IDC_STATIC,7,7,224,21
-    DEFPUSHBUTTON   "OK",IDOK,94,165,50,14
     LISTBOX         IDC_SKIPS,7,32,224,123,LBS_OWNERDRAWFIXED | 
                     LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | 
                     WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,94,165,50,14
 END
 
 IDD_SIDEBAR DIALOGEX 0, 0, 175, 183
@@ -280,19 +280,18 @@
 CAPTION "Search for DAISY Books"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
+    CONTROL         186,IDC_PICTURE,"Static",SS_BITMAP,7,7,85,79
     LTEXT           "You can search your computer for DAISY books. Enter a path or browse for a folder to search, then press Search to begin searching.",
-                    IDC_STATIC,105,15,149,9
+                    IDC_SEARCHINSTRUCTIONS,105,15,149,9
     EDITTEXT        IDC_SEARCHPATH,108,32,144,14,ES_AUTOHSCROLL
     PUSHBUTTON      "Browse...",IDC_BROWSE,260,34,45,13
     PUSHBUTTON      "&Search",IDC_STARTSEARCH,141,56,50,15
     PUSHBUTTON      "S&top",IDC_STOPSEARCH,201,56,50,14
     CTEXT           "Ready",IDC_SEARCHING,7,92,298,13,NOT WS_VISIBLE
-    CONTROL         "List1",IDC_FILESFOUND,"SysListView32",LVS_LIST | 
-                    LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,
-                    109,298,152
-    PUSHBUTTON      "&Open",IDC_OPENBOOK,79,266,50,14
-    PUSHBUTTON      "Cancel",IDC_CANCELBUTTON,160,266,50,14
-    CONTROL         186,IDC_PICTURE,"Static",SS_BITMAP,7,7,86,79
+    LISTBOX         IDC_FILESFOUND,7,105,298,156,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "&Open",IDC_OPENBOOK,103,266,50,14
+    PUSHBUTTON      "Cancel",IDC_CANCELBUTTON,158,266,50,14
 END
 
 IDD_LANGUAGES DIALOGEX 0, 0, 229, 223
@@ -302,13 +301,13 @@
 BEGIN
     LTEXT           "Here you can change the language of the software. New language packs are detected automatically.",
                     IDC_STATIC,7,7,215,20
-    PUSHBUTTON      "Select Language",IDC_BTN_SELECTLANG,165,200,57,15
-    CONTROL         "List1",IDC_LANGLIST,"SysListView32",LVS_SINGLESEL | 
-                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,77,215,111
+    ICON            IDI_LANGICON,IDC_LANGICON,7,31,20,20
     LTEXT           "You are currently using AMIS in",IDC_CURRLANG,34,35,142,
                     8
-    ICON            IDI_LANGICON,IDC_LANGICON,7,31,20,20
     LTEXT           "Your language choices are:",IDC_STATIC,7,57,56,8
+    CONTROL         "List1",IDC_LANGLIST,"SysListView32",LVS_SINGLESEL | 
+                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,77,215,111
+    PUSHBUTTON      "Select Language",IDC_BTN_SELECTLANG,165,200,57,15
 END
 
 IDD_PREFERENCES DIALOGEX 0, 0, 256, 236
@@ -316,12 +315,11 @@
 CAPTION "General Preferences"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    PUSHBUTTON      "Browse...",IDC_BMKDIRBROWSE,128,180,43,14,BS_NOTIFY
     CONTROL         "Use self-voicing",IDC_SELFVOICING,"Button",
                     BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,8,8,75,10
+    LTEXT           "Select TTS voice:",IDC_SELTTSLABEL,7,32,59,8
     COMBOBOX        IDC_TTSVOICE,7,47,108,88,CBS_DROPDOWNLIST | CBS_SORT | 
                     WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Select TTS voice:",IDC_SELTTSLABEL,7,32,59,8
     CONTROL         "Start AMIS in the basic view mode.",IDC_BASIC,"Button",
                     BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,90,125,10
     CONTROL         "Upon switching to basic view, tell the user how to go back to the default view.",
@@ -330,8 +328,9 @@
     CONTROL         "Load the most recently read book when the software starts.",
                     IDC_LOADLASTDTB,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | 
                     WS_TABSTOP,7,147,188,10
-    EDITTEXT        IDC_BMKDIR,7,180,111,13,ES_AUTOHSCROLL
     LTEXT           "Bookmarks directory:",IDC_BMKDIRLABEL,7,170,67,8
+    EDITTEXT        IDC_BMKDIR,7,180,111,13,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse...",IDC_BMKDIRBROWSE,128,180,43,14,BS_NOTIFY
 END
 
 IDD_GOTOPAGE DIALOGEX 0, 0, 138, 66
@@ -350,13 +349,13 @@
 CAPTION "Find in Text"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,124,7,50,14
-    PUSHBUTTON      "&Cancel",IDCANCEL,124,21,50,14
+    EDITTEXT        IDC_SEARCHSTRING,7,7,106,13,ES_AUTOHSCROLL
     CONTROL         "Find Next",IDC_FINDNEXT,"Button",BS_AUTORADIOBUTTON,19,
                     27,46,10
     CONTROL         "Find Previous",IDC_FINDPREV,"Button",BS_AUTORADIOBUTTON,
                     19,38,59,10
-    EDITTEXT        IDC_SEARCHSTRING,7,7,106,13,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,124,7,50,14
+    PUSHBUTTON      "&Cancel",IDCANCEL,124,21,50,14
 END
 
 IDD_CDSEARCH DIALOGEX 0, 0, 253, 180
@@ -366,11 +365,10 @@
 BEGIN
     LTEXT           "More than one book was found on this CD. Please select a book from the list below and press Alt + O to open.",
                     IDC_STATIC,7,7,239,18
-    CONTROL         "List1",IDC_BOOKLIST,"SysListView32",LVS_LIST | 
-                    LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,
-                    30,239,124
+    LISTBOX         IDC_BOOKLIST,7,27,239,124,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     PUSHBUTTON      "&Open",IDC_OPENBOOK,71,159,50,14
-    PUSHBUTTON      "&Cancel",IDC_CANCEL,150,159,50,14
+    PUSHBUTTON      "&Cancel",IDC_CANCEL,129,159,50,14
 END
 
 IDD_ABOUTBOX DIALOGEX 0, 0, 235, 97
@@ -381,12 +379,12 @@
     ICON            IDI_AMIS,IDC_STATIC,11,17,20,20
     LTEXT           "AMIS: \nAdaptive Multimedia Information System",
                     IDC_AMISNAME,40,10,132,31,SS_NOPREFIX
-    LTEXT           "Copyright \xA9 2008 DAISY for All",IDC_COPYRIGHT,40,82,119,
-                    8
-    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
     LTEXT           "Version 3.0 beta",IDC_VERSION,39,44,128,8
     LTEXT           "Release Date: 01 January 2008",IDC_VERSIONNOTE,40,59,
                     124,11
+    LTEXT           "Copyright \xA9 2008 DAISY for All",IDC_COPYRIGHT,40,82,119,
+                    8
+    DEFPUSHBUTTON   "OK",IDOK,178,7,50,14,WS_GROUP
 END
 
 IDD_PUBLICATIONINFO DIALOGEX 0, 0, 400, 278
@@ -394,18 +392,16 @@
 CAPTION "Publication Summary"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,176,256,50,14
     LTEXT           "About: TITLE by CREATOR",IDC_DIALOGCAPTION,6,7,387,17
-    CONTROL         "",IDC_PUBLICATIONINFO,"SysListView32",LVS_LIST | 
-                    LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,6,126,387,119,
-                    WS_EX_LEFTSCROLLBAR
     LTEXT           "About your current position:",
                     IDC_CURRENTPOSITIONCAPTION,6,27,387,17
-    CONTROL         "",IDC_CURRENTPOSITION2,"SysListView32",LVS_LIST | 
-                    LVS_SINGLESEL | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,
-                    46,386,47,WS_EX_LEFTSCROLLBAR
+    LISTBOX         IDC_CURRENTPOSITION,6,47,387,49,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
     LTEXT           "About this publication:",IDC_PUBLICATIONINFOCAPTION,6,
                     107,387,16
+    LISTBOX         IDC_PUBLICATIONINFO,6,125,387,123,LBS_SORT | 
+                    LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,176,256,50,14
 END
 
 IDD_OPENURL DIALOGEX 0, 0, 265, 70
@@ -414,11 +410,11 @@
 CAPTION "Open URL"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    DEFPUSHBUTTON   "OK",IDOK,73,49,50,14
-    PUSHBUTTON      "Cancel",IDCANCEL,127,49,50,14
     LTEXT           "Enter the URL of the book you want to open:",IDC_STATIC,
                     7,7,146,8
     EDITTEXT        IDC_URL,7,26,251,12,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,73,49,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,127,49,50,14
 END
 
 

Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.vcproj	2007-11-08 19:33:31 UTC (rev 2223)
@@ -150,6 +150,9 @@
 				RelativePath=".\include\stdafx.h">
 			</File>
 			<File
+				RelativePath=".\include\UiVariables.h">
+			</File>
+			<File
 				RelativePath=".\include\UrlInputSource.h">
 				<FileConfiguration
 					Name="Debug|Win32">
@@ -320,6 +323,15 @@
 						UsePrecompiledHeader="0"/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath=".\src\UiVariables.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="0"/>
+				</FileConfiguration>
+			</File>
 			<Filter
 				Name="io"
 				Filter="">

Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/DataTree.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/DataTree.cpp	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AccessibleUI/DataTree.cpp	2007-11-08 19:33:31 UTC (rev 2223)
@@ -17,7 +17,7 @@
 
 void DataTree::DestroyInstance()
 {
-	delete pinstance;
+	if (pinstance != NULL) delete pinstance;
 }
 
 DataTree::DataTree()

Modified: branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/AmisSelfVoicing/AudioSequencePlayer.cpp	2007-11-08 19:33:31 UTC (rev 2223)
@@ -109,7 +109,7 @@
 void AudioSequencePlayer::DestroyInstance()
 {
 	Stop();
-	delete pinstance;
+	if (pinstance != NULL) delete pinstance;
 	
 	AmisAudio::Instance()->DestroyInstance();
 	TTSPlayer::Instance()->DestroyInstance();

Added: branches/amis3/AmisGuiMFC2/include/UiVariables.h
===================================================================
--- branches/amis3/AmisGuiMFC2/include/UiVariables.h	                        (rev 0)
+++ branches/amis3/AmisGuiMFC2/include/UiVariables.h	2007-11-08 19:33:31 UTC (rev 2223)
@@ -0,0 +1,61 @@
+/*
+AMIS: Adaptive Multimedia Information System
+Software for playing DAISY books
+Homepage: http://amis.sf.net
+
+Copyright (C) 2004-2007  DAISY for All Project
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+*/
+#ifndef UIVARIABLES_H
+#define UIVARIABLES_H
+
+#include "AmisCore.h"
+
+namespace amis
+{
+namespace uiVariables
+{
+class Conditions
+{
+protected:
+	Conditions();
+public:
+	static Conditions* Instance();
+	DestroyInstance();
+	~Conditions();
+
+	bool lookupValue(std::string);
+	void setValue(std::string, bool);
+	amis::BooleanMap* getValues();
+private:
+	static Conditions* pinstance();
+	amis::BooleanMap mValues;
+};
+
+class PromptVars
+{
+protected:
+	PromptVars();
+public:
+	static PromptVars* Instance();
+	DestroyInstance();
+	~PromptVars();
+private:
+	static PromptVars* pinstance();
+};
+}
+}
+#endif
\ No newline at end of file

Modified: branches/amis3/AmisGuiMFC2/resource.h
===================================================================
--- branches/amis3/AmisGuiMFC2/resource.h	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/resource.h	2007-11-08 19:33:31 UTC (rev 2223)
@@ -93,8 +93,9 @@
 #define IDC_BORDER                      1081
 #define IDC_PUBLICATIONINFO             1081
 #define IDC_CURRENTPOSITIONCAPTION      1082
-#define IDC_CURRENTPOSITION2            1083
 #define IDC_PUBLICATIONINFOCAPTION      1084
+#define IDC_CURRENTPOSITION             1085
+#define IDC_SEARCHINSTRUCTIONS          1088
 #define ID_MENU_FIND_IN_TEXT_NEXT       9000
 #define IDC_LANGLIST                    9001
 #define ID_MENU_FIND_IN_TEXT_PREV       9001
@@ -156,8 +157,8 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
 #define _APS_NEXT_RESOURCE_VALUE        191
-#define _APS_NEXT_COMMAND_VALUE         32873
-#define _APS_NEXT_CONTROL_VALUE         1083
+#define _APS_NEXT_COMMAND_VALUE         32875
+#define _APS_NEXT_CONTROL_VALUE         1089
 #define _APS_NEXT_SYMED_VALUE           141
 #endif
 #endif

Added: branches/amis3/AmisGuiMFC2/src/UiVariables.cpp
===================================================================

Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/src/gui/AmisGuiMFC2.cpp	2007-11-08 19:33:31 UTC (rev 2223)
@@ -257,11 +257,8 @@
 	amis::gui::MenuManip::Instance()->DestroyInstance();
 	amis::gui::MainWndParts::Instance()->DestroyInstance();
 
-	if (amis::Preferences::Instance()->mbIsSelfVoicing == true)
-	{
-	AudioSequencePlayer::Instance()->DestroyInstance();
 	DataTree::Instance()->DestroyInstance();
-	}
+	AudioSequencePlayer::Instance()->DestroyInstance();
 
 	if (mpRecentBooks) delete mpRecentBooks;
 

Modified: branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/src/gui/MmView.cpp	2007-11-08 19:33:31 UTC (rev 2223)
@@ -941,6 +941,8 @@
 		if ((*it).first) 
 		{ // Only do something on inward iteration
 			lib::node *n = (*it).second;
+			//we are fiddling with things here...setting systemComponent only works (*should work*) because we are
+			//messing with something
 			const char *teststr = n->get_attribute("system-required");
 			if (teststr) 
 			{

Modified: branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp
===================================================================
--- branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/AmisGuiMFC2/src/gui/dialogs/SkipDialog.cpp	2007-11-08 19:33:31 UTC (rev 2223)
@@ -159,9 +159,9 @@
 			int idx = m_ListSkips.AddString(entry);
 			m_ListSkips.SetItemData(idx,(DWORD)p_test);
 
-			//false = skip this item
-			if (p_test->getCurrentState() == false) m_ListSkips.SetCheck(idx, 1);
-			else m_ListSkips.SetCheck(idx, 0);
+			//false = skip this item (display as unchecked)
+			if (p_test->getCurrentState() == false) m_ListSkips.SetCheck(idx, 0);
+			else m_ListSkips.SetCheck(idx, 1);
 		}
 	}
 }
@@ -265,9 +265,9 @@
 	
 	AudioSequencePlayer::Instance()->Play(seq);	
 
-	//if it's checked, it means we don't want to play it
-	if (m_ListSkips.GetCheck(i)) p_test->setCurrentState(false);
-	else p_test->setCurrentState(true);
+	//if it's checked, it means we want to play it
+	if (m_ListSkips.GetCheck(i)) p_test->setCurrentState(true);
+	else p_test->setCurrentState(false);
 }
 
 BEGIN_MESSAGE_MAP(SkipDialog, CDialog)

Modified: branches/amis3/DefaultLangpack/AmisLangpack/AmisLangpack.rc
===================================================================
(Binary files differ)

Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml
===================================================================
--- branches/amis3/DefaultLangpack/amisAccessibleUi.xml	2007-11-05 22:19:49 UTC (rev 2222)
+++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml	2007-11-08 19:33:31 UTC (rev 2223)
@@ -1312,21 +1312,22 @@
         </mnemonic>
       </control>
     </dialog>
+    <!--text changed-->
     <dialog mfcid="IDD_SKIP">
-      <note>This dialog lets the user control rendering of skippable structures.</note>
+      <note>This dialog lets the user control rendering of reading options.</note>
       <caption>
-        <text>Skippable Items</text>
+        <text>Reading Options</text>
         <originalText>Skippable Items</originalText>
         <audio src="./audio/185_Skippable_Items.mp3" from="file:///c:/devel/amis/Defaultlangpack/prompts/prom00ba.smil#text_00ba" />
       </caption>
       <switch element="description">
         <description mfcid="IDC_STATIC" condition="hasSkippableStructures">
-          <text>This book contains the following special structures.  Check the ones you want skipped.</text>
+          <text>This book contains the following special types of items.  Uncheck an item to turn off playback of all items of that type.</text>
           <originalText>This book contains the following special structures.  Check the ones you want skipped.</originalText>
           <audio src="./audio/186_This_book_contains_the_followi.mp3" from="file:///c:/devel/amis/Defaultlangpack/prompts/prom00bb.smil#text_00bb" />
         </description>
         <description mfcid="IDC_STATIC" condition="hasNoSkippableStructures">
-          <text>This publication has no skippable elements.</text>
+          <text>This publication has no special reading options.</text>
           <originalText>This publication has no skippable elements.</originalText>
           <audio src="./audio/187_This_publication_has_no_skippa.mp3" from="file:///c:/devel/amis/Defaultlangpack/prompts/prom00bc.smil#text_00bc" />
         </description>
@@ -1347,12 +1348,12 @@
       </control>
       <control mfcid="IDC_SKIPS" widget="list">
         <caption>
-          <text>Skippable items</text>
+          <text>Reading options</text>
           <originalText>Skippable items</originalText>
           <audio src="./audio/188_Skippable_items.mp3" from="file:///c:/devel/amis/Defaultlangpack/prompts/prom00bd.smil#text_00bd" />
         </caption>
         <description>
-          <text>Use the arrow keys to move around this list of skippable items.</text>
+          <text>Use the arrow keys to move around this list of reading options.</text>
           <originalText>Use the arrow keys to move around this list of skippable items.</originalText>
           <audio src="./audio/189_Use_the_arrow_keys_to_move_aro.mp3" from="file:///c:/devel/amis/Defaultlangpack/prompts/prom00be.smil#text_00be" />
         </description>


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




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

amis-cvs