From 73ae30e016b40f852de5d0c888d77e33f549a9ee Mon Sep 17 00:00:00 2001
From: Marius Stanciu <marius.adrian@gmail.com>
Date: Wed, 4 May 2022 05:43:47 +0300
Subject: [PATCH] - more changes for dark theme

---
 CHANGELOG.md               |  1 +
 appGUI/MainGUI.py          | 17 +++++++++++++++++
 appGUI/VisPyCanvas.py      |  8 ++++++--
 appPlugins/ToolDistance.py |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bef71c8c..87552cff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ CHANGELOG for FlatCAM Evo beta
 - darkened the text color for the dark theme in order to make it easier on the eyes
 - in Distance Plugin, when using the big cursor, the cursor colors are fixed to work for the dark mode too
 - for dark mode disabled hover highlight on the Status Bar
+- more changes for dark theme
 
 2.05.2022
 
diff --git a/appGUI/MainGUI.py b/appGUI/MainGUI.py
index be3012db..b5097172 100644
--- a/appGUI/MainGUI.py
+++ b/appGUI/MainGUI.py
@@ -1533,6 +1533,15 @@ class MainGUI(QtWidgets.QMainWindow):
         # remove the close button from the Plot Area tab (first tab index = 0) as this one will always be ON
         self.plot_tab_area.protectTab(0)
 
+        if self.app.options["global_theme"] not in ['default', 'light']:
+            self.plot_tab_area.setStyleSheet(
+                """
+                QTabWidget::pane {
+                border: 0px solid rgba(255.000, 00.000, 00.000, 1.000);
+                }
+                """
+            )
+
         # ########################################################################
         # ########################## PREFERENCES AREA Tab # ######################
         # ########################################################################
@@ -1542,6 +1551,14 @@ class MainGUI(QtWidgets.QMainWindow):
         self.pref_tab_layout.setContentsMargins(2, 2, 2, 2)
 
         self.pref_tab_area = FCTab()
+        if self.app.options["global_theme"] not in ['default', 'light']:
+            self.pref_tab_area.setStyleSheet(
+                """
+                QTabWidget::pane {
+                border: 0px solid rgba(63.000, 64.000, 66.000, 1.000);
+                }
+                """
+            )
         self.pref_tab_area.setTabsClosable(False)
         self.pref_tab_area_tabBar = self.pref_tab_area.tabBar()
         self.pref_tab_area_tabBar.setStyleSheet("QTabBar::tab{min-width:90px;}")
diff --git a/appGUI/VisPyCanvas.py b/appGUI/VisPyCanvas.py
index 35d86aa4..ded3db81 100644
--- a/appGUI/VisPyCanvas.py
+++ b/appGUI/VisPyCanvas.py
@@ -51,9 +51,13 @@ class VisPyCanvas(scene.SceneCanvas):
             tick_color = Color('#000000')
             back_color = str(QPalette().color(QPalette.ColorRole.Window).name())
         else:
-            theme_color = Color('#000000')
+            if theme not in ['default', 'light']:
+                theme_color = Color('#202124')
+                back_color = Color('#202124')
+            else:
+                theme_color = Color('#000000')
+                back_color = Color('#000000')
             tick_color = Color('gray')
-            back_color = Color('#000000')
             # back_color = Color('#272822') # darker
             # back_color = Color('#3c3f41') # lighter
 
diff --git a/appPlugins/ToolDistance.py b/appPlugins/ToolDistance.py
index 5f99e2ad..5cdf862b 100644
--- a/appPlugins/ToolDistance.py
+++ b/appPlugins/ToolDistance.py
@@ -218,7 +218,7 @@ class Distance(AppTool):
             self.app.on_cursor_type(val="big", control_cursor=True)
             self.cursor_color_memory = self.app.plotcanvas.cursor_color
 
-            if self.app.options["global_theme"] in ['defaul', 'light']:
+            if self.app.options["global_theme"] in ['default', 'light']:
                 if self.app.use_3d_engine is True:
                     self.app.plotcanvas.cursor_color = '#000000FF'
                 else: