From 9f9d5d4b157f6f992edcb5f8c20056915c7dcd7b Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 26 Jul 2015 07:29:02 +0200 Subject: main: simplify win32 add_program_library_path --- facetracknoir/main.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp index 326b40ec..7ba0a462 100644 --- a/facetracknoir/main.cpp +++ b/facetracknoir/main.cpp @@ -17,18 +17,14 @@ using namespace options; // workaround QTBUG-38598, allow for launching from another directory static void add_program_library_path() { + char* p = _pgmptr; + char path[MAX_PATH+1]; + strcpy(path, p); + char* ptr = strrchr(path, '\\'); + if (ptr) { - char* p = _pgmptr; - { - char path[MAX_PATH+1]; - strcpy(path, p); - char* ptr = strrchr(path, '\\'); - if (ptr) - { - *ptr = '\0'; - QCoreApplication::addLibraryPath(path); - } - } + *ptr = '\0'; + QCoreApplication::addLibraryPath(path); } } #endif -- cgit v1.2.3 From 667312695bacd560c60826a46cdb8e3d4f73d758 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 26 Jul 2015 08:24:01 +0200 Subject: main: improve theme/qt plugin selection logic --- facetracknoir/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/facetracknoir/main.cpp b/facetracknoir/main.cpp index 7ba0a462..45483a68 100644 --- a/facetracknoir/main.cpp +++ b/facetracknoir/main.cpp @@ -33,12 +33,14 @@ int main(int argc, char** argv) { #ifdef _WIN32 add_program_library_path(); -#endif +#elif !defined(__linux) // workaround QTBUG-38598 QCoreApplication::addLibraryPath("."); +#endif +#if defined(_WIN32) || defined(__APPLE__) // qt5 designer-made controls look like shit on 'doze -sh 20140921 -#ifdef _WIN32 + // also our OSX look leaves a lot to be desired -sh 20150726 { const QStringList preferred { "fusion", "windowsvista", "jazzbands'-marijuana", "macintosh", "windowsxp" }; for (const auto& style_name : preferred) -- cgit v1.2.3 From 18085c6177dbbe440a12974d29fd03eb477ce177 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 26 Jul 2015 08:25:01 +0200 Subject: ui: remove duplicate include --- facetracknoir/ui.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 8275cb2d..698d4a1a 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -135,10 +135,6 @@ void MainWindow::save_mappings() { pose.save_mappings(); } -#if defined(__unix) || defined(__linux) || defined(__APPLE__) -# include -#endif - void MainWindow::save() { s.b->save(); save_mappings(); -- cgit v1.2.3 From 2f631a5159542f7e2813ca6ed7bc0be37c50afae Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Sun, 26 Jul 2015 08:34:10 +0200 Subject: ui: also implicitly cancel options/mapping screens on normal close --- facetracknoir/curve-config.h | 1 + facetracknoir/options-dialog.cpp | 1 + facetracknoir/options-dialog.hpp | 1 + 3 files changed, 3 insertions(+) diff --git a/facetracknoir/curve-config.h b/facetracknoir/curve-config.h index d1ef7ad2..0cbc7055 100644 --- a/facetracknoir/curve-config.h +++ b/facetracknoir/curve-config.h @@ -11,6 +11,7 @@ public: private: Ui::UICCurveConfigurationDialog ui; Mappings& m; + void closeEvent(QCloseEvent *) override { doCancel(); } private slots: void doOK(); void doCancel(); diff --git a/facetracknoir/options-dialog.cpp b/facetracknoir/options-dialog.cpp index b90408a8..1ec26d5e 100644 --- a/facetracknoir/options-dialog.cpp +++ b/facetracknoir/options-dialog.cpp @@ -91,3 +91,4 @@ void OptionsDialog::doCancel() { ui.game_detector->revert(); close(); } + diff --git a/facetracknoir/options-dialog.hpp b/facetracknoir/options-dialog.hpp index 9ad656a4..3ef99d06 100644 --- a/facetracknoir/options-dialog.hpp +++ b/facetracknoir/options-dialog.hpp @@ -15,6 +15,7 @@ public: private: Ui::UI_Settings ui; Shortcuts::settings s; + void closeEvent(QCloseEvent *) override { doCancel(); } private slots: void doOK(); void doCancel(); -- cgit v1.2.3