[dasher: 189/217] Cleanup in redundant options for window position and size.

[Patrick Welche <pwelche src gnome org>]

commit 7a1a91b8e3c264091fcfc6d7e664db5888e39b56
Author: Ada Majorek <amajorek google com>
Date:   Sat Jan 23 18:34:58 2016 -0800

    Cleanup in redundant options for window position and size.
    
    https://github.com/ipomoena/dasher/issues/67

 Src/Common/AppSettingsData.h   |    5 +---
 Src/Common/AppSettingsHeader.h |    5 +--
 Src/Gtk2/dasher_main.cpp       |   42 +++++++++++----------------------------
 Src/Win32/DasherWindow.cpp     |    4 +-
 4 files changed, 17 insertions(+), 39 deletions(-)
---
diff --git a/Src/Common/AppSettingsData.h b/Src/Common/AppSettingsData.h
index a0b9692..bc15cfa 100644
--- a/Src/Common/AppSettingsData.h
+++ b/Src/Common/AppSettingsData.h
@@ -38,12 +38,9 @@ Dasher::Settings::bp_table app_boolparamtable[] = {
 Dasher::Settings::lp_table app_longparamtable[] = {
   {APP_LP_FILE_ENCODING, "FileEncodingFormat", Persistence::PERSISTENT, -1, "FileEncodingFormat"},
   {APP_LP_EDIT_FONT_SIZE, "EditFontSize", Persistence::PERSISTENT, 0, "EditFontSize"},
-  {APP_LP_EDIT_HEIGHT, "EditHeight", Persistence::PERSISTENT, 75, "The height of the edit window"},
-  {APP_LP_EDIT_WIDTH, "EditWidth", Persistence::PERSISTENT, 200, "EditWidth"},
+  {APP_LP_EDIT_SIZE, "EditSize", Persistence::PERSISTENT, 75, "The size of the edit window"},
   {APP_LP_SCREEN_WIDTH, "ScreenWidth", Persistence::PERSISTENT, 400, "ScreenWidth"},
   {APP_LP_SCREEN_HEIGHT, "ScreenHeight", Persistence::PERSISTENT, 500, "ScreenHeight"},
-  {APP_LP_SCREEN_WIDTH_H, "ScreenWidthH", Persistence::PERSISTENT, 625, "Screen Width for application style 
compose"},
-  {APP_LP_SCREEN_HEIGHT_H, "ScreenHeightH", Persistence::PERSISTENT, 250, "Screen Height for application 
style compose"},
   {APP_LP_STYLE, "AppStyle", Persistence::PERSISTENT, 0, "Application style"},
   {APP_LP_X, "XPosition", Persistence::PERSISTENT, 100, "X location of window"},
   {APP_LP_Y, "YPosition", Persistence::PERSISTENT, 100, "Y location of window"},
diff --git a/Src/Common/AppSettingsHeader.h b/Src/Common/AppSettingsHeader.h
index bdab7f1..e416465 100644
--- a/Src/Common/AppSettingsHeader.h
+++ b/Src/Common/AppSettingsHeader.h
@@ -13,9 +13,8 @@ enum {
 
 enum { 
   APP_LP_FILE_ENCODING = END_OF_APP_BPS, APP_LP_EDIT_FONT_SIZE, // 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_EDIT_SIZE,
+  APP_LP_SCREEN_WIDTH, APP_LP_SCREEN_HEIGHT,
   APP_LP_STYLE, APP_LP_X, APP_LP_Y,
 #ifdef WITH_MAEMO
   APP_LP_MAEMO_SIZE,
diff --git a/Src/Gtk2/dasher_main.cpp b/Src/Gtk2/dasher_main.cpp
index 96d980d..56d3cb4 100644
--- a/Src/Gtk2/dasher_main.cpp
+++ b/Src/Gtk2/dasher_main.cpp
@@ -711,26 +711,16 @@ static void
 dasher_main_load_state(DasherMain *pSelf) {
   DasherMainPrivate *pPrivate = DASHER_MAIN_GET_PRIVATE(pSelf);
 
-  int iWindowWidth;
-  int iWindowHeight;
-  int iEditHeight;
-  
-  if(pPrivate->pAppSettings->GetLong(APP_LP_STYLE) != APP_STYLE_COMPOSE) {
-    iEditHeight = pPrivate->pAppSettings->GetLong(APP_LP_EDIT_HEIGHT);
-    iWindowWidth = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_WIDTH);
-    iWindowHeight = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_HEIGHT);
-  }
-  else {
-    iEditHeight = pPrivate->pAppSettings->GetLong(APP_LP_EDIT_WIDTH);
-    iWindowWidth = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_WIDTH_H);
-    iWindowHeight = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_HEIGHT_H);
-  }
+  int iEditSize = pPrivate->pAppSettings->GetLong(APP_LP_EDIT_SIZE);
+  int iWindowWidth = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_WIDTH);
+  int iWindowHeight = pPrivate->pAppSettings->GetLong(APP_LP_SCREEN_HEIGHT);
+}
 
 #ifndef WITH_MAEMO
   gtk_window_resize(GTK_WINDOW(pPrivate->pMainWindow), iWindowWidth, iWindowHeight);
 #endif
 
-  gtk_paned_set_position(pPrivate->pDivider, iEditHeight);
+  gtk_paned_set_position(pPrivate->pDivider, iEditSize);
 
   pPrivate->iWidth = iWindowWidth;
   pPrivate->iHeight = iWindowHeight;
@@ -754,23 +744,15 @@ dasher_main_save_state(DasherMain *pSelf) {
   
   int iWindowWidth;
   int iWindowHeight;
-  int iEditHeight;
   
    gtk_window_get_size(GTK_WINDOW(pPrivate->pMainWindow), &iWindowWidth, &iWindowHeight);
-   iEditHeight = gtk_paned_get_position(pPrivate->pDivider);
-
-   if(pPrivate->pAppSettings->GetLong(APP_LP_STYLE) != APP_STYLE_COMPOSE) {
-     // APP_STYLE_DIRECT doesn't have an edit window.
-     if (pPrivate->pAppSettings->GetLong(APP_LP_STYLE) != APP_STYLE_DIRECT)
-       pPrivate->pAppSettings->SetLong(APP_LP_EDIT_HEIGHT, iEditHeight);
-     pPrivate->pAppSettings->SetLong(APP_LP_SCREEN_WIDTH, iWindowWidth);
-     pPrivate->pAppSettings->SetLong(APP_LP_SCREEN_HEIGHT, iWindowHeight);
-   }
-   else {
-     pPrivate->pAppSettings->SetLong(APP_LP_EDIT_WIDTH, iEditHeight);
-     pPrivate->pAppSettings->SetLong(APP_LP_SCREEN_WIDTH_H, iWindowWidth);
-     pPrivate->pAppSettings->SetLong(APP_LP_SCREEN_HEIGHT_H, iWindowHeight);
-   } 
+   int iEditSize = gtk_paned_get_position(pPrivate->pDivider);
+
+   // APP_STYLE_DIRECT doesn't have an edit window.
+   if (pPrivate->pAppSettings->GetLong(APP_LP_STYLE) != APP_STYLE_DIRECT)
+     pPrivate->pAppSettings->SetLong(APP_LP_EDIT_SIZE, iEditSize);
+   pPrivate->pAppSettings->SetLong(APP_LP_SCREEN_WIDTH, iWindowWidth);
+   pPrivate->pAppSettings->SetLong(APP_LP_SCREEN_HEIGHT, iWindowHeight);
 
    int iWindowX;
    int iWindowY;
diff --git a/Src/Win32/DasherWindow.cpp b/Src/Win32/DasherWindow.cpp
index 8a42796..969c9e7 100644
--- a/Src/Win32/DasherWindow.cpp
+++ b/Src/Win32/DasherWindow.cpp
@@ -443,7 +443,7 @@ void CDasherWindow::Layout() {
 
   default:
     int SplitterHeight = m_pSplitter->GetHeight();
-    int EditHeight = m_pAppSettings->GetLongParameter(APP_LP_EDIT_HEIGHT);
+    int EditHeight = m_pAppSettings->GetLongParameter(APP_LP_EDIT_SIZE);
  
     if (mirrorLayout)
     {
@@ -470,7 +470,7 @@ void CDasherWindow::Layout() {
   m_pEdit->ShowWindow(SW_SHOW);
     m_pSplitter->ShowWindow(SW_SHOW);
     if (m_bSizeRestored)
-      m_pAppSettings->SetLongParameter(APP_LP_EDIT_HEIGHT, EditHeight);
+      m_pAppSettings->SetLongParameter(APP_LP_EDIT_SIZE, EditHeight);
   }
 }