[dasher: 11/11] Merge branch 'ctrlmode' of ctrlmode.bundle
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 11/11] Merge branch 'ctrlmode' of ctrlmode.bundle
- Date: Sat, 31 Jul 2010 14:08:08 +0000 (UTC)
commit 49c6d70387734ab8a58a6dec92c73b3e5785927d
Merge: b2528e6 8390588
Author: Patrick Welche <prlw1 cam ac uk>
Date: Sat Jul 31 15:04:56 2010 +0100
Merge branch 'ctrlmode' of ctrlmode.bundle
Data/GUI/dasher.compose.ui | 1 -
Data/GUI/dasher.direct.ui | 1 -
Data/GUI/dasher.fullscreen.ui | 1 -
Data/GUI/dasher.gameWIP.ui | 1 -
Data/GUI/dasher.traditional.ui | 1 -
Data/GUI/dashermaemofullscreen.ui | 1 -
Src/DasherCore/AlphabetManager.cpp | 26 +-
Src/DasherCore/CircleStartHandler.cpp | 2 +-
Src/DasherCore/ControlManager.cpp | 125 +-
Src/DasherCore/ControlManager.h | 55 +-
Src/DasherCore/DasherGameMode.cpp | 31 +-
Src/DasherCore/DasherInterfaceBase.cpp | 127 +-
Src/DasherCore/DasherInterfaceBase.h | 73 +-
Src/DasherCore/DasherModel.h | 2 +-
Src/DasherCore/DefaultFilter.cpp | 8 +-
Src/DasherCore/DefaultFilter.h | 1 +
Src/DasherCore/DynamicFilter.cpp | 4 +-
Src/DasherCore/DynamicFilter.h | 2 +
Src/DasherCore/Event.h | 18 +-
Src/DasherCore/EyetrackerFilter.cpp | 48 +-
Src/DasherCore/EyetrackerFilter.h | 2 +-
Src/DasherCore/InputFilter.h | 2 +
Src/DasherCore/NodeCreationManager.cpp | 43 +-
Src/DasherCore/NodeCreationManager.h | 24 +-
Src/DasherCore/Parameters.h | 17 +-
Src/DasherCore/StylusFilter.cpp | 2 +-
Src/DasherCore/StylusFilter.h | 4 +-
Src/Gtk2/DasherControl.cpp | 30 +-
Src/Gtk2/DasherControl.h | 19 +
Src/Gtk2/GtkDasherControl.cpp | 24 +-
Src/Gtk2/GtkDasherControl.h | 4 -
Src/Gtk2/Makefile.am | 4 +-
Src/Gtk2/Preferences.cpp | 2 +-
Src/Gtk2/Speech.cpp | 79 +
Src/Gtk2/Speech.h | 24 +
Src/Gtk2/dasher_action_speech.cpp | 235 -
Src/Gtk2/dasher_action_speech.h | 31 -
Src/Gtk2/dasher_editor.cpp | 3 -
Src/Gtk2/dasher_editor_internal.cpp | 45 +-
Src/Gtk2/dasher_main.cpp | 85 +-
Src/Gtk2/dasher_main.h | 2 +-
Src/MacOSX/COSXDasherControl.h | 7 +-
Src/MacOSX/COSXDasherControl.mm | 27 +-
Src/MacOSX/Chatter.h | 40 -
Src/MacOSX/Chatter.m | 144 -
Src/MacOSX/Dasher.xcodeproj/project.pbxproj | 17 +-
Src/MacOSX/DasherApp.h | 8 +-
Src/MacOSX/DasherApp.mm | 42 +-
Src/MacOSX/DasherEdit.h | 2 +
Src/MacOSX/DasherEdit.mm | 13 +-
Src/MacOSX/DasherViewAqua.mm | 1 -
Src/MacOSX/DasherViewOpenGL.h | 5 +-
Src/MacOSX/DasherViewOpenGL.mm | 53 +-
Src/MacOSX/English.lproj/InfoPlist.strings | Bin 514 -> 534 bytes
.../English.lproj/Preferences.nib/classes.nib | 37 -
.../English.lproj/Preferences.nib/designable.nib | 5108 +++
Src/MacOSX/English.lproj/Preferences.nib/info.nib | 20 -
.../English.lproj/Preferences.nib/keyedobjects.nib | Bin 36489 -> 50726 bytes
.../English.lproj/Preferences.nib/objects.nib | Bin 18686 -> 0 bytes
Src/MacOSX/Info-Dasher.plist | 4 +-
Src/MacOSX/Queue.h | 21 +
Src/MacOSX/Queue.m | 57 +
Src/MacOSX/Readme.html | 17 +-
Src/Qt/QtDasherScreen.cc | 2 +-
Src/Win32/ActionSpeech.cpp | 58 -
Src/Win32/ActionSpeech.h | 27 -
Src/Win32/Dasher.cpp | 60 +
Src/Win32/Dasher.h | 18 +-
Src/Win32/DasherWindow.cpp | 22 -
Src/Win32/Widgets/AdvancedPage.cpp | 9 +-
Src/Win32/Widgets/Edit.cpp | 100 +-
Src/Win32/Widgets/Edit.h | 11 -
Src/iPhone/Classes/Actions.h | 18 +
Src/iPhone/Classes/Actions.mm | 370 +
Src/iPhone/Classes/CDasherInterfaceBridge.h | 5 +
Src/iPhone/Classes/CDasherInterfaceBridge.mm | 65 +-
Src/iPhone/Classes/CalibrationController.h | 2 +-
Src/iPhone/Classes/CalibrationController.mm | 7 +-
Src/iPhone/Classes/DasherAppDelegate.h | 25 +-
Src/iPhone/Classes/DasherAppDelegate.mm | 154 +-
Src/iPhone/Classes/FliteTTS.h | 43 +
Src/iPhone/Classes/FliteTTS.m | 142 +
Src/iPhone/Classes/IPhoneFilters.cpp | 2 +-
Src/iPhone/Classes/InputMethodSelector.h | 1 +
Src/iPhone/Classes/InputMethodSelector.mm | 30 +-
Src/iPhone/Classes/MiscSettings.mm | 36 +
Src/iPhone/Classes/PlainDragFilter.cpp | 2 +-
Src/iPhone/Dasher.xcodeproj/project.pbxproj | 507 +-
Src/iPhone/bubble.png | Bin 0 -> 1060 bytes
Src/iPhone/bubbletrash.png | Bin 0 -> 863 bytes
Src/iPhone/copy.png | Bin 0 -> 484 bytes
Src/iPhone/flite-1.4-iphone/include/cst_alloc.h | 82 +
Src/iPhone/flite-1.4-iphone/include/cst_audio.h | 118 +
Src/iPhone/flite-1.4-iphone/include/cst_cart.h | 77 +
Src/iPhone/flite-1.4-iphone/include/cst_cg.h | 129 +
Src/iPhone/flite-1.4-iphone/include/cst_diphone.h | 72 +
Src/iPhone/flite-1.4-iphone/include/cst_endian.h | 70 +
Src/iPhone/flite-1.4-iphone/include/cst_error.h | 78 +
Src/iPhone/flite-1.4-iphone/include/cst_features.h | 89 +
.../flite-1.4-iphone/include/cst_ffeatures.h | 65 +
Src/iPhone/flite-1.4-iphone/include/cst_file.h | 121 +
Src/iPhone/flite-1.4-iphone/include/cst_hrg.h | 50 +
Src/iPhone/flite-1.4-iphone/include/cst_item.h | 135 +
Src/iPhone/flite-1.4-iphone/include/cst_lexicon.h | 87 +
Src/iPhone/flite-1.4-iphone/include/cst_lts.h | 78 +
Src/iPhone/flite-1.4-iphone/include/cst_math.h | 51 +
Src/iPhone/flite-1.4-iphone/include/cst_mlpg.h | 248 +
Src/iPhone/flite-1.4-iphone/include/cst_mlsa.h | 133 +
Src/iPhone/flite-1.4-iphone/include/cst_phoneset.h | 76 +
Src/iPhone/flite-1.4-iphone/include/cst_regex.h | 160 +
.../flite-1.4-iphone/include/cst_regex_defs.h | 161 +
Src/iPhone/flite-1.4-iphone/include/cst_relation.h | 72 +
Src/iPhone/flite-1.4-iphone/include/cst_sigpr.h | 51 +
Src/iPhone/flite-1.4-iphone/include/cst_string.h | 72 +
Src/iPhone/flite-1.4-iphone/include/cst_sts.h | 127 +
Src/iPhone/flite-1.4-iphone/include/cst_synth.h | 93 +
.../flite-1.4-iphone/include/cst_tokenstream.h | 120 +
Src/iPhone/flite-1.4-iphone/include/cst_track.h | 70 +
Src/iPhone/flite-1.4-iphone/include/cst_units.h | 62 +
.../flite-1.4-iphone/include/cst_utt_utils.h | 64 +
.../flite-1.4-iphone/include/cst_utterance.h | 74 +
Src/iPhone/flite-1.4-iphone/include/cst_val.h | 155 +
.../flite-1.4-iphone/include/cst_val_const.h | 328 +
Src/iPhone/flite-1.4-iphone/include/cst_val_defs.h | 112 +
Src/iPhone/flite-1.4-iphone/include/cst_vc.h | 101 +
Src/iPhone/flite-1.4-iphone/include/cst_viterbi.h | 113 +
Src/iPhone/flite-1.4-iphone/include/cst_voice.h | 69 +
Src/iPhone/flite-1.4-iphone/include/cst_wave.h | 158 +
Src/iPhone/flite-1.4-iphone/include/flite.h | 123 +
Src/iPhone/flite-1.4-iphone/include/native_audio.h | 160 +
Src/iPhone/flite-1.4-iphone/src/au_none.c | 80 +
Src/iPhone/flite-1.4-iphone/src/au_streaming.c | 94 +
Src/iPhone/flite-1.4-iphone/src/audio.c | 300 +
Src/iPhone/flite-1.4-iphone/src/cst_alloc.c | 260 +
Src/iPhone/flite-1.4-iphone/src/cst_cart.c | 153 +
Src/iPhone/flite-1.4-iphone/src/cst_cg.c | 412 +
Src/iPhone/flite-1.4-iphone/src/cst_diphone.c | 156 +
Src/iPhone/flite-1.4-iphone/src/cst_endian.c | 70 +
Src/iPhone/flite-1.4-iphone/src/cst_error.c | 108 +
Src/iPhone/flite-1.4-iphone/src/cst_features.c | 273 +
Src/iPhone/flite-1.4-iphone/src/cst_ffeature.c | 198 +
Src/iPhone/flite-1.4-iphone/src/cst_ffeatures.c | 751 +
Src/iPhone/flite-1.4-iphone/src/cst_file_stdio.c | 142 +
Src/iPhone/flite-1.4-iphone/src/cst_item.c | 383 +
Src/iPhone/flite-1.4-iphone/src/cst_lexicon.c | 485 +
Src/iPhone/flite-1.4-iphone/src/cst_lpcres.c | 88 +
Src/iPhone/flite-1.4-iphone/src/cst_lts.c | 230 +
Src/iPhone/flite-1.4-iphone/src/cst_mlpg.c | 941 +
Src/iPhone/flite-1.4-iphone/src/cst_mlsa.c | 627 +
Src/iPhone/flite-1.4-iphone/src/cst_phoneset.c | 108 +
Src/iPhone/flite-1.4-iphone/src/cst_regex.c | 167 +
Src/iPhone/flite-1.4-iphone/src/cst_relation.c | 117 +
Src/iPhone/flite-1.4-iphone/src/cst_sigpr.c | 307 +
Src/iPhone/flite-1.4-iphone/src/cst_string.c | 160 +
Src/iPhone/flite-1.4-iphone/src/cst_sts.c | 125 +
Src/iPhone/flite-1.4-iphone/src/cst_synth.c | 636 +
Src/iPhone/flite-1.4-iphone/src/cst_tokenstream.c | 452 +
Src/iPhone/flite-1.4-iphone/src/cst_track.c | 109 +
Src/iPhone/flite-1.4-iphone/src/cst_units.c | 463 +
Src/iPhone/flite-1.4-iphone/src/cst_utt_utils.c | 67 +
Src/iPhone/flite-1.4-iphone/src/cst_utterance.c | 111 +
Src/iPhone/flite-1.4-iphone/src/cst_val.c | 554 +
Src/iPhone/flite-1.4-iphone/src/cst_val_const.c | 173 +
Src/iPhone/flite-1.4-iphone/src/cst_val_user.c | 101 +
Src/iPhone/flite-1.4-iphone/src/cst_vc.c | 275 +
Src/iPhone/flite-1.4-iphone/src/cst_voice.c | 66 +
Src/iPhone/flite-1.4-iphone/src/cst_wave.c | 131 +
Src/iPhone/flite-1.4-iphone/src/cst_wave_io.c | 483 +
Src/iPhone/flite-1.4-iphone/src/cst_wave_utils.c | 138 +
Src/iPhone/flite-1.4-iphone/src/flite.c | 368 +
Src/iPhone/flite-1.4-iphone/src/rateconv.c | 484 +
Src/iPhone/flite-1.4-iphone/src/regexp.c | 1318 +
.../voices/cmu_us_rms/cmu_us_rms.c | 96 +
.../voices/cmu_us_rms/cmu_us_rms_cg.c | 434 +
.../voices/cmu_us_rms/cmu_us_rms_cg_durmodel.c | 5564 +++
.../voices/cmu_us_rms/cmu_us_rms_cg_durmodel.h | 5438 +++
.../voices/cmu_us_rms/cmu_us_rms_cg_f0_trees.c | 7515 ++++
.../voices/cmu_us_rms/cmu_us_rms_cg_f0_trees.h | 5481 +++
.../voices/cmu_us_rms/cmu_us_rms_cg_phonestate.c | 89 +
.../cmu_us_rms/cmu_us_rms_cg_single_mcep_trees.c |25133 +++++++++++++
.../cmu_us_rms/cmu_us_rms_cg_single_mcep_trees.h |23326 ++++++++++++
.../cmu_us_rms/cmu_us_rms_cg_single_params.c |31346 +++++++++++++++++
.../flite-1.4-iphone/voices/cmu_us_rms/stdafx.h | 32 +
.../flite-1.4-iphone/voices/cmu_us_rms/voxdefs.h | 6 +
.../flite-1.4-iphone/voices/cmulex/cmu_lex.c | 374 +
.../flite-1.4-iphone/voices/cmulex/cmu_lex.h | 55 +
.../flite-1.4-iphone/voices/cmulex/cmu_lex_data.c |36977 ++++++++++++++++++++
.../voices/cmulex/cmu_lex_entries.c | 596 +
.../flite-1.4-iphone/voices/cmulex/cmu_lts_model.c |25544 ++++++++++++++
.../flite-1.4-iphone/voices/cmulex/cmu_lts_model.h |25556 ++++++++++++++
.../flite-1.4-iphone/voices/cmulex/cmu_lts_rules.c | 154 +
.../flite-1.4-iphone/voices/cmulex/cmu_postlex.c | 110 +
.../flite-1.4-iphone/voices/usenglish/us_aswd.c | 1568 +
.../voices/usenglish/us_dur_stats.c | 128 +
.../voices/usenglish/us_durz_cart.c | 971 +
.../voices/usenglish/us_durz_cart.h | 973 +
.../flite-1.4-iphone/voices/usenglish/us_expand.c | 410 +
.../flite-1.4-iphone/voices/usenglish/us_f0.h | 59 +
.../voices/usenglish/us_f0_model.c | 225 +
.../flite-1.4-iphone/voices/usenglish/us_f0lr.c | 106 +
.../voices/usenglish/us_ffeatures.c | 173 +
.../voices/usenglish/us_ffeatures.h | 49 +
.../flite-1.4-iphone/voices/usenglish/us_gpos.c | 290 +
.../voices/usenglish/us_int_accent_cart.c | 234 +
.../voices/usenglish/us_int_accent_cart.h | 144 +
.../voices/usenglish/us_int_tone_cart.c | 177 +
.../voices/usenglish/us_int_tone_cart.h | 117 +
.../voices/usenglish/us_nums_cart.c | 127 +
.../voices/usenglish/us_nums_cart.h | 82 +
.../voices/usenglish/us_phoneset.c | 257 +
.../voices/usenglish/us_phrasing_cart.c | 44 +
.../voices/usenglish/us_phrasing_cart.h | 18 +
.../flite-1.4-iphone/voices/usenglish/us_pos.tree | 367 +
.../voices/usenglish/us_pos_cart.c | 397 +
.../voices/usenglish/us_pos_cart.h | 280 +
.../flite-1.4-iphone/voices/usenglish/us_regexes.h | 224 +
.../flite-1.4-iphone/voices/usenglish/us_text.c | 902 +
.../flite-1.4-iphone/voices/usenglish/us_text.h | 64 +
.../flite-1.4-iphone/voices/usenglish/usenglish.c | 89 +
.../flite-1.4-iphone/voices/usenglish/usenglish.h | 70 +
Src/iPhone/paste.png | Bin 0 -> 442 bytes
Src/iPhone/scissors.png | Bin 0 -> 790 bytes
Src/iPhone/spanner.png | Bin 0 -> 632 bytes
Src/iPhone/spanner_lg.png | Bin 0 -> 529 bytes
224 files changed, 226558 insertions(+), 1229 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
