Merge pull request #884 from samusz/master

Small typo
Merge pull request #1 from samusz/samusz-patch-1
2026-03-12 19:41:38 +00:00 · 2021-05-09 23:32:32 -05:00 · 2021-05-07 09:41:47 +02:00 · 2021-05-07 09:40:08 +02:00 · 2021-04-20 20:05:05 -05:00 · 2021-04-16 17:54:49 +02:00
4 changed files with 6 additions and 4 deletions
--- a/macos.md
+++ b/macos.md
@@ -11,7 +11,7 @@
 1. Install Xcode if desired
 2. Install [Homebrew][homebrew], if not on the path after install (arm based Macs) create `~/.zshrc` 
 with `export PATH="/opt/homebrew/bin:$PATH"`. Will need to reload terminal or source the file to take 
-affect.
+effect.
 3. Install qt5 with `brew`. If you are using a version of macos without system python 3.6+ then you will 
 also need to install that via brew or with pyenv.

@@ -50,4 +50,4 @@ be installed to run unit tests: `pip install -r requirements-extra.txt`.

 [python]: http://www.python.org/
 [homebrew]: https://brew.sh/
-[xcode]: https://developer.apple.com/xcode/
+[xcode]: https://developer.apple.com/xcode/
--- a/qt/app.py
+++ b/qt/app.py
@@ -271,6 +271,9 @@ class DupeGuru(QObject):
        self.willSavePrefs.emit()
        self.prefs.save()
        self.model.save()
+        # Workaround for #857, hide() or close().
+        if self.details_dialog is not None:
+            self.details_dialog.close()
        QApplication.quit()

    # --- Signals
--- a/qt/details_dialog.py
+++ b/qt/details_dialog.py
@@ -51,7 +51,7 @@ class DetailsDialog(QDockWidget):
            if not self.titleBarWidget():  # default title bar
                self.setTitleBarWidget(QWidget())  # disables title bar
                # Windows (and MacOS?) users cannot move a floating window which
-                # has not native decoration so we force it to dock for now
+                # has no native decoration so we force it to dock for now
                if not ISLINUX:
                    self.setFloating(False)
        elif self.titleBarWidget() is not None:  # title bar is disabled
--- a/qt/pe/details_dialog.py
+++ b/qt/pe/details_dialog.py
@@ -19,7 +19,6 @@ tr = trget("ui")
 class DetailsDialog(DetailsDialogBase):
    def __init__(self, parent, app):
        self.vController = None
-        self.app = app
        super().__init__(parent, app)

    def _setupUi(self):
Author	SHA1	Message	Date
Andrew Senetar	e6c791ab0a	Merge pull request #884 from samusz/master Small typo	2021-05-09 23:32:32 -05:00
Sacha Muszlak	78f5088101	Merge pull request #1 from samusz/samusz-patch-1 typo correction	2021-05-07 09:41:47 +02:00
Sacha Muszlak	095df5eb95	typo correction	2021-05-07 09:40:08 +02:00
Andrew Senetar	0840104edf	Merge pull request #873 from glubsy/fix_857 Fix 857	2021-04-20 20:05:05 -05:00
glubsy	6b4b436251	Fix crash on shutdown * Fixes "'DetailsPanel' object has no attribute '_table'" error on shutdown if the Results table is updated (item removed) while the Details Dialog is shown as a floating window. * It seems that QApplication.quit() triggers some sort of refresh on the floating QDockWidget, which in turn makes calls to the underlying model that is possibly being destroyed, ie. there might be a race condition here. * Closing or hiding the QDockWidget before the cal to quit() is a workaround. Similarly, this is already done in the quitTriggered() method anyway. * This fixes #857.	2021-04-16 17:54:49 +02:00
glubsy	d18b8c10ec	Remove redundant assignment The "app" field is already set in the parent class.	2021-04-15 18:03:00 +02:00