q2rad 0.1.201__py3-none-any.whl → 0.1.202__py3-none-any.whl

q2rad/q2actions.py

@@ -18,6 +18,7 @@ from q2gui.q2model import Q2CursorModel
 from q2rad.q2raddb import last_error, insert
 from q2rad.q2utils import q2cursor, choice_form, choice_column, Q2_save_and_run, Q2Form, int_
 from q2gui import q2app
+
 # from q2rad import Q2Form
 
 import gettext
@@ -44,17 +45,9 @@ class Q2Actions(Q2Form, Q2_save_and_run):
         self.add_action("Copy to", icon="❖", worker=self.copy_to)
 
     def create_form(self):
+        from q2rad.q2forms import Q2Forms
+
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
-        self.add_control(
-            "name",
-            _("Form"),
-            disabled="*",
-            to_table="forms",
-            to_column="name",
-            related="name",
-            datatype="char",
-            datalen=100,
-        )
         self.add_control("action_text", _("Action text"), datatype="char", datalen=100)
         self.add_control("/")
         if self.add_control("/t", _("Main"), tag="tab"):
@@ -119,8 +112,22 @@ class Q2Actions(Q2Form, Q2_save_and_run):
                 control="radio",
                 datatype="int",
             )
+            self.add_control("/")
+            self.add_control("/f")
+            self.add_control(
+                "name",
+                _("Form"),
+                # disabled="*",
+                to_table="forms",
+                to_column="name",
+                to_form=Q2Forms(),
+                related="name",
+                datatype="char",
+                datalen=100,
+            )
 
             self.add_control("/s")
