[Amis-vcs] SF.net SVN: amis: [2387] branches/amis3
Brought to you by:
julienq,
marisademeglio
From: <mar...@us...> - 2008-03-03 06:30:40
|
Revision: 2387 http://amis.svn.sourceforge.net/amis/?rev=2387&view=rev Author: marisademeglio Date: 2008-03-02 22:30:45 -0800 (Sun, 02 Mar 2008) Log Message: ----------- First alpha of AMIS 3 Modified Paths: -------------- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp branches/amis3/DefaultLangpack/amisAccessibleUi.xml branches/amis3/bin/settings/amisPrefs.xml.default branches/amis3/bin/settings/lang/releasedate.mp3 branches/amis3/bin/settings/lang/version.mp3 branches/amis3/installer/main/setup-amis3.nsi Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.aps =================================================================== (Binary files differ) Modified: branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc =================================================================== --- branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/AmisGuiMFC2/AmisGuiMFC2.rc 2008-03-03 06:30:45 UTC (rev 2387) @@ -374,15 +374,17 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN CONTROL "Use self-voicing",IDC_ISSELFVOICING,"Button", - BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,7,7,241,10 - LTEXT "Select TTS voice:",IDC_SELTTSLABEL,7,22,242,8 + BS_AUTOCHECKBOX | BS_NOTIFY | WS_DISABLED | WS_TABSTOP,7, + 7,241,10 + LTEXT "Select TTS voice:",IDC_SELTTSLABEL,7,22,242,8, + WS_DISABLED COMBOBOX IDC_TTSVOICES,7,35,108,88,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP + WS_DISABLED | 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", - IDC_LOADLASTBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7, - 76,242,10 + IDC_LOADLASTBOOK,"Button",BS_AUTOCHECKBOX | WS_DISABLED | + WS_TABSTOP,7,76,242,10 CONTROL "Start in basic view mode",IDC_STARTINBASICVIEW,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,7,94,242,10 CONTROL "Pause audio when switching applications", Modified: branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/AmisGuiMFC2/src/gui/AmisApp.cpp 2008-03-03 06:30:45 UTC (rev 2387) @@ -863,7 +863,7 @@ double rate = ambulantX::gui::dx::audio_playerX::Instance()->get_rate(); //TODO: unhardcode the max rate - double max = 4.0; + double max = 2.0; bool can_increase = true; bool can_decrease = true; if (rate == 1) Modified: branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/AmisGuiMFC2/src/gui/MainFrm.cpp 2008-03-03 06:30:45 UTC (rev 2387) @@ -92,6 +92,8 @@ ON_UPDATE_COMMAND_UI_RANGE(AMIS_PAGE_STYLE_BASE_ID, AMIS_PAGE_STYLE_BASE_ID + AMIS_MAX_ANYTHING, OnUpdateCmdUiPageStyle) ON_UPDATE_COMMAND_UI(ID_AMIS_SMALLER_FONT, OnUpdateCmdUiSmallerFont) ON_UPDATE_COMMAND_UI(ID_AMIS_BIGGER_FONT, OnUpdateCmdUiBiggerFont) + ON_UPDATE_COMMAND_UI(ID_AMIS_INCREASE_VOLUME, OnUpdateCmdUiGeneral) + ON_UPDATE_COMMAND_UI(ID_AMIS_DECREASE_VOLUME, OnUpdateCmdUiGeneral) //}}AFX_MSG_MAP ON_WM_SIZE() END_MESSAGE_MAP() @@ -482,7 +484,7 @@ void CMainFrame::OnUpdateCmdUiPlayFaster(CCmdUI* pCmdUi) { //TODO: unhardcode the max rate - if (theApp.isBookOpen() && ambulantX::gui::dx::audio_playerX::Instance()->get_rate() < 4.0) + if (theApp.isBookOpen() && ambulantX::gui::dx::audio_playerX::Instance()->get_rate() < 2.0) updateUiCommandState(pCmdUi, true); else updateUiCommandState(pCmdUi, false); @@ -617,4 +619,6 @@ pToolbar->enable(ID_AMIS_NEXT_PAGE_STYLE, theApp.isBookOpen()); pToolbar->enable(ID_AMIS_INCREASE_SECTION_DEPTH, theApp.isBookOpen()); pToolbar->enable(ID_AMIS_DECREASE_SECTION_DEPTH, theApp.isBookOpen()); + pToolbar->enable(ID_AMIS_INCREASE_VOLUME, theApp.isBookOpen()); + pToolbar->enable(ID_AMIS_DECREASE_VOLUME, theApp.isBookOpen()); } \ No newline at end of file Modified: branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp =================================================================== --- branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/AmisGuiMFC2/src/gui/TextRenderBrain.cpp 2008-03-03 06:30:45 UTC (rev 2387) @@ -29,7 +29,8 @@ #include "util/Color.h" #include "util/Log.h" #include <algorithm> - +#include "DtbWithHooks.h" +#include "dtb\Dtb.h" #include <fstream> #include "resource.h" @@ -135,6 +136,10 @@ mpUserCss = MainWndParts::Instance()->mpHtmlView->applyStylesheet (Preferences::Instance()->getAmisCssFile()); scanStylesheetForAdditionalData(mpUserCss); + //TODO: does this ever work? need to test more books. + if (amis::dtb::DtbWithHooks::Instance()->getDaisyVersion() == amis::dtb::DAISY_2005) + MainWndParts::Instance()->mpHtmlView->applyStylesheet(Preferences::Instance()->getZed2005CssFile()); + MainWndParts::Instance()->mpHtmlView->RedrawWindow(); mbWaitForDocumentLoad = false; Modified: branches/amis3/DefaultLangpack/amisAccessibleUi.xml =================================================================== --- branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/DefaultLangpack/amisAccessibleUi.xml 2008-03-03 06:30:45 UTC (rev 2387) @@ -34,19 +34,19 @@ <icon src="./open.png" type="smallIcon"/> <caption> <text id="xx">Open URL...</text> - <audio src=""/> + <audio src="./audio/openurl.mp3"/> </caption> <description> <text id="xx">Open a DAISY publication from a URL</text> - <audio src=""/> + <audio src="./audio/openurl_desc.mp3"/> </description> <accelerator> <text id="xx">Ctrl+U</text> - <audio src=""/> + <audio src="./audio/openurl_ctrlu.mp3"/> </accelerator> <mnemonic> <text id="xx">U</text> - <audio src=""/> + <audio src="./audio/openurl_u.mp3"/> </mnemonic> </action> <!--new action--> @@ -55,15 +55,15 @@ <icon src="./close.png" type="smallIcon"/> <caption> <text id="xx">Close</text> - <audio src=""/> + <audio src="./audio/close.mp3"/> </caption> <description> <text id="xx">Close the DAISY publication.</text> - <audio src=""/> + <audio src="./audio/close_desc.mp3"/> </description> <mnemonic> <text id="xx">C</text> - <audio src=""/> + <audio src="./audio/close_c.mp3"/> </mnemonic> </action> <action mfcid="ID_AMIS_LOAD_CD" widget="menuItem toolbarItem"> Modified: branches/amis3/bin/settings/amisPrefs.xml.default =================================================================== --- branches/amis3/bin/settings/amisPrefs.xml.default 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/bin/settings/amisPrefs.xml.default 2008-03-03 06:30:45 UTC (rev 2387) @@ -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="yes"/> -<entry id="is-self-voicing" value="yes"/> +<entry id="load-last-book" value="no"/> +<entry id="is-self-voicing" value="no"/> <entry id="tts-voice-index" value="0"/> <entry id="pause-on-lost-focus" value="no"/> <entry id="use-tts-not-audio" value="no"/> Modified: branches/amis3/bin/settings/lang/releasedate.mp3 =================================================================== (Binary files differ) Modified: branches/amis3/bin/settings/lang/version.mp3 =================================================================== (Binary files differ) Modified: branches/amis3/installer/main/setup-amis3.nsi =================================================================== --- branches/amis3/installer/main/setup-amis3.nsi 2008-03-03 05:54:57 UTC (rev 2386) +++ branches/amis3/installer/main/setup-amis3.nsi 2008-03-03 06:30:45 UTC (rev 2387) @@ -86,7 +86,6 @@ ;copy the DLLs File "${BIN_DIR}\libambulant_shwin32.dll" - File "${BIN_DIR}\AmisAudio.dll" File "${BIN_DIR}\xerces-c_2_7.dll" File "${BIN_DIR}\libamplugin_pdtb.dll" File "${BIN_DIR}\PdtbIePlugin.dll" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |