--- qsampler/trunk/src/qsamplerOptions.cpp	2009/11/04 18:59:57	2028
+++ qsampler/trunk/src/qsamplerOptions.cpp	2010/03/31 09:07:30	2077
@@ -1,7 +1,7 @@
 // qsamplerOptions.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2004-2010, rncbc aka Rui Nuno Capela. All rights reserved.
    Copyright (C) 2007, Christian Schoenebeck
 
    This program is free software; you can redistribute it and/or
@@ -356,48 +356,47 @@
 //---------------------------------------------------------------------------
 // Widget geometry persistence helper methods.
 
-void Options::loadWidgetGeometry ( QWidget *pWidget )
+void Options::loadWidgetGeometry ( QWidget *pWidget, bool bVisible )
 {
 	// Try to restore old form window positioning.
 	if (pWidget) {
-		QPoint fpos;
-		QSize  fsize;
-		bool bVisible;
+		QPoint wpos;
+		QSize  wsize;
 		m_settings.beginGroup("/Geometry/" + pWidget->objectName());
-		fpos.setX(m_settings.value("/x", -1).toInt());
-		fpos.setY(m_settings.value("/y", -1).toInt());
-		fsize.setWidth(m_settings.value("/width", -1).toInt());
-		fsize.setHeight(m_settings.value("/height", -1).toInt());
-		bVisible = m_settings.value("/visible", false).toBool();
+		wpos.setX(m_settings.value("/x", -1).toInt());
+		wpos.setY(m_settings.value("/y", -1).toInt());
+		wsize.setWidth(m_settings.value("/width", -1).toInt());
+		wsize.setHeight(m_settings.value("/height", -1).toInt());
+		if (!bVisible) bVisible = m_settings.value("/visible", false).toBool();
 		m_settings.endGroup();
-		if (fpos.x() > 0 && fpos.y() > 0)
-			pWidget->move(fpos);
-		if (fsize.width() > 0 && fsize.height() > 0)
-			pWidget->resize(fsize);
-		else
-			pWidget->adjustSize();
+		if (wpos.x() > 0 && wpos.y() > 0)
+			pWidget->move(wpos);
+		if (wsize.width() > 0 && wsize.height() > 0)
+			pWidget->resize(wsize);
+	//	else
+	//		pWidget->adjustSize();
 		if (bVisible)
 			pWidget->show();
-		else
-			pWidget->hide();
+	//	else
+	//		pWidget->hide();
 	}
 }
 
 
-void Options::saveWidgetGeometry ( QWidget *pWidget )
+void Options::saveWidgetGeometry ( QWidget *pWidget, bool bVisible )
 {
 	// Try to save form window position...
 	// (due to X11 window managers ideossincrasies, we better
 	// only save the form geometry while its up and visible)
 	if (pWidget) {
 		m_settings.beginGroup("/Geometry/" + pWidget->objectName());
-		bool bVisible = pWidget->isVisible();
-		const QPoint& fpos  = pWidget->pos();
-		const QSize&  fsize = pWidget->size();
-		m_settings.setValue("/x", fpos.x());
-		m_settings.setValue("/y", fpos.y());
-		m_settings.setValue("/width", fsize.width());
-		m_settings.setValue("/height", fsize.height());
+		const QPoint& wpos  = pWidget->pos();
+		const QSize&  wsize = pWidget->size();
+		if (!bVisible) bVisible = pWidget->isVisible();
+		m_settings.setValue("/x", wpos.x());
+		m_settings.setValue("/y", wpos.y());
+		m_settings.setValue("/width", wsize.width());
+		m_settings.setValue("/height", wsize.height());
 		m_settings.setValue("/visible", bVisible);
 		m_settings.endGroup();
 	}