GUI: added GROOPS icon for windows builds

groops-devs · Nov 11, 2020 · 86e2506 · 86e2506
1 parent 436fc44
commit 86e2506
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/gui/groopsGui.pro b/gui/groopsGui.pro
@@ -25,6 +25,8 @@ QT += widgets
 
 CONFIG += c++14
 
+win32:RC_ICONS += resources/groops.ico
+
 TEMPLATE = app
 
 INCLUDEPATH += $$GROOPS_DIR/source

diff --git a/gui/resources/groops.ico b/gui/resources/groops.ico
diff --git a/gui/tree/tree.cpp b/gui/tree/tree.cpp
@@ -46,7 +46,8 @@
 #include "settingsDialog/settingsPathDialog.h"
 #include "tree/tree.h"
 #ifdef _WIN32
-#define NOMINMAX
+#undef  NOMINMAX
+#define NOMINMAX 1
 #include "windows.h"
 #endif
 
@@ -67,11 +68,7 @@ Tree::Tree(QWidget *parent, ActionList *actionList, TabEnvironment *workspace) :
     this->_undoStack        = new QUndoStack(this);
     this->workspace         = workspace;
 
-    #ifndef _WIN32
-    std::setlocale(LC_NUMERIC, "en_US.UTF-8"); // force . as decimal separator (QLocale behavior is strange)
-    #else
-    setlocale(LC_NUMERIC, "american_usa");
-    #endif
+    setlocale(LC_NUMERIC, "en_US.UTF-8"); // force . as decimal separator (QLocale behavior is strange)
 
     // init QTreeWidget
     // ----------------