diff --git a/__main__.py b/__main__.py index 39b7925..8852458 100644 --- a/__main__.py +++ b/__main__.py @@ -216,7 +216,7 @@ def __init__(self): _credits.triggered.connect(CreditsDialog(self).show) _about = QAction(tr("About"), self) - _about.triggered.connect(AboutDialog(self).show) # added the message bc it didnt have it before + _about.triggered.connect(AboutDialog(self).show) # ----- toolbar actions ----- diff --git a/main.log b/main.log index 1486707..a4793f5 100644 --- a/main.log +++ b/main.log @@ -50,3 +50,23 @@ __main__ [level 20 INFO 2021/07/19 03:02:40.761 AM, line 499 in __main__.py | Th __main__ [level 20 INFO 2021/07/19 03:04:18.936 AM, line 485 in __main__.py | Thread MainThread 29392 Process MainProcess 10540] Application closed. __main__ [level 20 INFO 2021/07/19 03:08:47.4 AM, line 499 in __main__.py | Thread MainThread 9064 Process MainProcess 11476] Application started. __main__ [level 20 INFO 2021/07/19 03:09:01.197 AM, line 485 in __main__.py | Thread MainThread 9064 Process MainProcess 11476] Application closed. +__main__ [level 20 INFO 2021/07/19 03:10:57.295 AM, line 499 in __main__.py | Thread MainThread 25332 Process MainProcess 21596] Application started. +__main__ [level 10 DEBUG 2021/07/19 03:11:29.688 AM, line 364 in __main__.py | Thread MainThread 25332 Process MainProcess 21596] Attempted to encode "PyQt5==5.15.4 +colorlog>=5.0.1 +requests>=2.25.1 +clipboard>=0.0.4 +Markdown>=3.3.4" by Base64. Result: "UHlRdDU9PTUuMTUuNApjb2xvcmxvZz49NS4wLjEKcmVxdWVzdHM+PTIuMjUuMQpjbGlwYm9hcmQ+PTAuMC40Ck1hcmtkb3duPj0zLjMuNA==" +__main__ [level 20 INFO 2021/07/19 03:12:11.958 AM, line 499 in __main__.py | Thread MainThread 21452 Process MainProcess 29616] Application started. +__main__ [level 20 INFO 2021/07/19 03:12:37.999 AM, line 499 in __main__.py | Thread MainThread 23228 Process MainProcess 16088] Application started. +__main__ [level 20 INFO 2021/07/19 03:13:05.113 AM, line 499 in __main__.py | Thread MainThread 13920 Process MainProcess 4388] Application started. +__main__ [level 20 INFO 2021/07/19 03:13:32.709 AM, line 485 in __main__.py | Thread MainThread 13920 Process MainProcess 4388] Application closed. +__main__ [level 20 INFO 2021/07/19 03:15:10.171 AM, line 499 in __main__.py | Thread MainThread 22396 Process MainProcess 24808] Application started. +__main__ [level 20 INFO 2021/07/19 03:15:38.767 AM, line 485 in __main__.py | Thread MainThread 22396 Process MainProcess 24808] Application closed. +__main__ [level 20 INFO 2021/07/19 03:23:57.659 AM, line 499 in __main__.py | Thread MainThread 22860 Process MainProcess 29236] Application started. +__main__ [level 20 INFO 2021/07/19 03:24:15.251 AM, line 485 in __main__.py | Thread MainThread 22860 Process MainProcess 29236] Application closed. +__main__ [level 20 INFO 2021/07/19 03:26:12.547 AM, line 499 in __main__.py | Thread MainThread 7740 Process MainProcess 10228] Application started. +__main__ [level 20 INFO 2021/07/19 03:26:19.235 AM, line 485 in __main__.py | Thread MainThread 7740 Process MainProcess 10228] Application closed. +__main__ [level 20 INFO 2021/07/19 03:34:13.986 AM, line 499 in __main__.py | Thread MainThread 22876 Process MainProcess 14780] Application started. +__main__ [level 20 INFO 2021/07/19 03:34:27.787 AM, line 485 in __main__.py | Thread MainThread 22876 Process MainProcess 14780] Application closed. +__main__ [level 20 INFO 2021/07/19 03:36:48.437 AM, line 499 in __main__.py | Thread MainThread 3104 Process MainProcess 28296] Application started. +__main__ [level 20 INFO 2021/07/19 03:37:02.764 AM, line 485 in __main__.py | Thread MainThread 3104 Process MainProcess 28296] Application closed. diff --git a/modules/dialogs/__pycache__/about.cpython-39.pyc b/modules/dialogs/__pycache__/about.cpython-39.pyc index 77c0813..3b4e4e2 100644 Binary files a/modules/dialogs/__pycache__/about.cpython-39.pyc and b/modules/dialogs/__pycache__/about.cpython-39.pyc differ diff --git a/modules/dialogs/__pycache__/find.cpython-39.pyc b/modules/dialogs/__pycache__/find.cpython-39.pyc index d62c2b9..47991b3 100644 Binary files a/modules/dialogs/__pycache__/find.cpython-39.pyc and b/modules/dialogs/__pycache__/find.cpython-39.pyc differ diff --git a/modules/dialogs/__pycache__/replace.cpython-39.pyc b/modules/dialogs/__pycache__/replace.cpython-39.pyc index d33821f..709f93c 100644 Binary files a/modules/dialogs/__pycache__/replace.cpython-39.pyc and b/modules/dialogs/__pycache__/replace.cpython-39.pyc differ diff --git a/modules/dialogs/__pycache__/web.cpython-39.pyc b/modules/dialogs/__pycache__/web.cpython-39.pyc index cf54f85..93f3f86 100644 Binary files a/modules/dialogs/__pycache__/web.cpython-39.pyc and b/modules/dialogs/__pycache__/web.cpython-39.pyc differ diff --git a/modules/dialogs/find.py b/modules/dialogs/find.py index def471f..23eb884 100644 --- a/modules/dialogs/find.py +++ b/modules/dialogs/find.py @@ -42,6 +42,5 @@ def __init__(self, parent=None): layout.addWidget(buttonbox) def __find_and_highlight(self): - stillworking(parent=self) + stillworking.stillworking(parent=self) self.accept() - diff --git a/modules/dialogs/replace.py b/modules/dialogs/replace.py index af7ad7f..17fcd6d 100644 --- a/modules/dialogs/replace.py +++ b/modules/dialogs/replace.py @@ -20,7 +20,6 @@ def __init__(self, inputWidget: QWidget, parent=None) -> None: self.setWindowFlag(Qt.WindowContextHelpButtonHint, False) self.resize(400, 150) - self.gridLayout = QGridLayout(self) self._inputwidget = inputWidget diff --git a/modules/dialogs/submodules/__pycache__/customwebenginepage.cpython-39.pyc b/modules/dialogs/submodules/__pycache__/customwebenginepage.cpython-39.pyc index 744ddb2..5dbbd62 100644 Binary files a/modules/dialogs/submodules/__pycache__/customwebenginepage.cpython-39.pyc and b/modules/dialogs/submodules/__pycache__/customwebenginepage.cpython-39.pyc differ diff --git a/modules/dialogs/submodules/customwebenginepage.py b/modules/dialogs/submodules/customwebenginepage.py index d36a678..371353a 100644 --- a/modules/dialogs/submodules/customwebenginepage.py +++ b/modules/dialogs/submodules/customwebenginepage.py @@ -3,27 +3,18 @@ """ from PyQt5.QtWebEngineWidgets import QWebEnginePage, QWebEngineView -from PyQt5.QtWidgets import QMainWindow +from PyQt5.QtGui import QDesktopServices class CustomWebEnginePage(QWebEnginePage): """ Custom WebEnginePage to customize how we handle link navigation """ - # Store external windows. - external_windows = [] def acceptNavigationRequest(self, url, _type, isMainFrame): if _type == QWebEnginePage.NavigationTypeLinkClicked: - window = QMainWindow(self.parent()) - w = QWebEngineView(window) - w.setUrl(url) - window.setCentralWidget(w) - window.show() - - - # Keep reference to external window, so it isn't garbage collected. - self.external_windows.append(window) + # Send the URL to the system default URL handler. + QDesktopServices.openUrl(url) return False return super().acceptNavigationRequest(url, _type, isMainFrame) \ No newline at end of file