From 2f13bf677e6c3a4d5ff1d3b28d115089d23f45ac Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 7 Apr 2010 04:02:18 -0700 Subject: [PATCH 1/4] Adjusted details table height by 2 pixels so that it doesn't show a scrollbar under Linux. --- qt/pe/details_dialog.ui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt/pe/details_dialog.ui b/qt/pe/details_dialog.ui index aef34876..c4498068 100644 --- a/qt/pe/details_dialog.ui +++ b/qt/pe/details_dialog.ui @@ -85,7 +85,7 @@ 16777215 - 188 + 190 From 87e0011525afa074d71ba4388dded81b51d7fbf9 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 7 Apr 2010 09:04:58 -0700 Subject: [PATCH 2/4] Under Linux, don't show the "Check for Update" action and correctly open the help file. --- qt/base/app.py | 3 ++- qt/base/main_window.py | 6 ++++++ qt/base/platform_lnx.py | 3 ++- qt/base/platform_osx.py | 3 ++- qt/base/platform_win.py | 3 ++- qt/me/app.py | 1 + qt/pe/app.py | 1 + qt/se/app.py | 1 + 8 files changed, 17 insertions(+), 4 deletions(-) diff --git a/qt/base/app.py b/qt/base/app.py index 279d824d..5bc86c6c 100644 --- a/qt/base/app.py +++ b/qt/base/app.py @@ -183,7 +183,8 @@ class DupeGuru(DupeGuruBase, QObject): self.directories_dialog.show() def show_help(self): - url = QUrl.fromLocalFile(op.abspath('help/intro.htm')) + base_path = platform.HELP_PATH.format(self.EDITION) + url = QUrl.fromLocalFile(op.abspath(op.join(base_path, 'intro.htm'))) QDesktopServices.openUrl(url) def show_preferences(self): diff --git a/qt/base/main_window.py b/qt/base/main_window.py index 2ada1c83..ac30c02b 100644 --- a/qt/base/main_window.py +++ b/qt/base/main_window.py @@ -6,6 +6,8 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/hs_license +import sys + from PyQt4.QtCore import Qt, QCoreApplication, QProcess, SIGNAL, QUrl from PyQt4.QtGui import (QMainWindow, QMenu, QPixmap, QIcon, QToolButton, QLabel, QHeaderView, QMessageBox, QInputDialog, QLineEdit, QDesktopServices) @@ -85,6 +87,10 @@ class MainWindow(QMainWindow, Ui_MainWindow): self.statusLabel = QLabel(self) self.statusbar.addPermanentWidget(self.statusLabel, 1) + + # Linux setup + if sys.platform == 'linux2': + self.actionCheckForUpdate.setVisible(False) # This only works on Windows #--- Private def _confirm(self, title, msg, default_button=QMessageBox.Yes): diff --git a/qt/base/platform_lnx.py b/qt/base/platform_lnx.py index 07dd08ef..d05fa789 100644 --- a/qt/base/platform_lnx.py +++ b/qt/base/platform_lnx.py @@ -7,4 +7,5 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/hs_license -INITIAL_FOLDER_IN_DIALOGS = u'/' \ No newline at end of file +INITIAL_FOLDER_IN_DIALOGS = u'/' +HELP_PATH = '/usr/local/share/dupeguru_{0}/help' diff --git a/qt/base/platform_osx.py b/qt/base/platform_osx.py index 0379656e..43c5474f 100644 --- a/qt/base/platform_osx.py +++ b/qt/base/platform_osx.py @@ -9,4 +9,5 @@ # dummy unit to allow the app to run under OSX during development -INITIAL_FOLDER_IN_DIALOGS = u'/' \ No newline at end of file +INITIAL_FOLDER_IN_DIALOGS = u'/' +HELP_PATH = '' diff --git a/qt/base/platform_win.py b/qt/base/platform_win.py index 1e2aefe3..d9c694e2 100644 --- a/qt/base/platform_win.py +++ b/qt/base/platform_win.py @@ -7,4 +7,5 @@ # which should be included with this package. The terms are also available at # http://www.hardcoded.net/licenses/hs_license -INITIAL_FOLDER_IN_DIALOGS = u'C:\\' \ No newline at end of file +INITIAL_FOLDER_IN_DIALOGS = u'C:\\' +HELP_PATH = 'help' diff --git a/qt/me/app.py b/qt/me/app.py index ea5e3065..59c910c9 100644 --- a/qt/me/app.py +++ b/qt/me/app.py @@ -14,6 +14,7 @@ from preferences import Preferences from preferences_dialog import PreferencesDialog class DupeGuru(DupeGuruBase): + EDITION = 'me' LOGO_NAME = 'logo_me' NAME = 'dupeGuru Music Edition' VERSION = '5.7.2' diff --git a/qt/pe/app.py b/qt/pe/app.py index 609c0f8e..da91e0f5 100644 --- a/qt/pe/app.py +++ b/qt/pe/app.py @@ -54,6 +54,7 @@ class File(fs.File): class DupeGuru(DupeGuruBase): + EDITION = 'pe' LOGO_NAME = 'logo_pe' NAME = 'dupeGuru Picture Edition' VERSION = '1.8.6' diff --git a/qt/se/app.py b/qt/se/app.py index 9a0ac79a..0998d12a 100644 --- a/qt/se/app.py +++ b/qt/se/app.py @@ -24,6 +24,7 @@ class Directories(DirectoriesBase): return STATE_EXCLUDED class DupeGuru(DupeGuruBase): + EDITION = 'se' LOGO_NAME = 'logo_se' NAME = 'dupeGuru' VERSION = '2.9.2' From 77ab073cdba836339678c7251a4a4d6bef658652 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 7 Apr 2010 09:32:49 -0700 Subject: [PATCH 3/4] Added a missing python-lxml dep to the debian packages. --- debian_me/control | 2 +- debian_pe/control | 2 +- debian_se/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian_me/control b/debian_me/control index a8056cce..7e141760 100644 --- a/debian_me/control +++ b/debian_me/control @@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net Package: dupeguru-me Architecture: any -Depends: python (>= 2.6), python-qt4 (>= 4.6) +Depends: python (>= 2.6), python-qt4 (>= 4.6), python-lxml (>= 2.1) Description: dupeGuru Music Edition diff --git a/debian_pe/control b/debian_pe/control index 9ba5993b..d7f296f1 100644 --- a/debian_pe/control +++ b/debian_pe/control @@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net Package: dupeguru-pe Architecture: any -Depends: python (>= 2.6), python-qt4 (>= 4.6), python-imaging (>= 1.1.6) +Depends: python (>= 2.6), python-qt4 (>= 4.6), python-lxml (>= 2.1), python-imaging (>= 1.1.6) Description: dupeGuru Picture Edition diff --git a/debian_se/control b/debian_se/control index e7235229..67bd00a1 100644 --- a/debian_se/control +++ b/debian_se/control @@ -8,5 +8,5 @@ Homepage: http://www.hardcoded.net Package: dupeguru-se Architecture: any -Depends: python (>= 2.6), python-qt4 (>= 4.6) +Depends: python (>= 2.6), python-qt4 (>= 4.6), python-lxml (>= 2.1) Description: dupeGuru From ab8691f5aca6543e3e14515ae90dbfb67f280110 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Thu, 8 Apr 2010 08:35:17 +0200 Subject: [PATCH 4/4] Changed the release date for pe 1.8.6, which has been delayed by packaging problems. --- help_pe/changelog.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/help_pe/changelog.yaml b/help_pe/changelog.yaml index 1189242c..74fb3941 100644 --- a/help_pe/changelog.yaml +++ b/help_pe/changelog.yaml @@ -1,4 +1,4 @@ -- date: 2010-04-07 +- date: 2010-04-08 version: 1.8.6 description: | * Fixed a crash when performing very big scans.