[dasher: 35/38] Changed some module settings descriptions to be closer to android wordings



commit 4cbb3849be33c196517456efdf6e350729dbe009
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Fri Sep 10 13:54:59 2010 +0100

    Changed some module settings descriptions to be closer to android wordings
    
    Inc. adding CStylusFilter::GetSettings

 Src/DasherCore/AlternatingDirectMode.cpp |    2 +-
 Src/DasherCore/ButtonMode.cpp            |    4 ++--
 Src/DasherCore/CompassMode.cpp           |    2 +-
 Src/DasherCore/StylusFilter.cpp          |   11 +++++++++++
 Src/DasherCore/StylusFilter.h            |    1 +
 5 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/Src/DasherCore/AlternatingDirectMode.cpp b/Src/DasherCore/AlternatingDirectMode.cpp
index 9ba5d74..d4740de 100644
--- a/Src/DasherCore/AlternatingDirectMode.cpp
+++ b/Src/DasherCore/AlternatingDirectMode.cpp
@@ -25,7 +25,7 @@ using namespace Dasher;
 
 static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode. */
-  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Zoom steps")},
+  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")},
   /* TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.*/
   {BP_GLOBAL_KEYBOARD, T_BOOL, -1, -1, -1, -1, _("Global keyboard grab")}
 };
diff --git a/Src/DasherCore/ButtonMode.cpp b/Src/DasherCore/ButtonMode.cpp
index 248e9ce..8716d5a 100644
--- a/Src/DasherCore/ButtonMode.cpp
+++ b/Src/DasherCore/ButtonMode.cpp
@@ -25,9 +25,9 @@ using namespace Dasher;
 
 static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode. */
-  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Zoom steps")},
+  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")},
   {LP_BUTTON_SCAN_TIME, T_LONG, 0, 2000, 1, 100, _("Scan time in menu mode (0 to not scan)")},
-  {LP_B, T_LONG, 2, 10, 1, 1, _("Number of boxes")},
+  {LP_B, T_LONG, 2, 10, 1, 1, _("Number of forward boxes")},
   {LP_S, T_LONG, 0, 256, 1, 1, _("Safety margin")},
   /* TRANSLATORS: The boxes (zoom targets) in button mode can either be the same size, or different sizes - this is the extent to which the sizes are allowed to differ from each other. */
   /* XXX PRLW: 128 log(2) = 89, where 2 is the ratio of adjacent boxes
diff --git a/Src/DasherCore/CompassMode.cpp b/Src/DasherCore/CompassMode.cpp
index be2d07c..77c2baf 100644
--- a/Src/DasherCore/CompassMode.cpp
+++ b/Src/DasherCore/CompassMode.cpp
@@ -25,7 +25,7 @@ using namespace Dasher;
 
 static SModuleSettings sSettings[] = {
   /* TRANSLATORS: The number of time steps over which to perform the zooming motion in button mode. */
-  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Zoom steps")},
+  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")},
   /* TRANSLATORS: The zoom factor per press when moving to the right in compass mode. */
   {LP_RIGHTZOOM, T_LONG, 1024, 10240, 1024, 1024, _("Right zoom")},
   /* TRANSLATORS: Intercept keyboard events for 'special' keys even when the Dasher window doesn't have keyboard focus.*/
diff --git a/Src/DasherCore/StylusFilter.cpp b/Src/DasherCore/StylusFilter.cpp
index e215fa7..4cb20e5 100644
--- a/Src/DasherCore/StylusFilter.cpp
+++ b/Src/DasherCore/StylusFilter.cpp
@@ -6,6 +6,11 @@
 
 using namespace Dasher;
 
+static SModuleSettings sSettings[] = {
+  {LP_TAP_TIME, T_LONG, 1, 1000, 1, 25, _("Max time for a 'tap' (anything longer is held)")},
+  {LP_ZOOMSTEPS, T_LONG, 1, 63, 1, 1, _("Frames over which to perform zoom")},
+};
+
 CStylusFilter::CStylusFilter(CSettingsUser *pCreator, CDasherInterfaceBase *pInterface, CFrameRate *pFramerate, ModuleID_t iID, const char *szName)
   : CDefaultFilter(pCreator, pInterface, pFramerate, iID, szName), m_pModel(NULL) {
 }
@@ -45,3 +50,9 @@ void CStylusFilter::ApplyClickTransform(myint &iDasherX, myint &iDasherY, CDashe
 CStartHandler *CStylusFilter::MakeStartHandler() {
   return NULL;
 }
+
+bool CStylusFilter::GetSettings(SModuleSettings **pSettings, int *iCount) {
+  *pSettings = sSettings;
+  *iCount = sizeof(sSettings) / sizeof(sSettings[0]);
+  return true;
+}
diff --git a/Src/DasherCore/StylusFilter.h b/Src/DasherCore/StylusFilter.h
index 670f1ce..a344d30 100644
--- a/Src/DasherCore/StylusFilter.h
+++ b/Src/DasherCore/StylusFilter.h
@@ -26,6 +26,7 @@ class CStylusFilter : public CDefaultFilter, protected CZoomAdjuster {
   virtual void ApplyClickTransform(myint &iDasherX, myint &iDasherY, CDasherView *pView);
   ///Do not make a start handler when in stylus mode
   virtual CStartHandler *MakeStartHandler();
+  virtual bool GetSettings(SModuleSettings **pSettings, int *iCount);
  private:
   unsigned long m_iKeyDownTime;
   CDasherModel *m_pModel;



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