From 0180a683f5940021b8ca13ce48f697a04b2ecbc7 Mon Sep 17 00:00:00 2001
From: ffsup2 <ffsup2@localhost>
Date: Sat, 19 Mar 2011 19:03:52 +0100
Subject: [PATCH] Patch on behalf of maweso. issue #470

---
 rtgui/options.cc     | 6 ++++++
 rtgui/options.h      | 2 ++
 rtgui/preferences.cc | 8 ++++++++
 rtgui/preferences.h  | 1 +
 4 files changed, 17 insertions(+)

diff --git a/rtgui/options.cc b/rtgui/options.cc
index 09fefc10f..c6062bfe0 100644
--- a/rtgui/options.cc
+++ b/rtgui/options.cc
@@ -63,6 +63,8 @@ void Options::setDefaults () {
     profilePath = "profiles";
     dirBrowserWidth = 200;
     dirBrowserHeight = 150;
+    preferencesWidth = 0;
+    preferencesHeight = 0;
     toolPanelWidth = 300;
     browserToolPanelWidth = 300;
     browserToolPanelHeight = 300;
@@ -261,6 +263,8 @@ if (keyFile.has_group ("GUI")) {
     if (keyFile.has_key ("GUI", "WindowMaximized")) windowMaximized = keyFile.get_boolean ("GUI", "WindowMaximized");
     if (keyFile.has_key ("GUI", "DirBrowserWidth"))     dirBrowserWidth          = keyFile.get_integer ("GUI", "DirBrowserWidth");
     if (keyFile.has_key ("GUI", "DirBrowserHeight"))    dirBrowserHeight         = keyFile.get_integer ("GUI", "DirBrowserHeight");
+    if (keyFile.has_key ("GUI", "PreferencesWidth"))    preferencesWidth         = keyFile.get_integer ("GUI", "PreferencesWidth");
+    if (keyFile.has_key ("GUI", "PreferencesHeight"))   preferencesHeight        = keyFile.get_integer ("GUI", "PreferencesHeight");
     if (keyFile.has_key ("GUI", "SaveAsDialogWidth"))   saveAsDialogWidth        = keyFile.get_integer ("GUI", "SaveAsDialogWidth");
     if (keyFile.has_key ("GUI", "SaveAsDialogHeight"))  saveAsDialogHeight       = keyFile.get_integer ("GUI", "SaveAsDialogHeight");
     if (keyFile.has_key ("GUI", "ToolPanelWidth"))      toolPanelWidth           = keyFile.get_integer ("GUI", "ToolPanelWidth");
@@ -394,6 +398,8 @@ int Options::saveToFile (Glib::ustring fname) {
     keyFile.set_boolean ("GUI", "WindowMaximized", windowMaximized);
     keyFile.set_integer ("GUI", "DirBrowserWidth", dirBrowserWidth);
     keyFile.set_integer ("GUI", "DirBrowserHeight", dirBrowserHeight);
+    keyFile.set_integer ("GUI", "PreferencesWidth", preferencesWidth);
+    keyFile.set_integer ("GUI", "PreferencesHeight", preferencesHeight);
     keyFile.set_integer ("GUI", "SaveAsDialogWidth", saveAsDialogWidth);
     keyFile.set_integer ("GUI", "SaveAsDialogHeight", saveAsDialogHeight);
     keyFile.set_integer ("GUI", "ToolPanelWidth", toolPanelWidth);
diff --git a/rtgui/options.h b/rtgui/options.h
index c33d61ef7..105cfc5c5 100644
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -75,6 +75,8 @@ class Options {
     bool windowMaximized;
     int dirBrowserWidth;
     int dirBrowserHeight;
+    int preferencesWidth;
+    int preferencesHeight;
     int lastScale;
     int lastCropSize;
     bool fbOnlyRaw;
diff --git a/rtgui/preferences.cc b/rtgui/preferences.cc
index 845adca43..5c082ac42 100644
--- a/rtgui/preferences.cc
+++ b/rtgui/preferences.cc
@@ -36,6 +36,7 @@ Preferences::Preferences  (RTWindow *rtwindow):parent(rtwindow)  {
 
     // Do not increase height, since it's not visible on e.g. smaller netbook screens
     set_size_request (650, 600);
+    set_default_size (options.preferencesWidth, options.preferencesHeight);
     set_border_width (4);
 
     Gtk::VBox* mainvb = get_vbox ();
@@ -88,6 +89,13 @@ Preferences::Preferences  (RTWindow *rtwindow):parent(rtwindow)  {
     set_modal (true);
 }
 
+
+Preferences::~Preferences () {
+
+    options.preferencesWidth = get_width();
+    options.preferencesHeight = get_height();
+}
+
 Gtk::Widget* Preferences::getBatchProcPanel () {
 
     Gtk::VBox* mvbpp = Gtk::manage (new Gtk::VBox ());
diff --git a/rtgui/preferences.h b/rtgui/preferences.h
index f06edeb5b..a6fa32594 100644
--- a/rtgui/preferences.h
+++ b/rtgui/preferences.h
@@ -133,6 +133,7 @@ class Preferences : public Gtk::Dialog {
     
   public:
          Preferences (RTWindow *rtwindow);
+         ~Preferences ();
     
     void savePressed ();
     void loadPressed ();