q2rad 0.1.148__tar.gz → 0.1.150__tar.gz

{q2rad-0.1.148 → q2rad-0.1.150}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.148
+Version: 0.1.150
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de

{q2rad-0.1.148 → q2rad-0.1.150}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "q2rad"
-version = "0.1.148"
+version = "0.1.150"
 description = "RAD - database, GUI, reports"
 authors = ["Andrei Puchko <andrei.puchko@gmx.de>"]
 readme = "README.md"

{q2rad-0.1.148 → q2rad-0.1.150}/q2rad/q2rad.py

@@ -514,10 +514,7 @@ class Q2RadApp(Q2App):
         about.append("Versions:")
         about.append(f"<b>Python</b>: {sys.version}<p>")
 
-        task = Q2Tasker("Checking packages version")
-        for package in q2_modules:
-            task.add(self.get_package_versions, package, name=package)
-        rez = task.wait()
+        rez = self.get_packages_verion(q2_modules)
 
         for package in rez:
             latest_version, current_version = rez[package]
@@ -641,7 +638,6 @@ class Q2RadApp(Q2App):
             latest_version = json.load(response)["info"]["version"]
         else:
             latest_version = None
-        # current_version = sys.modules[package].__version__ if package in sys.modules else ""
         installed_packages = [x.name for x in pkgutil.iter_modules()]
         if package in installed_packages:
             current_version = self.code_runner(f"from {package} import __version__ as tmpv;return tmpv")()
@@ -762,10 +758,7 @@ class Q2RadApp(Q2App):
         list_2_upgrade_message = []
         list_2_upgrade = []
 
-        task = Q2Tasker("Checking packages version")
-        for package in packages_list:
-            task.add(self.get_package_versions, package, name=package)
-        rez = task.wait()
+        rez = self.get_packages_verion(packages_list)
 
         for package in rez:
             latest_version, current_version = rez[package]
@@ -786,6 +779,13 @@ class Q2RadApp(Q2App):
             ):
                 self.update_packages(list_2_upgrade)
 
+    def get_packages_verion(self, packages_list):
+        task = Q2Tasker("Checking packages version")
+        for package in packages_list:
+            task.add(self.get_package_versions, package, name=package)
+        rez = task.wait()
+        return rez
+
     def run_stylesettings(self):
         AppStyleSettings().run()
 

{q2rad-0.1.148 → q2rad-0.1.150}/q2rad/q2stylesettings.py

@@ -32,6 +32,7 @@ class AppStyleSettings(Q2Form):
         super().__init__("Style Settings")
 
     def on_init(self):
+        self.color_modes = {"dark": "Dark", "light": "Light", "clean": "Clean"}
         self.last_font_size = self.q2_app.q2style.font_size
         # print("==", self.last_font_size)
         self.last_color_mode = self.q2_app.q2style.color_mode
@@ -43,26 +44,37 @@ class AppStyleSettings(Q2Form):
             control="radio",
             datalen=10,
             valid=self.style_valid,
-            data=2,
+            data=self.color_modes.get(
+                self.q2_app.q2style.color_mode, self.q2_app.q2style.get_system_color_mode()
+            ),
         )
 
+        self.add_control("/h")
         self.add_control(
             "font_size",
             "Font size",
             datalen=6,
             datatype="int",
             control="spin",
-            valid=self.style_valid,
             data=self.q2_app.q2style.font_size,
         )
+        self.add_control(
+            "apply",
+            "Apply",
+            datalen=10,
+            datatype="int",
+            control="button",
+            valid=self.style_valid,
+        )
+        self.add_control("/")
 
         self.ok_button = 1
         self.cancel_button = 1
 
-    def after_form_show(self):
-        self.s.color_mode = {"dark": "Dark", "light": "Light", "clean": "Clean"}.get(
-            self.q2_app.q2style.color_mode, self.q2_app.q2style.get_system_color_mode()
-        )
+    # def after_form_show(self):
+    #     self.s.color_mode = self.color_modes.get(
+    #         self.q2_app.q2style.color_mode, self.q2_app.q2style.get_system_color_mode()
+    #     )
 
     def get_color_mode(self):
         color_mode = self.s.color_mode.lower()
@@ -71,6 +83,7 @@ class AppStyleSettings(Q2Form):
         return color_mode
 
     def valid(self):
+        self.style_valid()
         color_mode = self.get_color_mode()
         self.q2_app.q2style.font_size = int_(self.s.font_size)
         self.q2_app.settings.set("Style Settings", "color_mode", color_mode)

q2rad-0.1.150/q2rad/version.py

@@ -0,0 +1 @@
+__version__ = "0.1.150"

q2rad-0.1.148/q2rad/version.py

@@ -1 +0,0 @@
-__version__ = "0.1.148"