From 01720c57d9a4b30582e0f2f47ab9879dfdca9d3a Mon Sep 17 00:00:00 2001 From: Wim Vriend Date: Tue, 26 Feb 2013 16:42:25 +0000 Subject: Updating before branching. Last revision is v170 beta1. git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@271 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb --- FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) (limited to 'FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp') diff --git a/FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp b/FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp index 9f6fdcb1..2e6c91f7 100644 --- a/FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp +++ b/FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp @@ -51,29 +51,36 @@ QWidget() // Connect Qt signals to member-functions connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK())); connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel())); - connect(ui.chkTIRViews, SIGNAL(stateChanged(int)), this, SLOT(chkTIRViewsChanged())); + connect(ui.bntLocateNPClient, SIGNAL(clicked()), this, SLOT(selectDLL())); + connect(ui.chkTIRViews, SIGNAL(stateChanged(int)), this, SLOT(settingChanged())); connect(ui.chkStartDummy, SIGNAL(stateChanged(int)), this, SLOT(settingChanged())); connect(ui.cbxSelectInterface, SIGNAL(currentIndexChanged(int)), this, SLOT(settingChanged( int ))); - connect(ui.bntLocateNPClient, SIGNAL(clicked()), this, SLOT(selectDLL())); ui.cbxSelectInterface->addItem("Enable both"); ui.cbxSelectInterface->addItem("Use FreeTrack, hide TrackIR"); ui.cbxSelectInterface->addItem("Use TrackIR, hide FreeTrack"); + theProtocol = NULL; + + // Load the settings from the current .INI-file + loadSettings(); + + aFileName = QCoreApplication::applicationDirPath() + "/TIRViews.dll"; if ( !QFile::exists( aFileName ) ) { ui.chkTIRViews->setChecked( false ); ui.chkTIRViews->setEnabled ( false ); + + // + // Best do this save() last, or it will continually reset the settings... :-( + // save(); } else { ui.chkTIRViews->setEnabled ( true ); } - theProtocol = NULL; - // Load the settings from the current .INI-file - loadSettings(); } // -- cgit v1.2.3