q2rad 0.1.239__tar.gz → 0.1.241__tar.gz

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

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

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

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

{q2rad-0.1.239 → q2rad-0.1.241}/q2rad/q2appmanager.py

@@ -165,7 +165,7 @@ class AppManager(Q2Form):
                                 control="button",
                                 # datalen=14,
                                 valid=self.export_q2market,
-                                style="background:LightCoral",
+                                style="background:LightCoral; ; font-weight:bold",
                             )
                         self.add_control("/")
 
@@ -187,7 +187,7 @@ class AppManager(Q2Form):
                             control="button",
                             # datalen=10,
                             valid=self.import_app_all,
-                            style="background:red",
+                            style="background:#FF6666; font-weight:bold",
                         )
                         if self.q2_app.app_url:
                             self.add_control(

{q2rad-0.1.239 → q2rad-0.1.241}/q2rad/q2queries.py

@@ -194,20 +194,6 @@ class Q2QueryEdit(Q2Form):
                     control="button",
                 )
                 self.add_control("/s")
-                self.add_control(
-                    "show_json",
-                    "Show as JSON",
-                    valid=self.query_list.show_dataset_json,
-                    control="button",
-                )
-                self.add_control("/s")
-                self.add_control(
-                    "save_json",
-                    "Save as JSON",
-                    valid=self.query_list.save_dataset_json,
-                    control="button",
-                )
-                self.add_control("/s")
             self.add_control("/")
             self.add_control("pl", "", widget=self.param_list, nogrid=1, migrate=0)
             self.add_control("/")
@@ -263,6 +249,10 @@ class Q2QueryList(Q2Form):
         self.add_control("/")
         self.set_model(Q2Model())
         self.add_action("/crud")
+        self.add_action("-")
+        self.add_action("Dataset|Show as JSON", self.show_dataset_json)
+        self.add_action("Dataset|Save as JSON", self.save_dataset_json)
+        
         self.model.readonly = False
         self.last_current_row = -1
 

{q2rad-0.1.239 → q2rad-0.1.241}/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.241/q2rad/version.py

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

q2rad-0.1.239/q2rad/version.py

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