q2rad 0.1.181__py3-none-any.whl → 0.1.183__py3-none-any.whl

q2rad/q2make.py

@@ -15,6 +15,7 @@
 import os
 import sys
 import shutil
+import zipfile
 from q2terminal.q2terminal import Q2Terminal
 from q2rad.q2utils import q2cursor, Q2Form, open_folder  # noqa F401
 from q2gui.q2dialogs import q2mess, q2wait, q2ask
@@ -69,7 +70,7 @@ def make_binary(self):
     if not form.ok_pressed:
         return
 
-    if q2ask("Уou are about to start buiding binary executable file of Q2RAD!<br>Are You Sure?") != 2:
+    if q2ask("Уou are about to start building binary executable file of Q2RAD!<br>Are You Sure?") != 2:
         return
 
     make_folder = os.path.abspath(form.s.make_folder)
@@ -81,7 +82,16 @@ def make_binary(self):
     if not os.path.isdir(make_folder):
         return
 
-    main = "from q2rad.q2rad import Q2RadApp;app = Q2RadApp();app.run()"
+    main = """
+if "darwin" in sys.platform:
+    path = sys.argv[0].split("/Contents/MacOS")[0]
+    path = os.path.dirname(path)
+    os.chdir(path)
+
+from q2rad.q2rad import Q2RadApp
+app = Q2RadApp()
+app.run()
+    """
     open(f"{make_folder}/{binary_name}.py", "w").write(main)
 
     dist_folder = os.path.abspath(f"{make_folder}/dist/{binary_name}")
@@ -89,6 +99,8 @@ def make_binary(self):
     terminal = Q2Terminal(callback=print)
     # pynstaller_executable = os.path.dirname(sys.executable) + "/pyinstaller"
     pynstaller_executable = f"'{sys.executable}' -m PyInstaller"
+    if "win32" in sys.platform:
+        pynstaller_executable = "&" + pynstaller_executable
 
     if not os.path.isfile("poetry.lock"):
         terminal.run(f"{pynstaller_executable} -v")
@@ -128,6 +140,24 @@ def make_binary(self):
     #         if os.path.isfile(os.path.join(dist_folder, x)):
     #             shutil.move(os.path.join(dist_folder, x), os.path.join(dist_folder, binary_name, x))
 
+    if "darwin" in sys.platform:
+        shutil.move(
+            f"{make_folder}/dist/{binary_name}.app", f"{make_folder}/dist/{binary_name}/{binary_name}.app"
+        )
+        os.remove(f"{make_folder}/dist/{binary_name}/{binary_name}")
+        shutil.rmtree(f"{make_folder}/dist/{binary_name}/_internal", ignore_errors=True)
+
+    name = f"{make_folder}/dist/{binary_name}"
+    zip_name = name + ".zip"
+
+    with zipfile.ZipFile(zip_name, "w", zipfile.ZIP_DEFLATED) as zip_ref:
+        for folder_name, subfolders, filenames in os.walk(name):
+            for filename in filenames:
+                file_path = os.path.join(folder_name, filename)
+                zip_ref.write(file_path, arcname=f"{binary_name}/{os.path.relpath(file_path, name)}")
+
+    zip_ref.close()
+
     w.close()
 
     if terminal.exit_code != 0:

q2rad/q2packages.py

@@ -40,9 +40,9 @@ class Q2Packages(Q2Form):
         self.set_model(model)
         self.add_action("/crud")
         # self.add_action("Imp", self.imp)
-        self.add_action("Install", self.install)
-        self.add_action("Uninstall", self.uninstall)
-        self.add_action("Versions", self.info)
+        self.add_action("Install", self.install, eof_disabled=True)
+        self.add_action("Uninstall", self.uninstall, eof_disabled=True)
+        self.add_action("Versions", self.info, eof_disabled=True)
 
     # def imp(self):
     #     __import__(self.r.package_name)

q2rad/q2utils.py

@@ -203,7 +203,10 @@ class Q2Form(_Q2Form):
             )
 
     def changelog(self):
-        choice = q2ask("Что смотрим?", buttons=["Cancel", "Current row", "All rows"])
+        choice = q2ask(
+            "Select viewing mode for changelog: only current row or all rows?",
+            buttons=["Cancel", "Current row", "All rows"],
+        )
         if choice < 2:  # Cancel
             return
         elif choice == 2:  # Row
@@ -507,10 +510,10 @@ class auto_filter:
                 self.mem.add_control("/h", cu.r.label, check=1)
                 col["label"] = "from"
                 co = col["column"]
-                col["column"] = co + "1"
+                col["column"] = co + "____1"
                 self.mem.add_control(**col)
                 col["label"] = "to"
-                col["column"] = co + "2"
+                col["column"] = co + "____2"
                 self.mem.add_control(**col)
                 self.mem.add_control("/s")
                 self.mem.add_control("/")
@@ -534,8 +537,8 @@ class auto_filter:
         if control1 is None:
             if column in mem_widgets:
                 control1 = column
