Upload beta 1.3

added pb:policy listing browser configuration
added indicator to refresh button to inicate page loading, may move to url bar sometime soon

Author: Great3github

browser_config.py

@@ -1,18 +1,19 @@
-url_allowlist = ['example.com']
-url_blocklist = ['bonk.io', 'multiplayer.gg/physics']
-homepage = "https://google.com" # All URLs in config files must start with http:// or https:// , otherwise the program will not work correctly!
-startingpage = "https://slausonrobotics.top" # if starting page should be different than homepage, set to your homepage URL enclosed in quotes
-runMode = "fullscreen" # options: fullscreen, maximized, minimized, or normal
-windowDimensions = [100, 100, 1000, 600] # dimensions: ax, ay, aw, ah (see PyQt5 setGeometry() function)
-urlBarDisabled = False
-showBackButton = True
-showForwardButton = True
-showRefreshButton = False
-showHomeButton = False
+class Config():
+    url_allowlist = ['example.com']
+    url_blocklist = ['bonk.io', 'multiplayer.gg/physics']
+    homepage = "https://google.com" # All URLs in config files must start with http:// or https:// , otherwise the program will not work correctly!
+    startingpage = "https://slausonrobotics.top" # if starting page should be different than homepage, set to your homepage URL enclosed in quotes
+    runMode = "normal" # options: fullscreen, maximized, minimized, or normal
+    windowDimensions = [100, 100, 1000, 600] # dimensions: ax, ay, aw, ah (see PyQt5 setGeometry() function)
+    urlBarDisabled = False
+    showBackButton = True
+    showForwardButton = True
+    showRefreshButton = True
+    showHomeButton = False
 
-#enablePolicyConfirm = True
-# pb: url settings below
-pbUrlsEnabled = True
-exitURLEnabled = True
-aboutURLEnabled = True
-policyURLEnabled = True
+    #enablePolicyConfirm = True
+    # pb: url settings below
+    pbUrlsEnabled = True
+    exitURLEnabled = True
+    aboutURLEnabled = True
+    policyURLEnabled = True

internal/__pycache__/pb_url.cpython-313.pyc

@@ -1,4 +1,4 @@
 from dialog import CustomDialog
 from msg import msgconfig
 def ShowAbout(): CustomDialog.NewOkDialog(msgconfig.InternalPageContent.aboutText[0], msgconfig.InternalPageContent.aboutText[1])
-def ShowPolicy(): CustomDialog.NewOkDialog()
+def ShowPolicy(): CustomDialog.NewOkDialog("replace me", msgconfig.InternalPageContent.policyText)

internal/pb_url.py

@@ -1,83 +1,85 @@
 
-import subprocess
+
 from msg import cmdconfig, msgconfig
 from dialog import CustomDialog
-import browser_config
+from browser_config import Config
 from internal import pb_url
-from subprocess import DEVNULL, STDOUT
-try:
-    subprocess.run(cmdconfig.installcmd, stdout=DEVNULL, stderr=DEVNULL)
-    from PyQt5.QtWidgets import QApplication, QMainWindow, QLineEdit, QPushButton, QHBoxLayout, QVBoxLayout, QWidget, QMessageBox, QDialog, QLabel,QDialogButtonBox
-    from PyQt5.QtWebEngineWidgets import QWebEngineView
-    from PyQt5.QtCore import QUrl
-except ImportError as e:
-    CustomDialog.NewOkDialog("Error", msgconfig.ErrorMsg.importErrorMsg(e))
-    exit(1)
+from time import sleep
+
+
+from PyQt5.QtWidgets import QApplication, QMainWindow, QLineEdit, QPushButton, QHBoxLayout, QVBoxLayout, QWidget, QMessageBox, QDialog, QLabel,QDialogButtonBox
+from PyQt5.QtWebEngineWidgets import QWebEngineView
+from PyQt5.QtCore import QUrl
+
+
 import sys
 
 
 class SimpleBrowser(QMainWindow):
     def __init__(self):
         super().__init__()
 