+
         self.add_control("/t", _("Action Script"))
         self.add_control(
             "action_worker",
@@ -151,7 +158,8 @@ class Q2Actions(Q2Form, Q2_save_and_run):
             seq = (
                 int_(
                     q2cursor(
-                        f"select max(seq) as maxseq from actions where name='{choice['name']}'", q2app.q2_app.db_logic
+                        f"select max(seq) as maxseq from actions where name='{choice['name']}'",
+                        q2app.q2_app.db_logic,
                     ).r.maxseq
                 )
                 + 1
@@ -159,7 +167,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
             for x in rows:
                 rec = self.model.get_record(x)
                 rec["seq"] = seq
-                rec["name"] = choice['name']
+                rec["name"] = choice["name"]
                 seq += 1
                 if not insert("actions", rec, q2app.q2_app.db_logic):
                     print(last_error(q2app.q2_app.db_logic))
@@ -184,7 +192,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
     def select_child_form(self):
         choice = choice_form()
         if choice:
-            self.s.child_form = choice['name']
+            self.s.child_form = choice["name"]
             if self.s.child_where == "":
                 parent_pk = q2cursor(
                     f"""select column
@@ -199,7 +207,7 @@ class Q2Actions(Q2Form, Q2_save_and_run):
         if self.s.child_where.startswith("=") or self.s.child_where == "":
             choice = choice_column(self.s.child_form)
             if choice:
-                self.s.child_where = choice['col'] + self.s.child_where
+                self.s.child_where = choice["col"] + self.s.child_where
 
     def before_form_show(self):
         self.action_mode_valid()

q2rad/q2appmanager.py

@@ -50,7 +50,6 @@ class AppManager(Q2Form):
                     "upgrade",
                     "Check updates",
                     control="button",
-                    datalen=10,
                     valid=q2app.q2_app.update_packages,
                 )
 
@@ -76,7 +75,6 @@ class AppManager(Q2Form):
                 "reload_assets",
                 "Reload assets",
                 control="button",
-                datalen=10,
                 valid=self.reload_assets,
             )
 

q2rad/q2lines.py

@@ -102,17 +102,8 @@ class Q2Lines(Q2Form, Q2_save_and_run):
         self.add_action("Alter column", icon="🔧", worker=self.alter_column)
 
     def create_form(self):
+        from q2rad.q2forms import Q2Forms
         self.add_control("id", "", datatype="int", pk="*", ai="*", noform=1, nogrid=1)
-        self.add_control(
-            "name",
-            _("Form"),
-            # disabled="*",
-            to_table="forms",
-            to_column="name",
-            related="name",
-            datatype="char",
-            datalen=100,
-        )
         self.add_control("column", _("Column name"), datalen=50)
         self.add_control("/")
         if self.add_control("/t", _("Main")):
@@ -197,7 +188,6 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_table,
                     )
                     self.add_control("to_table", gridlabel=_("To table"), datatype="char", datalen=100)
@@ -208,20 +198,20 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing tables"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_table_pk,
                     )
                     self.add_control("to_column", gridlabel=_("To field"), datatype="char", datalen=100)
                     self.add_control("/")
                 if self.add_control("/h", _("Data to show")):
+                    self.add_control("/v")
                     self.add_control(
                         "select_column",
                         _("?"),
                         mess=_("Open list of existing columns"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_table_column,
                     )
+                    self.add_control("/")
                     self.add_control(
                         "related", control="codesql", gridlabel=_("Data to show"), datatype="text"
                     )
@@ -232,7 +222,6 @@ class Q2Lines(Q2Form, Q2_save_and_run):
                         _("?"),
                         mess=_("Open list of existing forms"),
                         control="button",
-                        datalen=3,
                         valid=self.select_linked_form,
                     )
                     self.add_control("to_form", gridlabel=_("Form to open"), datatype="char", datalen=100)
@@ -240,6 +229,20 @@ class Q2Lines(Q2Form, Q2_save_and_run):
 
                 self.add_control("/")
 
+            self.add_control("/f")
+            self.add_control(
+                "name",
+                _("Form"),
+                # disabled="*",
+                to_table="forms",
+                to_column="name",
+                to_form=Q2Forms(),
+                related="name",
+                datatype="char",
+                datalen=100,
+            )
+            self.add_control("/")
+
             self.add_control("/s")
 
         self.add_control("/t", _("Comment"))

q2rad/q2queries.py

@@ -171,6 +171,7 @@ class Q2QueryEdit(Q2Form):
         self.query_list = Q2QueryList(self)
         self.param_list = Q2ParamList()
         self.actions = Q2Actions()
+        self._db = None
         self.actions.add_action("Run F4", self.query_list.sql_runner, hotkey="F4")
 
         self.actions.show_main_button = 0
@@ -257,7 +258,7 @@ class Q2QueryList(Q2Form):
                 sql = sql.replace(x, f"{value}")
             else:
                 sql = sql.replace(x, f"'{value}'")
-        q2cursor(sql).browse()
+        q2cursor(sql, q2_db=self.query_editor_form._db).browse()
 
     def sql_to_model(self, sql):
         self.model.update({"sql": sql}, self.current_row, refresh=False)
@@ -317,7 +318,6 @@ class Q2ParamList(Q2Form):
         return params
 
     def get_param(self, param):
-        print(self.model.records)
         for x in self.model.records:
             if x["name"] == (param[1:] if param.startswith(":") else param[1:-1]):
                 return x["value"]

q2rad/q2stylesettings.py

@@ -114,8 +114,8 @@ class AppStyleSettings(Q2Form):
         self.q2_app.set_color_mode(color_mode)
 
     def font_size_valid(self):
-        if int_(self.s.font_size) < 8:
-            self.s.font_size = 8
+        if int_(self.s.font_size) < 10:
+            self.s.font_size = 10
         if self.s.apply:
             self.q2_app.q2style.font_size = int_(self.s.font_size)
             self.style_valid()

q2rad/q2utils.py

@@ -217,7 +217,8 @@ class Q2Form(_Q2Form):
                 f"""select *
                         from log_{self.model.get_table_name()}
                         where {pk} = '{self.r.__getattr__(pk)}'
-                    """
+                    """,
+                q2_db=self.db,
             )
         elif choice == 3:
             where = self.model.get_where()
@@ -264,6 +265,7 @@ class Q2Form(_Q2Form):
             from q2rad.q2queries import Q2QueryEdit
 
             form.query_edit = Q2QueryEdit()
+            form.query_edit._db = self.db
             form.add_control("ql", "", widget=form.query_edit, nogrid=1, migrate=0)
 
             def after_form_show():

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.201"
+__version__ = "0.1.202"

{q2rad-0.1.201.dist-info → q2rad-0.1.202.dist-info}/METADATA

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

{q2rad-0.1.201.dist-info → q2rad-0.1.202.dist-info}/RECORD

@@ -1,24 +1,24 @@
 q2rad/__init__.py,sha256=Y0Up-UTXOmCYC9llNmTF10CpDDgF2kv10pyHT3-YwmQ,183
 q2rad/__main__.py,sha256=zP4JARM-FzFHM-vWLehx7c5N4v4m_F-TuMobCdFzr4Q,824
-q2rad/q2actions.py,sha256=Xqrpm68e36KVzyrmbDP8wDJfh-C_PVS-YTCF5nAQdcU,8034
-q2rad/q2appmanager.py,sha256=FFty5-BvXou21kHabnBzetgKIpHL2JiYBsDtQrn_9cw,16028
+q2rad/q2actions.py,sha256=eExRvOSyLhT_v1XCR-DmLEhQ9g_LRkrlyXnwDCjT0LM,8258
+q2rad/q2appmanager.py,sha256=f_xM1XsYTRHdr3ZLBRVFKR3-jk_JbHMTZWjj8OxF_I4,15966
 q2rad/q2appselector.py,sha256=3VlYG2kn0cOVOuRfA3dWIStvtnyKZWmfbP9Jpb8w9VI,12595
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=A5VeBK8OdE3zn0L1TgvCk4OjpB1nLibJqBFfpVZr_Uc,10181
-q2rad/q2lines.py,sha256=5KcIh-uxOBfgRsVW30y-lhivSSZSlecmisNMTf5IWpY,16835
+q2rad/q2lines.py,sha256=ttiINynYBnRbUg7WOs6xUNRT6h4iQrCiRecMN4Yaz8A,16970
 q2rad/q2make.py,sha256=wXoyBUwf2zaAl9JjWDCbjAteUElRq0O7ippyaMY9eug,6476
 q2rad/q2market.py,sha256=nyIBhZYqxNSlBXpcxdBRQ1vGSzWV8jI4cQoVa9JdRhE,2589
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
 q2rad/q2packages.py,sha256=ifRu8LuVrrTphiJe1JUVED_KB2sHJCPVnZq9VEh3K8w,3473
-q2rad/q2queries.py,sha256=ABbr66YRLmleo2wcpvwcQwSPt_htjQsYXgoCqRRQSbo,12512
+q2rad/q2queries.py,sha256=EXcau1UCdPrvTvsYr0857NoXldmrkhdrkmbUTk5LrMQ,12536
 q2rad/q2rad.py,sha256=6tdOqShosy379Q_5MtTKl4_9vISvYrukT2XVMoM-QdQ,45868
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
 q2rad/q2reports.py,sha256=Q-bZONOSDDQPrLziHTpW_L6FS82CkWzxITkv5EX5x98,84439
-q2rad/q2stylesettings.py,sha256=_aK-44kFfkaEGdwH7FzRs1KP7nsP08bL8t8OmdjM2eY,4767
-q2rad/q2utils.py,sha256=EODL46tMih2tQOV20e5nkNoKeNPyPQZ_YZFk-eAJC2M,19104
-q2rad/version.py,sha256=b5gX_HTnsuQMze8B7eGOfsOt1vDe0UEoMwaH1dflSJM,23
-q2rad-0.1.201.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.201.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.201.dist-info/METADATA,sha256=8EsfMtwlrI5G0iQlxVuXW5V6M1layK13endlCMfyXTQ,3369
-q2rad-0.1.201.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.201.dist-info/RECORD,,
+q2rad/q2stylesettings.py,sha256=rEJLyLzsffJEXnMbg9bPB3KHLjYfw-49QgrtcYOfGV0,4769
+q2rad/q2utils.py,sha256=n8BBzh-2G05zSRJLv2cCx2919laN9FmxzLVHOOoyoyg,19180
+q2rad/version.py,sha256=ENd5zaP0caBdahFV3gqq_Ugt-hgm_mU8gicYRh0aKO0,23
+q2rad-0.1.202.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.202.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.202.dist-info/METADATA,sha256=ShW-j3uKVIZThOzdnmLcruBbWHFj-htcN1dKr_cXZag,3369
+q2rad-0.1.202.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.202.dist-info/RECORD,,