--- qsampler/trunk/src/qsamplerOptions.cpp	2004/10/06 15:42:59	267
+++ qsampler/trunk/src/qsamplerOptions.cpp	2005/03/14 10:59:57	454
@@ -1,7 +1,7 @@
 // qsamplerOptions.cpp
 //
 /****************************************************************************
-   Copyright (C) 2003-2004, rncbc aka Rui Nuno Capela. All rights reserved.
+   Copyright (C) 2003-2005, rncbc aka Rui Nuno Capela. All rights reserved.
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU General Public License
@@ -46,10 +46,10 @@
     m_settings.beginGroup("/Server");
     sServerHost    = m_settings.readEntry("/ServerHost", "localhost");
     iServerPort    = m_settings.readNumEntry("/ServerPort", 8888);
-    iServerTimeout = m_settings.readNumEntry("/ServerTimeout", 500);
+    iServerTimeout = m_settings.readNumEntry("/ServerTimeout", 1000);
     bServerStart   = m_settings.readBoolEntry("/ServerStart", true);
     sServerCmdLine = m_settings.readEntry("/ServerCmdLine", "linuxsampler");
-    iStartDelay    = m_settings.readNumEntry("/StartDelay", 2);
+    iStartDelay    = m_settings.readNumEntry("/StartDelay", 3);
     m_settings.endGroup();
 
     // Load display options...
@@ -63,9 +63,11 @@
     bMessagesLimit   = m_settings.readBoolEntry("/MessagesLimit", true);
     iMessagesLimitLines = m_settings.readNumEntry("/MessagesLimitLines", 1000);
     bConfirmRemove   = m_settings.readBoolEntry("/ConfirmRemove", true);
+    bKeepOnTop       = m_settings.readBoolEntry("/KeepOnTop", true);
     bStdoutCapture   = m_settings.readBoolEntry("/StdoutCapture", true);
     bCompletePath    = m_settings.readBoolEntry("/CompletePath", true);
     iMaxRecentFiles  = m_settings.readNumEntry("/MaxRecentFiles", 5);
+    bInstrumentNames = m_settings.readBoolEntry("/InstrumentNames", false);
     m_settings.endGroup();
 
     // And go into view options group.
@@ -131,9 +133,11 @@
     m_settings.writeEntry("/MessagesLimit", bMessagesLimit);
     m_settings.writeEntry("/MessagesLimitLines", iMessagesLimitLines);
     m_settings.writeEntry("/ConfirmRemove", bConfirmRemove);
+    m_settings.writeEntry("/KeepOnTop", bKeepOnTop);
     m_settings.writeEntry("/StdoutCapture", bStdoutCapture);
     m_settings.writeEntry("/CompletePath", bCompletePath);
     m_settings.writeEntry("/MaxRecentFiles", iMaxRecentFiles);
+    m_settings.writeEntry("/InstrumentNames", bInstrumentNames);
     m_settings.endGroup();
 
     // View options group.