diff options
| author | Wim Vriend <facetracknoir@gmail.com> | 2013-02-26 16:42:25 +0000 |
|---|---|---|
| committer | Wim Vriend <facetracknoir@gmail.com> | 2013-02-26 16:42:25 +0000 |
| commit | 01720c57d9a4b30582e0f2f47ab9879dfdca9d3a (patch) | |
| tree | 5dcda5520dbfea67b5177ca0d4e30f83b36fc642 /FTNoIR_Protocol_FT | |
| parent | 36f82a4f0dc4f002123cc313eab7c845dcd13572 (diff) | |
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
Diffstat (limited to 'FTNoIR_Protocol_FT')
| -rw-r--r-- | FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp | 1 | ||||
| -rw-r--r-- | FTNoIR_Protocol_FT/ftnoir_protocol_FT_dialog.cpp | 17 |
2 files changed, 13 insertions, 5 deletions
diff --git a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp index f33f92c5..b8461993 100644 --- a/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp +++ b/FTNoIR_Protocol_FT/FTNoIR_Protocol_FT.cpp @@ -120,6 +120,7 @@ QStringList gameLine; if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){
QString strError( "Cannot load file: FaceTrackNoIR Supported Games.csv" );
sprintf_s(pMemData->ProgramName, 99, strError.toAscii());
+ sprintf_s(pMemData->FTNVERSION, 9, "V160");
//
// Return true anyway, because maybe it's V160 compatible.
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();
}
//
|