--- qsampler/trunk/src/qsamplerOptions.cpp	2014/06/16 19:31:33	2642
+++ qsampler/trunk/src/qsamplerOptions.cpp	2015/09/17 20:43:47	2843
@@ -1,8 +1,8 @@
 // qsamplerOptions.cpp
 //
 /****************************************************************************
-   Copyright (C) 2004-2014, rncbc aka Rui Nuno Capela. All rights reserved.
-   Copyright (C) 2007, Christian Schoenebeck
+   Copyright (C) 2004-2015, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2007,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
@@ -72,8 +72,8 @@
 	iServerTimeout = m_settings.value("/ServerTimeout", 1000).toInt();
 #endif
 	bServerStart   = m_settings.value("/ServerStart", true).toBool();
-#if defined(__APPLE__)  //  Toshi Nagata 20080113
-	sServerCmdLine = m_settings.value("/ServerCmdLine", "linuxsampler.starter").toString();
+#if defined(__APPLE__)
+	sServerCmdLine = m_settings.value("/ServerCmdLine", "/usr/local/bin/linuxsampler").toString();
 #else
 	sServerCmdLine = m_settings.value("/ServerCmdLine", "linuxsampler").toString();
 #endif
@@ -97,6 +97,9 @@
 	bMessagesLimit   = m_settings.value("/MessagesLimit", true).toBool();
 	iMessagesLimitLines = m_settings.value("/MessagesLimitLines", 1000).toInt();
 	bConfirmRemove   = m_settings.value("/ConfirmRemove", true).toBool();
+	bConfirmReset    = m_settings.value("/ConfirmReset", true).toBool();
+	bConfirmRestart  = m_settings.value("/ConfirmRestart", true).toBool();
+	bConfirmError    = m_settings.value("/ConfirmError", true).toBool();
 	bKeepOnTop       = m_settings.value("/KeepOnTop", true).toBool();
 	bStdoutCapture   = m_settings.value("/StdoutCapture", true).toBool();
 	bCompletePath    = m_settings.value("/CompletePath", true).toBool();
@@ -104,7 +107,7 @@
 	iBaseFontSize    = m_settings.value("/BaseFontSize", 0).toInt();
 // if libgig provides a fast way to retrieve instrument names even for large
 // .gig files, then we enable this feature by default
-#if HAVE_LIBGIG_SETAUTOLOAD
+#ifdef CONFIG_LIBGIG_SETAUTOLOAD
 	bInstrumentNames = m_settings.value("/InstrumentNames", true).toBool();
 #else
 	bInstrumentNames = m_settings.value("/InstrumentNames", false).toBool();
@@ -192,6 +195,9 @@
 	m_settings.setValue("/MessagesLimit", bMessagesLimit);
 	m_settings.setValue("/MessagesLimitLines", iMessagesLimitLines);
 	m_settings.setValue("/ConfirmRemove", bConfirmRemove);
+	m_settings.setValue("/ConfirmReset", bConfirmReset);
+	m_settings.setValue("/ConfirmRestart", bConfirmRestart);
+	m_settings.setValue("/ConfirmError", bConfirmError);
 	m_settings.setValue("/KeepOnTop", bKeepOnTop);
 	m_settings.setValue("/StdoutCapture", bStdoutCapture);
 	m_settings.setValue("/CompletePath", bCompletePath);
@@ -363,25 +369,34 @@
 {
 	// Try to restore old form window positioning.
 	if (pWidget) {
+		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;
-		m_settings.beginGroup("/Geometry/" + pWidget->objectName());
 		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 (wpos.x() > 0 && wpos.y() > 0)
 			pWidget->move(wpos);
 		if (wsize.width() > 0 && wsize.height() > 0)
 			pWidget->resize(wsize);
-	//	else
-	//		pWidget->adjustSize();
+		else
+	#endif
+		pWidget->adjustSize();
+		if (!bVisible)
+			bVisible = m_settings.value("/visible", false).toBool();
 		if (bVisible)
 			pWidget->show();
-	//	else
-	//		pWidget->hide();
+		else
+			pWidget->hide();
+		m_settings.endGroup();
 	}
 }
 
@@ -393,13 +408,17 @@
 	// only save the form geometry while its up and visible)
 	if (pWidget) {
 		m_settings.beginGroup("/Geometry/" + pWidget->objectName());
+	#if QT_VERSION >= 0x050000
+		m_settings.setValue("/geometry", pWidget->saveGeometry());
+	#else//--SAVE_OLD_GEOMETRY
 		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());
+	#endif
+		if (!bVisible) bVisible = pWidget->isVisible();
 		m_settings.setValue("/visible", bVisible);
 		m_settings.endGroup();
 	}
@@ -411,6 +430,8 @@
 
 void Options::loadComboBoxHistory ( QComboBox *pComboBox, int iLimit )
 {
+	const bool bBlockSignals = pComboBox->blockSignals(true);
+
 	// Load combobox list from configuration settings file...
 	m_settings.beginGroup("/History/" + pComboBox->objectName());
 
@@ -418,7 +439,7 @@
 		pComboBox->setUpdatesEnabled(false);
 		pComboBox->setDuplicatesEnabled(false);
 		pComboBox->clear();
-		for (int i = 0; i < iLimit; i++) {
+		for (int i = 0; i < iLimit; ++i) {
 			const QString& sText = m_settings.value(
 				"/Item" + QString::number(i + 1)).toString();
 			if (sText.isEmpty())
@@ -429,38 +450,46 @@
 	}
 
 	m_settings.endGroup();
+
+	pComboBox->blockSignals(bBlockSignals);
 }
 
 
 void Options::saveComboBoxHistory ( QComboBox *pComboBox, int iLimit )
 {
+	const bool bBlockSignals = pComboBox->blockSignals(true);
+
 	// Add current text as latest item...
-	const QString& sCurrentText = pComboBox->currentText();
+	const QString sCurrentText = pComboBox->currentText();
 	int iCount = pComboBox->count();
 	for (int i = 0; i < iCount; i++) {
 		const QString& sText = pComboBox->itemText(i);
 		if (sText == sCurrentText) {
 			pComboBox->removeItem(i);
-			iCount--;
+			--iCount;
 			break;
 		}
 	}
 	while (iCount >= iLimit)
 		pComboBox->removeItem(--iCount);
 	pComboBox->insertItem(0, sCurrentText);
-	iCount++;
+	pComboBox->setCurrentIndex(0);
+	++iCount;
 
 	// Save combobox list to configuration settings file...
 	m_settings.beginGroup("/History/" + pComboBox->objectName());
-	for (int i = 0; i < iCount; i++) {
+	for (int i = 0; i < iCount; ++i) {
 		const QString& sText = pComboBox->itemText(i);
 		if (sText.isEmpty())
 			break;
 		m_settings.setValue("/Item" + QString::number(i + 1), sText);
 	}
 	m_settings.endGroup();
+
+	pComboBox->blockSignals(bBlockSignals);
 }
 
+
 int Options::getMaxVoices() {
 #ifndef CONFIG_MAX_VOICES
 	return -1;