GNOME.org
 

[dasher: 21/28] Remove 'bool persistent' field of all parameter types in DasherCore

commit 5d5c2f16cfb7a4923cc97f8759d69971f162643b
Author: Alan Lawrence <acl33 inf phy cam ac uk>
Date:   Wed Sep 28 17:24:45 2011 +0100

    Remove 'bool persistent' field of all parameter types in DasherCore
    
    Common/app_{b,s,l}p_table unaffected. Update Gtk2 GenerateSchema.

 Src/DasherCore/Parameters.cpp    |  262 +++++++++++++++++++-------------------
 Src/DasherCore/Parameters.h      |    3 -
 Src/DasherCore/SettingsStore.cpp |   50 +++-----
 Src/Gtk2/GenerateSchema.cpp      |   30 ++---
 4 files changed, 160 insertions(+), 185 deletions(-)
---
diff --git a/Src/DasherCore/Parameters.cpp b/Src/DasherCore/Parameters.cpp
index ec92aa2..1175dec 100644
--- a/Src/DasherCore/Parameters.cpp
+++ b/Src/DasherCore/Parameters.cpp
@@ -6,170 +6,170 @@ namespace Dasher{
 // The important thing here is that these are in the same order
 // as the enum declarations (could add check in class that enforces this instead)
 const bp_table boolparamtable[] = {
-  {BP_DRAW_MOUSE_LINE, "DrawMouseLine", PERS, true, "Draw Mouse Line"},
-  {BP_DRAW_MOUSE, "DrawMouse", PERS, false, "Draw Mouse Position"},
-  {BP_CURVE_MOUSE_LINE, "CurveMouseLine", PERS, false, "Curve mouse line according to screen nonlinearity"},
+  {BP_DRAW_MOUSE_LINE, "DrawMouseLine", true, "Draw Mouse Line"},
+  {BP_DRAW_MOUSE, "DrawMouse", false, "Draw Mouse Position"},
+  {BP_CURVE_MOUSE_LINE, "CurveMouseLine", false, "Curve mouse line according to screen nonlinearity"},
 #ifdef WITH_MAEMO
-  {BP_SHOW_SLIDER, "ShowSpeedSlider", PERS, false, "ShowSpeedSlider"},
+  {BP_SHOW_SLIDER, "ShowSpeedSlider", false, "ShowSpeedSlider"},
 #else
-  {BP_SHOW_SLIDER, "ShowSpeedSlider", PERS, true, "ShowSpeedSlider"},
+  {BP_SHOW_SLIDER, "ShowSpeedSlider", true, "ShowSpeedSlider"},
 #endif
-  {BP_START_MOUSE, "StartOnLeft", PERS, true, "StartOnLeft"},
-  {BP_START_SPACE, "StartOnSpace", PERS, false, "StartOnSpace"},
-  {BP_STOP_IDLE, "StopOnIdle", PERS, false, "StopOnIdle"},
-  {BP_CONTROL_MODE, "ControlMode", PERS, false, "ControlMode"},
-  {BP_COLOUR_MODE, "ColourMode", PERS, true, "ColourMode"},
-  {BP_MOUSEPOS_MODE, "StartOnMousePosition", PERS, false, "StartOnMousePosition"},
-  {BP_PALETTE_CHANGE, "PaletteChange", PERS, true, "PaletteChange"},
-  {BP_TURBO_MODE, "TurboMode", PERS, true, "Boost speed when holding key1 or right mouse button"},
-  {BP_AUTOCALIBRATE, "Autocalibrate", PERS, false, "Automatically learn TargetOffset e.g. gazetracking"},
-  {BP_REMAP_XTREME, "RemapXtreme", PERS, false, "Pointer at extreme Y translates more and zooms less"},
-  {BP_LM_DICTIONARY, "Dictionary", PERS, true, "Whether the word-based language model uses a dictionary"},
-  {BP_LM_LETTER_EXCLUSION, "LetterExclusion", PERS, true, "Whether to do letter exclusion in the word-based model"},
-  {BP_AUTO_SPEEDCONTROL, "AutoSpeedControl", PERS, true, "AutoSpeedControl"},
-  {BP_LM_ADAPTIVE, "LMAdaptive", PERS, true, "Whether language model should learn as you enter text"},
-  {BP_SOCKET_INPUT_ENABLE, "SocketInputEnable", PERS, false, "Read pointer coordinates from network socket instead of mouse"},
-  {BP_SOCKET_DEBUG, "SocketInputDebug", PERS, false, "Print information about socket input processing to console"},
-  {BP_CIRCLE_START, "CircleStart", PERS, false, "Start on circle mode"},
-  {BP_GLOBAL_KEYBOARD, "GlobalKeyboard", PERS, false, "Whether to assume global control of the keyboard"},
+  {BP_START_MOUSE, "StartOnLeft", true, "StartOnLeft"},
+  {BP_START_SPACE, "StartOnSpace", false, "StartOnSpace"},
+  {BP_STOP_IDLE, "StopOnIdle", false, "StopOnIdle"},
+  {BP_CONTROL_MODE, "ControlMode", false, "ControlMode"},
+  {BP_COLOUR_MODE, "ColourMode", true, "ColourMode"},
+  {BP_MOUSEPOS_MODE, "StartOnMousePosition", false, "StartOnMousePosition"},
+  {BP_PALETTE_CHANGE, "PaletteChange", true, "PaletteChange"},
+  {BP_TURBO_MODE, "TurboMode", true, "Boost speed when holding key1 or right mouse button"},
+  {BP_AUTOCALIBRATE, "Autocalibrate", false, "Automatically learn TargetOffset e.g. gazetracking"},
+  {BP_REMAP_XTREME, "RemapXtreme", false, "Pointer at extreme Y translates more and zooms less"},
+  {BP_LM_DICTIONARY, "Dictionary", true, "Whether the word-based language model uses a dictionary"},
+  {BP_LM_LETTER_EXCLUSION, "LetterExclusion", true, "Whether to do letter exclusion in the word-based model"},
+  {BP_AUTO_SPEEDCONTROL, "AutoSpeedControl", true, "AutoSpeedControl"},
+  {BP_LM_ADAPTIVE, "LMAdaptive", true, "Whether language model should learn as you enter text"},
+  {BP_SOCKET_INPUT_ENABLE, "SocketInputEnable", false, "Read pointer coordinates from network socket instead of mouse"},
+  {BP_SOCKET_DEBUG, "SocketInputDebug", false, "Print information about socket input processing to console"},
+  {BP_CIRCLE_START, "CircleStart", false, "Start on circle mode"},
+  {BP_GLOBAL_KEYBOARD, "GlobalKeyboard", false, "Whether to assume global control of the keyboard"},
 #ifdef WITH_MAEMO
-  {BP_NONLINEAR_Y, "NonlinearY", PERS, false, "Apply nonlinearities to Y axis (i.e. compress top &amp; bottom)"},
+  {BP_NONLINEAR_Y, "NonlinearY", false, "Apply nonlinearities to Y axis (i.e. compress top &amp; bottom)"},
 #else
-  {BP_NONLINEAR_Y, "NonlinearY", PERS, true, "Apply nonlinearities to Y axis (i.e. compress top &amp; bottom)"},
+  {BP_NONLINEAR_Y, "NonlinearY", true, "Apply nonlinearities to Y axis (i.e. compress top &amp; bottom)"},
 #endif
-  {BP_STOP_OUTSIDE, "PauseOutside", PERS, false, "Whether to stop when pointer leaves canvas area"},
+  {BP_STOP_OUTSIDE, "PauseOutside", false, "Whether to stop when pointer leaves canvas area"},
 #ifdef TARGET_OS_IPHONE
-  {BP_BACKOFF_BUTTON, "BackoffButton", PERS, false, "Whether to enable the extra backoff button in dynamic mode"},
+  {BP_BACKOFF_BUTTON, "BackoffButton", false, "Whether to enable the extra backoff button in dynamic mode"},
 #else
-  {BP_BACKOFF_BUTTON, "BackoffButton", PERS, true, "Whether to enable the extra backoff button in dynamic mode"},
+  {BP_BACKOFF_BUTTON, "BackoffButton", true, "Whether to enable the extra backoff button in dynamic mode"},
 #endif
-  {BP_TWOBUTTON_REVERSE, "TwoButtonReverse", PERS, false, "Reverse the up/down buttons in two button mode"},
-  {BP_2B_INVERT_DOUBLE, "TwoButtonInvertDouble", PERS, false, "Double-press acts as opposite button in two-button mode"},
-  {BP_SLOW_START, "SlowStart", PERS, false, "Start at low speed and increase"},
-  {BP_COPY_ALL_ON_STOP, "CopyOnStop", PERS, false, "Copy all text to clipboard whenever we stop"},
-  {BP_SPEAK_ALL_ON_STOP, "SpeakOnStop", PERS, false, "Speak all text whenever we stop"},
-  {BP_SPEAK_WORDS, "SpeakWords", PERS, false, "Speak words as they are written"},
-  {BP_CONTROL_MODE_HAS_HALT, "ControlHasHalt", PERS, false, "Force Control Mode to provide a stop action (triggering clipboard/speech)"},
+  {BP_TWOBUTTON_REVERSE, "TwoButtonReverse", false, "Reverse the up/down buttons in two button mode"},
+  {BP_2B_INVERT_DOUBLE, "TwoButtonInvertDouble", false, "Double-press acts as opposite button in two-button mode"},
+  {BP_SLOW_START, "SlowStart", false, "Start at low speed and increase"},
+  {BP_COPY_ALL_ON_STOP, "CopyOnStop", false, "Copy all text to clipboard whenever we stop"},
+  {BP_SPEAK_ALL_ON_STOP, "SpeakOnStop", false, "Speak all text whenever we stop"},
+  {BP_SPEAK_WORDS, "SpeakWords", false, "Speak words as they are written"},
+  {BP_CONTROL_MODE_HAS_HALT, "ControlHasHalt", false, "Force Control Mode to provide a stop action (triggering clipboard/speech)"},
 #ifdef TARGET_OS_MAC
-  {BP_CONTROL_MODE_HAS_EDIT, "ControlHasEdit", PERS, false, "Provide editing functions in control mode (forward &amp; backward movement &amp; deletion)"},
+  {BP_CONTROL_MODE_HAS_EDIT, "ControlHasEdit", false, "Provide editing functions in control mode (forward &amp; backward movement &amp; deletion)"},
 #else
-  {BP_CONTROL_MODE_HAS_EDIT, "ControlHasEdit", PERS, true, "Provide editing functions in control mode (forward &amp; backward movement &amp; deletion)"},
+  {BP_CONTROL_MODE_HAS_EDIT, "ControlHasEdit", true, "Provide editing functions in control mode (forward &amp; backward movement &amp; deletion)"},
 #endif
-  {BP_CONTROL_MODE_HAS_COPY, "ControlHasCopy", PERS, true, "Provide copy-to-clipboard actions in Control Mode (if platforms supports)"},
-  {BP_CONTROL_MODE_HAS_SPEECH, "ControlHasSpeech", PERS, true, "Provide speech actions in Control Mode (if platform supports)"},
-  {BP_GAME_HELP_DRAW_PATH, "GameDrawPath", PERS, true, "When we give help, show the shortest path to the target sentence"},
+  {BP_CONTROL_MODE_HAS_COPY, "ControlHasCopy", true, "Provide copy-to-clipboard actions in Control Mode (if platforms supports)"},
+  {BP_CONTROL_MODE_HAS_SPEECH, "ControlHasSpeech", true, "Provide speech actions in Control Mode (if platform supports)"},
+  {BP_GAME_HELP_DRAW_PATH, "GameDrawPath", true, "When we give help, show the shortest path to the target sentence"},
 };
 
 const lp_table longparamtable[] = {
-  {LP_ORIENTATION, "ScreenOrientation", PERS, -2, "Screen Orientation"},
-  {LP_MAX_BITRATE, "MaxBitRateTimes100", PERS, 80, "Max Bit Rate Times 100"},
-  {LP_FRAMERATE, "FrameRate", PERS, 3200, "Decaying average of last known frame rates, *100"},
-  {LP_VIEW_ID, "ViewID", PERS, 1, "ViewID"},
-  {LP_LANGUAGE_MODEL_ID, "LanguageModelID", PERS, 0, "LanguageModelID"},
-  {LP_DASHER_FONTSIZE, "DasherFontSize", PERS, 2, "DasherFontSize"},
-  {LP_MESSAGE_FONTSIZE, "MessageFontSize", PERS, 14, "Size of font for messages (in points)"},
-  {LP_SHAPE_TYPE, "RenderStyle", PERS, 1, "Shapes to render in (0/1=disjoint/overlapping rects, 2/3=triangles/truncated, 4=quadrics, 5=circles)"},
-  {LP_UNIFORM, "UniformTimes1000", PERS, 50, "UniformTimes1000"},
-  {LP_YSCALE, "YScaling", PERS, 0, "YScaling"},
-  {LP_MOUSEPOSDIST, "MousePositionBoxDistance", PERS, 50, "MousePositionBoxDistance"},
-  {LP_STOP_IDLETIME, "StopIdleTime", PERS, 1000, "StopIdleTime" },
-  {LP_PY_PROB_SORT_THRES, "PYProbabilitySortThreshold", PERS, 85, "Sort converted syms in descending probability order up to this %age"},
-  {LP_MESSAGE_TIME, "MessageTime", PERS, 2500, "Time for which non-modal messages are displayed, in ms"},
-  {LP_LM_MAX_ORDER, "LMMaxOrder", PERS, 5, "LMMaxOrder"},
-  {LP_LM_EXCLUSION, "LMExclusion", PERS, 0, "LMExclusion"},
-  {LP_LM_UPDATE_EXCLUSION, "LMUpdateExclusion", PERS, 1, "LMUpdateExclusion"},
-  {LP_LM_ALPHA, "LMAlpha", PERS, 49, "LMAlpha"},
-  {LP_LM_BETA, "LMBeta", PERS, 77, "LMBeta"},
-  {LP_LM_MIXTURE, "LMMixture", PERS, 50, "LMMixture"},
-  {LP_LINE_WIDTH, "LineWidth", PERS, 1, "Width to draw crosshair and mouse line"},
-  {LP_GEOMETRY, "Geometry", PERS, 0, "Screen geometry (mostly for tall thin screens) - 0=old-style, 1=square no-xhair, 2=squish, 3=squish+log"},
-  {LP_LM_WORD_ALPHA, "WordAlpha", PERS, 50, "Alpha value for word-based model"},
-  {LP_USER_LOG_LEVEL_MASK, "UserLogLevelMask", PERS, 0, "Controls level of user logging, 0 = none, 1 = short, 2 = detailed, 3 = both"},
-  {LP_ZOOMSTEPS, "Zoomsteps", PERS, 32, "Integerised ratio of zoom size for click/button mode, denom 64."},
-  {LP_B, "ButtonMenuBoxes", PERS, 4, "Number of boxes for button menu mode"},
-  {LP_S, "ButtonMenuSafety", PERS, 25, "Safety parameter for button mode, in percent."},
+  {LP_ORIENTATION, "ScreenOrientation", -2, "Screen Orientation"},
+  {LP_MAX_BITRATE, "MaxBitRateTimes100", 80, "Max Bit Rate Times 100"},
+  {LP_FRAMERATE, "FrameRate", 3200, "Decaying average of last known frame rates, *100"},
+  {LP_VIEW_ID, "ViewID", 1, "ViewID"},
+  {LP_LANGUAGE_MODEL_ID, "LanguageModelID", 0, "LanguageModelID"},
+  {LP_DASHER_FONTSIZE, "DasherFontSize", 2, "DasherFontSize"},
+  {LP_MESSAGE_FONTSIZE, "MessageFontSize", 14, "Size of font for messages (in points)"},
+  {LP_SHAPE_TYPE, "RenderStyle", 1, "Shapes to render in (0/1=disjoint/overlapping rects, 2/3=triangles/truncated, 4=quadrics, 5=circles)"},
+  {LP_UNIFORM, "UniformTimes1000", 50, "UniformTimes1000"},
+  {LP_YSCALE, "YScaling", 0, "YScaling"},
+  {LP_MOUSEPOSDIST, "MousePositionBoxDistance", 50, "MousePositionBoxDistance"},
+  {LP_STOP_IDLETIME, "StopIdleTime", 1000, "StopIdleTime" },
+  {LP_PY_PROB_SORT_THRES, "PYProbabilitySortThreshold", 85, "Sort converted syms in descending probability order up to this %age"},
+  {LP_MESSAGE_TIME, "MessageTime", 2500, "Time for which non-modal messages are displayed, in ms"},
+  {LP_LM_MAX_ORDER, "LMMaxOrder", 5, "LMMaxOrder"},
+  {LP_LM_EXCLUSION, "LMExclusion", 0, "LMExclusion"},
+  {LP_LM_UPDATE_EXCLUSION, "LMUpdateExclusion", 1, "LMUpdateExclusion"},
+  {LP_LM_ALPHA, "LMAlpha", 49, "LMAlpha"},
+  {LP_LM_BETA, "LMBeta", 77, "LMBeta"},
+  {LP_LM_MIXTURE, "LMMixture", 50, "LMMixture"},
+  {LP_LINE_WIDTH, "LineWidth", 1, "Width to draw crosshair and mouse line"},
+  {LP_GEOMETRY, "Geometry", 0, "Screen geometry (mostly for tall thin screens) - 0=old-style, 1=square no-xhair, 2=squish, 3=squish+log"},
+  {LP_LM_WORD_ALPHA, "WordAlpha", 50, "Alpha value for word-based model"},
+  {LP_USER_LOG_LEVEL_MASK, "UserLogLevelMask", 0, "Controls level of user logging, 0 = none, 1 = short, 2 = detailed, 3 = both"},
+  {LP_ZOOMSTEPS, "Zoomsteps", 32, "Integerised ratio of zoom size for click/button mode, denom 64."},
+  {LP_B, "ButtonMenuBoxes", 4, "Number of boxes for button menu mode"},
+  {LP_S, "ButtonMenuSafety", 25, "Safety parameter for button mode, in percent."},
 #ifdef TARGET_OS_IPHONE
-  {LP_BUTTON_SCAN_TIME, "ButtonMenuScanTime", PERS, 600, "Scanning time in menu mode (0 = don't scan), in ms"},
+  {LP_BUTTON_SCAN_TIME, "ButtonMenuScanTime", 600, "Scanning time in menu mode (0 = don't scan), in ms"},
 #else
-  {LP_BUTTON_SCAN_TIME, "ButtonMenuScanTime", PERS, 0, "Scanning time in menu mode (0 = don't scan), in ms"},
+  {LP_BUTTON_SCAN_TIME, "ButtonMenuScanTime", 0, "Scanning time in menu mode (0 = don't scan), in ms"},
 #endif
-  {LP_R, "ButtonModeNonuniformity", PERS, 0, "Button mode box non-uniformity"},
-  {LP_RIGHTZOOM, "ButtonCompassModeRightZoom", PERS, 5120, "Zoomfactor (*1024) for compass mode"},
+  {LP_R, "ButtonModeNonuniformity", 0, "Button mode box non-uniformity"},
+  {LP_RIGHTZOOM, "ButtonCompassModeRightZoom", 5120, "Zoomfactor (*1024) for compass mode"},
 #if defined(WITH_MAEMO) || defined (TARGET_OS_IPHONE)
-  {LP_NODE_BUDGET, "NodeBudget", PERS, 1000, "Target (min) number of node objects to maintain"},
+  {LP_NODE_BUDGET, "NodeBudget", 1000, "Target (min) number of node objects to maintain"},
 #else
-  {LP_NODE_BUDGET, "NodeBudget", PERS, 3000, "Target (min) number of node objects to maintain"},
+  {LP_NODE_BUDGET, "NodeBudget", 3000, "Target (min) number of node objects to maintain"},
 #endif
-  {LP_OUTLINE_WIDTH, "OutlineWidth", PERS, 0, "Absolute value is line width to draw boxes (fill iff >=0)" },
-  {LP_MIN_NODE_SIZE, "MinNodeSize", PERS, 50, "Minimum size of node (in dasher coords) to draw" }, 
+  {LP_OUTLINE_WIDTH, "OutlineWidth", 0, "Absolute value is line width to draw boxes (fill iff >=0)" },
+  {LP_MIN_NODE_SIZE, "MinNodeSize", 50, "Minimum size of node (in dasher coords) to draw" }, 
 #ifdef WITH_MAEMO
-  {LP_NONLINEAR_X, "NonLinearX", PERS, 0, "Nonlinear compression of X-axis (0 = none, higher = more extreme)"},
+  {LP_NONLINEAR_X, "NonLinearX", 0, "Nonlinear compression of X-axis (0 = none, higher = more extreme)"},
 #else
-  {LP_NONLINEAR_X, "NonLinearX", PERS, 5, "Nonlinear compression of X-axis (0 = none, higher = more extreme)"},
+  {LP_NONLINEAR_X, "NonLinearX", 5, "Nonlinear compression of X-axis (0 = none, higher = more extreme)"},
 #endif
-  {LP_AUTOSPEED_SENSITIVITY, "AutospeedSensitivity", PERS, 100, "Sensitivity of automatic speed control (percent)"},
-  {LP_SOCKET_PORT, "SocketPort", PERS, 20320, "UDP/TCP socket to use for network socket input"},
-  {LP_SOCKET_INPUT_X_MIN, "SocketInputXMinTimes1000", PERS, 0, "Bottom of range of X values expected from network input"},
-  {LP_SOCKET_INPUT_X_MAX, "SocketInputXMaxTimes1000", PERS, 1000, "Top of range of X values expected from network input"},
-  {LP_SOCKET_INPUT_Y_MIN, "SocketInputYMinTimes1000", PERS, 0, "Bottom of range of Y values expected from network input"},
-  {LP_SOCKET_INPUT_Y_MAX, "SocketInputYMaxTimes1000", PERS, 1000, "Top of range of Y values expected from network input"},
-  {LP_INPUT_FILTER, "InputFilterID", PERS, 3, "Module ID of input filter"},
-  {LP_CIRCLE_PERCENT, "CirclePercent", PERS, 10, "Percentage of nominal vertical range to use for radius of start circle"},
-  {LP_TWO_BUTTON_OFFSET, "TwoButtonOffset", PERS, 1638, "Offset for two button dynamic mode"},
-  {LP_HOLD_TIME, "HoldTime", PERS, 1000, "Time for which buttons must be held to count as long presses, in ms"},
-  {LP_MULTIPRESS_TIME, "MultipressTime", PERS, 1000, "Time in which multiple presses must occur, in ms"},
-  {LP_SLOW_START_TIME, "SlowStartTime", PERS, 1000, "Time over which slow start occurs"},
-  {LP_CONVERSION_ORDER, "ConversionOrder", PERS, 0, "Conversion ordering"},
-  {LP_CONVERSION_TYPE, "ConversionType", PERS, 0, "Conversion type"},
-  {LP_TWO_PUSH_OUTER, "TwoPushOuter", PERS, 1792, "Offset for one button dynamic mode outer marker"},
-  {LP_TWO_PUSH_UP, "TwoPushUp", PERS, 1536, "Offset to up marker in one button dynamic"},
-  {LP_TWO_PUSH_DOWN, "TwoPushDown", PERS, 1280, "Offset to down marker in one button dynamic"},
-  {LP_TWO_PUSH_TOLERANCE, "TwoPushTolerance", PERS, 100, "Tolerance of two-push-mode pushes, in ms"},
-  {LP_DYNAMIC_BUTTON_LAG, "DynamicButtonLag", PERS, 50, "Lag of pushes in dynamic button mode (ms)"},
-  {LP_STATIC1B_TIME, "Static1BTime", PERS, 2000, "Time for static-1B mode to scan from top to bottom (ms)"},
-  {LP_STATIC1B_ZOOM, "Static1BZoom", PERS, 8, "Zoom factor for static-1B mode"},
-  {LP_DEMO_SPRING, "DemoSpring", PERS, 100, "Springyness in Demo-mode"},
-  {LP_DEMO_NOISE_MEM, "DemoNoiseMem", PERS, 100, "Memory parameter for noise in Demo-mode"},
-  {LP_DEMO_NOISE_MAG, "DemoNoiseMag", PERS, 325, "Magnitude of noise in Demo-mode"},
-  {LP_MAXZOOM, "ClickMaxZoom", PERS, 200, "Maximum zoom possible in click mode (times 10)"},
-  {LP_DYNAMIC_SPEED_INC, "DynamicSpeedInc", PERS, 3, "%age by which dynamic mode auto speed control increases speed"},
-  {LP_DYNAMIC_SPEED_FREQ, "DynamicSpeedFreq", PERS, 10, "Seconds after which dynamic mode auto speed control increases speed"},
-  {LP_DYNAMIC_SPEED_DEC, "DynamicSpeedDec", PERS, 8, "%age by which dynamic mode auto speed control decreases speed on reverse"},
-  {LP_TAP_TIME, "TapTime", PERS, 200, "Max length of a stylus 'tap' rather than hold (ms)"},
+  {LP_AUTOSPEED_SENSITIVITY, "AutospeedSensitivity", 100, "Sensitivity of automatic speed control (percent)"},
+  {LP_SOCKET_PORT, "SocketPort", 20320, "UDP/TCP socket to use for network socket input"},
+  {LP_SOCKET_INPUT_X_MIN, "SocketInputXMinTimes1000", 0, "Bottom of range of X values expected from network input"},
+  {LP_SOCKET_INPUT_X_MAX, "SocketInputXMaxTimes1000", 1000, "Top of range of X values expected from network input"},
+  {LP_SOCKET_INPUT_Y_MIN, "SocketInputYMinTimes1000", 0, "Bottom of range of Y values expected from network input"},
+  {LP_SOCKET_INPUT_Y_MAX, "SocketInputYMaxTimes1000", 1000, "Top of range of Y values expected from network input"},
+  {LP_INPUT_FILTER, "InputFilterID", 3, "Module ID of input filter"},
+  {LP_CIRCLE_PERCENT, "CirclePercent", 10, "Percentage of nominal vertical range to use for radius of start circle"},
+  {LP_TWO_BUTTON_OFFSET, "TwoButtonOffset", 1638, "Offset for two button dynamic mode"},
+  {LP_HOLD_TIME, "HoldTime", 1000, "Time for which buttons must be held to count as long presses, in ms"},
+  {LP_MULTIPRESS_TIME, "MultipressTime", 1000, "Time in which multiple presses must occur, in ms"},
+  {LP_SLOW_START_TIME, "SlowStartTime", 1000, "Time over which slow start occurs"},
+  {LP_CONVERSION_ORDER, "ConversionOrder", 0, "Conversion ordering"},
+  {LP_CONVERSION_TYPE, "ConversionType", 0, "Conversion type"},
+  {LP_TWO_PUSH_OUTER, "TwoPushOuter", 1792, "Offset for one button dynamic mode outer marker"},
+  {LP_TWO_PUSH_UP, "TwoPushUp", 1536, "Offset to up marker in one button dynamic"},
+  {LP_TWO_PUSH_DOWN, "TwoPushDown", 1280, "Offset to down marker in one button dynamic"},
+  {LP_TWO_PUSH_TOLERANCE, "TwoPushTolerance", 100, "Tolerance of two-push-mode pushes, in ms"},
+  {LP_DYNAMIC_BUTTON_LAG, "DynamicButtonLag", 50, "Lag of pushes in dynamic button mode (ms)"},
+  {LP_STATIC1B_TIME, "Static1BTime", 2000, "Time for static-1B mode to scan from top to bottom (ms)"},
+  {LP_STATIC1B_ZOOM, "Static1BZoom", 8, "Zoom factor for static-1B mode"},
+  {LP_DEMO_SPRING, "DemoSpring", 100, "Springyness in Demo-mode"},
+  {LP_DEMO_NOISE_MEM, "DemoNoiseMem", 100, "Memory parameter for noise in Demo-mode"},
+  {LP_DEMO_NOISE_MAG, "DemoNoiseMag", 325, "Magnitude of noise in Demo-mode"},
+  {LP_MAXZOOM, "ClickMaxZoom", 200, "Maximum zoom possible in click mode (times 10)"},
+  {LP_DYNAMIC_SPEED_INC, "DynamicSpeedInc", 3, "%age by which dynamic mode auto speed control increases speed"},
+  {LP_DYNAMIC_SPEED_FREQ, "DynamicSpeedFreq", 10, "Seconds after which dynamic mode auto speed control increases speed"},
+  {LP_DYNAMIC_SPEED_DEC, "DynamicSpeedDec", 8, "%age by which dynamic mode auto speed control decreases speed on reverse"},
+  {LP_TAP_TIME, "TapTime", 200, "Max length of a stylus 'tap' rather than hold (ms)"},
 #ifdef TARGET_OS_IPHONE
-  {LP_MARGIN_WIDTH, "MarginWidth", PERS, 500, "Width of RHS margin (in Dasher co-ords)"},
+  {LP_MARGIN_WIDTH, "MarginWidth", 500, "Width of RHS margin (in Dasher co-ords)"},
 #else
-  {LP_MARGIN_WIDTH, "MarginWidth", PERS, 300, "Width of RHS margin (in Dasher co-ords)"},
+  {LP_MARGIN_WIDTH, "MarginWidth", 300, "Width of RHS margin (in Dasher co-ords)"},
 #endif
-  {LP_TARGET_OFFSET, "TargetOffset", PERS, 0, "Vertical distance between mouse pointer and target (400=screen height)"},
-  {LP_GAME_HELP_DIST, "GameHelpDistance", PERS, 1920, "Distance of sentence from center to decide user needs help"},
-  {LP_GAME_HELP_TIME, "GameHelpTime", PERS, 0, "Time for which user must need help before help drawn"},
+  {LP_TARGET_OFFSET, "TargetOffset", 0, "Vertical distance between mouse pointer and target (400=screen height)"},
+  {LP_GAME_HELP_DIST, "GameHelpDistance", 1920, "Distance of sentence from center to decide user needs help"},
+  {LP_GAME_HELP_TIME, "GameHelpTime", 0, "Time for which user must need help before help drawn"},
 };
 
 const sp_table stringparamtable[] = {
-  {SP_ALPHABET_ID, "AlphabetID", PERS, "", "AlphabetID"},
-  {SP_ALPHABET_1, "Alphabet1", PERS, "", "Alphabet History 1"},
-  {SP_ALPHABET_2, "Alphabet2", PERS, "", "Alphabet History 2"},
-  {SP_ALPHABET_3, "Alphabet3", PERS, "", "Alphabet History 3"},
-  {SP_ALPHABET_4, "Alphabet4", PERS, "", "Alphabet History 4"},
-  {SP_COLOUR_ID, "ColourID", PERS, "", "ColourID"}, 
-  {SP_DASHER_FONT, "DasherFont", PERS, "", "DasherFont"},
-  {SP_GAME_TEXT_FILE, "GameTextFile", PERS, "", "User-specified file with strings to practice writing"},
-  {SP_SOCKET_INPUT_X_LABEL, "SocketInputXLabel", PERS, "x", "Label preceding X values for network input"},
-  {SP_SOCKET_INPUT_Y_LABEL, "SocketInputYLabel", PERS, "y", "Label preceding Y values for network input"},
+  {SP_ALPHABET_ID, "AlphabetID", "", "AlphabetID"},
+  {SP_ALPHABET_1, "Alphabet1", "", "Alphabet History 1"},
+  {SP_ALPHABET_2, "Alphabet2", "", "Alphabet History 2"},
+  {SP_ALPHABET_3, "Alphabet3", "", "Alphabet History 3"},
+  {SP_ALPHABET_4, "Alphabet4", "", "Alphabet History 4"},
+  {SP_COLOUR_ID, "ColourID", "", "ColourID"}, 
+  {SP_DASHER_FONT, "DasherFont", "", "DasherFont"},
+  {SP_GAME_TEXT_FILE, "GameTextFile", "", "User-specified file with strings to practice writing"},
+  {SP_SOCKET_INPUT_X_LABEL, "SocketInputXLabel", "x", "Label preceding X values for network input"},
+  {SP_SOCKET_INPUT_Y_LABEL, "SocketInputYLabel", "y", "Label preceding Y values for network input"},
 #if defined(WITH_MAEMO) || defined(TARGET_OS_IPHONE)
-  {SP_INPUT_FILTER, "InputFilter", PERS, "Stylus Control", "Input filter used to provide the current control mode"},
+  {SP_INPUT_FILTER, "InputFilter", "Stylus Control", "Input filter used to provide the current control mode"},
 #else
-  {SP_INPUT_FILTER, "InputFilter", PERS, "Normal Control", "Input filter used to provide the current control mode"},
+  {SP_INPUT_FILTER, "InputFilter", "Normal Control", "Input filter used to provide the current control mode"},
 #endif
-  {SP_INPUT_DEVICE, "InputDevice", PERS, "Mouse Input", "Driver for the input device"},
-  {SP_BUTTON_0, "Button0", PERS, "", "Assignment to button 0"},
-  {SP_BUTTON_1, "Button1", PERS, "", "Assignment to button 1"},
-  {SP_BUTTON_2, "Button2", PERS, "", "Assignment to button 2"},
-  {SP_BUTTON_3, "Button3", PERS, "", "Assignment to button 3"},
-  {SP_BUTTON_4, "Button4", PERS, "", "Assignment to button 4"},
-  {SP_BUTTON_10, "Button10", PERS, "", "Assignment to button 10"},
-  {SP_JOYSTICK_DEVICE, "JoystickDevice", PERS, "/dev/input/js0", "Joystick device"},
+  {SP_INPUT_DEVICE, "InputDevice", "Mouse Input", "Driver for the input device"},
+  {SP_BUTTON_0, "Button0", "", "Assignment to button 0"},
+  {SP_BUTTON_1, "Button1", "", "Assignment to button 1"},
+  {SP_BUTTON_2, "Button2", "", "Assignment to button 2"},
+  {SP_BUTTON_3, "Button3", "", "Assignment to button 3"},
+  {SP_BUTTON_4, "Button4", "", "Assignment to button 4"},
+  {SP_BUTTON_10, "Button10", "", "Assignment to button 10"},
+  {SP_JOYSTICK_DEVICE, "JoystickDevice", "/dev/input/js0", "Joystick device"},
 };
 
 ParameterType GetParameterType(int iParameter) {
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index a1790c5..506f3c0 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -102,7 +102,6 @@ namespace Dasher {
     struct bp_table {
       int key;
       const char *regName;
-      bool persistent;
       bool defaultValue;
       const char *humanReadable;
     };
@@ -114,7 +113,6 @@ namespace Dasher {
     struct lp_table {
       int key;
       const char *regName;
-      bool persistent;
       long defaultValue;
       const char *humanReadable;
     };
@@ -126,7 +124,6 @@ namespace Dasher {
     struct sp_table {
       int key;
       const char *regName;
-      bool persistent;
       const char *defaultValue;
       const char *humanReadable;
     };
diff --git a/Src/DasherCore/SettingsStore.cpp b/Src/DasherCore/SettingsStore.cpp
index a1b5972..de225ac 100644
--- a/Src/DasherCore/SettingsStore.cpp
+++ b/Src/DasherCore/SettingsStore.cpp
@@ -41,36 +41,29 @@ void CSettingsStore::LoadPersistent() {
   // we'll save the settings with the default value that comes from Parameters.h
 
   for(int i(0); i < NUM_OF_BPS; ++i) {
-    boolParamValues[i] = boolparamtable[i].defaultValue;
-    if(boolparamtable[i].persistent) {
-      bool bValue;
-      if(LoadSetting(boolparamtable[i].regName, &bValue))
-        boolParamValues[i] = bValue;
-      else
-        SaveSetting(boolparamtable[i].regName, boolParamValues[i]);
-    }
+    bool bValue;
+    if(LoadSetting(boolparamtable[i].regName, &bValue))
+      boolParamValues[i] = bValue;
+    else
+      SaveSetting(boolparamtable[i].regName,
+                  boolParamValues[i] = boolparamtable[i].defaultValue);
   }
 
   for(int j(0); j < NUM_OF_LPS; ++j) {
-    longParamValues[j] = longparamtable[j].defaultValue;
-    if(longparamtable[j].persistent) {
-      long lValue;
-      if(LoadSetting(longparamtable[j].regName, &lValue)) 
-        longParamValues[j] = lValue;
-      else
-        SaveSetting(longparamtable[j].regName, longParamValues[j]);            
-    }
+    long lValue;
+    if(LoadSetting(longparamtable[j].regName, &lValue))
+      longParamValues[j] = lValue;
+    else
+      SaveSetting(longparamtable[j].regName,
+                  longParamValues[j] = longparamtable[j].defaultValue);
   }
 
   for(int k(0); k < NUM_OF_SPS; ++k) {
-    stringParamValues[k] = stringparamtable[k].defaultValue;
-    if(stringparamtable[k].persistent) {
-      std::string strValue;
-      if(LoadSetting(stringparamtable[k].regName, &strValue))
-        stringParamValues[k] = strValue;
-      else
-        SaveSetting(stringparamtable[k].regName, stringParamValues[k]);            
-    }
+    std::string strValue;
+    if(LoadSetting(stringparamtable[k].regName, &strValue))
+      stringParamValues[k] = strValue;
+    else
+      SaveSetting(stringparamtable[k].regName,     stringParamValues[k] = stringparamtable[k].defaultValue);
   }
 }
 
@@ -128,8 +121,7 @@ void CSettingsStore::SetBoolParameter(int iParameter, bool bValue) {
   DispatchEvent(iParameter);
 
   // Write out to permanent storage
-  if(boolparamtable[iParameter - FIRST_BP].persistent)
-    SaveSetting(boolparamtable[iParameter - FIRST_BP].regName, bValue);
+  SaveSetting(boolparamtable[iParameter - FIRST_BP].regName, bValue);
 }
 
 void CSettingsStore::SetLongParameter(int iParameter, long lValue) {
@@ -147,8 +139,7 @@ void CSettingsStore::SetLongParameter(int iParameter, long lValue) {
   DispatchEvent(iParameter);
 
   // Write out to permanent storage
-  if(longparamtable[iParameter - FIRST_LP].persistent)
-    SaveSetting(longparamtable[iParameter - FIRST_LP].regName, lValue);
+  SaveSetting(longparamtable[iParameter - FIRST_LP].regName, lValue);
 }
 
 void CSettingsStore::SetStringParameter(int iParameter, const std::string sValue) {
@@ -166,8 +157,7 @@ void CSettingsStore::SetStringParameter(int iParameter, const std::string sValue
   DispatchEvent(iParameter);
 
   // Write out to permanent storage
-  if(stringparamtable[iParameter - FIRST_SP].persistent)
-    SaveSetting(stringparamtable[iParameter - FIRST_SP].regName, sValue);
+  SaveSetting(stringparamtable[iParameter - FIRST_SP].regName, sValue);
 }
 
 bool CSettingsStore::GetBoolParameter(int iParameter) const {
diff --git a/Src/Gtk2/GenerateSchema.cpp b/Src/Gtk2/GenerateSchema.cpp
index ab0527c..093ab5a 100644
--- a/Src/Gtk2/GenerateSchema.cpp
+++ b/Src/Gtk2/GenerateSchema.cpp
@@ -174,22 +174,15 @@ int main(int argc, char **argv) {
   }
 
   for(int i(0); i < NUM_OF_BPS; ++i) {
-    if(boolparamtable[i].persistent) {
-      std::string strDefault;
+    std::string strDefault(boolparamtable[i].defaultValue ? "TRUE" : "FALSE");
       
-      if(boolparamtable[i].defaultValue)
-	strDefault = "TRUE";
-      else
-	strDefault = "FALSE";
-      
-      CSchema oSchema( boolparamtable[i].regName,
+    CSchema oSchema( boolparamtable[i].regName,
 		       TYPE_BOOL,
 		       strDefault,
 		       "",
 		       boolparamtable[i].humanReadable );
       
-      oSchema.Dump(output);
-    }
+    oSchema.Dump(output);
   }  
 
   for(int i(0); i < END_OF_APP_BPS - END_OF_SPS; ++i) {
@@ -213,21 +206,18 @@ int main(int argc, char **argv) {
   } 
 
   for(int i(0); i < NUM_OF_LPS; ++i) {
-    if(longparamtable[i].persistent) {
-
-      std::stringstream ssDefault;
+    std::stringstream ssDefault;
       
-      ssDefault << longparamtable[i].defaultValue;
+    ssDefault << longparamtable[i].defaultValue;
 
       
-      CSchema oSchema( longparamtable[i].regName,
+    CSchema oSchema( longparamtable[i].regName,
 		       TYPE_LONG,
 		       ssDefault.str(),
 		       "",
 		       longparamtable[i].humanReadable );
       
-      oSchema.Dump(output);
-    }
+    oSchema.Dump(output);
   }  
  
   for(int i(0); i < END_OF_APP_LPS - END_OF_APP_BPS; ++i) {
@@ -249,15 +239,13 @@ int main(int argc, char **argv) {
   }  
 
   for(int i(0); i < NUM_OF_SPS; ++i) {
-    if(stringparamtable[i].persistent) {
-      CSchema oSchema( stringparamtable[i].regName,
+    CSchema oSchema( stringparamtable[i].regName,
 		       TYPE_STRING,
 		       stringparamtable[i].defaultValue,
 		       "",
 		       stringparamtable[i].humanReadable );
       
-      oSchema.Dump(output);
-    }
+    oSchema.Dump(output);
   } 
   
   for(int i(0); i < END_OF_APP_SPS - END_OF_APP_LPS; ++i) {
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]