arsenetar/dupeguru
1
0
Fork 0
mirror of https://github.com/arsenetar/dupeguru.git synced 2025-05-08 09:49:51 +00:00
Code Releases Wiki Activity

Update URLs

Browse Source
This commit is contained in:
Andrew Senetar 2021-01-05 23:21:44 -06:00
parent ae51842007
commit 6a03e1e399
Signed by: arsenetar
GPG Key ID: C63300DCE48AB2F1
2 changed files with 54 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
qt/app.py
View File

@ -65,20 +65,25 @@ class DupeGuru(QObject):
self.recentResults.mustOpenItem.connect(self.model.load_from) self.recentResults.mustOpenItem.connect(self.model.load_from)
self.resultWindow = None self.resultWindow = None
if self.use_tabs: if self.use_tabs:
self.main_window = TabBarWindow(self) if not self.prefs.tabs_default_pos else TabWindow(self) self.main_window = (
TabBarWindow(self)
if not self.prefs.tabs_default_pos
else TabWindow(self)
)
parent_window = self.main_window parent_window = self.main_window
self.directories_dialog = self.main_window.createPage("DirectoriesDialog", app=self) self.directories_dialog = self.main_window.createPage(
"DirectoriesDialog", app=self
)
self.main_window.addTab( self.main_window.addTab(
self.directories_dialog, "Directories", switch=False) self.directories_dialog, "Directories", switch=False
)
self.actionDirectoriesWindow.setEnabled(False) self.actionDirectoriesWindow.setEnabled(False)
else: # floating windows only else: # floating windows only
self.main_window = None self.main_window = None
self.directories_dialog = DirectoriesDialog(self) self.directories_dialog = DirectoriesDialog(self)
parent_window = self.directories_dialog parent_window = self.directories_dialog
self.progress_window = ProgressWindow( self.progress_window = ProgressWindow(parent_window, self.model.progress_window)
parent_window, self.model.progress_window
)
self.problemDialog = ProblemDialog( self.problemDialog = ProblemDialog(
parent=parent_window, model=self.model.problem_dialog parent=parent_window, model=self.model.problem_dialog
) )
@ -86,22 +91,25 @@ class DupeGuru(QObject):
self.ignoreListDialog = self.main_window.createPage( self.ignoreListDialog = self.main_window.createPage(
"IgnoreListDialog", "IgnoreListDialog",
parent=self.main_window, parent=self.main_window,
model=self.model.ignore_list_dialog) model=self.model.ignore_list_dialog,
)
self.excludeListDialog = self.main_window.createPage( self.excludeListDialog = self.main_window.createPage(
"ExcludeListDialog", "ExcludeListDialog",
app=self, app=self,
parent=self.main_window, parent=self.main_window,
model=self.model.exclude_list_dialog) model=self.model.exclude_list_dialog,
)
else: else:
self.ignoreListDialog = IgnoreListDialog( self.ignoreListDialog = IgnoreListDialog(
parent=parent_window, model=self.model.ignore_list_dialog) parent=parent_window, model=self.model.ignore_list_dialog
)
self.excludeDialog = ExcludeListDialog( self.excludeDialog = ExcludeListDialog(
app=self, parent=parent_window, model=self.model.exclude_list_dialog) app=self, parent=parent_window, model=self.model.exclude_list_dialog
)
self.deletionOptions = DeletionOptions( self.deletionOptions = DeletionOptions(
parent=parent_window, parent=parent_window, model=self.model.deletion_options
model=self.model.deletion_options
) )
self.about_box = AboutBox(parent_window, self) self.about_box = AboutBox(parent_window, self)
@ -129,7 +137,13 @@ class DupeGuru(QObject):
self.preferencesTriggered, self.preferencesTriggered,
), ),
("actionIgnoreList", "", "", tr("Ignore List"), self.ignoreListTriggered), ("actionIgnoreList", "", "", tr("Ignore List"), self.ignoreListTriggered),
("actionDirectoriesWindow", "", "", tr("Directories"), self.showDirectoriesWindow), (
"actionDirectoriesWindow",
"",
"",
tr("Directories"),
self.showDirectoriesWindow,
),
( (
"actionClearPictureCache", "actionClearPictureCache",
"Ctrl+Shift+P", "Ctrl+Shift+P",
@ -137,7 +151,13 @@ class DupeGuru(QObject):
tr("Clear Picture Cache"), tr("Clear Picture Cache"),
self.clearPictureCacheTriggered, self.clearPictureCacheTriggered,
), ),
("actionExcludeList", "", "", tr("Exclusion Filters"), self.excludeListTriggered), (
"actionExcludeList",
"",
"",
tr("Exclusion Filters"),
self.excludeListTriggered,
),
("actionShowHelp", "F1", "", tr("dupeGuru Help"), self.showHelpTriggered), ("actionShowHelp", "F1", "", tr("dupeGuru Help"), self.showHelpTriggered),
("actionAbout", "", "", tr("About dupeGuru"), self.showAboutBoxTriggered), ("actionAbout", "", "", tr("About dupeGuru"), self.showAboutBoxTriggered),
( (
@ -232,8 +252,7 @@ class DupeGuru(QObject):
if self.resultWindow is not None: if self.resultWindow is not None:
if self.use_tabs: if self.use_tabs:
if self.main_window.indexOfWidget(self.resultWindow) < 0: if self.main_window.indexOfWidget(self.resultWindow) < 0:
self.main_window.addTab( self.main_window.addTab(self.resultWindow, "Results", switch=True)
self.resultWindow, "Results", switch=True)
return return
self.main_window.showTab(self.resultWindow) self.main_window.showTab(self.resultWindow)
else: else:
@ -265,9 +284,11 @@ class DupeGuru(QObject):
"scanning have accented letters, you'll probably get a crash. It is advised that " "scanning have accented letters, you'll probably get a crash. It is advised that "
"you set your system locale properly." "you set your system locale properly."
) )
QMessageBox.warning(self.main_window if self.main_window QMessageBox.warning(
else self.directories_dialog, self.main_window if self.main_window else self.directories_dialog,
"Wrong Locale", msg) "Wrong Locale",
msg,
)
def clearPictureCacheTriggered(self): def clearPictureCacheTriggered(self):
title = tr("Clear Picture Cache") title = tr("Clear Picture Cache")
@ -293,7 +314,9 @@ class DupeGuru(QObject):
"""Add tab for dialog, name the tab with desc_string, then show it.""" """Add tab for dialog, name the tab with desc_string, then show it."""
index = self.main_window.indexOfWidget(dialog) index = self.main_window.indexOfWidget(dialog)
# Create the tab if it doesn't exist already # Create the tab if it doesn't exist already
if index < 0: # or (not dialog.isVisible() and not self.main_window.isTabVisible(index)): if (
index < 0
): # or (not dialog.isVisible() and not self.main_window.isTabVisible(index)):
index = self.main_window.addTab(dialog, desc_string, switch=True) index = self.main_window.addTab(dialog, desc_string, switch=True)
# Show the tab for that widget # Show the tab for that widget
self.main_window.setCurrentIndex(index) self.main_window.setCurrentIndex(index)
@ -304,8 +327,7 @@ class DupeGuru(QObject):
def preferencesTriggered(self): def preferencesTriggered(self):
preferences_dialog = self._get_preferences_dialog_class()( preferences_dialog = self._get_preferences_dialog_class()(
self.main_window if self.main_window else self.directories_dialog, self.main_window if self.main_window else self.directories_dialog, self
self
) )
preferences_dialog.load() preferences_dialog.load()
result = preferences_dialog.exec() result = preferences_dialog.exec()
@ -333,7 +355,7 @@ class DupeGuru(QObject):
if op.exists(help_path): if op.exists(help_path):
url = QUrl.fromLocalFile(help_path) url = QUrl.fromLocalFile(help_path)
else: else:
url = QUrl("https://www.hardcoded.net/dupeguru/help/en/") url = QUrl("https://dupeguru.voltaicideas.net/help/en/")
QDesktopServices.openUrl(url) QDesktopServices.openUrl(url)
def handleSIGTERM(self): def handleSIGTERM(self):
@ -354,8 +376,7 @@ class DupeGuru(QObject):
return self.confirm("", prompt) return self.confirm("", prompt)
def create_results_window(self): def create_results_window(self):
"""Creates resultWindow and details_dialog depending on the selected ``app_mode``. """Creates resultWindow and details_dialog depending on the selected ``app_mode``."""
"""
if self.details_dialog is not None: if self.details_dialog is not None:
# The object is not deleted entirely, avoid saving its geometry in the future # The object is not deleted entirely, avoid saving its geometry in the future
# self.willSavePrefs.disconnect(self.details_dialog.appWillSavePrefs) # self.willSavePrefs.disconnect(self.details_dialog.appWillSavePrefs)
@ -367,10 +388,13 @@ class DupeGuru(QObject):
if self.resultWindow is not None: if self.resultWindow is not None:
self.resultWindow.close() self.resultWindow.close()
# This is better for tabs, as it takes care of duplicate items in menu bar # This is better for tabs, as it takes care of duplicate items in menu bar
self.resultWindow.deleteLater() if self.use_tabs else self.resultWindow.setParent(None) self.resultWindow.deleteLater() if self.use_tabs else self.resultWindow.setParent(
None
)
if self.use_tabs: if self.use_tabs:
self.resultWindow = self.main_window.createPage( self.resultWindow = self.main_window.createPage(
"ResultWindow", parent=self.main_window, app=self) "ResultWindow", parent=self.main_window, app=self
)
else: # We don't use a tab widget, regular floating QMainWindow else: # We don't use a tab widget, regular floating QMainWindow
self.resultWindow = ResultWindow(self.directories_dialog, self) self.resultWindow = ResultWindow(self.directories_dialog, self)
self.directories_dialog._updateActionsState() self.directories_dialog._updateActionsState()

6
setup.nsi
View File

@ -48,9 +48,9 @@ SetCompressor /SOLID lzma
!define APPLICENSE "LICENSE" ; License is not in build directory !define APPLICENSE "LICENSE" ; License is not in build directory
!define APPICON "images\dgse_logo.ico" ; nor is the icon !define APPICON "images\dgse_logo.ico" ; nor is the icon
!define DISTDIR "dist" !define DISTDIR "dist"
!define HELPURL "http://www.hardcoded.net/support/" !define HELPURL "https://github.com/arsenetar/dupeguru/issues"
!define UPDATEURL "http://www.hardcoded.net/dupeguru/" !define UPDATEURL "https://dupeguru.voltaicideas.net/"
!define ABOUTURL "http://www.hardcoded.net/dupeguru/" !define ABOUTURL "https://dupeguru.voltaicideas.net/"
; Static Defines ; Static Defines
!define UNINSTALLREGBASE "Software\Microsoft\Windows\CurrentVersion\Uninstall" !define UNINSTALLREGBASE "Software\Microsoft\Windows\CurrentVersion\Uninstall"