q2rad 0.1.237__tar.gz → 0.1.239__tar.gz

{q2rad-0.1.237 → q2rad-0.1.239}/PKG-INFO

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

{q2rad-0.1.237 → q2rad-0.1.239}/pyproject.toml

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

{q2rad-0.1.237 → q2rad-0.1.239}/q2rad/q2reports.py

@@ -523,7 +523,7 @@ class Q2ContentEditor(Q2Form):
         self.s.width = num(width.replace("%", ""))
         self.s.pz = "*" if "%" in width else ""
 
-    def changed_width(self, text):
+    def changed_width(self):
         if self.width_callback:
             self.width_callback(self.s.width, self.s.pz)
 
@@ -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.239/q2rad/version.py

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

q2rad-0.1.237/q2rad/version.py

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