-            elif column + "1" in mem_widgets:
-                control1 = column + "1"
+            elif column + "____1" in mem_widgets:
+                control1 = column + "____1"
         if control1 not in mem_widgets:
             return ""
 
@@ -546,8 +549,8 @@ class auto_filter:
         num_control = self.mem.controls.c.__getattr__(control1).get("num")
         control1_value = self.mem.s.__getattr__(control1)
         if control2 is None:
-            if control1.endswith("1"):
-                control2 = control1[:-1] + "2"
+            if control1.endswith("____1"):
+                control2 = control1[:-5] + "____2"
                 control2_value = self.mem.s.__getattr__(control2)
             else:
                 control2_value = None

q2rad/version.py

@@ -1 +1 @@
-__version__ = "0.1.181"
+__version__ = "0.1.183"

{q2rad-0.1.181.dist-info → q2rad-0.1.183.dist-info}/METADATA

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

{q2rad-0.1.181.dist-info → q2rad-0.1.183.dist-info}/RECORD

@@ -6,19 +6,19 @@ q2rad/q2appselector.py,sha256=oKlBdGPaCh0HEeDNJRMtGMVYGev2Ylundqum74NtPqY,12238
 q2rad/q2constants.py,sha256=dQtN4OMvZw0FATDAFYjolI7eGMVUnNnbTl6qM-ggZ4I,3416
 q2rad/q2forms.py,sha256=A5VeBK8OdE3zn0L1TgvCk4OjpB1nLibJqBFfpVZr_Uc,10181
 q2rad/q2lines.py,sha256=e2GwnXxGhxMw_xWF_-enmYeHaMSKRnxER1jGFgRlOAc,14481
-q2rad/q2make.py,sha256=UdrmyGngzVD5Ix9mBqb8SPmZ2tOYghQ9Tv69lg-LjOs,5514
+q2rad/q2make.py,sha256=SjHgHMczkmjAURUoGxRf37tV4kO8NE2f_vAvPzBjC6s,6568
 q2rad/q2market.py,sha256=koWwKKc1MVn0ud2XDu_dal8lBFEMLX8KABpZO_OzTIM,2597
 q2rad/q2modules.py,sha256=N3OkUKfiwVZtmDyAtnJcs2Rprd7uIHd0HhjHTyFoN_s,4294
-q2rad/q2packages.py,sha256=IpWEcAT9nLCHUGViInEyM4T1cLEwK9GtNcdGF-pk0tw,3345
+q2rad/q2packages.py,sha256=-JrBRyyjGNsckcQfkqihRY-SZWUbVnsieBNKM6DJngk,3402
 q2rad/q2queries.py,sha256=ABbr66YRLmleo2wcpvwcQwSPt_htjQsYXgoCqRRQSbo,12512
 q2rad/q2rad.py,sha256=yf-W0YHQcCI5BNqzfKmTLzMOIgybk7fauR9-dsIn_Ps,42942
 q2rad/q2raddb.py,sha256=ISqT5EBFO7eaXcQRNpA0hMiRU84kbd-FcfckwKMlGfs,4506
 q2rad/q2reports.py,sha256=xciOPsSbhepcKk_q2bIHsceAyg5ZMbs-EVbzyD8sqBI,81212
 q2rad/q2stylesettings.py,sha256=esbfQoPgP7lJN2GRkqeQKjDpHCqCilJBzZf-c73ThCU,3593
-q2rad/q2utils.py,sha256=GOc7Ymf3EKi1ANHmXKNPsufYu5HkXysq4LaYjZh71GI,18400
-q2rad/version.py,sha256=ZdxQFgfwMgcLstS2tHqv93Tm2T7lXzvvmJLNB0GKS_c,23
-q2rad-0.1.181.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
-q2rad-0.1.181.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
-q2rad-0.1.181.dist-info/METADATA,sha256=1zFouimq6c1GfVVlpk3rCz8KW0unqAPPf16XHXg-Kf0,3329
-q2rad-0.1.181.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
-q2rad-0.1.181.dist-info/RECORD,,
+q2rad/q2utils.py,sha256=YKmHbfvKqGqhVjOERdceK2lT9IShj0afwZkGTObCs-I,18504
+q2rad/version.py,sha256=262HoV_V3P5Q9BFxC-7XwuMUEj7KKuFEc7fj0QupKz0,23
+q2rad-0.1.183.dist-info/entry_points.txt,sha256=DmsJQE6f3wYuhdN2h6ARYxSe8_d03paeepfGpdVj5rs,42
+q2rad-0.1.183.dist-info/LICENSE,sha256=JRR3LlR18ghhYXT4G2cWgXmnxRvcuVcKlqncWWK4MRY,10347
+q2rad-0.1.183.dist-info/METADATA,sha256=BUEIR4kPD58ZahimzSNNj0GDo-lrb-f8BClCqukaem0,3329
+q2rad-0.1.183.dist-info/WHEEL,sha256=WGfLGfLX43Ei_YORXSnT54hxFygu34kMpcQdmgmEwCQ,88
+q2rad-0.1.183.dist-info/RECORD,,