pyPDFeditor-GUI 3.0.6__tar.gz → 3.0.7__tar.gz

{pypdfeditor_gui-3.0.6 → pypdfeditor_gui-3.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyPDFeditor-GUI
-Version: 3.0.6
+Version: 3.0.7
 Summary: A desktop application to edit PDF files.
 Home-page: https://github.com/Augus1999/pyPDFeditor-GUI/
 Author: Nianze A. TAO
@@ -36,16 +36,16 @@ Requires-Dist: PyQt6>=6.7.0
 ![pylint](https://github.com/Augus1999/pyPDFeditor-GUI/actions/workflows/pylint.yml/badge.svg)
 
 ![OS](https://img.shields.io/badge/OS-Win%20|%20Linux%20|%20macOS-blue?color=00b166)
-![python](https://img.shields.io/badge/Python-3.9%20|%203.10-blue.svg?color=dd9b65)
-![PyQt](https://img.shields.io/badge/PyQt-5.15-blue?color=708ddd)
+![python](https://img.shields.io/badge/Python-≥3.9%20-blue.svg?color=dd9b65)
+![PyQt](https://img.shields.io/badge/PyQt-6.7-blue?color=708ddd)
 ![black](https://img.shields.io/badge/code%20style-black-black)
 
-This project is based on PyQt5 and PyMuPDF and tested on Windows 10 & 11.
+This project is based on PyQt5 and PyMuPDF and tested on Windows 10 & 11 and Ubuntu on WSL2.
 
 ## Welcome 🎃🎉
 
 Welcome to use pyPDFeditor-GUI. pyPDFeditor-GUI is a simple cross-platform application, thanks
-to [Python](https://www.python.org/), [PyQt5](https://www.riverbankcomputing.com/software/pyqt/)
+to [Python](https://www.python.org/), [PyQt6](https://www.riverbankcomputing.com/software/pyqt/)
 and [PyMuPDF](https://github.com/pymupdf/PyMuPDF), designed to work on simple PDF handling.
 
 I tried my best to make it close to Fluent UI. Icons used can be found [🔗here](https://fluenticons.co/).

{pypdfeditor_gui-3.0.6 → pypdfeditor_gui-3.0.7}/README.md

@@ -5,16 +5,16 @@
 ![pylint](https://github.com/Augus1999/pyPDFeditor-GUI/actions/workflows/pylint.yml/badge.svg)
 
 ![OS](https://img.shields.io/badge/OS-Win%20|%20Linux%20|%20macOS-blue?color=00b166)
-![python](https://img.shields.io/badge/Python-3.9%20|%203.10-blue.svg?color=dd9b65)
-![PyQt](https://img.shields.io/badge/PyQt-5.15-blue?color=708ddd)
+![python](https://img.shields.io/badge/Python-≥3.9%20-blue.svg?color=dd9b65)
+![PyQt](https://img.shields.io/badge/PyQt-6.7-blue?color=708ddd)
 ![black](https://img.shields.io/badge/code%20style-black-black)
 
-This project is based on PyQt5 and PyMuPDF and tested on Windows 10 & 11.
+This project is based on PyQt5 and PyMuPDF and tested on Windows 10 & 11 and Ubuntu on WSL2.
 
 ## Welcome 🎃🎉
 
 Welcome to use pyPDFeditor-GUI. pyPDFeditor-GUI is a simple cross-platform application, thanks
-to [Python](https://www.python.org/), [PyQt5](https://www.riverbankcomputing.com/software/pyqt/)
+to [Python](https://www.python.org/), [PyQt6](https://www.riverbankcomputing.com/software/pyqt/)
 and [PyMuPDF](https://github.com/pymupdf/PyMuPDF), designed to work on simple PDF handling.
 
 I tried my best to make it close to Fluent UI. Icons used can be found [🔗here](https://fluenticons.co/).

{pypdfeditor_gui-3.0.6 → pypdfeditor_gui-3.0.7}/pyPDFeditor_GUI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyPDFeditor-GUI
-Version: 3.0.6
+Version: 3.0.7
 Summary: A desktop application to edit PDF files.
 Home-page: https://github.com/Augus1999/pyPDFeditor-GUI/
 Author: Nianze A. TAO
@@ -36,16 +36,16 @@ Requires-Dist: PyQt6>=6.7.0
 ![pylint](https://github.com/Augus1999/pyPDFeditor-GUI/actions/workflows/pylint.yml/badge.svg)
 
 ![OS](https://img.shields.io/badge/OS-Win%20|%20Linux%20|%20macOS-blue?color=00b166)
-![python](https://img.shields.io/badge/Python-3.9%20|%203.10-blue.svg?color=dd9b65)
-![PyQt](https://img.shields.io/badge/PyQt-5.15-blue?color=708ddd)
+![python](https://img.shields.io/badge/Python-≥3.9%20-blue.svg?color=dd9b65)
+![PyQt](https://img.shields.io/badge/PyQt-6.7-blue?color=708ddd)
 ![black](https://img.shields.io/badge/code%20style-black-black)
 
-This project is based on PyQt5 and PyMuPDF and tested on Windows 10 & 11.
+This project is based on PyQt5 and PyMuPDF and tested on Windows 10 & 11 and Ubuntu on WSL2.
 
 ## Welcome 🎃🎉
 
 Welcome to use pyPDFeditor-GUI. pyPDFeditor-GUI is a simple cross-platform application, thanks
-to [Python](https://www.python.org/), [PyQt5](https://www.riverbankcomputing.com/software/pyqt/)
+to [Python](https://www.python.org/), [PyQt6](https://www.riverbankcomputing.com/software/pyqt/)
 and [PyMuPDF](https://github.com/pymupdf/PyMuPDF), designed to work on simple PDF handling.
 
 I tried my best to make it close to Fluent UI. Icons used can be found [🔗here](https://fluenticons.co/).

{pypdfeditor_gui-3.0.6 → pypdfeditor_gui-3.0.7}/pypdfeditor_core/__init__.py

@@ -15,7 +15,7 @@ if not os.path.exists(app_home):
 
 __system__ = platform.system()
 __author__ = "Nianze A. TAO (Omozawa SUENO)"
-__version__ = "3.0.6"
+__version__ = "3.0.7"
 __all__ = ["main", "reset", "remove"]
 
 

{pypdfeditor_gui-3.0.6 → pypdfeditor_gui-3.0.7}/pypdfeditor_core/application.py

@@ -4,6 +4,7 @@
 wrap the whole application to one function
 """
 import os
+import sys
 import json
 import shutil
 import getpass
@@ -698,6 +699,7 @@ class FontDialog(FontDialogR):
         """
         display the font
         """
+        font_file = self.name_dict[self.combobox.currentText()]
         doc = fitz.Document()
         fitz.utils.new_page(doc, -1, 380, 220)
         r1 = fitz.Rect(10, 10, 370, 210)
@@ -711,8 +713,8 @@ class FontDialog(FontDialogR):
             color=(0.24, 0.24, 0.24),
             align=1,
             fontsize=25,
-            fontfile=self.name_dict[self.combobox.currentText()],
-            fontname="ext_0",
+            fontfile=None if font_file == "" else font_file,
+            fontname="helv" if font_file == "" else "ext_0",
         )
         shape.commit()
         cover = render_pdf_page(page)
@@ -749,7 +751,11 @@ def remove() -> None:
     """
     c = input("Are you sure to remove the whole application? n/Y" "\n>>>")
     if c.lower() == "y":
-        sp.call("pip uninstall pypdfeditor-gui", shell=True)
+        if sys.executable:
+            cmd = f"{sys.executable} -m "
+        else:
+            cmd = ""
+        sp.call(f"{cmd}pip uninstall pypdfeditor-gui", shell=True)
         if os.path.exists(app_home):
             shutil.rmtree(app_home)
         print("process finished")

{pypdfeditor_gui-3.0.6 → pypdfeditor_gui-3.0.7}/pypdfeditor_core/functions.py

@@ -152,7 +152,7 @@ def add_watermark(
     font_size: int,
     font_file: str,
     opacity: float = 0.5,
-    position: Tuple[int] = (0, 0),
+    position: Tuple[int, int] = (0, 0),
 ) -> Union[Doc, Document]:
     """
     add watermark
@@ -182,8 +182,8 @@ def add_watermark(
             stroke_opacity=0.5,
             fill_opacity=opacity,
             align=1,
-            fontfile=font_file,
-            fontname=os.path.basename(font_file),
+            fontfile=None if font_file == "" else font_file,
+            fontname="helv" if font_file == "" else os.path.basename(font_file),
             morph=(pos0, Matrix(rotate)),
         )
         shape.commit()
@@ -768,17 +768,20 @@ def find_font(font_dirs: List) -> Tuple[dict]:
     :return: two dictionaries => {font name: font file address} &
                                  {font file address: font name}
     """
-    name_dict = {}
-    dir_dict = {}
-    for font_dir in font_dirs:
-        for file_name in os.listdir(font_dir):
-            full_name = os.path.join(font_dir, file_name)
-            try:
-                font_name = Font(fontfile=full_name).name
-                name_dict[font_name] = str(Path(full_name))
-                dir_dict[str(Path(full_name))] = font_name
-            except FzErrorLibrary:
-                pass
+    name_dict = {"default": ""}
+    dir_dict = {"": "default"}
+    try:
+        for font_dir in font_dirs:
+            for file_name in os.listdir(font_dir):
+                full_name = os.path.join(font_dir, file_name)
+                try:
+                    font_name = Font(fontfile=full_name).name
+                    name_dict[font_name] = str(Path(full_name))
+                    dir_dict[str(Path(full_name))] = font_name
+                except FzErrorLibrary:
+                    pass
+    except FileNotFoundError:
+        ...
     return name_dict, dir_dict