[dasher: 15/16] iPhone port from Alan Lawrence



commit 5aa052551406c2057bcd942bab8b02c7e9762940
Merge: d1903b0... 911cba1...
Author: Patrick Welche <prlw1 cam ac uk>
Date:   Tue Dec 1 15:40:52 2009 +0000

    iPhone port from Alan Lawrence
    
    Merge branch from iphone2.bundle (master)
    
    Changes also include simplifying state/lock management
    functions / CPPMnode access, and tidying training text
    (and more).

 Data/alphabets/alphabet.finnish2.xml               |    4 +-
 Data/alphabets/alphabet.german.xml                 |    4 +-
 Data/alphabets/alphabet.japanese.canna.xml         |    1 -
 Data/alphabets/alphabet.russian.xml                |    4 +-
 ...aining_basque_EU.txt => training_basque_ES.txt} |    0
 Data/training/training_bengali_bn.txt              | 1333 -
 Data/training/training_czechC_CS.txt               | 4012 ++
 Data/training/training_englishLC_GB.txt            |  664 +
 Data/training/training_frenchC_FR.txt              | 2546 ++
 Data/training/training_italianC_IT.txt             |  875 +
 Data/training/training_portugueseC_BR.txt          | 2779 ++
 Data/training/training_spanishC_ES.txt             |43279 ++++++++++++++++++++
 Src/Common/SBTree.cpp                              |   94 +
 Src/Common/SBTree.h                                |   32 +
 ...s-non-linearity-a-parameter-rather-than-a.patch |   81 +
 Src/DasherCore/Alphabet/AlphIO.cpp                 |    2 +-
 Src/DasherCore/Alphabet/AlphIO.h                   |    2 +-
 Src/DasherCore/ButtonMode.cpp                      |   21 +
 Src/DasherCore/ButtonMode.h                        |    3 +
 Src/DasherCore/ColourIO.cpp                        |    2 +-
 Src/DasherCore/ColourIO.h                          |    2 +-
 Src/DasherCore/DasherButtons.cpp                   |    6 +-
 Src/DasherCore/DasherInterfaceBase.cpp             |  127 +-
 Src/DasherCore/DasherInterfaceBase.h               |   30 -
 Src/DasherCore/DasherView.cpp                      |    5 -
 Src/DasherCore/DasherViewSquare.cpp                |   44 +-
 Src/DasherCore/DasherViewSquare.h                  |    1 +
 Src/DasherCore/DefaultFilter.h                     |    4 +-
 .../LanguageModelling/CTWLanguageModel.h           |    4 -
 .../LanguageModelling/DictLanguageModel.h          |    4 +-
 .../LanguageModelling/JapaneseLanguageModel.cpp    |   30 +-
 .../LanguageModelling/JapaneseLanguageModel.h      |   59 +-
 Src/DasherCore/LanguageModelling/LanguageModel.h   |   14 -
 .../LanguageModelling/MixtureLanguageModel.h       |   10 -
 .../LanguageModelling/PPMLanguageModel.cpp         |  210 +-
 .../LanguageModelling/PPMLanguageModel.h           |  132 +-
 .../LanguageModelling/PPMPYLanguageModel.cpp       |   88 +-
 .../LanguageModelling/PPMPYLanguageModel.h         |  107 +-
 .../LanguageModelling/WordLanguageModel.h          |    4 +-
 Src/DasherCore/NodeCreationManager.cpp             |   33 +-
 Src/DasherCore/OneDimensionalFilter.cpp            |   11 +-
 Src/DasherCore/OneDimensionalFilter.h              |    9 +-
 Src/DasherCore/Parameters.h                        |   47 +-
 Src/DasherCore/Trainer.cpp                         |   47 +-
 Src/DasherCore/Trainer.h                           |    7 +-
 Src/DasherCore/TrainingHelper.h                    |    6 +-
 Src/DasherCore/TwoButtonDynamicFilter.cpp          |   19 +
 Src/DasherCore/TwoButtonDynamicFilter.h            |    4 +
 Src/iPhone/.gitignore                              |    1 +
 Src/iPhone/Classes/AlphabetLetter.h                |   20 +
 Src/iPhone/Classes/AlphabetLetter.mm               |  116 +
 Src/iPhone/Classes/CDasherInterfaceBridge.h        |   79 +
 Src/iPhone/Classes/CDasherInterfaceBridge.mm       |  305 +
 Src/iPhone/Classes/CDasherScreenBridge.h           |  119 +
 Src/iPhone/Classes/CDasherScreenBridge.mm          |   79 +
 Src/iPhone/Classes/COSXSettingsStore.h             |   39 +
 Src/iPhone/Classes/COSXSettingsStore.mm            |  112 +
 Src/iPhone/Classes/CalibrationController.h         |   43 +
 Src/iPhone/Classes/CalibrationController.mm        |  471 +
 Src/iPhone/Classes/DasherAppDelegate.h             |   45 +
 Src/iPhone/Classes/DasherAppDelegate.mm            |  338 +
 Src/iPhone/Classes/DasherScreenCallbacks.h         |   27 +
 Src/iPhone/Classes/DasherUtil.h                    |   16 +
 Src/iPhone/Classes/DasherUtil.mm                   |   49 +
 Src/iPhone/Classes/EAGLView.h                      |   46 +
 Src/iPhone/Classes/EAGLView.mm                     |  335 +
 Src/iPhone/Classes/IPhoneFilters.cpp               |   81 +
 Src/iPhone/Classes/IPhoneFilters.h                 |   37 +
 Src/iPhone/Classes/IPhoneInputs.h                  |  101 +
 Src/iPhone/Classes/IPhoneInputs.mm                 |  111 +
 Src/iPhone/Classes/InputMethodSelector.h           |   19 +
 Src/iPhone/Classes/InputMethodSelector.mm          |  226 +
 Src/iPhone/Classes/LanguagesController.h           |   16 +
 Src/iPhone/Classes/LanguagesController.mm          |   30 +
 Src/iPhone/Classes/MiscSettings.h                  |   16 +
 Src/iPhone/Classes/MiscSettings.mm                 |  139 +
 Src/iPhone/Classes/PlainDragFilter.cpp             |   38 +
 Src/iPhone/Classes/PlainDragFilter.h               |   29 +
 Src/iPhone/Classes/StringParamController.h         |   20 +
 Src/iPhone/Classes/StringParamController.mm        |  182 +
 Src/iPhone/Classes/TextView.h                      |   16 +
 Src/iPhone/Classes/TextView.mm                     |   32 +
 Src/iPhone/Classes/Vec3.cpp                        |   45 +
 Src/iPhone/Classes/Vec3.h                          |   30 +
 Src/iPhone/Credits.html                            |   17 +
 Src/iPhone/Dasher.png                              |  Bin 0 -> 6093 bytes
 Src/iPhone/Dasher.xcodeproj/.gitignore             |    2 +
 Src/iPhone/Dasher.xcodeproj/project.pbxproj        | 1402 +
 Src/iPhone/DasherApp.icns                          |  Bin 0 -> 6618 bytes
 Src/iPhone/Dasher_Prefix.pch                       |    8 +
 Src/iPhone/Dasher_small.png                        |  Bin 0 -> 659 bytes
 Src/iPhone/Default.png                             |  Bin 0 -> 15915 bytes
 Src/iPhone/Info-Dasher.plist                       |   32 +
 Src/iPhone/Info.plist                              |   30 +
 Src/iPhone/Locked.png                              |  Bin 0 -> 27258 bytes
 Src/iPhone/MainWindow.xib                          |  153 +
 Src/iPhone/Screenshot.png                          |  Bin 0 -> 16586 bytes
 Src/iPhone/Screenshot_no_tb.png                    |  Bin 0 -> 14473 bytes
 Src/iPhone/cog.png                                 |  Bin 0 -> 302 bytes
 Src/iPhone/config.h                                |    1 +
 Src/iPhone/expat_config.h                          |   93 +
 Src/iPhone/globe.png                               |  Bin 0 -> 728 bytes
 Src/iPhone/lib/ascii.h                             |   92 +
 Src/iPhone/lib/asciitab.h                          |   36 +
 Src/iPhone/lib/expat.dsp                           |  185 +
 Src/iPhone/lib/expat.h                             | 1014 +
 Src/iPhone/lib/expat_external.h                    |  115 +
 Src/iPhone/lib/expat_static.dsp                    |  162 +
 Src/iPhone/lib/expatw.dsp                          |  185 +
 Src/iPhone/lib/expatw_static.dsp                   |  162 +
 Src/iPhone/lib/iasciitab.h                         |   37 +
 Src/iPhone/lib/internal.h                          |   73 +
 Src/iPhone/lib/latin1tab.h                         |   36 +
 Src/iPhone/lib/libexpat.def                        |   73 +
 Src/iPhone/lib/libexpatw.def                       |   73 +
 Src/iPhone/lib/nametab.h                           |  150 +
 Src/iPhone/lib/utf8tab.h                           |   37 +
 Src/iPhone/lib/xmlparse.c                          | 6287 +++
 Src/iPhone/lib/xmlrole.c                           | 1336 +
 Src/iPhone/lib/xmlrole.h                           |  114 +
 Src/iPhone/lib/xmltok.c                            | 1651 +
 Src/iPhone/lib/xmltok.h                            |  316 +
 Src/iPhone/lib/xmltok_impl.c                       | 1783 +
 Src/iPhone/lib/xmltok_impl.h                       |   46 +
 Src/iPhone/lib/xmltok_ns.c                         |  115 +
 Src/iPhone/mail.png                                |  Bin 0 -> 248 bytes
 Src/iPhone/main.m                                  |   17 +
 Src/iPhone/misc.png                                |  Bin 0 -> 198 bytes
 Src/iPhone/palette.png                             |  Bin 0 -> 452 bytes
 Src/iPhone/pen.pdf                                 |  Bin 0 -> 33317 bytes
 Src/iPhone/pen.png                                 |  Bin 0 -> 4954 bytes
 Src/iPhone/tilt.pdf                                |  Bin 0 -> 9213 bytes
 Src/iPhone/tilt.png                                |  Bin 0 -> 5016 bytes
 133 files changed, 74195 insertions(+), 1848 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]