Cleanup the main class's file some more. Windows still broken.

1 files changed, 132 insertions, 2 deletions

diff --git a/facetracknoir/shortcuts.cpp b/facetracknoir/shortcuts.cpp
index 1a80c8dc..001edf80 100644
--- a/facetracknoir/shortcuts.cpp
+++ b/facetracknoir/shortcuts.cpp
@@ -1,6 +1,136 @@
-#if defined(__WIN32) || defined(_WIN32)
 #include "facetracknoir/facetracknoir.h"
-#include "facetracknoir/shortcut-dialog.h"
+#include "facetracknoir/shortcuts.h"
+
+KeyboardShortcutDialog::KeyboardShortcutDialog( FaceTrackNoIR *ftnoir, QWidget *parent, Qt::WindowFlags f ) :
+QWidget( parent , f)
+{
+    ui.setupUi( this );
+
+    QPoint offsetpos(100, 100);
+    this->move(parent->pos() + offsetpos);
+
+    mainApp = ftnoir;											// Preserve a pointer to FTNoIR
+
+    // Connect Qt signals to member-functions
+    connect(ui.btnOK, SIGNAL(clicked()), this, SLOT(doOK()));
+    connect(ui.btnCancel, SIGNAL(clicked()), this, SLOT(doCancel()));
+
+    for ( int i = 0; i < global_key_sequences.size(); i++) {
+        ui.cbxCenterKey->addItem(global_key_sequences.at(i));
+    }
+
+    loadSettings();
+}
+
+//
+// Destructor for server-dialog
+//
+KeyboardShortcutDialog::~KeyboardShortcutDialog() {
+    qDebug() << "~KeyboardShortcutDialog() says: started";
+}
+
+//
+// OK clicked on server-dialog
+//
+void KeyboardShortcutDialog::doOK() {
+    save();
+    this->close();
+    mainApp->bindKeyboardShortcuts();
+}
+
+// override show event
+void KeyboardShortcutDialog::showEvent ( QShowEvent * event ) {
+    loadSettings();
+}
+
+//
+// Cancel clicked on server-dialog
+//
+void KeyboardShortcutDialog::doCancel() {
+    //
+    // Ask if changed Settings should be saved
+    //
+    if (settingsDirty) {
+        int ret = QMessageBox::question ( this, "Settings have changed", "Do you want to save the settings?", QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard );
+
+        qDebug() << "doCancel says: answer =" << ret;
+
+        switch (ret) {
+            case QMessageBox::Save:
+                save();
+                this->close();
+                break;
+            case QMessageBox::Discard:
+                this->close();
+                break;
+            case QMessageBox::Cancel:
+                // Cancel was clicked
+                break;
+            default:
+                // should never be reached
+            break;
+        }
+    }
+    else {
+        this->close();
+    }
+}
+
+//
+// Load the current Settings from the currently 'active' INI-file.
+//
+void KeyboardShortcutDialog::loadSettings() {
+    qDebug() << "loadSettings says: Starting ";
+    QSettings settings("opentrack");	// Registry settings (in HK_USER)
+
+    QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
+    QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
+
+    qDebug() << "loadSettings says: iniFile = " << currentFile;
+
+    iniFile.beginGroup ( "KB_Shortcuts" );
+
+    ui.chkCenterShift->setChecked (iniFile.value ( "Shift_Center", 0 ).toBool());
+    ui.chkCenterCtrl->setChecked (iniFile.value ( "Ctrl_Center", 0 ).toBool());
+    ui.chkCenterAlt->setChecked (iniFile.value ( "Alt_Center", 0 ).toBool());
+
+    ui.cbxCenterKey->setCurrentIndex(iniFile.value("Key_index_Center", 0).toInt());
+
+    iniFile.endGroup ();
+
+    settingsDirty = false;
+
+}
+
+//
+// Save the current Settings to the currently 'active' INI-file.
+//
+void KeyboardShortcutDialog::save() {
+
+    qDebug() << "save() says: started";
+
+    QSettings settings("opentrack");	// Registry settings (in HK_USER)
+
+    QString currentFile = settings.value ( "SettingsFile", QCoreApplication::applicationDirPath() + "/settings/default.ini" ).toString();
+    QSettings iniFile( currentFile, QSettings::IniFormat );		// Application settings (in INI-file)
+
+    iniFile.beginGroup ( "KB_Shortcuts" );
+    iniFile.setValue ( "Key_index_Center", ui.cbxCenterKey->currentIndex() );
+    iniFile.setValue ( "Shift_Center", ui.chkCenterShift->isChecked() );
+    iniFile.setValue ( "Ctrl_Center", ui.chkCenterCtrl->isChecked() );
+    iniFile.setValue ( "Alt_Center", ui.chkCenterAlt->isChecked() );
+
+    iniFile.endGroup ();
+
+    settingsDirty = false;
+
+    //
+    // Send a message to the main program, to update the Settings (for the tracker)
+    //
+    mainApp->updateSettings();
+}
+
+#if defined(__WIN32) || defined(_WIN32)
 #include <windows.h>
 
 KeybindingWorkerDummy::~KeybindingWorkerDummy() {