-        self.setGeometry(browser_config.windowDimensions[0], browser_config.windowDimensions[1], browser_config.windowDimensions[2], browser_config.windowDimensions[3])
+        self.setGeometry(Config.windowDimensions[0], Config.windowDimensions[1], Config.windowDimensions[2], Config.windowDimensions[3])
 
         # Create browser widget
         self.browser = QWebEngineView()
-        self.browser.setUrl(QUrl(browser_config.startingpage))
-        if browser_config.runMode.lower() == "fullscreen": self.showFullScreen()
-        if browser_config.runMode.lower() == "maximized": self.showMaximized()
-        if browser_config.runMode.lower() == "minimized": self.showMinimized()
-        if browser_config.runMode.lower() == "normal": self.showNormal()
-        if browser_config.runMode.lower() not in ['normal', 'minimized', 'maximized', 'fullscreen']:
+        self.browser.setUrl(QUrl(Config.startingpage))
+        if Config.runMode.lower() == "fullscreen": self.showFullScreen()
+        if Config.runMode.lower() == "maximized": self.showMaximized()
+        if Config.runMode.lower() == "minimized": self.showMinimized()
+        if Config.runMode.lower() == "normal": self.showNormal()
+        if Config.runMode.lower() not in ['normal', 'minimized', 'maximized', 'fullscreen']:
             CustomDialog.NewOkDialog("Error", msgconfig.ErrorMsg.invalidParamError)
             exit(1)
         # Create navigation bar
         self.url_bar = QLineEdit()
         self.url_bar.returnPressed.connect(self.navigateToURL)
-        self.url_bar.setDisabled(browser_config.urlBarDisabled)
-        if browser_config.showHomeButton:
+        self.url_bar.setDisabled(Config.urlBarDisabled)
+        if Config.showHomeButton:
             self.go_btn = QPushButton(msgconfig.ButtonText.homeButton)
             self.go_btn.clicked.connect(self.navigate_to_home)
-        if browser_config.showBackButton:
+        if Config.showBackButton:
             self.back_btn = QPushButton(msgconfig.ButtonText.backButton)
             self.back_btn.clicked.connect(self.browser.back)
-        if browser_config.showForwardButton:
+        if Config.showForwardButton:
             self.forward_btn = QPushButton(msgconfig.ButtonText.forwardButton)
             self.forward_btn.clicked.connect(self.browser.forward)
-        if browser_config.showRefreshButton:
+        if Config.showRefreshButton:
             self.refresh_btn = QPushButton(msgconfig.ButtonText.refreshButton)
             self.refresh_btn.clicked.connect(self.browser.reload)
 
         # Layout for navigation bar
         nav_layout = QHBoxLayout()
-        if browser_config.showBackButton: nav_layout.addWidget(self.back_btn)
-        if browser_config.showForwardButton: nav_layout.addWidget(self.forward_btn)
-        if browser_config.showRefreshButton: nav_layout.addWidget(self.refresh_btn)
+        if Config.showBackButton: nav_layout.addWidget(self.back_btn)
+        if Config.showForwardButton: nav_layout.addWidget(self.forward_btn)
+        if Config.showRefreshButton: nav_layout.addWidget(self.refresh_btn)
         nav_layout.addWidget(self.url_bar)
-        if browser_config.showHomeButton: nav_layout.addWidget(self.go_btn)
+        if Config.showHomeButton: nav_layout.addWidget(self.go_btn)
 
         # Main layout
         main_layout = QVBoxLayout()
         main_layout.addLayout(nav_layout)
         main_layout.addWidget(self.browser)
-
+        
         # Main widget
         container = QWidget()
         container.setLayout(main_layout)
         self.setCentralWidget(container)
 
         # Update URL bar when URL changes
         self.browser.urlChanged.connect(self.update_url_bar)
+        self.browser.loadStarted.connect(self.onLoadStarted)
+        self.browser.loadFinished.connect(self.onLoadFinished)
     def navigateToURL(self):
