q2rad 0.1.191__tar.gz → 0.1.192__tar.gz

{q2rad-0.1.191 → q2rad-0.1.192}/PKG-INFO

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

{q2rad-0.1.191 → q2rad-0.1.192}/pyproject.toml

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

{q2rad-0.1.191 → q2rad-0.1.192}/q2rad/q2rad.py

@@ -220,6 +220,7 @@ class Q2RadApp(Q2App):
         self.last_root_password = ""
         self.selected_application = {}
         self.q2style.font_size = int_(self.settings.get("Style Settings", "font_size", "10"))  # noqa F405
+        self.q2style.font_name = self.settings.get("Style Settings", "font_name", "Arial")  # noqa F405
         self.set_color_mode(self.settings.get("Style Settings", "color_mode", ""))
 
         self.clear_app_info()
@@ -496,7 +497,7 @@ class Q2RadApp(Q2App):
         self.clear_menu()
         self.add_menu("File|About", self.about, icon="info.png")
         self.add_menu("File|Manage", self.run_app_manager, icon="tools.png")
-        self.add_menu("File|Settings", self.run_stylesettings)
+        self.add_menu("File|Style", self.run_stylesettings)
         self.add_menu("File|Constants", self.run_constants)
         if not self.frozen:
             self.add_menu("File|-")

{q2rad-0.1.191 → q2rad-0.1.192}/q2rad/q2stylesettings.py

@@ -15,6 +15,8 @@
 
 from q2rad import Q2Form
 from q2rad.q2raddb import int_
+from PyQt6.QtWidgets import QFontDialog
+from PyQt6.QtGui import QFont
 import logging
 
 _logger = logging.getLogger(__name__)
@@ -41,28 +43,53 @@ class AppStyleSettings(Q2Form):
                 self.q2_app.q2style.color_mode, self.q2_app.q2style.get_system_color_mode()
             ),
         )
-
-        self.add_control("/h", "Font size")
-        self.add_control("minus", "-", datatype="int", control="button", valid=self._font_minus)
+        self.add_control("/")
+        self.add_control("/f", "Font")
+        if self.add_control("/h", "Size"):
+            self.add_control("minus", "-", datatype="int", control="button", valid=self._font_minus)
+
+            self.add_control(
+                "font_size",
+                "",
+                datalen=6,
+                datatype="int",
+                control="line",
+                data=self.q2_app.q2style.font_size,
+                valid=self.font_size_valid,
+            )
+            self.add_control("plus", "+", datatype="int", control="button", valid=self._font_plus)
+
+            self.add_control("/s")
+        self.add_control("/")
 
         self.add_control(
-            "font_size",
-            "",
-            datalen=6,
-            datatype="int",
+            "font_name",
+            "Font",
             control="line",
-            data=self.q2_app.q2style.font_size,
-            valid=self.font_size_valid,
+            disabled=1,
+            data=self.q2_app.q2style.font_name,
         )
-        self.add_control("plus", "+", datatype="int", control="button", valid=self._font_plus)
+        self.add_control("get_font", "Change font", datalen=15, control="button", valid=self.change_font)
         self.add_control("apply", "Apply immediately", control="check", data=True)
-
-        self.add_control("/s")
-        self.add_control("/")
+        self.add_control("reset", "Reset to Arial, 12", control="button", valid=self.reset_font)
 
         self.ok_button = 1
         self.cancel_button = 1
 
+    def reset_font(self):
+        self.s.font_size=12
+        self.s.font_name="Arial"
+        if self.s.apply:
+            self.style_valid()
+    
+    def change_font(self):
+        font, ok = QFontDialog.getFont(QFont(self.s.font_name, int_(self.s.font_size)))
+        if ok:
+            self.s.font_name = font.family()
+            self.s.font_size = font.pointSize()
+            if self.s.apply:
+                self.style_valid()
+
     def _font_plus(self):
         self.s.font_size = int_(self.s.font_size) + 1
         self.font_size_valid()
@@ -83,6 +110,7 @@ class AppStyleSettings(Q2Form):
         self.q2_app.q2style.font_size = int_(self.s.font_size)
         self.q2_app.settings.set("Style Settings", "color_mode", color_mode)
         self.q2_app.settings.set("Style Settings", "font_size", self.s.font_size)
+        self.q2_app.settings.set("Style Settings", "font_name", self.s.font_name)
         self.q2_app.set_color_mode(color_mode)
 
     def font_size_valid(self):
@@ -93,6 +121,7 @@ class AppStyleSettings(Q2Form):
             self.style_valid()
 
     def style_valid(self):
+        self.q2_app.q2style.font_name = self.s.font_name
         self.q2_app.set_color_mode(self.get_color_mode())
 
     def close(self):

q2rad-0.1.192/q2rad/version.py

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

q2rad-0.1.191/q2rad/version.py

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