dasher r3485 - in trunk: . Src/Common Src/Gtk2

[alarson svn gnome org]

Author: alarson
Date: Wed Mar 26 05:43:47 2008
New Revision: 3485
URL: http://svn.gnome.org/viewvc/dasher?rev=3485&view=rev

Log:
Don't save edit window height on exit when appstyle is direct
(#521241).


Modified:
   trunk/ChangeLog
   trunk/Src/Common/AppSettingsData.h
   trunk/Src/Gtk2/dasher_main.cpp

Modified: trunk/Src/Common/AppSettingsData.h
==============================================================================
--- trunk/Src/Common/AppSettingsData.h	(original)
+++ trunk/Src/Common/AppSettingsData.h	Wed Mar 26 05:43:47 2008
@@ -68,12 +68,12 @@
 app_lp_table app_longparamtable[] = {
   {APP_LP_FILE_ENCODING, "FileEncodingFormat", PERS, -2, -2, "FileEncodingFormat"},
   {APP_LP_EDIT_FONT_SIZE, "EditFontSize", PERS, 0, 0, "EditFontSize"},
-  {APP_LP_EDIT_HEIGHT, "EditHeight", PERS, 75, 75, "EditHeight0"},
+  {APP_LP_EDIT_HEIGHT, "EditHeight", PERS, 75, 75, "The height of the edit window"},
   {APP_LP_EDIT_WIDTH, "EditWidth", PERS, 200, 200, "EditWidth"},
   {APP_LP_SCREEN_WIDTH, "ScreenWidth", PERS, 400, 400, "ScreenWidth"},
   {APP_LP_SCREEN_HEIGHT, "ScreenHeight", PERS, 500, 500, "ScreenHeight"},
-  {APP_LP_SCREEN_WIDTH_H, "ScreenWidthH", PERS, 625, 625, "ScreenWidth"},
-  {APP_LP_SCREEN_HEIGHT_H, "ScreenHeightH", PERS, 250, 250, "ScreenHeight"},
+  {APP_LP_SCREEN_WIDTH_H, "ScreenWidthH", PERS, 625, 625, "Screen Width for application style compose"},
+  {APP_LP_SCREEN_HEIGHT_H, "ScreenHeightH", PERS, 250, 250, "Screen Height for application style compose"},
   {APP_LP_STYLE, "AppStyle", PERS, 0, 0, "Application style"},
   {APP_LP_DOCK_STYLE, "DockStyle", PERS, 4, 4, "Dock Style, 0-3 = docked, 4 = floating, 5 = fullscreen"},
   {APP_LP_DOCK_POSITION, "DockPosition", PERS, 100, 100, "Dock Position"},

Modified: trunk/Src/Gtk2/dasher_main.cpp
==============================================================================
--- trunk/Src/Gtk2/dasher_main.cpp	(original)
+++ trunk/Src/Gtk2/dasher_main.cpp	Wed Mar 26 05:43:47 2008
@@ -751,7 +751,9 @@
    iEditHeight = gtk_paned_get_position(GTK_PANED(pPrivate->pDivider));
 
    if(dasher_app_settings_get_long(pPrivate->pAppSettings, APP_LP_STYLE) != APP_STYLE_COMPOSE) {
-     dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_EDIT_HEIGHT, iEditHeight);
+     // APP_STYLE_DIRECT doesn't have an edit window.
+     if (dasher_app_settings_get_long(pPrivate->pAppSettings, APP_LP_STYLE) != APP_STYLE_DIRECT)
+       dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_EDIT_HEIGHT, iEditHeight);
      dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_SCREEN_WIDTH, iWindowWidth);
      dasher_app_settings_set_long(pPrivate->pAppSettings, APP_LP_SCREEN_HEIGHT, iWindowHeight);
    }