--- qsampler/trunk/src/qsamplerOptions.cpp	2015/09/17 20:43:47	2843
+++ qsampler/trunk/src/qsamplerOptions.cpp	2019/06/30 16:58:30	3518
@@ -1,8 +1,8 @@
 // qsamplerOptions.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2015, rncbc aka Rui Nuno Capela. All rights reserved.
-   Copyright (C) 2007,2015 Christian Schoenebeck
+   Copyright (C) 2004-2019, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2007,2008,2015 Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -162,7 +162,7 @@
 {
 	// Make program version available in the future.
 	m_settings.beginGroup("/Program");
-	m_settings.setValue("/Version", QSAMPLER_VERSION);
+	m_settings.setValue("/Version", CONFIG_BUILD_VERSION);
 	m_settings.endGroup();
 
 	// And go into general options group.
@@ -299,7 +299,7 @@
 		}
 
 		QString sArg = args.at(i);
-		QString sVal = QString::null;
+		QString sVal;
 		const int iEqual = sArg.indexOf("=");
 		if (iEqual >= 0) {
 			sVal = sArg.right(sArg.length() - iEqual - 1);
@@ -337,7 +337,11 @@
 			return false;
 		}
 		else if (sArg == "-v" || sArg == "--version") {
-			out << QObject::tr("Qt: %1\n").arg(qVersion());
+			out << QString("Qt: %1\n")
+				.arg(qVersion());
+			out << QString("%1: %2\n")
+				.arg(QSAMPLER_TITLE)
+				.arg(CONFIG_BUILD_VERSION);
 		#ifdef CONFIG_LIBGIG
 			out << QString("%1: %2\n")
 				.arg(gig::libraryName().c_str())
@@ -346,7 +350,6 @@
 			out << QString("%1: %2\n")
 				.arg(::lscp_client_package())
 				.arg(::lscp_client_version());
-			out << QObject::tr(QSAMPLER_TITLE ": %1\n").arg(QSAMPLER_VERSION);
 			return false;
 		}
 		else {
@@ -369,13 +372,13 @@
 {
 	// Try to restore old form window positioning.
 	if (pWidget) {
+	//	if (bVisible) pWidget->show(); -- force initial exposure?
 		m_settings.beginGroup("/Geometry/" + pWidget->objectName());
 	#if QT_VERSION >= 0x050000
 		const QByteArray& geometry
 			= m_settings.value("/geometry").toByteArray();
 		if (!geometry.isEmpty())
 			pWidget->restoreGeometry(geometry);
-		else
 	#else//--LOAD_OLD_GEOMETRY
 		QPoint wpos;
 		QSize  wsize;
@@ -387,9 +390,9 @@
 			pWidget->move(wpos);
 		if (wsize.width() > 0 && wsize.height() > 0)
 			pWidget->resize(wsize);
-		else
 	#endif
-		pWidget->adjustSize();
+	//	else
+	//	pWidget->adjustSize();
 		if (!bVisible)
 			bVisible = m_settings.value("/visible", false).toBool();
 		if (bVisible)
@@ -587,3 +590,4 @@
 
 
 // end of qsamplerOptions.cpp
+