q2rad 0.1.203__tar.gz → 0.1.204__tar.gz

{q2rad-0.1.203 → q2rad-0.1.204}/PKG-INFO

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

{q2rad-0.1.203 → q2rad-0.1.204}/pyproject.toml

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

{q2rad-0.1.203 → q2rad-0.1.204}/q2rad/q2lines.py

@@ -188,6 +188,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_table,
                     )
                     self.add_control("to_table", gridlabel=_("To table"), datatype="char", datalen=100)
@@ -198,6 +199,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_table_pk,
                     )
                     self.add_control("to_column", gridlabel=_("To field"), datatype="char", datalen=100)
@@ -209,6 +211,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing columns"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_table_column,
                     )
                     self.add_control("/")
@@ -222,6 +225,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing forms"),
                         control="button",
+                        datalen=2,
                         valid=self.select_linked_form,
                     )
                     self.add_control("to_form", gridlabel=_("Form to open"), datatype="char", datalen=100)
@@ -328,11 +332,11 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         if last < self.model.row_count():
             last_seq = int_(self.model.get_record(last)["seq"]) + 1
-            self.move_rows_down(last, False)
+            self.move_rows_down(last)
         else:
             last_seq = int_(self.model.get_record(self.model.row_count() - 1)["seq"]) + 2
 
-        self.move_rows_down(first, False)
+        self.move_rows_down(first)
         self.model.insert({"column": layout_type, "seq": first_seq})
         self.model.insert({"column": "/", "seq": last_seq})
         self.refresh()
@@ -342,7 +346,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
             current_row = self.current_row
         for x in range(current_row, self.model.row_count()):
             rec = self.model.get_record(x)
-            self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])})
+            self.model.update({"id": rec["id"], "seq": 1 + int_(rec["seq"])}, refresh=False)
         if refresh:
             self.refresh()
 
@@ -357,17 +361,22 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         def seek_end():
             nonlocal last_row
+            same_panel = 0
             while last_row < self.model.row_count():
                 self.set_grid_index(last_row)
-                # if is_panel_start():
-                #     break
-                if is_panel_end():
-                    break
+                if is_panel_start():
+                    same_panel += 1
+                elif is_panel_end():
+                    if same_panel == 1:
+                        break
+                    else:
+                        same_panel -= 1
                 last_row += 1
 
         def seek_start():
-            in_panel = -1 if is_panel_end() else 0
             nonlocal first_row
+            self.set_grid_index(first_row)
+            in_panel = -1 if is_panel_end() else 0
             while first_row > 0:
                 self.set_grid_index(first_row)
                 if is_panel_start():
@@ -381,6 +390,7 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
         if not is_panel_start():
             seek_start()
+        last_row = first_row
         if not is_panel_end():
             seek_end()
         self.set_grid_selected_rows([x for x in range(first_row, last_row + 1)])

{q2rad-0.1.203 → q2rad-0.1.204}/q2rad/q2utils.py

@@ -492,13 +492,14 @@ class Q2_save_and_run:
 
 
 class auto_filter:
-    def __init__(self, form_name, mem):
+    def __init__(self, form_name, mem, lines_per_tab=10):
         self.form_name = form_name
         self.mem = mem
         self.filter_columns = []
         self.mem.ok_button = True
         self.mem.cancel_button = True
         self.mem.add_ok_cancel_buttons()
+        self.lines_per_tab = lines_per_tab
 
         self.auto_filter()
 
@@ -515,8 +516,13 @@ class auto_filter:
             """,
             self.mem.q2_app.db_logic,
         )
-        self.mem.add_control("/f")
+        make_tabs = cu.row_count() > self.lines_per_tab
+        if not make_tabs:
+            self.mem.add_control("/f")
         for col in cu.records():
+            if make_tabs and cu.current_row() % self.lines_per_tab == 0:
+                self.mem.add_control("/t", f"Tab #{1+ cu.current_row() // self.lines_per_tab}")
+                self.mem.add_control("/f")
             if col["control"] == "text":
                 col["control"] = "line"
             col = Q2Controls.validate(col)
@@ -538,6 +544,7 @@ class auto_filter:
                 col["check"] = 1
 
                 self.mem.add_control(**col)
+        self.mem.add_control("/")
         self.mem.valid = self.valid
 
     def valid(self):

q2rad-0.1.204/q2rad/version.py

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

q2rad-0.1.203/q2rad/version.py

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