-        if self.url_bar.text().startswith("pb:") and browser_config.pbUrlsEnabled:
-            if self.url_bar.text() == "pb:exit" and browser_config.exitURLEnabled: exit()
+        if self.url_bar.text().startswith("pb:") and Config.pbUrlsEnabled:
+            if self.url_bar.text() == "pb:exit" and Config.exitURLEnabled: exit()
             elif self.url_bar.text() == "pb:exit": self.browser.setUrl(QUrl(""))
-            if self.url_bar.text() == "pb:about" and browser_config.aboutURLEnabled: pb_url.ShowAbout()
+            if self.url_bar.text() == "pb:about" and Config.aboutURLEnabled: pb_url.ShowAbout()
             elif self.url_bar.text() == "pb:about": self.browser.setUrl(QUrl(""))
-            if self.url_bar.text() == "pb:policy" and browser_config.policyURLEnabled: pb_url.ShowPolicy()
+            if self.url_bar.text() == "pb:policy" and Config.policyURLEnabled: pb_url.ShowPolicy()
+            elif self.url_bar.text() == "pb:policy": self.browser.setUrl(QUrl(""))
 
-        for url in browser_config.url_blocklist:
+        for url in Config.url_blocklist:
             if url in self.url_bar.text():
                 CustomDialog.NewOkDialog(msgconfig.ErrorMsg.siteBlockedError[0], msgconfig.ErrorMsg.siteBlockedError[1])
                 self.url_bar.setText("")
@@ -88,10 +90,24 @@ def navigateToURL(self):
 
     def navigate_to_home(self):
 
-        self.browser.setUrl(QUrl(browser_config.homepage))
+        self.browser.setUrl(QUrl(Config.homepage))
 
     def update_url_bar(self, q):
         self.url_bar.setText(q.toString())
+    def onLoadStarted(self):
+        if Config.showRefreshButton:
+            self.refresh_btn.setText("Loading...")
+            self.refresh_btn.setDisabled(True)
+        else:
+            print("Started page loading...")
+    def onLoadFinished(self):
+        if Config.showRefreshButton:
+            # self.refresh_btn.setText("Finished!")
+            
+            self.refresh_btn.setText("Refresh")
+            self.refresh_btn.setDisabled(False)
+        else:
+            print("Finished page loading!")
 
 
 

main.py

@@ -1,5 +1,7 @@
-import sys
-sys.path.append("..")
+import sys, os
+dir_path = os.path.dirname(os.path.realpath(__file__))
+sys.path.append(dir_path.removesuffix("msg"))
+
 import browser_config
 CURRENTVERSION="1.3"
 # title, msg
@@ -19,7 +21,37 @@ class ButtonText():
     refreshButton = "Refresh"
 class InternalPageContent():
     aboutText = ["About This Program", f"Poly Browser version {CURRENTVERSION}\nDeveloped by Matt Fichter with the help of AI"]
+    buttonsEnabled = {
+        "Back": browser_config.Config.showBackButton,
+        "Forward": browser_config.Config.showForwardButton,
+        "Refresh": browser_config.Config.showRefreshButton,
+        "Home": browser_config.Config.showHomeButton
+    }
+    pbUrlsEnabled = {
+        "pb:exit": browser_config.Config.exitURLEnabled,
+        "pb:about": browser_config.Config.aboutURLEnabled,
+        "pb:policy": browser_config.Config.policyURLEnabled
+    }
     policyText = f"""
     Browser Configuration:
-    url_allowlist: {browser_config.url_allowlist}
+
+    URL Allowlist: {str(browser_config.Config.url_allowlist)}
+
+    URL Blocklist: {str(browser_config.Config.url_blocklist)}
+
+    Homepage: {str(browser_config.Config.homepage)}
+
+    Starting page: {str(browser_config.Config.startingpage)}
+
+    Run Mode: {str(browser_config.Config.runMode)}
+
+    Window Dimensions: {str(browser_config.Config.windowDimensions)}
+
+    URL Bar Disabled: {str(browser_config.Config.urlBarDisabled)}
+
+    Browser Buttons Enabled: {str(buttonsEnabled)}
+    
+    pb: URLs Enabled: {str(browser_config.Config.pbUrlsEnabled)}
+
+    Allowed pb: URLs: {str(pbUrlsEnabled)}
 """