[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4112-g7124bc4

[Clinton Stimpson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  7124bc45c79f8e7db5cd7e6e945561c12118393e (commit)
       via  81ea3637b4a49d028fbce47d92de979d0ecd1278 (commit)
      from  05435dfab93add5d256fab8df05fad4b60a0f9f9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7124bc45c79f8e7db5cd7e6e945561c12118393e
commit 7124bc45c79f8e7db5cd7e6e945561c12118393e
Merge: 05435df 81ea363
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Sep 10 16:36:38 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Sep 10 16:36:38 2013 -0400

    Merge topic 'cmake-gui-window-settings' into next
    
    81ea363 cmake-gui: save and restore the geometry and window state between sessions.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=81ea3637b4a49d028fbce47d92de979d0ecd1278
commit 81ea3637b4a49d028fbce47d92de979d0ecd1278
Author:     Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Tue Sep 10 14:35:11 2013 -0600
Commit:     Clinton Stimpson <clinton at elemtech.com>
CommitDate: Tue Sep 10 14:35:11 2013 -0600

    cmake-gui: save and restore the geometry and window state between sessions.

diff --git a/Source/QtDialog/CMakeSetupDialog.cxx b/Source/QtDialog/CMakeSetupDialog.cxx
index 4d62f72..a4dfdc9 100644
--- a/Source/QtDialog/CMakeSetupDialog.cxx
+++ b/Source/QtDialog/CMakeSetupDialog.cxx
@@ -66,9 +66,8 @@ CMakeSetupDialog::CMakeSetupDialog()
   // create the GUI
   QSettings settings;
   settings.beginGroup("Settings/StartPath");
-  int h = settings.value("Height", 500).toInt();
-  int w = settings.value("Width", 700).toInt();
-  this->resize(w, h);
+  restoreGeometry(settings.value("geometry").toByteArray());
+  restoreState(settings.value("windowState").toByteArray());
 
   this->AddVariableCompletions = settings.value("AddVariableCompletionEntries",
                            QStringList("CMAKE_INSTALL_PREFIX")).toStringList();
@@ -299,8 +298,8 @@ CMakeSetupDialog::~CMakeSetupDialog()
 {
   QSettings settings;
   settings.beginGroup("Settings/StartPath");
-  settings.setValue("Height", this->height());
-  settings.setValue("Width", this->width());
+  settings.setValue("windowState", QVariant(saveState()));
+  settings.setValue("geometry", QVariant(saveGeometry()));
   settings.setValue("SplitterSizes", this->Splitter->saveState());
 
   // wait for thread to stop

-----------------------------------------------------------------------

Summary of changes:
 Source/QtDialog/CMakeSetupDialog.cxx |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake