q2rad 0.1.149__tar.gz → 0.1.151__tar.gz

{q2rad-0.1.149 → q2rad-0.1.151}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: q2rad
-Version: 0.1.149
+Version: 0.1.151
 Summary: RAD - database, GUI, reports
 Author: Andrei Puchko
 Author-email: andrei.puchko@gmx.de
@@ -34,23 +34,36 @@ sudo apt install python3-pip python3-virtualenv
 ```
 
 ## Install & run - Launcher (https://github.com/AndreiPuchko/q2radlauncher)
-**Linux**: https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/linux/q2radlauncher
-
 **Windows**: https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/windows/q2radlauncher.exe
 
+**Linux**: https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/linux/q2radlauncher
+
 **macOS**: run from terminal or ```git clone https://github.com/AndreiPuchko/q2radlauncher``` and build executable with ```build_executable.zsh```
 
       https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/macos/q2radlauncher
 ## Install & run - Python script
-**Linux, macOS**
+**Windows**
+```bash
+wget https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py  -O get-q2rad.py | py get-q2rad.py; del get-q2rad.py
+```
+**Linux**
 ```bash
 wget https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py -O - | python3 
 ```
-**Windows**
+**macOS**
 ```bash
-wget https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py  -O get-q2rad.py | py get-q2rad.py; del get-q2rad.py
+curl https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py | python3 
 ```
 ## Install & run - terminal
+**Windows (Powershell)**
+```bash
+mkdir q2rad ;`
+cd q2rad ;`
+py -m pip install --upgrade pip ;`
+py -m venv q2rad;q2rad/scripts/activate ;`
+py -m pip install --upgrade q2rad ;`
+q2rad
+```
 **Linux**
 ```bash
 sudo apt install python3-venv python3-pip -y &&\
@@ -62,15 +75,6 @@ sudo apt install python3-venv python3-pip -y &&\
     python3 -m pip install --upgrade q2rad && \
     q2rad
 ```
-**Windows (Powershell)**
-```bash
-mkdir q2rad ;`
-cd q2rad ;`
-py -m pip install --upgrade pip ;`
-py -m venv q2rad;q2rad/scripts/activate ;`
-py -m pip install --upgrade q2rad ;`
-q2rad
-```
 **macOS**
 ```bash
 mkdir -p q2rad && \

{q2rad-0.1.149 → q2rad-0.1.151}/README.md

@@ -17,23 +17,36 @@ sudo apt install python3-pip python3-virtualenv
 ```
 
 ## Install & run - Launcher (https://github.com/AndreiPuchko/q2radlauncher)
-**Linux**: https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/linux/q2radlauncher
-
 **Windows**: https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/windows/q2radlauncher.exe
 
+**Linux**: https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/linux/q2radlauncher
+
 **macOS**: run from terminal or ```git clone https://github.com/AndreiPuchko/q2radlauncher``` and build executable with ```build_executable.zsh```
 
       https://github.com/AndreiPuchko/q2radlauncher/blob/main/bin/macos/q2radlauncher
 ## Install & run - Python script
-**Linux, macOS**
+**Windows**
+```bash
+wget https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py  -O get-q2rad.py | py get-q2rad.py; del get-q2rad.py
+```
+**Linux**
 ```bash
 wget https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py -O - | python3 
 ```
-**Windows**
+**macOS**
 ```bash
-wget https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py  -O get-q2rad.py | py get-q2rad.py; del get-q2rad.py
+curl https://raw.githubusercontent.com/AndreiPuchko/q2rad/main/install/get-q2rad.py | python3 
 ```
 ## Install & run - terminal
+**Windows (Powershell)**
+```bash
+mkdir q2rad ;`
+cd q2rad ;`
+py -m pip install --upgrade pip ;`
+py -m venv q2rad;q2rad/scripts/activate ;`
+py -m pip install --upgrade q2rad ;`
+q2rad
+```
 **Linux**
 ```bash
 sudo apt install python3-venv python3-pip -y &&\
@@ -45,15 +58,6 @@ sudo apt install python3-venv python3-pip -y &&\
     python3 -m pip install --upgrade q2rad && \
     q2rad
 ```
-**Windows (Powershell)**
-```bash
-mkdir q2rad ;`
-cd q2rad ;`
-py -m pip install --upgrade pip ;`
-py -m venv q2rad;q2rad/scripts/activate ;`
-py -m pip install --upgrade q2rad ;`
-q2rad
-```
 **macOS**
 ```bash
 mkdir -p q2rad && \

{q2rad-0.1.149 → q2rad-0.1.151}/pyproject.toml

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

{q2rad-0.1.149 → q2rad-0.1.151}/q2rad/q2rad.py

@@ -51,7 +51,7 @@ from q2rad.q2raddb import q2cursor
 from q2rad.q2appmanager import AppManager
 from q2rad.q2stylesettings import AppStyleSettings
 from q2rad.q2utils import set_logging
-
+from q2terminal.q2terminal import Q2Terminal
 from q2rad.q2appselector import Q2AppSelect
 from q2rad.q2modules import Q2Modules
 from q2rad.q2forms import Q2Forms
@@ -633,8 +633,6 @@ class Q2RadApp(Q2App):
         self.process_events()
 
     def get_package_versions(self, package):
-        import time
-        time.sleep(1)
         response = open_url(f"https://pypi.python.org/pypi/{package}/json")  # noqa F405
         if response:
             latest_version = json.load(response)["info"]["version"]
@@ -674,11 +672,35 @@ class Q2RadApp(Q2App):
             mess = "Updates not found!<p>"
         q2Mess(mess)
         if upgraded:
-            if "win32" in sys.platform:
-                subprocess.Popen([sys.executable, "-m", "q2rad"], start_new_session=True)
-            else:
-                os.execv(sys.executable, [sys.executable, "-m", "q2rad"])
-            self.close()
+            self.restart()
+
+    def update_from_git(self, package=""):
+        if os.path.isfile("poetry.lock"):
+            q2mess("poetry.lock presents - update from git is impossible!")
+            return
+
+        def callback(data):
+            print(data)
+
+        trm = Q2Terminal(callback=callback)
+        executable = sys.executable.replace("w.exe", ".exe")
+        for x in q2_modules:
+            if not x.startswith("q2"):
+                continue
+            if package and x != package:
+                continue
+            trm.run(
+                f"{executable} -m pip install  --upgrade --force-reinstall " 
+                f" git+https://github.com/AndreiPuchko/{x}.git"
+            )
+        print("Done")
+
+    def restart(self):
+        if "win32" in sys.platform:
+            subprocess.Popen([sys.executable, "-m", "q2rad"], start_new_session=True)
+        else:
+            os.execv(sys.executable, [sys.executable, "-m", "q2rad"])
+        self.close()
 
     def pip_install(self, package, latest_version):
         q2working(

{q2rad-0.1.149 → q2rad-0.1.151}/q2rad/q2stylesettings.py

@@ -32,6 +32,7 @@ class AppStyleSettings(Q2Form):
         super().__init__("Style Settings")
 
     def on_init(self):
+        self.color_modes = {"dark": "Dark", "light": "Light", "clean": "Clean"}
         self.last_font_size = self.q2_app.q2style.font_size
         # print("==", self.last_font_size)
         self.last_color_mode = self.q2_app.q2style.color_mode
@@ -43,35 +44,36 @@ class AppStyleSettings(Q2Form):
             control="radio",
             datalen=10,
             valid=self.style_valid,
-            data=2,
+            data=self.color_modes.get(
+                self.q2_app.q2style.color_mode, self.q2_app.q2style.get_system_color_mode()
+            ),
         )
 
-        self.add_control("/h")
+        self.add_control("/h", "Font size")
+        self.add_control("minus", "-", datalen=1, datatype="int", control="button", valid=self._font_minus)
+
         self.add_control(
             "font_size",
-            "Font size",
+            "",
             datalen=6,
             datatype="int",
-            control="spin",
+            control="line",
             data=self.q2_app.q2style.font_size,
-        )
-        self.add_control(
-            "apply",
-            "Apply",
-            datalen=10,
-            datatype="int",
-            control="button",
             valid=self.style_valid,
         )
+        self.add_control("plus", "+", datalen=1, datatype="int", control="button", valid=self._font_plus)
         self.add_control("/")
 
         self.ok_button = 1
         self.cancel_button = 1
 
-    def after_form_show(self):
-        self.s.color_mode = {"dark": "Dark", "light": "Light", "clean": "Clean"}.get(
-            self.q2_app.q2style.color_mode, self.q2_app.q2style.get_system_color_mode()
-        )
+    def _font_plus(self):
+        self.s.font_size = int_(self.s.font_size) + 1
+        self.style_valid()
+
+    def _font_minus(self):
+        self.s.font_size = int_(self.s.font_size) - 1
+        self.style_valid()
 
     def get_color_mode(self):
         color_mode = self.s.color_mode.lower()
@@ -89,6 +91,9 @@ class AppStyleSettings(Q2Form):
 
     def style_valid(self):
         self.q2_app.q2style.font_size = int_(self.s.font_size)
+        if self.q2_app.q2style.font_size < 8:
+            self.s.font_size = 8
+            self.style_valid()
         self.q2_app.set_color_mode(self.get_color_mode())
         self.q2_app.set_color_mode(self.get_color_mode())
 

q2rad-0.1.151/q2rad/version.py

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

q2rad-0.1.149/q2rad/version.py

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