summaryrefslogtreecommitdiffhomepage
path: root/facetracknoir
diff options
context:
space:
mode:
Diffstat (limited to 'facetracknoir')
-rw-r--r--facetracknoir/curve-config.cpp6
-rw-r--r--facetracknoir/curve-config.h4
-rw-r--r--facetracknoir/facetracknoir.ui11
3 files changed, 5 insertions, 16 deletions
diff --git a/facetracknoir/curve-config.cpp b/facetracknoir/curve-config.cpp
index f5ed6aa7..b6c99fed 100644
--- a/facetracknoir/curve-config.cpp
+++ b/facetracknoir/curve-config.cpp
@@ -86,11 +86,7 @@ void CurveConfigurationDialog::loadSettings() {
alt_configs[i]->setConfig(&mainApp->axis(i).curveAlt, currentFile);
configs[i]->loadSettings(currentFile);
alt_configs[i]->loadSettings(currentFile);
- connect(configs[i], SIGNAL(CurveChanged(bool)), this, SLOT(curveChanged(bool)), Qt::UniqueConnection);
- connect(alt_configs[i], SIGNAL(CurveChanged(bool)), this, SLOT(curveChanged(bool)), Qt::UniqueConnection);
}
-
- settingsDirty = false;
}
//
@@ -119,6 +115,4 @@ void CurveConfigurationDialog::save() {
ui.rxconfig_alt->saveSettings(currentFile);
ui.ryconfig_alt->saveSettings(currentFile);
ui.rzconfig_alt->saveSettings(currentFile);
-
- settingsDirty = false;
}
diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h
index 950f6d14..0949cdc4 100644
--- a/facetracknoir/curve-config.h
+++ b/facetracknoir/curve-config.h
@@ -14,13 +14,9 @@ public:
private:
Ui::UICCurveConfigurationDialog ui;
void save();
-
- bool settingsDirty;
FaceTrackNoIR *mainApp;
private slots:
void doOK();
void doCancel();
- void curveChanged( bool ) { settingsDirty = true; }
- void curveChanged( int ) { settingsDirty = true; }
};
diff --git a/facetracknoir/facetracknoir.ui b/facetracknoir/facetracknoir.ui
index d5300b0f..b257ae30 100644
--- a/facetracknoir/facetracknoir.ui
+++ b/facetracknoir/facetracknoir.ui
@@ -39,7 +39,7 @@
<string>opentrack</string>
</property>
<property name="windowIcon">
- <iconset resource="../ftnoir_protocol_ftn/ftn-protocol.qrc">
+ <iconset resource="main-facetracknoir.qrc">
<normaloff>:/images/facetracknoir.png</normaloff>:/images/facetracknoir.png</iconset>
</property>
<property name="toolTip">
@@ -702,16 +702,16 @@
<widget class="QGroupBox" name="groupFilter">
<property name="geometry">
<rect>
- <x>550</x>
+ <x>580</x>
<y>210</y>
- <width>231</width>
+ <width>171</width>
<height>91</height>
</rect>
</property>
<property name="minimumSize">
<size>
- <width>180</width>
- <height>80</height>
+ <width>0</width>
+ <height>0</height>
</size>
</property>
<property name="maximumSize">
@@ -1721,7 +1721,6 @@
</customwidget>
</customwidgets>
<resources>
- <include location="../ftnoir_protocol_ftn/ftn-protocol.qrc"/>
<include location="main-facetracknoir.qrc"/>
</resources>
<connections/>