From 98b13ef24d530c26388f969c9d17bc420b0c6a96 Mon Sep 17 00:00:00 2001
From: malte_langkabel <malte.langkabel@gmail.com>
Date: Tue, 14 Jun 2016 15:27:03 +0200
Subject: [PATCH] ui: overlay window base size

* added property in application settings to define a basic width and height that is used when creating new overlay windows.
* fixed crash in tests
---
 bin/app/user/ApplicationSettings_for_package.xml |  2 ++
 bin/app/user/ApplicationSettings_template.xml    |  2 ++
 src/lib/settings/ApplicationSettings.cpp         | 10 ++++++++++
 src/lib/settings/ApplicationSettings.h           |  3 +++
 src/lib_gui/qt/window/QtWindow.cpp               |  6 +++++-
 src/test/StorageTestSuite.h                      |  5 -----
 6 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/bin/app/user/ApplicationSettings_for_package.xml b/bin/app/user/ApplicationSettings_for_package.xml
index 3fcdae1f..50eeeec9 100644
--- a/bin/app/user/ApplicationSettings_for_package.xml
+++ b/bin/app/user/ApplicationSettings_for_package.xml
@@ -2,6 +2,8 @@
 <config>
 	<application>
 		<indexer_thread_count>4</indexer_thread_count>
+		<window_base_width>500</window_base_width>
+		<window_base_height>500</window_base_height>
 	</application>
 	<user>
 		<recent_projects>
diff --git a/bin/app/user/ApplicationSettings_template.xml b/bin/app/user/ApplicationSettings_template.xml
index 609daffb..f3eb6d79 100644
--- a/bin/app/user/ApplicationSettings_template.xml
+++ b/bin/app/user/ApplicationSettings_template.xml
@@ -30,6 +30,8 @@
 		<font_size_min><!-- INTEGER: minimum font size in pt --></font_size_min>
 		<font_size_std><!-- INTEGER: standard font size in pt --></font_size_std>
 		<indexer_thread_count><!-- INTEGER: number of threads indexing the source code --></indexer_thread_count>
+		<window_base_width><!-- INTEGER: initial width of an overlay window --></window_base_width>
+		<window_base_height><!-- INTEGER: initial height of an overlay window --></window_base_height>
 	</application>
 
 	<code>
diff --git a/src/lib/settings/ApplicationSettings.cpp b/src/lib/settings/ApplicationSettings.cpp
index 457321ce..5a86c2a2 100644
--- a/src/lib/settings/ApplicationSettings.cpp
+++ b/src/lib/settings/ApplicationSettings.cpp
@@ -153,6 +153,16 @@ void ApplicationSettings::setIndexerThreadCount(const int count)
 	setValue<int>("application/indexer_thread_count", count);
 }
 
+int ApplicationSettings::getWindowBaseWidth() const
+{
+	return getValue<int>("application/window_base_width", 500);
+}
+
+int ApplicationSettings::getWindowBaseHeight() const
+{
+	return getValue<int>("application/window_base_height", 500);
+}
+
 int ApplicationSettings::getCodeTabWidth() const
 {
 	return getValue<int>("code/tab_width", 4);
diff --git a/src/lib/settings/ApplicationSettings.h b/src/lib/settings/ApplicationSettings.h
index ec45eec9..d7cd4e00 100644
--- a/src/lib/settings/ApplicationSettings.h
+++ b/src/lib/settings/ApplicationSettings.h
@@ -50,6 +50,9 @@ public:
 	int getIndexerThreadCount() const;
 	void setIndexerThreadCount(const int count);
 
+	int getWindowBaseWidth() const;
+	int getWindowBaseHeight() const;
+
 	// code
 	int getCodeTabWidth() const;
 	void setCodeTabWidth(int codeTabWidth);
diff --git a/src/lib_gui/qt/window/QtWindow.cpp b/src/lib_gui/qt/window/QtWindow.cpp
index f59b0d87..7bd931ff 100644
--- a/src/lib_gui/qt/window/QtWindow.cpp
+++ b/src/lib_gui/qt/window/QtWindow.cpp
@@ -8,6 +8,7 @@
 
 #include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
+#include "settings/ApplicationSettings.h"
 #include "utility/ResourcePaths.h"
 
 QtWindow::QtWindow(QWidget* parent)
@@ -56,7 +57,10 @@ QtWindow::QtWindow(QWidget* parent)
 
 QSize QtWindow::sizeHint() const
 {
-	return QSize(500, 500);
+	return QSize(
+		ApplicationSettings::getInstance()->getWindowBaseWidth(),
+		ApplicationSettings::getInstance()->getWindowBaseHeight()
+	);
 }
 
 void QtWindow::setup()
diff --git a/src/test/StorageTestSuite.h b/src/test/StorageTestSuite.h
index c7f203ce..1f8b911a 100644
--- a/src/test/StorageTestSuite.h
+++ b/src/test/StorageTestSuite.h
@@ -233,11 +233,6 @@ private:
 			clear();
 		}
 
-		~TestStorage()
-		{
-			boost::filesystem::remove("data/test.sqlite");
-		}
-
 		std::shared_ptr<TokenLocationCollection> getLocationCollectionForTokenId(Id id) const
 		{
 			std::vector<Id> tokenIds;