q2rad 0.1.209__tar.gz → 0.1.210__tar.gz

{q2rad-0.1.209 → q2rad-0.1.210}/PKG-INFO

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

{q2rad-0.1.209 → q2rad-0.1.210}/pyproject.toml

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

{q2rad-0.1.209 → q2rad-0.1.210}/q2rad/q2appselector.py

@@ -102,13 +102,14 @@ class Q2AppSelect(Q2Form):
                 self.add_control(
                     "select_data_storage_file",
                     _("?"),
+                    datalen=3,
                     mess=_("Open Data Storage sqlite database file"),
                     control="button",
                     valid=self.openSqliteDataFile,
                 )
                 self.add_control("/")
             if self.add_control("/h"):
-                self.add_control("host_data", _("Host"), gridlabel=_("Data host"), datalen=100)
+                self.add_control("host_data", _("Host"), gridlabel=_("Data host"), datalen=100, stretch=90)
                 self.add_control("port_data", _("Port"), gridlabel=_("Data port"), datatype="int")
                 self.add_control(
                     "guest_mode",
@@ -118,6 +119,7 @@ class Q2AppSelect(Q2Form):
                     datalen=1,
                     mess=_("No database schema changes"),
                 )
+                self.add_control("/s", stretch=0)
                 self.add_control("/")
 
             self.add_control("/")
@@ -145,13 +147,14 @@ class Q2AppSelect(Q2Form):
                 self.add_control(
                     "select_app_storage_file",
                     _("?"),
+                    datalen=3,
                     mess=_("Open App Storage sqlite database file"),
                     control="button",
                     valid=self.openSqliteDataFile,
                 )
                 self.add_control("/")
             if self.add_control("/h"):
-                self.add_control("host_logic", _("Host"), gridlabel=_("Logic host"), datalen=100)
+                self.add_control("host_logic", _("Host"), gridlabel=_("Logic host"), datalen=100, stretch=90)
                 self.add_control("port_logic", _("Port"), gridlabel=_("Logic port"), datatype="int")
                 self.add_control(
                     "dev_mode",
@@ -161,6 +164,7 @@ class Q2AppSelect(Q2Form):
                     datalen=1,
                     mess=_("Allow to change App"),
                 )
+                self.add_control("/s", stretch=0)
                 self.add_control("/")
             self.add_control("/")
 
@@ -307,7 +311,9 @@ class Q2AppSelect(Q2Form):
         pinform.add_control("/h")
         pinform.add_control("/s")
         pinform.add_control("", "Application:", control="label")
-        pinform.add_control("appname", app_name, control="label", style="color:green;font-weight:bold;background:white")
+        pinform.add_control(
+            "appname", app_name, control="label", style="color:green;font-weight:bold;background:white"
+        )
         pinform.add_control("/s")
         pinform.add_control("/")
         pinform.add_control("/f")

{q2rad-0.1.209 → q2rad-0.1.210}/q2rad/q2rad.py

@@ -731,6 +731,12 @@ class Q2RadApp(Q2App):
 
         return latest_version, current_version
 
+    def get_git_package_version(git_package):
+        package_name = os.path.basename(git_package)
+        package_path = git_package.replace("github.com", "githubusercontent.com")
+        version_url = f"https://raw.{package_path}/main/{package_name}/version.py"
+        return read_url(version_url).decode().split("=")[-1].strip()
+
     def update_packages(self, packages_list=q2_modules, force=False):
         if self.frozen:
             return
@@ -912,7 +918,12 @@ class Q2RadApp(Q2App):
         for package in rez:
             latest_version, current_version = rez[package]
             if self.db_logic is not None and package not in q2_modules:
-                pkg_ver = get("packages", f"package_name='{package}'", "package_version", q2_db=self.db_logic)
+                pkg_ver = get(
+                    "packages",
+                    f"package_name='{package if isinstance(package, str) else package[0]}'",
+                    "package_version",
+                    q2_db=self.db_logic,
+                )
                 pkg_ver = pkg_ver if pkg_ver else "99999"
                 if pkg_ver != "":
                     try:

q2rad-0.1.210/q2rad/version.py

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

q2rad-0.1.209/q2rad/version.py

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