GNOME.org
 

[dasher: 121/217] Cleanup in app settings.

commit 154624552627507d28a8256e874caf5c233e970a
Author: ipomoena <amajorek google com>
Date:   Fri Nov 13 16:30:57 2015 -0800

    Cleanup in app settings.

 Src/Common/AppSettingsData.h       |   16 ++++++----------
 Src/Common/AppSettingsHeader.h     |   11 ++++-------
 Src/DasherCore/Parameters.cpp      |    5 -----
 Src/DasherCore/Parameters.h        |    2 +-
 Src/Gtk2/Preferences.cpp           |    2 +-
 Src/Gtk2/dasher_main.cpp           |    6 +++---
 Src/Win32/DasherWindow.cpp         |    4 ++--
 Src/Win32/Widgets/AdvancedPage.cpp |    2 +-
 8 files changed, 18 insertions(+), 30 deletions(-)
---
diff --git a/Src/Common/AppSettingsData.h b/Src/Common/AppSettingsData.h
index a87777d..0999e54 100644
--- a/Src/Common/AppSettingsData.h
+++ b/Src/Common/AppSettingsData.h
@@ -55,14 +55,12 @@ app_bp_table app_boolparamtable[] = {
   { APP_BP_TIME_STAMP, "TimeStampNewFiles", PERS, true, true, "TimeStampNewFiles" },
   { APP_BP_CONFIRM_UNSAVED, "ConfirmUnsavedFiles", PERS, true, true, "ConfirmUnsavedFiles" },
   {APP_BP_SHOW_TOOLBAR, "ViewToolbar", PERS, true, true, "ViewToolbar"},
-  {APP_BP_SHOW_TOOLBAR_TEXT, "ShowToolbarText", PERS, true, true, "ShowToolbarText"},
-  {APP_BP_SHOW_LARGE_ICONS, "ShowLargeIcons", PERS, true, true, "ShowLargeIcons"},
-  {APP_BP_FIX_LAYOUT, "FixLayout", PERS, false, false, "FixLayout"},
-  {APP_BP_COPY_ALL_ON_STOP, "CopyAllOnStop", PERS, false, false, "CopyAllOnStop"},
-  {APP_BP_WINDOW_PAUSE, "PauseOutsideWindow", PERS, false, false, "PauseOutsideWindow"},
-  {APP_BP_SPEECH_MODE, "SpeechEnabled", PERS, false, false, "Speak on stop"},
-  {APP_BP_KEYBOARD_MODE, "KeyboardMode", PERS, false, false, "KeyboardMode"},
-  {APP_BP_SPEECH_WORD, "SpeechWord", PERS, false, false, "Speak on word boundaries"}
+#ifdef WITH_MAEMO
+  { APP_BP_SHOW_STATUSBAR, "ViewStatusbar", false, "ViewStatusbar" },
+#else
+  { APP_BP_SHOW_STATUSBAR, "ViewStatusbar", true, "ViewStatusbar" },
+#endif
+
 };
 
 app_lp_table app_longparamtable[] = {
@@ -87,7 +85,5 @@ app_sp_table app_stringparamtable[] = {
 #else
   {APP_SP_EDIT_FONT, "EditFont", PERS, "Sans 10", NULL, "EditFont"},
 #endif
-#ifndef _WIN32_WCE
   {APP_SP_WINDOW_STATE, "WindowState", PERS, "", NULL, "WindowState"},
-#endif
 };
diff --git a/Src/Common/AppSettingsHeader.h b/Src/Common/AppSettingsHeader.h
index 2787f1b..8bdd43b 100644
--- a/Src/Common/AppSettingsHeader.h
+++ b/Src/Common/AppSettingsHeader.h
@@ -8,13 +8,12 @@
 
 enum { 
   APP_BP_TIME_STAMP = END_OF_SPS, APP_BP_CONFIRM_UNSAVED, APP_BP_SHOW_TOOLBAR,
-  APP_BP_SHOW_TOOLBAR_TEXT, APP_BP_SHOW_LARGE_ICONS, APP_BP_FIX_LAYOUT,
-  APP_BP_COPY_ALL_ON_STOP,APP_BP_WINDOW_PAUSE, APP_BP_SPEECH_MODE, 
-  APP_BP_KEYBOARD_MODE, APP_BP_SPEECH_WORD, END_OF_APP_BPS
+  APP_BP_SHOW_STATUSBAR, END_OF_APP_BPS
 };
 
 enum { 
-  APP_LP_EDIT_FONT_SIZE = END_OF_APP_BPS, APP_LP_EDIT_HEIGHT,
+  APP_LP_EDIT_FONT_SIZE = END_OF_APP_BPS, // TODO Extract font size from APP_SP_EDIT_FONT as linux
+  APP_LP_EDIT_HEIGHT,
   APP_LP_EDIT_WIDTH, 
   APP_LP_SCREEN_WIDTH, APP_LP_SCREEN_HEIGHT, APP_LP_SCREEN_WIDTH_H, APP_LP_SCREEN_HEIGHT_H, 
   APP_LP_STYLE, APP_LP_X, APP_LP_Y,
@@ -26,9 +25,7 @@ enum {
 
 enum {
   APP_SP_EDIT_FONT = END_OF_APP_LPS, 
-#ifndef _WIN32_WCE
-  APP_SP_WINDOW_STATE, 
-#endif
+  APP_SP_WINDOW_STATE,  // TODO Use the same settings as linux.
   END_OF_APP_SPS
 };
 
diff --git a/Src/DasherCore/Parameters.cpp b/Src/DasherCore/Parameters.cpp
index 3e6aee1..a3c3e7a 100644
--- a/Src/DasherCore/Parameters.cpp
+++ b/Src/DasherCore/Parameters.cpp
@@ -9,11 +9,6 @@ const bp_table boolparamtable[] = {
   {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", false, "ShowSpeedSlider"},
-#else
-  {BP_SHOW_SLIDER, "ShowSpeedSlider", true, "ShowSpeedSlider"},
-#endif
   {BP_START_MOUSE, "StartOnLeft", true, "StartOnLeft"},
   {BP_START_SPACE, "StartOnSpace", false, "StartOnSpace"},
   {BP_STOP_IDLE, "StopOnIdle", false, "StopOnIdle"},
diff --git a/Src/DasherCore/Parameters.h b/Src/DasherCore/Parameters.h
index 547ed0b..c6e098b 100644
--- a/Src/DasherCore/Parameters.h
+++ b/Src/DasherCore/Parameters.h
@@ -29,7 +29,7 @@
 // They are unique across the different types
 enum { 
   BP_DRAW_MOUSE_LINE, BP_DRAW_MOUSE, BP_CURVE_MOUSE_LINE,
-  BP_SHOW_SLIDER, BP_START_MOUSE,
+  BP_START_MOUSE,
   BP_START_SPACE, BP_STOP_IDLE, BP_CONTROL_MODE, 
   BP_COLOUR_MODE, BP_MOUSEPOS_MODE,
   BP_PALETTE_CHANGE, BP_TURBO_MODE, BP_EXACT_DYNAMICS,
diff --git a/Src/Gtk2/Preferences.cpp b/Src/Gtk2/Preferences.cpp
index da196c6..c165398 100644
--- a/Src/Gtk2/Preferences.cpp
+++ b/Src/Gtk2/Preferences.cpp
@@ -39,7 +39,7 @@ struct _BoolTranslation {
 BoolTranslation sBoolTranslationTable[] = {
   {BP_DRAW_MOUSE_LINE, "showmouselinebutton", NULL},
   {BP_DRAW_MOUSE, "showmousebutton", NULL},
-  {BP_SHOW_SLIDER, "speedsliderbutton", NULL},
+  { APP_BP_SHOW_STATUSBAR, "speedsliderbutton", NULL },
   {APP_BP_SHOW_TOOLBAR, "toolbarbutton", NULL},
   {BP_CONTROL_MODE, "control_controlmode", NULL},
   {APP_BP_TIME_STAMP, "timestampbutton", NULL},
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index fac09de..39074c8 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -633,8 +633,8 @@ dasher_main_handle_parameter_change(DasherMain *pSelf, int iParameter) {
     else
       gtk_widget_hide(pPrivate->pToolbar);
     break;
-  case BP_SHOW_SLIDER: // TODO: Shouldn't be a core parmeter
-    if( dasher_app_settings_get_bool(pPrivate->pAppSettings, BP_SHOW_SLIDER))
+  case APP_BP_SHOW_STATUSBAR:
+    if (dasher_app_settings_get_bool(pPrivate->pAppSettings, APP_BP_SHOW_STATUSBAR))
       gtk_widget_show(pPrivate->pStatusControl);
     else
       gtk_widget_hide(pPrivate->pStatusControl);
@@ -844,7 +844,7 @@ dasher_main_setup_internal_layout(DasherMain *pSelf) {
   }    
 
   if(pPrivate->pStatusControl) {
-    if( dasher_app_settings_get_bool(pPrivate->pAppSettings, BP_SHOW_SLIDER))
+    if (dasher_app_settings_get_bool(pPrivate->pAppSettings, APP_BP_SHOW_STATUSBAR))
       gtk_widget_show(pPrivate->pStatusControl);
     else
       gtk_widget_hide(pPrivate->pStatusControl);
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index 31c1bb1..1b47e04 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -152,7 +152,7 @@ void CDasherWindow::HandleParameterChange(int iParameter) {
   case APP_BP_SHOW_TOOLBAR:
     m_pToolbar->ShowToolbar(m_pAppSettings->GetBoolParameter(APP_BP_SHOW_TOOLBAR));
     break;
-  case BP_SHOW_SLIDER:
+  case APP_BP_SHOW_STATUSBAR:
   case APP_LP_STYLE:
     Layout();
     break;
@@ -386,7 +386,7 @@ void CDasherWindow::Layout() {
 
   int ToolbarHeight = m_pAppSettings->GetBoolParameter(APP_BP_SHOW_TOOLBAR) ? m_pToolbar->GetHeight() : 0;
 
-  int SpeedAlphabetHeight = m_pAppSettings->GetBoolParameter(BP_SHOW_SLIDER) ? 
m_pSpeedAlphabetBar->GetHeight() : 0;
+  int SpeedAlphabetHeight = m_pAppSettings->GetBoolParameter(APP_BP_SHOW_STATUSBAR) ? 
m_pSpeedAlphabetBar->GetHeight() : 0;
   m_pSpeedAlphabetBar->MoveWindow(0, Height - SpeedAlphabetHeight, Width, SpeedAlphabetHeight);
   m_pSpeedAlphabetBar->ShowWindow(SpeedAlphabetHeight ? SW_SHOW : SW_HIDE);
 
diff --git a/Src/Win32/Widgets/AdvancedPage.cpp b/Src/Win32/Widgets/AdvancedPage.cpp
index 94ebd0d..e8b64d5 100644
--- a/Src/Win32/Widgets/AdvancedPage.cpp
+++ b/Src/Win32/Widgets/AdvancedPage.cpp
@@ -39,7 +39,7 @@ struct menuentry {
 // List of menu items that will be displayed in the General Preferences
 static menuentry menutable[] = {
   {APP_BP_SHOW_TOOLBAR, IDC_CHECK1},
-  {BP_SHOW_SLIDER, IDC_CHECK2},
+  { APP_BP_SHOW_STATUSBAR, IDC_CHECK2 },
   { APP_BP_TIME_STAMP, IDC_TIMESTAMP },
   { APP_BP_CONFIRM_UNSAVED, IDC_CONFIRM_UNSAVED },
   {BP_CONTROL_MODE, IDC_CONTROLMODE},  // Not global setting - specific to editbox/widget
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]