Merge pull request #369 from Robin-K-Lynn/optional-envionment

Environmental changes are now optional

Author: tlecomte

friture/FritureMainWindow.qml

@@ -28,6 +28,7 @@ Rectangle { // eventually move to ApplicationWindow
                     checkable: true
                     checked: mainWindow.main_window_view_model.toolbar_view_model.recording
                     icon.source: startButton.checked ? "qrc:/images-src/stop.svg" : "qrc:/images-src/start.svg"
+                    icon.color: undefined
                     text: startButton.checked ? qsTr("Stop") : qsTr("Start")
                     ToolTip.text: qsTr("Start/Stop")
                     icon.height: 32
@@ -40,6 +41,7 @@ Rectangle { // eventually move to ApplicationWindow
                 ToolButton {
                     id: newDockButton
                     icon.source: "qrc:/images-src/new-dock.svg"
+                    icon.color: undefined
                     text: qsTr("New dock")
                     ToolTip.text: qsTr("Add a new dock to Friture window")
                     icon.height: 32
@@ -51,6 +53,7 @@ Rectangle { // eventually move to ApplicationWindow
                 ToolButton {
                     id: settingsButton
                     icon.source: "qrc:/images-src/tools.svg"
+                    icon.color: undefined
                     text: qsTr("Settings")
                     ToolTip.text: qsTr("Display settings dialog")
                     icon.height: 32
@@ -62,6 +65,7 @@ Rectangle { // eventually move to ApplicationWindow
                 ToolButton {
                     id: aboutButton
                     icon.source: "qrc:/images-src/window-icon.svg"
+                    icon.color: undefined
                     text: qsTr("About Friture")
                     icon.height: 32
                     icon.width: 32

friture/analyzer.py

@@ -452,7 +452,8 @@ def main():
         logger.info("Applying Windows-specific setup")
 
         # enable automatic scaling for high-DPI screens
-        os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "1"
+        if "QT_AUTO_SCREEN_SCALE_FACTOR" not in os.environ:
+            os.environ["QT_AUTO_SCREEN_SCALE_FACTOR"] = "1"
 
         # set the App ID for Windows 7 to properly display the icon in the
         # taskbar.
@@ -479,7 +480,8 @@ def main():
     # Set the style for Qt Quick Controls
     # We choose the Fusion style as it is a desktop-oriented style
     # It uses the standard system palettes to provide colors that match the desktop environment.
-    os.environ["QT_QUICK_CONTROLS_STYLE"] = "Fusion"
+    if "QT_QUICK_CONTROLS_STYLE" not in os.environ:
+        os.environ["QT_QUICK_CONTROLS_STYLE"] = "Fusion"
 
     # Splash screen
     if not program_arguments.no_splash: