q2rad 0.1.238__tar.gz → 0.1.240__tar.gz

{q2rad-0.1.238 → q2rad-0.1.240}/PKG-INFO

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

{q2rad-0.1.238 → q2rad-0.1.240}/pyproject.toml

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

{q2rad-0.1.238 → q2rad-0.1.240}/q2rad/q2rad.py

@@ -620,20 +620,24 @@ class Q2RadApp(Q2App):
         q2Mess("<br>".join(about))
 
     def asset_file_loader(self, name):
-        asset_url = f"{self.assets_url}/{name}"
+        if name.endswith(".svg"):
+            asset_url = f"https://unpkg.com/lucide-static@latest/icons/{name}"
+        else:
+            asset_url = f"{self.assets_url}/{name}"
         try:
             asset_content = read_url(asset_url)  # noqa F405
             if not asset_content:
+                _logger.info(f"Asset not found {asset_url}")
                 return False
         except Exception:
-            print(f"Error reading {asset_url}")
+            _logger.info(f"Error reading {asset_url}")
             return False
 
         try:
             open(f"assets/{name}", "wb").write(asset_content)
             return True
         except Exception:
-            print(f"Error writing asset/{name}")
+            _logger.info(f"Error writing asset/{name}")
             return False
 
     def write_restore_file(self, name, content):
@@ -1222,7 +1226,6 @@ class Q2RadApp(Q2App):
         make_binary(self)
 
     def run_form(self, name, order="", where=""):
-        # print(">>", len(set(self.QApplication.allWidgets())))
         form = self.get_form(name, where=where, order=order)
         form.run()
 

{q2rad-0.1.238 → q2rad-0.1.240}/q2rad/q2reports.py

@@ -2032,16 +2032,18 @@ class Q2ReportRows(Q2Form, ReportForm):
         if form.ok_pressed:
             # proceed = False23
             last_role = self.rows_data.role
-            if self.rows_data.role == "table" and form.s.role != "table":
+            new_role = form.s.role
+            if self.rows_data.role == "table" and new_role != "table":
                 proceed = q2AskYN(_("It will remove all siblings! Proceed?")) == 2
-                proceed = True
                 if proceed:
                     form.s.data_source = ""
                     for x in self.children_rows:
                         x.widget().remove()
+                else:
+                    new_role = last_role
 
             if last_role in roles_list.split(";"):  # skip table children
-                self.rows_data.role = form.s.role
+                self.rows_data.role = new_role
                 self.rows_data.data_source = form.s.data_source
 
             if self.group_mate:
@@ -2054,7 +2056,7 @@ class Q2ReportRows(Q2Form, ReportForm):
             self.rows_data.new_page_before = form.s.new_page_before
             self.rows_data.new_page_after = form.s.new_page_after
 
-            if last_role != "table" and form.s.role == "table":  # is is table now
+            if last_role != "table" and new_role == "table":  # is is table now
                 self.add_table_header()
                 self.add_table_footer()
 

q2rad-0.1.240/q2rad/version.py

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

q2rad-0.1.238/q2rad/version.py

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