[dasher: 28/28] Merge ../ourdasher
- From: Patrick Welche <pwelche src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dasher: 28/28] Merge ../ourdasher
- Date: Tue, 22 Nov 2011 17:05:01 +0000 (UTC)
commit c5a11c7900cddf901abb2583bcbb4b8780a8938e
Merge: 1408393 1faa979
Author: Patrick Welche <prlw1 cam ac uk>
Date: Tue Nov 22 17:02:16 2011 +0000
Merge ../ourdasher
Src/Common/Globber.cpp | 35 +
Src/Common/Globber.h | 17 +
Src/Common/Makefile.am | 2 +
Src/Common/OpenGLScreen.h | 11 +-
Src/Common/OpenGLScreen.mm | 31 +-
Src/DasherCore/AbstractXMLParser.cpp | 55 +-
Src/DasherCore/AbstractXMLParser.h | 40 +-
Src/DasherCore/Alphabet/AlphIO.cpp | 19 +-
Src/DasherCore/Alphabet/AlphIO.h | 9 +-
Src/DasherCore/AlphabetManager.cpp | 93 +-
Src/DasherCore/AlphabetManager.h | 27 +-
Src/DasherCore/AlternatingDirectMode.cpp | 2 +-
Src/DasherCore/BasicLog.cpp | 6 +-
Src/DasherCore/BasicLog.h | 4 +-
Src/DasherCore/ButtonMode.cpp | 6 +-
Src/DasherCore/ButtonMode.h | 2 +-
Src/DasherCore/ButtonMultiPress.cpp | 33 +-
Src/DasherCore/ButtonMultiPress.h | 22 +-
Src/DasherCore/CannaConversionHelper.cpp | 2 +-
Src/DasherCore/CannaConversionHelper.h | 4 +-
Src/DasherCore/CircleStartHandler.cpp | 69 +-
Src/DasherCore/CircleStartHandler.h | 10 +-
Src/DasherCore/ClickFilter.cpp | 10 +-
Src/DasherCore/ClickFilter.h | 5 +-
Src/DasherCore/ColourIO.cpp | 20 +-
Src/DasherCore/ColourIO.h | 13 +-
Src/DasherCore/ControlManager.cpp | 198 ++--
Src/DasherCore/ControlManager.h | 34 +-
Src/DasherCore/ConversionHelper.cpp | 220 -----
Src/DasherCore/ConversionHelper.h | 147 ---
Src/DasherCore/ConversionManager.cpp | 189 +++-
Src/DasherCore/ConversionManager.h | 124 ++-
Src/DasherCore/ConvertingAlphMgr.cpp | 19 +-
Src/DasherCore/ConvertingAlphMgr.h | 2 +-
Src/DasherCore/DashIntfScreenMsgs.cpp | 53 +-
Src/DasherCore/DashIntfScreenMsgs.h | 7 +-
Src/DasherCore/DasherButtons.cpp | 10 +-
Src/DasherCore/DasherButtons.h | 4 +-
Src/DasherCore/DasherCore_vc80.vcproj | 8 -
Src/DasherCore/DasherInterfaceBase.cpp | 141 ++--
Src/DasherCore/DasherInterfaceBase.h | 143 ++--
Src/DasherCore/DasherModel.cpp | 256 +++---
Src/DasherCore/DasherModel.h | 65 +-
Src/DasherCore/DasherNode.cpp | 32 +-
Src/DasherCore/DasherNode.h | 45 +-
Src/DasherCore/DasherView.h | 2 +
Src/DasherCore/DasherViewSquare.cpp | 32 +-
Src/DasherCore/DasherViewSquare.h | 12 +-
Src/DasherCore/DefaultFilter.cpp | 75 +-
Src/DasherCore/DefaultFilter.h | 6 +-
Src/DasherCore/DemoFilter.cpp | 131 +++
Src/DasherCore/DemoFilter.h | 29 +
Src/DasherCore/DynamicButtons.cpp | 77 +-
Src/DasherCore/DynamicButtons.h | 43 +-
Src/DasherCore/DynamicFilter.cpp | 44 +-
Src/DasherCore/DynamicFilter.h | 35 +-
Src/DasherCore/FileWordGenerator.cpp | 13 +-
Src/DasherCore/FileWordGenerator.h | 29 +-
Src/DasherCore/FrameRate.cpp | 23 +-
Src/DasherCore/FrameRate.h | 23 +-
Src/DasherCore/GameModule.cpp | 173 +++-
Src/DasherCore/GameModule.h | 26 +-
Src/DasherCore/IMEConversionHelper.cpp | 2 +-
Src/DasherCore/IMEConversionHelper.h | 4 +-
Src/DasherCore/InputFilter.h | 48 +-
Src/DasherCore/Makefile.am | 5 +-
Src/DasherCore/MandarinAlphMgr.cpp | 63 +-
Src/DasherCore/MandarinAlphMgr.h | 16 +-
Src/DasherCore/Messages.cpp | 50 +
Src/DasherCore/Messages.h | 4 +
Src/DasherCore/NodeCreationManager.cpp | 85 +-
Src/DasherCore/NodeCreationManager.h | 6 +-
Src/DasherCore/OneButtonDynamicFilter.cpp | 9 +-
Src/DasherCore/OneButtonDynamicFilter.h | 2 +-
Src/DasherCore/OneButtonFilter.cpp | 20 +-
Src/DasherCore/OneButtonFilter.h | 5 +-
Src/DasherCore/OneDimensionalFilter.cpp | 31 +-
Src/DasherCore/Parameters.cpp | 265 +++---
Src/DasherCore/Parameters.h | 18 +-
Src/DasherCore/SettingsStore.cpp | 50 +-
Src/DasherCore/StartHandler.h | 3 +-
Src/DasherCore/StylusFilter.cpp | 28 +-
Src/DasherCore/StylusFilter.h | 7 +-
Src/DasherCore/Trainer.cpp | 90 +--
Src/DasherCore/Trainer.h | 18 +-
Src/DasherCore/TwoBoxStartHandler.cpp | 11 +-
Src/DasherCore/TwoBoxStartHandler.h | 4 +-
Src/DasherCore/TwoButtonDynamicFilter.cpp | 22 +-
Src/DasherCore/TwoButtonDynamicFilter.h | 6 +-
Src/DasherCore/TwoPushDynamicFilter.cpp | 221 ++---
Src/DasherCore/TwoPushDynamicFilter.h | 22 +-
Src/DasherCore/UserLog.cpp | 7 +-
Src/DasherCore/UserLog.h | 2 +-
Src/DasherCore/UserLogBase.cpp | 15 +-
Src/DasherCore/UserLogBase.h | 9 +-
Src/Gtk2/DasherControl.cpp | 128 +--
Src/Gtk2/DasherControl.h | 14 +-
Src/Gtk2/GenerateSchema.cpp | 30 +-
Src/Gtk2/GtkDasherControl.cpp | 15 +-
Src/Gtk2/GtkDasherControl.h | 5 +-
Src/Gtk2/dasher_editor.cpp | 6 +-
Src/Gtk2/dasher_editor.h | 8 +-
Src/Gtk2/dasher_editor_internal.cpp | 11 +-
Src/Gtk2/dasher_main.cpp | 15 +-
Src/MacOSX/COSXDasherControl.h | 14 +-
Src/MacOSX/COSXDasherControl.mm | 92 +--
Src/MacOSX/COSXMouseInput.h | 2 +-
Src/MacOSX/Dasher.xcodeproj/project.pbxproj | 41 +-
Src/MacOSX/DasherApp.h | 1 -
Src/MacOSX/DasherApp.mm | 34 +-
Src/MacOSX/DasherTextView.h | 4 +
Src/MacOSX/DasherTextView.mm | 3 +-
Src/MacOSX/DasherViewOpenGL.mm | 33 +-
.../English.lproj/MainMenu.nib/designable.nib | 1008 ++------------------
.../English.lproj/MainMenu.nib/keyedobjects.nib | Bin 33605 -> 27930 bytes
Src/MacOSX/PreferencesController.mm | 6 +-
Src/MacOSX/TODO | 2 +-
Src/Win32/Dasher.cpp | 103 +--
Src/Win32/Dasher.h | 5 +-
Src/iPhone/Classes/CDasherInterfaceBridge.h | 16 +-
Src/iPhone/Classes/CDasherInterfaceBridge.mm | 109 +--
Src/iPhone/Classes/DasherAppDelegate.mm | 12 +-
Src/iPhone/Classes/EAGLView.h | 2 +-
Src/iPhone/Classes/EAGLView.mm | 9 +-
Src/iPhone/Classes/IPhoneFilters.h | 4 +-
Src/iPhone/Classes/IPhoneFilters.mm | 22 +-
Src/iPhone/Dasher.xcodeproj/project.pbxproj | 22 +-
127 files changed, 2587 insertions(+), 3354 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
