Merge pull request #3 from MarcinOrlowski/dev

Relase 1.2.0

.gitignore

@@ -4,6 +4,8 @@
 *.bak
 *.swp
 
+/*.sh
+
 
 
 # Linters

CHANGES.md

@@ -4,6 +4,10 @@
 
 ---
 
+* 1.2.0-dev (2024-10-09)
+  * Added support for downloading files.
+  * Added `--version` switch.
+
 * 1.1.1 (2024-10-06)
   * Fixed setup script missing runtime dependency.
 

README.md

@@ -6,15 +6,25 @@ Run any website as standalone desktop application
 
 ---
 
-Small Python script opening any web page in dedicated window, using embedded QT WebEngine. There are
-no visible browser's UI etc., so the that can be useful to turn any website into standalone desktop
-application. This is useful if you, as me, would like to have a website run as standalone app,
-independently of your main browser which can be beneficial as it gives you separate entry in
-window manager or task switcher etc.
-
-> **IMPORTANT:** This tool is **NOT** turning websites into OFFLINE apps! It's about separating
-> each of your key websites i.e. from each other, or gazzilions of your browser's tabs. But you
-> still MUST be connected to the Internet for the apps (websites) to work as previously.
+This Python script offers a unique approach to web browsing by opening any webpage in a dedicated
+window using the embedded QT WebEngine. By removing the typical browser UI elements, it effectively
+turns websites into standalone desktop applications. This can be particularly useful if you've ever
+wished to run a frequently used website as a separate app, independent from your main browser.
+
+The tool provides a practical solution for those who find themselves juggling numerous browser tabs
+or wanting a clearer separation between work and personal web applications. With each website
+running as its own "app", you gain the benefit of individual entries in your window manager or task
+switcher, potentially improving your workflow organization and efficiency.
+
+Whether you're looking to streamline your digital workspace or simply curious about alternative
+ways to interact with web content, this script presents an interesting concept that might just
+solve a problem you didn't know you had.
+
+**IMPORTANT:** It's worth pointing out however, that this tool doesn't transform websites into
+offline applications. Rather, it focuses on separating your key websites from each other and from
+the multitude of browser tabs you might typically have open. While this approach offers improved
+organization and workflow, it's crucial to understand that an internet connection is still required
+for these "apps" (websites) to function as they normally would in a traditional browser environment.
 
 ## Installation
 

docs/README.md

@@ -6,15 +6,25 @@ Run any website as standalone desktop application
 
 ---
 
-Small Python script opening any web page in dedicated window, using embedded QT WebEngine. There are
-no visible browser's UI etc., so the that can be useful to turn any website into standalone desktop
-application. This is useful if you, as me, would like to have a website run as standalone app,
-independently of your main browser which can be beneficial as it gives you separate entry in
-window manager or task switcher etc.
-
-> **IMPORTANT:** This tool is **NOT** turning websites into OFFLINE apps! It's about separating
-> each of your key websites i.e. from each other, or gazzilions of your browser's tabs. But you
-> still MUST be connected to the Internet for the apps (websites) to work as previously.
+This Python script offers a unique approach to web browsing by opening any webpage in a dedicated
+window using the embedded QT WebEngine. By removing the typical browser UI elements, it effectively
+turns websites into standalone desktop applications. This can be particularly useful if you've ever
+wished to run a frequently used website as a separate app, independent from your main browser.
+
+The tool provides a practical solution for those who find themselves juggling numerous browser tabs
+or wanting a clearer separation between work and personal web applications. With each website
+running as its own "app", you gain the benefit of individual entries in your window manager or task
+switcher, potentially improving your workflow organization and efficiency.
+
+Whether you're looking to streamline your digital workspace or simply curious about alternative
+ways to interact with web content, this script presents an interesting concept that might just
+solve a problem you didn't know you had.
+
+**IMPORTANT:** It's worth pointing out however, that this tool doesn't transform websites into
+offline applications. Rather, it focuses on separating your key websites from each other and from
+the multitude of browser tabs you might typically have open. While this approach offers improved
+organization and workflow, it's crucial to understand that an internet connection is still required
+for these "apps" (websites) to function as they normally would in a traditional browser environment.
 
 ---
 

websiteapp/const.py

@@ -18,8 +18,8 @@
 
 class Version(Enum):
     MAJOR = 1
-    MINOR = 1
-    PATCH = 1
+    MINOR = 2
+    PATCH = 0
 
     @classmethod
     def as_string(cls) -> str:

websiteapp/utils.py

@@ -102,6 +102,8 @@ def handle_args():
                             help='Starts app minimized to system tray.')
         parser.add_argument('--allow-multiple', '-a', action='store_true',
                             help='Allows multiple instances of the app to run on the same profile')
+        parser.add_argument('--version', '-v', action='store_true',
+                            help='Prints the version of the app and exits')
 
         parser.add_argument('--debug', '-d', action='store_true',
                             help='Makes app print more debug messages during execution')

websiteapp/webapp.py

@@ -16,12 +16,12 @@
 from typing import Optional
 
 import fasteners
-from PySide6.QtCore import QUrl, QFileSystemWatcher
+from PySide6.QtCore import QUrl, QFileSystemWatcher, QStandardPaths, Qt
 from PySide6.QtGui import QAction
 from PySide6.QtWebEngineCore import QWebEngineProfile, QWebEnginePage, QWebEngineSettings
 from PySide6.QtWebEngineWidgets import QWebEngineView
 from PySide6.QtWidgets import QApplication, QMainWindow, QVBoxLayout, QWidget, QSystemTrayIcon, \
-    QMenu
+    QMenu, QFileDialog
 
 from websiteapp.about import About
 from websiteapp.const import Const
@@ -36,6 +36,11 @@ class WebApp(QMainWindow):
     def __init__(self):
         super().__init__()
 
+        # Check for --version before full argument parsing
+        if '--version' in sys.argv:
+            print(f'{Const.APP_NAME} {Const.APP_VERSION}')
+            sys.exit(0)
+
         self.app = QApplication.instance()
         self.args = Utils.handle_args()
 
@@ -64,6 +69,9 @@ def __init__(self):
         self.profile = QWebEngineProfile(self.args.profile, self)
         self.page = QWebEnginePage(self.profile, self)
 
+        # Handle downloads
+        self.profile.downloadRequested.connect(self.on_download_requested)
+
         self.browser = QWebEngineView(self)
         web_settings = self.browser.settings()
         web_settings.setAttribute(
@@ -72,6 +80,10 @@ def __init__(self):
         self.browser.setPage(self.page)
         self.browser.setZoomFactor(self.args.zoom)
 
+        # Ensure the browser widget can receive focus and key events
+        self.browser.setFocusPolicy(Qt.StrongFocus)
+        self.browser.setFocus()
+
         self.dbug(f'URL: {self.args.url}')
         self.browser.setUrl(QUrl(self.args.url))
 
@@ -212,16 +224,6 @@ def toggle_window(self) -> None:
         """
         self.hide() if self.isVisible() else self.show()
 
-
-    # def on_tray_icon_activated(self, reason):
-    #   if reason == QSystemTrayIcon.ActivationReason.Trigger:
-    #       if self.isVisible():
-    #           self.hide()
-    #       else:
-    #           self.show()
-    #           self.activateWindow()
-
-
     # ############################################################################################ #
 
     def dbug(self, msg: str) -> None:
@@ -259,3 +261,19 @@ def run() -> None:
             window.lock = None
 
         sys.exit(exit_code)
+
+    def on_download_requested(self, download):
+        """
+        Handles file download requests from the web page.
+        """
+        print('on_download_requested')
+        # Prompt the user to select a download location
+        suggested_filename = download.downloadFileName()
+        options = QFileDialog.Options()
+        path, _ = QFileDialog.getSaveFileName(self, "Save File", suggested_filename, options=options)
+        if path:
+            download.setDownloadFileName(os.path.basename(path))
+            download.setDownloadDirectory(os.path.dirname(path))
+            download.accept()
+        else:
+            download.cancel()