diff --git a/build.py b/build.py index e971ee19..c616a2c4 100644 --- a/build.py +++ b/build.py @@ -200,7 +200,6 @@ def build_cocoa_bridging_interfaces(edition): OutlineView, PySelectableList, SelectableListView, PyTable, TableView, PyFairware) from inter.details_panel import PyDetailsPanel, DetailsPanelView from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView - from inter.extra_fairware_reminder import PyExtraFairwareReminder, ExtraFairwareReminderView from inter.prioritize_dialog import PyPrioritizeDialog, PrioritizeDialogView from inter.prioritize_list import PyPrioritizeList, PrioritizeListView from inter.problem_dialog import PyProblemDialog @@ -209,14 +208,13 @@ def build_cocoa_bridging_interfaces(edition): from inter.app import PyDupeGuruBase, DupeGuruView appmod = importlib.import_module('inter.app_{}'.format(edition)) allclasses = [PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyFairware, - PyDetailsPanel, PyDirectoryOutline, PyExtraFairwareReminder, PyPrioritizeDialog, - PyPrioritizeList, PyProblemDialog, PyResultTable, PyStatsLabel, PyDupeGuruBase, - appmod.PyDupeGuru] + PyDetailsPanel, PyDirectoryOutline, PyPrioritizeDialog, PyPrioritizeList, PyProblemDialog, + PyResultTable, PyStatsLabel, PyDupeGuruBase, appmod.PyDupeGuru] for class_ in allclasses: objp.o2p.generate_objc_code(class_, 'cocoa/autogen', inherit=True) allclasses = [GUIObjectView, ColumnsView, OutlineView, SelectableListView, TableView, - DetailsPanelView, DirectoryOutlineView, ExtraFairwareReminderView, PrioritizeDialogView, - PrioritizeListView, ResultTableView, StatsLabelView, DupeGuruView] + DetailsPanelView, DirectoryOutlineView, PrioritizeDialogView, PrioritizeListView, + ResultTableView, StatsLabelView, DupeGuruView] clsspecs = [objp.o2p.spec_from_python_class(class_) for class_ in allclasses] objp.p2o.generate_python_proxy_code_from_clsspec(clsspecs, 'build/CocoaViews.m') build_cocoa_ext('CocoaViews', 'cocoa/inter', ['build/CocoaViews.m', 'build/ObjP.m']) diff --git a/cocoa/base/AppDelegate.h b/cocoa/base/AppDelegate.h index 9501a4fb..7a849eaf 100644 --- a/cocoa/base/AppDelegate.h +++ b/cocoa/base/AppDelegate.h @@ -61,7 +61,6 @@ http://www.hardcoded.net/licenses/bsd_license - (IBAction)startScanning:(id)sender; /* model --> view */ -- (void)showExtraFairwareReminder; - (void)showMessage:(NSString *)msg; - (void)setupAsRegistered; - (void)showFairwareNagWithPrompt:(NSString *)prompt; diff --git a/cocoa/base/AppDelegate.m b/cocoa/base/AppDelegate.m index d8660183..4911a8eb 100644 --- a/cocoa/base/AppDelegate.m +++ b/cocoa/base/AppDelegate.m @@ -9,7 +9,6 @@ http://www.hardcoded.net/licenses/bsd_license #import "AppDelegate.h" #import "ProgressController.h" #import "HSFairwareReminder.h" -#import "ExtraFairwareReminder.h" #import "Utils.h" #import "Consts.h" #import "Dialogs.h" @@ -209,15 +208,6 @@ http://www.hardcoded.net/licenses/bsd_license /* model --> view */ -- (void)showExtraFairwareReminder -{ - ExtraFairwareReminder *dialog = [[ExtraFairwareReminder alloc] initWithApp:model]; - [dialog start]; - [NSApp runModalForWindow:[dialog window]]; - [dialog close]; - [dialog release]; -} - - (void)showMessage:(NSString *)msg { [Dialogs showMessage:msg]; diff --git a/cocoa/base/ExtraFairwareReminder.h b/cocoa/base/ExtraFairwareReminder.h deleted file mode 100644 index cd828417..00000000 --- a/cocoa/base/ExtraFairwareReminder.h +++ /dev/null @@ -1,27 +0,0 @@ -/* -Copyright 2011 Hardcoded Software (http://www.hardcoded.net) - -This software is licensed under the "BSD" License as described in the "LICENSE" file, -which should be included with this package. The terms are also available at -http://www.hardcoded.net/licenses/bsd_license -*/ - -#import -#import "PyExtraFairwareReminder.h" -#import "PyDupeGuru.h" - -@interface ExtraFairwareReminder : NSWindowController -{ - IBOutlet NSButton *continueButton; - - PyExtraFairwareReminder *model; - NSTimer *timer; -} -- (id)initWithApp:(PyDupeGuru *)aApp; -- (PyExtraFairwareReminder *)model; - -- (void)start; -- (void)updateButton; -- (IBAction)continue:(id)sender; -- (IBAction)contribute:(id)sender; -@end diff --git a/cocoa/base/ExtraFairwareReminder.m b/cocoa/base/ExtraFairwareReminder.m deleted file mode 100644 index e518585b..00000000 --- a/cocoa/base/ExtraFairwareReminder.m +++ /dev/null @@ -1,78 +0,0 @@ -/* -Copyright 2011 Hardcoded Software (http://www.hardcoded.net) - -This software is licensed under the "BSD" License as described in the "LICENSE" file, -which should be included with this package. The terms are also available at -http://www.hardcoded.net/licenses/bsd_license -*/ - -#import "ExtraFairwareReminder.h" -#import "Utils.h" - -@implementation ExtraFairwareReminder -- (id)initWithApp:(PyDupeGuru *)aApp -{ - self = [super initWithWindowNibName:@"ExtraFairwareReminder"]; - [self window]; - [continueButton setEnabled:NO]; - model = [[PyExtraFairwareReminder alloc] initWithApp:[aApp pyRef]]; - [model bindCallback:createCallback(@"ExtraFairwareReminderView", self)]; - return self; -} - -- (void)dealloc -{ - [model release]; - [timer release]; - [super dealloc]; -} - -- (PyExtraFairwareReminder *)model -{ - return (PyExtraFairwareReminder *)model; -} - -- (void)start -{ - [[self model] start]; -} - -- (void)updateButton -{ - [[self model] updateButton]; -} - -- (IBAction)continue:(id)sender -{ - [NSApp stopModal]; -} - -- (IBAction)contribute:(id)sender -{ - [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://open.hardcoded.net/contribute/"]]; -} - -/* Model --> View */ -- (void)startTimer -{ - timer = [[NSTimer timerWithTimeInterval:0.2 target:self selector:@selector(updateButton) - userInfo:nil repeats:YES] retain]; - // Needed for the timer to work in modal mode. - [[NSRunLoop currentRunLoop] addTimer:timer forMode:NSModalPanelRunLoopMode]; -} - -- (void)stopTimer -{ - [timer invalidate]; -} - -- (void)setButtonText:(NSString *)text -{ - [continueButton setTitle:text]; -} - -- (void)enableButton -{ - [continueButton setEnabled:YES]; -} -@end \ No newline at end of file diff --git a/cocoa/base/en.lproj/ExtraFairwareReminder.strings b/cocoa/base/en.lproj/ExtraFairwareReminder.strings deleted file mode 100644 index b1fcef25..00000000 --- a/cocoa/base/en.lproj/ExtraFairwareReminder.strings +++ /dev/null @@ -1,11 +0,0 @@ -/* Class = "NSWindow"; title = "Sorry, I must insist"; ObjectID = "1"; */ -"1.title" = "Sorry, I must insist"; - -/* Class = "NSTextFieldCell"; title = "This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project"; ObjectID = "4"; */ -"4.title" = "This reminder showed up because:\n\n1. You are processing more than 100 duplicates\n2. You have not yet contributed to dupeGuru\n3. There are unpaid hours in the project"; - -/* Class = "NSTextFieldCell"; title = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.

You might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded.

If you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; ObjectID = "6"; */ -"6.title" = "It seems that you found a lot of duplicates. Nice! I must insist, however, that contributions are expected when there are unpaid hours on the project.\n\nYou might think \"but I'm only going to use this once, I don't have to contribute\". The problem is that most people use dupeGuru only once in a while. If everyone thinks like that, dupeGuru development cannot be funded. It's because of this tendency inherent to dupeGuru's nature that I have to insist here.\n\nIf you can't afford to contribute, you can ignore this reminder or send me an e-mail at hsoft@hardcoded.net so I can give you a key to remove this reminder."; - -/* Class = "NSButtonCell"; title = "Contribute"; ObjectID = "10"; */ -"10.title" = "Contribute"; diff --git a/cocoa/base/en.lproj/ExtraFairwareReminder.xib b/cocoa/base/en.lproj/ExtraFairwareReminder.xib deleted file mode 100644 index 10ffa649..00000000 --- a/cocoa/base/en.lproj/ExtraFairwareReminder.xib +++ /dev/null @@ -1,402 +0,0 @@ - - - - 1060 - 11C74 - 1938 - 1138.23 - 567.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 1938 - - - NSTextField - NSView - NSWindowTemplate - NSCustomObject - NSButtonCell - NSButton - NSTextFieldCell - - - com.apple.InterfaceBuilder.CocoaPlugin - - - PluginDependencyRecalculationVersion - - - - - ExtraFairwareReminder - - - FirstResponder - - - NSApplication - - - 1 - 2 - {{418, 295}, {480, 390}} - 1081606144 - Sorry, I must insist - NSWindow - - - - - 256 - - - - 268 - {{17, 48}, {446, 85}} - - - - YES - - 67239424 - 272629760 - This reminder showed up because:

1. You are processing more than 100 duplicates
2. You have not yet contributed to dupeGuru
3. There are unpaid hours in the project - - LucidaGrande-Bold - 12 - 16 - - - - 6 - System - controlColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - 3 - MAA - - - - - - - 268 - {{17, 141}, {446, 229}} - - - - YES - - 67239424 - 205520896 - - SXQgc2VlbXMgdGhhdCB5b3UgZm91bmQgYSBsb3Qgb2YgZHVwbGljYXRlcy4gTmljZSEgSSBtdXN0IGlu -c2lzdCwgaG93ZXZlciwgdGhhdCBjb250cmlidXRpb25zIGFyZSBleHBlY3RlZCB3aGVuIHRoZXJlIGFy -ZSB1bnBhaWQgaG91cnMgb24gdGhlIHByb2plY3Qu4oCo4oCoWW91IG1pZ2h0IHRoaW5rICJidXQgSSdt -IG9ubHkgZ29pbmcgdG8gdXNlIHRoaXMgb25jZSwgSSBkb24ndCBoYXZlIHRvIGNvbnRyaWJ1dGUiLiBU -aGUgcHJvYmxlbSBpcyB0aGF0IG1vc3QgcGVvcGxlIHVzZSBkdXBlR3VydSBvbmx5IG9uY2UgaW4gYSB3 -aGlsZS4gSWYgZXZlcnlvbmUgdGhpbmtzIGxpa2UgdGhhdCwgZHVwZUd1cnUgZGV2ZWxvcG1lbnQgY2Fu -bm90IGJlIGZ1bmRlZC4gSXQncyBiZWNhdXNlIG9mIHRoaXMgdGVuZGVuY3kgaW5oZXJlbnQgdG8gZHVw -ZUd1cnUncyBuYXR1cmUgdGhhdCBJIGhhdmUgdG8gaW5zaXN0IGhlcmUu4oCo4oCoSWYgeW91IGNhbid0 -IGFmZm9yZCB0byBjb250cmlidXRlLCB5b3UgY2FuIGlnbm9yZSB0aGlzIHJlbWluZGVyIG9yIHNlbmQg -bWUgYW4gZS1tYWlsIGF0IGhzb2Z0QGhhcmRjb2RlZC5uZXQgc28gSSBjYW4gZ2l2ZSB5b3UgYSBrZXkg -dG8gcmVtb3ZlIHRoaXMgcmVtaW5kZXIuA - - - LucidaGrande - 12 - 16 - - - - - - - - - 268 - {{338, 12}, {128, 32}} - - - - YES - - 67239424 - 134217728 - Continue - - LucidaGrande - 13 - 1044 - - - -2038284033 - 129 - - - 200 - 25 - - - - - 268 - {{210, 12}, {128, 32}} - - - - YES - - 67239424 - 134217728 - Contribute - - - -2038284033 - 129 - - DQ - 200 - 25 - - - - {480, 390} - - - - - {{0, 0}, {1440, 878}} - {10000000000000, 10000000000000} - YES - - - - - - - contribute: - - - - 11 - - - - continue: - - - - 12 - - - - window - - - - 13 - - - - continueButton - - - - 14 - - - - - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 1 - - - - - - - - 2 - - - - - - - - - - - 3 - - - - - - - - 4 - - - - - 5 - - - - - - - - 6 - - - - - 7 - - - - - - - - 8 - - - - - 9 - - - - - - - - 10 - - - - - - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{418, 295}, {480, 390}} - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - - - - - 14 - - - - - ExtraFairwareReminder - HSWindowController - - id - id - - - - continue: - id - - - contribute: - id - - - - continueButton - NSButton - - - continueButton - - continueButton - NSButton - - - - IBProjectSource - ./Classes/ExtraFairwareReminder.h - - - - HSWindowController - NSWindowController - - IBProjectSource - ./Classes/HSWindowController.h - - - - - 0 - IBCocoaFramework - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - 3 - - diff --git a/cocoa/inter/app.py b/cocoa/inter/app.py index a4abca3d..54aa9238 100644 --- a/cocoa/inter/app.py +++ b/cocoa/inter/app.py @@ -20,7 +20,7 @@ JOBID2TITLE = { } class DupeGuruView(FairwareView): - def showExtraFairwareReminder(self): pass + pass class PyDupeGuruBase(PyFairware): FOLLOW_PROTOCOLS = ['Worker'] @@ -191,7 +191,3 @@ class PyDupeGuruBase(PyFairware): ud = {'desc': JOBID2TITLE[jobid], 'jobid':jobid} proxy.postNotification_userInfo_('JobStarted', ud) - @dontwrap - def show_extra_fairware_reminder(self): - self.cocoa.showExtraFairwareReminder() - diff --git a/cocoa/inter/extra_fairware_reminder.py b/cocoa/inter/extra_fairware_reminder.py deleted file mode 100644 index c956a9d3..00000000 --- a/cocoa/inter/extra_fairware_reminder.py +++ /dev/null @@ -1,37 +0,0 @@ -from objp.util import pyref, dontwrap -from cocoa.inter import PyGUIObject -from core.gui.extra_fairware_reminder import ExtraFairwareReminder - -class ExtraFairwareReminderView: - def startTimer(self): pass - def stopTimer(self): pass - def setButtonText_(self, text: str): pass; - def enableButton(self): pass - -class PyExtraFairwareReminder(PyGUIObject): - def __init__(self, app: pyref): - model = ExtraFairwareReminder(app.model) - PyGUIObject.__init__(self, model) - - def start(self): - self.model.start() - - def updateButton(self): - self.model.update_button() - - # model --> view - @dontwrap - def start_timer(self): - self.callback.startTimer() - - @dontwrap - def stop_timer(self): - self.callback.stopTimer() - - @dontwrap - def enable_button(self): - self.callback.enableButton() - - @dontwrap - def set_button_text(self, text): - self.callback.setButtonText_(text) diff --git a/cocoa/me/dg_cocoa.py b/cocoa/me/dg_cocoa.py index d3db3672..373d4c6b 100644 --- a/cocoa/me/dg_cocoa.py +++ b/cocoa/me/dg_cocoa.py @@ -11,7 +11,6 @@ from cocoa.inter import PySelectableList, PyColumns, PyTable from inter.details_panel import PyDetailsPanel from inter.directory_outline import PyDirectoryOutline -from inter.extra_fairware_reminder import PyExtraFairwareReminder from inter.prioritize_dialog import PyPrioritizeDialog from inter.prioritize_list import PyPrioritizeList from inter.problem_dialog import PyProblemDialog diff --git a/cocoa/me/dupeguru.xcodeproj/project.pbxproj b/cocoa/me/dupeguru.xcodeproj/project.pbxproj index f29e1260..0eeb1c5d 100644 --- a/cocoa/me/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/me/dupeguru.xcodeproj/project.pbxproj @@ -71,7 +71,6 @@ CE9705E914C46E7D007A28F6 /* PyDirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705CB14C46E7D007A28F6 /* PyDirectoryOutline.m */; }; CE9705EA14C46E7D007A28F6 /* PyDupeGuru.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705CD14C46E7D007A28F6 /* PyDupeGuru.m */; }; CE9705EB14C46E7D007A28F6 /* PyDupeGuruBase.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705CF14C46E7D007A28F6 /* PyDupeGuruBase.m */; }; - CE9705EC14C46E7D007A28F6 /* PyExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705D114C46E7D007A28F6 /* PyExtraFairwareReminder.m */; }; CE9705ED14C46E7D007A28F6 /* PyFairware.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705D314C46E7D007A28F6 /* PyFairware.m */; }; CE9705EE14C46E7D007A28F6 /* PyGUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705D514C46E7D007A28F6 /* PyGUIObject.m */; }; CE9705EF14C46E7D007A28F6 /* PyOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9705D714C46E7D007A28F6 /* PyOutline.m */; }; @@ -89,8 +88,6 @@ CE97060314C471F2007A28F6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CE97060214C471F2007A28F6 /* main.m */; }; CEA14F431461ED63007F01A5 /* locale in Resources */ = {isa = PBXBuildFile; fileRef = CEA14F421461ED63007F01A5 /* locale */; }; CEB14D29124DFC2800FA7481 /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB14D28124DFC2800FA7481 /* ResultTable.m */; }; - CEB5E07813225C89009F521D /* ExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CEB5E07613225C89009F521D /* ExtraFairwareReminder.m */; }; - CEB5E07D13225CA2009F521D /* ExtraFairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEB5E07B13225CA2009F521D /* ExtraFairwareReminder.xib */; }; CEDF07A3112493B200EE5BC0 /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CEDF07A2112493B200EE5BC0 /* StatsLabel.m */; }; CEEB135209C837A2004D2330 /* dupeguru.icns in Resources */ = {isa = PBXBuildFile; fileRef = CEEB135109C837A2004D2330 /* dupeguru.icns */; }; CEF3185913D8660000B8CDCA /* about.xib in Resources */ = {isa = PBXBuildFile; fileRef = CEF3185513D8660000B8CDCA /* about.xib */; }; @@ -168,7 +165,6 @@ CE335AF514B393DC0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ../base/ru.lproj/Localizable.strings; sourceTree = ""; }; CE335AF714B393EE0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DetailsPanel.xib; sourceTree = ""; }; CE335AF814B393EE0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE335AF914B393EE0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE335AFA14B393EE0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/MainMenu.xib; sourceTree = ""; }; CE335AFB14B393EE0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE335AFC14B393EE0000AF1A /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -180,7 +176,6 @@ CE35FCF314C637C8004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = ../base/uk.lproj/Localizable.strings; sourceTree = ""; }; CE35FCF514C637DD004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DetailsPanel.xib; sourceTree = ""; }; CE35FCF614C637DD004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE35FCF714C637DD004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE35FCF814C637DD004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/MainMenu.xib; sourceTree = ""; }; CE35FCF914C637DD004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE35FCFA14C637DD004E4864 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -221,7 +216,6 @@ CE74254414603143002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = ../base/cs.lproj/Localizable.strings; sourceTree = ""; }; CE74255114603152002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DetailsPanel.xib; sourceTree = ""; }; CE74255214603152002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE74255314603152002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE74255414603152002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/MainMenu.xib; sourceTree = ""; }; CE74255514603152002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE74255614603152002F8E3E /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -233,7 +227,6 @@ CE7A6992146442F80007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = ../base/it.lproj/Localizable.strings; sourceTree = ""; }; CE7A6998146443090007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DetailsPanel.xib; sourceTree = ""; }; CE7A6999146443090007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE7A699A146443090007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE7A699B146443090007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/MainMenu.xib; sourceTree = ""; }; CE7A699C146443090007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE7A699D146443090007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -264,8 +257,6 @@ CE9705CD14C46E7D007A28F6 /* PyDupeGuru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDupeGuru.m; sourceTree = ""; }; CE9705CE14C46E7D007A28F6 /* PyDupeGuruBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDupeGuruBase.h; sourceTree = ""; }; CE9705CF14C46E7D007A28F6 /* PyDupeGuruBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDupeGuruBase.m; sourceTree = ""; }; - CE9705D014C46E7D007A28F6 /* PyExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyExtraFairwareReminder.h; sourceTree = ""; }; - CE9705D114C46E7D007A28F6 /* PyExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyExtraFairwareReminder.m; sourceTree = ""; }; CE9705D214C46E7D007A28F6 /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyFairware.h; sourceTree = ""; }; CE9705D314C46E7D007A28F6 /* PyFairware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyFairware.m; sourceTree = ""; }; CE9705D414C46E7D007A28F6 /* PyGUIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUIObject.h; sourceTree = ""; }; @@ -293,13 +284,8 @@ CEA14F421461ED63007F01A5 /* locale */ = {isa = PBXFileReference; lastKnownFileType = folder; name = locale; path = ../../build/locale; sourceTree = ""; }; CEB14D27124DFC2800FA7481 /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; }; CEB14D28124DFC2800FA7481 /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; }; - CEB5E07513225C89009F521D /* ExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtraFairwareReminder.h; path = ../base/ExtraFairwareReminder.h; sourceTree = SOURCE_ROOT; }; - CEB5E07613225C89009F521D /* ExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtraFairwareReminder.m; path = ../base/ExtraFairwareReminder.m; sourceTree = SOURCE_ROOT; }; - CEB5E07C13225CA2009F521D /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; - CEB5E07E13225CB8009F521D /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CEC3D37C14911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DetailsPanel.xib; sourceTree = ""; }; CEC3D37D14911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CEC3D37E14911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CEC3D37F14911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/MainMenu.xib; sourceTree = ""; }; CEC3D38014911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEC3D38114911253006B1A91 /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -315,7 +301,6 @@ CEC8F3111416A0F0004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = ../base/zh_CN.lproj/Localizable.strings; sourceTree = ""; }; CEC8F3141416A0FC004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DetailsPanel.xib; sourceTree = ""; }; CEC8F3151416A0FC004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CEC8F3161416A0FC004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CEC8F3171416A0FC004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/MainMenu.xib; sourceTree = ""; }; CEC8F3181416A0FC004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ProblemDialog.xib; sourceTree = ""; }; CEC8F3191416A0FC004D28F3 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ResultWindow.xib; sourceTree = ""; }; @@ -335,7 +320,6 @@ CEF3186113D8661300B8CDCA /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/FairwareReminder.xib; sourceTree = ""; }; CEF5770713CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; }; CEF5770813CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; - CEF5770913CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CEF5770A13CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CEF5770B13CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; }; CEF5770C13CDFB250083CB30 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; @@ -486,7 +470,6 @@ CE05331312E5D3ED0029EF25 /* ProblemDialog.xib */, CE05331512E5D3ED0029EF25 /* ResultWindow.xib */, CE05332112E5D4100029EF25 /* Preferences.xib */, - CEB5E07B13225CA2009F521D /* ExtraFairwareReminder.xib */, CE84C9BB1423AF200050A6AD /* PrioritizeDialog.xib */, ); name = xib; @@ -552,8 +535,6 @@ CE515E1C0FC6C19300EC695D /* ResultWindow.m */, CEDF07A1112493B200EE5BC0 /* StatsLabel.h */, CEDF07A2112493B200EE5BC0 /* StatsLabel.m */, - CEB5E07513225C89009F521D /* ExtraFairwareReminder.h */, - CEB5E07613225C89009F521D /* ExtraFairwareReminder.m */, CE84C9AC1423ADFB0050A6AD /* PrioritizeDialog.h */, CE84C9AD1423ADFB0050A6AD /* PrioritizeDialog.m */, CE84C9AE1423ADFB0050A6AD /* PrioritizeList.h */, @@ -578,8 +559,6 @@ CE9705CD14C46E7D007A28F6 /* PyDupeGuru.m */, CE9705CE14C46E7D007A28F6 /* PyDupeGuruBase.h */, CE9705CF14C46E7D007A28F6 /* PyDupeGuruBase.m */, - CE9705D014C46E7D007A28F6 /* PyExtraFairwareReminder.h */, - CE9705D114C46E7D007A28F6 /* PyExtraFairwareReminder.m */, CE9705D214C46E7D007A28F6 /* PyFairware.h */, CE9705D314C46E7D007A28F6 /* PyFairware.m */, CE9705D414C46E7D007A28F6 /* PyGUIObject.h */, @@ -690,7 +669,6 @@ CE05331B12E5D3ED0029EF25 /* ResultWindow.xib in Resources */, CE05332312E5D4100029EF25 /* Preferences.xib in Resources */, CE05332F12E5D6100029EF25 /* Localizable.strings in Resources */, - CEB5E07D13225CA2009F521D /* ExtraFairwareReminder.xib in Resources */, CEF3185913D8660000B8CDCA /* about.xib in Resources */, CEF3185A13D8660000B8CDCA /* ErrorReportWindow.xib in Resources */, CE84C9BD1423AF200050A6AD /* PrioritizeDialog.xib in Resources */, @@ -733,7 +711,6 @@ CE74A12412537F06008A8DF0 /* HSFairwareReminder.m in Sources */, CE4F934912CCA96C0067A3AE /* HSAboutBox.m in Sources */, CE1EAA0A12DF3E81009BA949 /* HSRecentFiles.m in Sources */, - CEB5E07813225C89009F521D /* ExtraFairwareReminder.m in Sources */, CE84C9B21423ADFB0050A6AD /* PrioritizeDialog.m in Sources */, CE84C9B31423ADFB0050A6AD /* PrioritizeList.m in Sources */, CE84C9B91423AE410050A6AD /* HSPopUpList.m in Sources */, @@ -746,7 +723,6 @@ CE9705E914C46E7D007A28F6 /* PyDirectoryOutline.m in Sources */, CE9705EA14C46E7D007A28F6 /* PyDupeGuru.m in Sources */, CE9705EB14C46E7D007A28F6 /* PyDupeGuruBase.m in Sources */, - CE9705EC14C46E7D007A28F6 /* PyExtraFairwareReminder.m in Sources */, CE9705ED14C46E7D007A28F6 /* PyFairware.m in Sources */, CE9705EE14C46E7D007A28F6 /* PyGUIObject.m in Sources */, CE9705EF14C46E7D007A28F6 /* PyOutline.m in Sources */, @@ -909,22 +885,6 @@ name = PrioritizeDialog.xib; sourceTree = ""; }; - CEB5E07B13225CA2009F521D /* ExtraFairwareReminder.xib */ = { - isa = PBXVariantGroup; - children = ( - CEB5E07C13225CA2009F521D /* en */, - CEB5E07E13225CB8009F521D /* fr */, - CEF5770913CDFB250083CB30 /* de */, - CEC8F3161416A0FC004D28F3 /* zh_CN */, - CE74255314603152002F8E3E /* cs */, - CE7A699A146443090007D927 /* it */, - CEC3D37E14911253006B1A91 /* hy */, - CE335AF914B393EE0000AF1A /* ru */, - CE35FCF714C637DD004E4864 /* uk */, - ); - name = ExtraFairwareReminder.xib; - sourceTree = SOURCE_ROOT; - }; CEF3185513D8660000B8CDCA /* about.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/cocoa/pe/dg_cocoa.py b/cocoa/pe/dg_cocoa.py index 0e1572c2..ccad635d 100644 --- a/cocoa/pe/dg_cocoa.py +++ b/cocoa/pe/dg_cocoa.py @@ -11,7 +11,6 @@ from cocoa.inter import PySelectableList, PyColumns, PyTable from inter.details_panel import PyDetailsPanel from inter.directory_outline import PyDirectoryOutline -from inter.extra_fairware_reminder import PyExtraFairwareReminder from inter.prioritize_dialog import PyPrioritizeDialog from inter.prioritize_list import PyPrioritizeList from inter.problem_dialog import PyProblemDialog diff --git a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj index 6cefbf23..37e42105 100644 --- a/cocoa/pe/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/pe/dupeguru.xcodeproj/project.pbxproj @@ -22,8 +22,6 @@ CE15C8C00ADEB8D40061D4A5 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = CE15C8A70ADEB8B50061D4A5 /* Sparkle.framework */; }; CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE1EB5FC12537F9D0034AABB /* HSFairwareReminder.m */; }; CE1EB60112537FB90034AABB /* FairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE1EB5FF12537FB90034AABB /* FairwareReminder.xib */; }; - CE2A29F413213BE3005899AC /* ExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE2A29F313213BE3005899AC /* ExtraFairwareReminder.m */; }; - CE2A29F713213BFB005899AC /* ExtraFairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE2A29F513213BFB005899AC /* ExtraFairwareReminder.xib */; }; CE381C9609914ACE003581CE /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9409914ACE003581CE /* AppDelegate.m */; }; CE381C9C09914ADF003581CE /* ResultWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CE381C9A09914ADF003581CE /* ResultWindow.m */; }; CE60180812DF3EA900236FDC /* HSRecentFiles.m in Sources */ = {isa = PBXBuildFile; fileRef = CE60180712DF3EA900236FDC /* HSRecentFiles.m */; }; @@ -42,7 +40,6 @@ CE7501A114C477B100E2A349 /* PyDirectoryOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018314C477B100E2A349 /* PyDirectoryOutline.m */; }; CE7501A214C477B100E2A349 /* PyDupeGuru.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018514C477B100E2A349 /* PyDupeGuru.m */; }; CE7501A314C477B100E2A349 /* PyDupeGuruBase.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018714C477B100E2A349 /* PyDupeGuruBase.m */; }; - CE7501A414C477B100E2A349 /* PyExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018914C477B100E2A349 /* PyExtraFairwareReminder.m */; }; CE7501A514C477B100E2A349 /* PyFairware.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018B14C477B100E2A349 /* PyFairware.m */; }; CE7501A614C477B100E2A349 /* PyGUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018D14C477B100E2A349 /* PyGUIObject.m */; }; CE7501A714C477B100E2A349 /* PyOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE75018F14C477B100E2A349 /* PyOutline.m */; }; @@ -137,9 +134,6 @@ CE21AFB61423EA6E00DE35BF /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE21AFB71423EA6E00DE35BF /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE21AFB81423EA6E00DE35BF /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/PrioritizeDialog.xib; sourceTree = ""; }; - CE2A29F213213BE3005899AC /* ExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtraFairwareReminder.h; path = ../base/ExtraFairwareReminder.h; sourceTree = SOURCE_ROOT; }; - CE2A29F313213BE3005899AC /* ExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtraFairwareReminder.m; path = ../base/ExtraFairwareReminder.m; sourceTree = SOURCE_ROOT; }; - CE2A29F613213BFB005899AC /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CE381C9409914ACE003581CE /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = SOURCE_ROOT; }; CE381C9509914ACE003581CE /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = SOURCE_ROOT; }; CE381C9A09914ADF003581CE /* ResultWindow.m */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.c.objc; path = ResultWindow.m; sourceTree = SOURCE_ROOT; }; @@ -156,7 +150,6 @@ CE653CF61416A0140058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = zh_CN.lproj/DetailsPanel.xib; sourceTree = ""; }; CE653CF71416A0140058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = zh_CN.lproj/Preferences.xib; sourceTree = ""; }; CE653CFA1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE653CFB1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE653CFC1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/MainMenu.xib; sourceTree = ""; }; CE653CFD1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ProblemDialog.xib; sourceTree = ""; }; CE653CFE1416A0260058A022 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ResultWindow.xib; sourceTree = ""; }; @@ -180,8 +173,6 @@ CE75018514C477B100E2A349 /* PyDupeGuru.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDupeGuru.m; sourceTree = ""; }; CE75018614C477B100E2A349 /* PyDupeGuruBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyDupeGuruBase.h; sourceTree = ""; }; CE75018714C477B100E2A349 /* PyDupeGuruBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyDupeGuruBase.m; sourceTree = ""; }; - CE75018814C477B100E2A349 /* PyExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyExtraFairwareReminder.h; sourceTree = ""; }; - CE75018914C477B100E2A349 /* PyExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyExtraFairwareReminder.m; sourceTree = ""; }; CE75018A14C477B100E2A349 /* PyFairware.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyFairware.h; sourceTree = ""; }; CE75018B14C477B100E2A349 /* PyFairware.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyFairware.m; sourceTree = ""; }; CE75018C14C477B100E2A349 /* PyGUIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUIObject.h; sourceTree = ""; }; @@ -203,7 +194,6 @@ CE75019C14C477B100E2A349 /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = ""; }; CE75019D14C477B100E2A349 /* PyTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyTable.m; sourceTree = ""; }; CE78759D13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; - CE78759E13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CE78759F13CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CE7875A013CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; }; CE7875A113CDFA7100F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; @@ -211,7 +201,6 @@ CE7875A613CDFAB900F23771 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Preferences.xib; sourceTree = ""; }; CE7A69B3146443A00007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = ../base/it.lproj/Localizable.strings; sourceTree = ""; }; CE7A69B9146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE7A69BA146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE7A69BB146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/MainMenu.xib; sourceTree = ""; }; CE7A69BC146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE7A69BD146443AD0007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -256,7 +245,6 @@ CE905DE314C6387B00C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../uk.lproj/FairwareReminder.xib; sourceTree = ""; }; CE905DE814C6388E00C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = ../base/uk.lproj/Localizable.strings; sourceTree = ""; }; CE905DEA14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE905DEB14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE905DEC14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/MainMenu.xib; sourceTree = ""; }; CE905DED14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE905DEE14C638A500C0ECEF /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -293,9 +281,7 @@ CECB2ACB13D867C00081E295 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/about.xib; sourceTree = ""; }; CECB2ACC13D867C00081E295 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/ErrorReportWindow.xib; sourceTree = ""; }; CECB2ACD13D867C00081E295 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../de.lproj/FairwareReminder.xib; sourceTree = ""; }; - CEE660B7132253910036DB04 /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CEE6D5461491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CEE6D5471491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CEE6D5481491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/MainMenu.xib; sourceTree = ""; }; CEE6D5491491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEE6D54A1491130D0087CDFC /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -314,7 +300,6 @@ CEEE15701460325B00783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../cs.lproj/FairwareReminder.xib; sourceTree = ""; }; CEEE15771460327300783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = ../base/cs.lproj/Localizable.strings; sourceTree = ""; }; CEEE15841460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CEEE15851460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CEEE15861460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/MainMenu.xib; sourceTree = ""; }; CEEE15871460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEEE15881460328400783E91 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -437,7 +422,6 @@ CE05339912E5DA350029EF25 /* ResultWindow.xib */, CE0533A312E5DA4D0029EF25 /* DetailsPanel.xib */, CE0533A512E5DA4D0029EF25 /* Preferences.xib */, - CE2A29F513213BFB005899AC /* ExtraFairwareReminder.xib */, CE7D24A71423B123002E2297 /* PrioritizeDialog.xib */, ); name = xib; @@ -458,8 +442,6 @@ CE75018514C477B100E2A349 /* PyDupeGuru.m */, CE75018614C477B100E2A349 /* PyDupeGuruBase.h */, CE75018714C477B100E2A349 /* PyDupeGuruBase.m */, - CE75018814C477B100E2A349 /* PyExtraFairwareReminder.h */, - CE75018914C477B100E2A349 /* PyExtraFairwareReminder.m */, CE75018A14C477B100E2A349 /* PyFairware.h */, CE75018B14C477B100E2A349 /* PyFairware.m */, CE75018C14C477B100E2A349 /* PyGUIObject.h */, @@ -549,8 +531,6 @@ CE80DB890FC1951C0086DCA6 /* ResultWindow.m */, CE95865C112C516400F95FD2 /* StatsLabel.h */, CE95865D112C516400F95FD2 /* StatsLabel.m */, - CE2A29F213213BE3005899AC /* ExtraFairwareReminder.h */, - CE2A29F313213BE3005899AC /* ExtraFairwareReminder.m */, CE7D249F1423B106002E2297 /* PrioritizeDialog.h */, CE7D24A01423B106002E2297 /* PrioritizeDialog.m */, CE7D24A11423B106002E2297 /* PrioritizeList.h */, @@ -679,7 +659,6 @@ CE0533A712E5DA4D0029EF25 /* DetailsPanel.xib in Resources */, CE0533A812E5DA4D0029EF25 /* Preferences.xib in Resources */, CE0533AB12E5DA6A0029EF25 /* Localizable.strings in Resources */, - CE2A29F713213BFB005899AC /* ExtraFairwareReminder.xib in Resources */, CECB2AC513D867AD0081E295 /* about.xib in Resources */, CECB2AC613D867AD0081E295 /* ErrorReportWindow.xib in Resources */, CE7D24A91423B123002E2297 /* PrioritizeDialog.xib in Resources */, @@ -725,7 +704,6 @@ CE1EB5FE12537F9D0034AABB /* HSFairwareReminder.m in Sources */, CEC9DB4C12CCAA7D003102F0 /* HSAboutBox.m in Sources */, CE60180812DF3EA900236FDC /* HSRecentFiles.m in Sources */, - CE2A29F413213BE3005899AC /* ExtraFairwareReminder.m in Sources */, CE7D249D1423B0BD002E2297 /* HSPopUpList.m in Sources */, CE7D249E1423B0BD002E2297 /* HSSelectableList.m in Sources */, CE7D24A51423B106002E2297 /* PrioritizeDialog.m in Sources */, @@ -739,7 +717,6 @@ CE7501A114C477B100E2A349 /* PyDirectoryOutline.m in Sources */, CE7501A214C477B100E2A349 /* PyDupeGuru.m in Sources */, CE7501A314C477B100E2A349 /* PyDupeGuruBase.m in Sources */, - CE7501A414C477B100E2A349 /* PyExtraFairwareReminder.m in Sources */, CE7501A514C477B100E2A349 /* PyFairware.m in Sources */, CE7501A614C477B100E2A349 /* PyGUIObject.m in Sources */, CE7501A714C477B100E2A349 /* PyOutline.m in Sources */, @@ -877,21 +854,6 @@ path = ../../cocoalib/xib; sourceTree = SOURCE_ROOT; }; - CE2A29F513213BFB005899AC /* ExtraFairwareReminder.xib */ = { - isa = PBXVariantGroup; - children = ( - CE2A29F613213BFB005899AC /* en */, - CEE660B7132253910036DB04 /* fr */, - CE78759E13CDFA7100F23771 /* de */, - CE653CFB1416A0260058A022 /* zh_CN */, - CEEE15851460328400783E91 /* cs */, - CE7A69BA146443AD0007D927 /* it */, - CEE6D5471491130D0087CDFC /* hy */, - CE905DEB14C638A500C0ECEF /* uk */, - ); - name = ExtraFairwareReminder.xib; - sourceTree = SOURCE_ROOT; - }; CE7D24A71423B123002E2297 /* PrioritizeDialog.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/cocoa/se/dg_cocoa.py b/cocoa/se/dg_cocoa.py index 6c9cf09c..06dd790e 100644 --- a/cocoa/se/dg_cocoa.py +++ b/cocoa/se/dg_cocoa.py @@ -11,7 +11,6 @@ from cocoa.inter import PySelectableList, PyColumns, PyTable from inter.details_panel import PyDetailsPanel from inter.directory_outline import PyDirectoryOutline -from inter.extra_fairware_reminder import PyExtraFairwareReminder from inter.prioritize_dialog import PyPrioritizeDialog from inter.prioritize_list import PyPrioritizeList from inter.problem_dialog import PyProblemDialog diff --git a/cocoa/se/dupeguru.xcodeproj/project.pbxproj b/cocoa/se/dupeguru.xcodeproj/project.pbxproj index 7cf3de4c..054c461f 100644 --- a/cocoa/se/dupeguru.xcodeproj/project.pbxproj +++ b/cocoa/se/dupeguru.xcodeproj/project.pbxproj @@ -33,8 +33,6 @@ CE587E9A14C07BCF004CA031 /* PyOutline.m in Sources */ = {isa = PBXBuildFile; fileRef = CE587E9814C07BCF004CA031 /* PyOutline.m */; }; CE587E9E14C0801F004CA031 /* PySelectableList.m in Sources */ = {isa = PBXBuildFile; fileRef = CE587E9D14C0801F004CA031 /* PySelectableList.m */; }; CE647E571173024A006D28BA /* ProblemDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE647E551173024A006D28BA /* ProblemDialog.m */; }; - CE665B3013225ADD003F5CFB /* ExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE665B2E13225ADD003F5CFB /* ExtraFairwareReminder.m */; }; - CE665B3313225AF8003F5CFB /* ExtraFairwareReminder.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE665B3113225AF8003F5CFB /* ExtraFairwareReminder.xib */; }; CE6DD4E7124CA3070089A48D /* ResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6DD4E6124CA3070089A48D /* ResultTable.m */; }; CE6DD547124CAF1F0089A48D /* HSTableView.m in Sources */ = {isa = PBXBuildFile; fileRef = CE6DD546124CAF1F0089A48D /* HSTableView.m */; }; CE6E0DFE1054E9EF008D9390 /* dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = CE6E0DFD1054E9EF008D9390 /* dsa_pub.pem */; }; @@ -56,7 +54,6 @@ CE91F216113BC22D0010360B /* StatsLabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CE91F214113BC22D0010360B /* StatsLabel.m */; }; CE9777CD141F8C2500C13FB5 /* PrioritizeDialog.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9777CC141F8C2500C13FB5 /* PrioritizeDialog.m */; }; CE9777D1141F8CB400C13FB5 /* PrioritizeDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */; }; - CE9D842A14BE2AE900184165 /* PyExtraFairwareReminder.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9D842914BE2AE900184165 /* PyExtraFairwareReminder.m */; }; CE9FC22D14C080CF005C31FD /* PyGUIObject.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC22C14C080CF005C31FD /* PyGUIObject.m */; }; CE9FC23014C08622005C31FD /* PyTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC22F14C08622005C31FD /* PyTable.m */; }; CE9FC23314C0866F005C31FD /* PyResultTable.m in Sources */ = {isa = PBXBuildFile; fileRef = CE9FC23214C0866F005C31FD /* PyResultTable.m */; }; @@ -108,7 +105,6 @@ 8D1107320486CEB800E47090 /* dupeGuru.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = dupeGuru.app; sourceTree = BUILT_PRODUCTS_DIR; }; CE00BBBD14910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DetailsPanel.xib; sourceTree = ""; }; CE00BBBE14910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE00BBBF14910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE00BBC014910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/MainMenu.xib; sourceTree = ""; }; CE00BBC114910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE00BBC214910C5E006A717C /* hy */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = hy; path = ../base/hy.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -125,7 +121,6 @@ CE0564B014169D9E00D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh_CN; path = ../base/zh_CN.lproj/Localizable.strings; sourceTree = ""; }; CE0564B314169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DetailsPanel.xib; sourceTree = ""; }; CE0564B414169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE0564B514169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE0564B614169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/MainMenu.xib; sourceTree = ""; }; CE0564B714169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ProblemDialog.xib; sourceTree = ""; }; CE0564B814169DB100D3D907 /* zh_CN */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = zh_CN; path = ../base/zh_CN.lproj/ResultWindow.xib; sourceTree = ""; }; @@ -176,10 +171,6 @@ CE587E9D14C0801F004CA031 /* PySelectableList.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PySelectableList.m; sourceTree = ""; }; CE647E541173024A006D28BA /* ProblemDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ProblemDialog.h; path = ../base/ProblemDialog.h; sourceTree = SOURCE_ROOT; }; CE647E551173024A006D28BA /* ProblemDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ProblemDialog.m; path = ../base/ProblemDialog.m; sourceTree = SOURCE_ROOT; }; - CE665B2D13225ADD003F5CFB /* ExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtraFairwareReminder.h; path = ../base/ExtraFairwareReminder.h; sourceTree = SOURCE_ROOT; }; - CE665B2E13225ADD003F5CFB /* ExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtraFairwareReminder.m; path = ../base/ExtraFairwareReminder.m; sourceTree = SOURCE_ROOT; }; - CE665B3213225AF8003F5CFB /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; - CE665B3413225B07003F5CFB /* fr */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = fr; path = ../base/fr.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CE6DD4E5124CA3070089A48D /* ResultTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ResultTable.h; path = ../base/ResultTable.h; sourceTree = SOURCE_ROOT; }; CE6DD4E6124CA3070089A48D /* ResultTable.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ResultTable.m; path = ../base/ResultTable.m; sourceTree = SOURCE_ROOT; }; CE6DD545124CAF1F0089A48D /* HSTableView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSTableView.h; path = ../../cocoalib/views/HSTableView.h; sourceTree = SOURCE_ROOT; }; @@ -201,7 +192,6 @@ CE7A6971146442010007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = it; path = ../base/it.lproj/Localizable.strings; sourceTree = ""; }; CE7A6977146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DetailsPanel.xib; sourceTree = ""; }; CE7A6978146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CE7A6979146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CE7A697A146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/MainMenu.xib; sourceTree = ""; }; CE7A697B146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CE7A697C146442160007D927 /* it */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = it; path = ../base/it.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -231,8 +221,6 @@ CE9777CB141F8C2500C13FB5 /* PrioritizeDialog.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrioritizeDialog.h; path = ../base/PrioritizeDialog.h; sourceTree = ""; }; CE9777CC141F8C2500C13FB5 /* PrioritizeDialog.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PrioritizeDialog.m; path = ../base/PrioritizeDialog.m; sourceTree = ""; }; CE9777D0141F8CB400C13FB5 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = ../base/en.lproj/PrioritizeDialog.xib; sourceTree = ""; }; - CE9D842814BE2AE900184165 /* PyExtraFairwareReminder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyExtraFairwareReminder.h; sourceTree = ""; }; - CE9D842914BE2AE900184165 /* PyExtraFairwareReminder.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyExtraFairwareReminder.m; sourceTree = ""; }; CE9FC22B14C080CF005C31FD /* PyGUIObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyGUIObject.h; sourceTree = ""; }; CE9FC22C14C080CF005C31FD /* PyGUIObject.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PyGUIObject.m; sourceTree = ""; }; CE9FC22E14C08622005C31FD /* PyTable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PyTable.h; sourceTree = ""; }; @@ -245,7 +233,6 @@ CEB57990146ADC5100EDF7D7 /* HSConsts.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HSConsts.h; path = ../../cocoalib/HSConsts.h; sourceTree = ""; }; CECFFF1C13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DetailsPanel.xib; sourceTree = SOURCE_ROOT; }; CECFFF1D13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/DirectoryPanel.xib; sourceTree = SOURCE_ROOT; }; - CECFFF1E13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ExtraFairwareReminder.xib; sourceTree = SOURCE_ROOT; }; CECFFF1F13CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/MainMenu.xib; sourceTree = SOURCE_ROOT; }; CECFFF2013CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ProblemDialog.xib; sourceTree = SOURCE_ROOT; }; CECFFF2113CDF8D0003A4518 /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = ../base/de.lproj/ResultWindow.xib; sourceTree = SOURCE_ROOT; }; @@ -255,7 +242,6 @@ CED638D714B38CC800B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../ru.lproj/FairwareReminder.xib; sourceTree = ""; }; CED638DC14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DetailsPanel.xib; sourceTree = ""; }; CED638DD14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CED638DE14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CED638DF14B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/MainMenu.xib; sourceTree = ""; }; CED638E014B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CED638E114B38CEC00B88D00 /* ru */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = ru; path = ../base/ru.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -265,7 +251,6 @@ CED64CEB145EF06000572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = ../base/cs.lproj/Localizable.strings; sourceTree = ""; }; CED64CF8145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DetailsPanel.xib; sourceTree = ""; }; CED64CF9145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CED64CFA145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CED64CFB145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/MainMenu.xib; sourceTree = ""; }; CED64CFC145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CED64CFD145EF07700572B00 /* cs */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = cs; path = ../base/cs.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -281,7 +266,6 @@ CEECCD0D14C636F100A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = ../base/uk.lproj/Localizable.strings; sourceTree = ""; }; CEECCD0F14C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DetailsPanel.xib; sourceTree = ""; }; CEECCD1014C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/DirectoryPanel.xib; sourceTree = ""; }; - CEECCD1114C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ExtraFairwareReminder.xib; sourceTree = ""; }; CEECCD1214C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/MainMenu.xib; sourceTree = ""; }; CEECCD1314C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/PrioritizeDialog.xib; sourceTree = ""; }; CEECCD1414C6370000A2F3A0 /* uk */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = uk; path = ../base/uk.lproj/ProblemDialog.xib; sourceTree = ""; }; @@ -451,8 +435,6 @@ CE9FC22F14C08622005C31FD /* PyTable.m */, CE3A3B4714BF19B8007898AB /* PyDetailsPanel.h */, CE3A3B4814BF19B8007898AB /* PyDetailsPanel.m */, - CE9D842814BE2AE900184165 /* PyExtraFairwareReminder.h */, - CE9D842914BE2AE900184165 /* PyExtraFairwareReminder.m */, CE275C5414BF712B00265960 /* PyDirectoryOutline.h */, CE275C5514BF712B00265960 /* PyDirectoryOutline.m */, CE548CC214BF903D00D180CB /* PyPrioritizeDialog.h */, @@ -523,7 +505,6 @@ CE81134812E5CE4D00A36C80 /* ProblemDialog.xib */, CE81134A12E5CE4D00A36C80 /* ResultWindow.xib */, CE81135612E5CE6D00A36C80 /* Preferences.xib */, - CE665B3113225AF8003F5CFB /* ExtraFairwareReminder.xib */, CE9777CF141F8CB400C13FB5 /* PrioritizeDialog.xib */, ); name = xib; @@ -583,8 +564,6 @@ CEE7EA120FE675C80004E467 /* DetailsPanel.m */, CEFC7FB40FC951A700CD5728 /* DirectoryPanel.h */, CEFC7FB50FC951A700CD5728 /* DirectoryPanel.m */, - CE665B2D13225ADD003F5CFB /* ExtraFairwareReminder.h */, - CE665B2E13225ADD003F5CFB /* ExtraFairwareReminder.m */, CEFC7FB70FC951A700CD5728 /* ResultWindow.h */, CEFC7FB80FC951A700CD5728 /* ResultWindow.m */, CE647E541173024A006D28BA /* ProblemDialog.h */, @@ -627,7 +606,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = NO; - LastUpgradeCheck = 0420; + LastUpgradeCheck = 0430; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "dupeguru" */; compatibilityVersion = "Xcode 3.2"; @@ -675,7 +654,6 @@ CE81135012E5CE4D00A36C80 /* ResultWindow.xib in Resources */, CE81135812E5CE6D00A36C80 /* Preferences.xib in Resources */, CE8113EB12E5CE9A00A36C80 /* Localizable.strings in Resources */, - CE665B3313225AF8003F5CFB /* ExtraFairwareReminder.xib in Resources */, CE31819D13D85D9B00B6D649 /* about.xib in Resources */, CE31819E13D85D9B00B6D649 /* ErrorReportWindow.xib in Resources */, CE9777D1141F8CB400C13FB5 /* PrioritizeDialog.xib in Resources */, @@ -714,13 +692,11 @@ CE79638C12536F4E008D405B /* HSFairwareReminder.m in Sources */, CE27D3C412CCA43800859E67 /* HSAboutBox.m in Sources */, CEF0ACCE12DF3C2000B32F7E /* HSRecentFiles.m in Sources */, - CE665B3013225ADD003F5CFB /* ExtraFairwareReminder.m in Sources */, CE9777CD141F8C2500C13FB5 /* PrioritizeDialog.m in Sources */, CE89240A14239CC30024CE4E /* PrioritizeList.m in Sources */, CE5335FC142BBFAF008E5374 /* HSQuicklook.m in Sources */, CE1D091814BE0C6400CA6B8C /* ObjP.m in Sources */, CE1D091914BE0C6400CA6B8C /* PyStatsLabel.m in Sources */, - CE9D842A14BE2AE900184165 /* PyExtraFairwareReminder.m in Sources */, CE3A3B4914BF19B8007898AB /* PyDetailsPanel.m in Sources */, CE275C5714BF712B00265960 /* PyDirectoryOutline.m in Sources */, CE275C5A14BF71DF00265960 /* PyColumns.m in Sources */, @@ -780,22 +756,6 @@ name = ErrorReportWindow.xib; sourceTree = ""; }; - CE665B3113225AF8003F5CFB /* ExtraFairwareReminder.xib */ = { - isa = PBXVariantGroup; - children = ( - CE665B3213225AF8003F5CFB /* en */, - CE665B3413225B07003F5CFB /* fr */, - CECFFF1E13CDF8D0003A4518 /* de */, - CE0564B514169DB100D3D907 /* zh_CN */, - CED64CFA145EF07700572B00 /* cs */, - CE7A6979146442160007D927 /* it */, - CE00BBBF14910C5E006A717C /* hy */, - CED638DE14B38CEC00B88D00 /* ru */, - CEECCD1114C6370000A2F3A0 /* uk */, - ); - name = ExtraFairwareReminder.xib; - sourceTree = SOURCE_ROOT; - }; CE79638412536C94008D405B /* FairwareReminder.xib */ = { isa = PBXVariantGroup; children = ( diff --git a/core/app.py b/core/app.py index 8852a496..a3fbdc12 100644 --- a/core/app.py +++ b/core/app.py @@ -80,7 +80,6 @@ class DupeGuru(RegistrableApplication, Broadcaster): # open_path(path) # reveal_path(path) # start_job(jobid, func, args=()) ( func(j, *args) ) - # show_extra_fairware_reminder() # in fairware prompts, we don't mention the edition, it's too long. PROMPT_NAME = "dupeGuru" @@ -236,10 +235,6 @@ class DupeGuru(RegistrableApplication, Broadcaster): self.results.apply_filter(filter) self._results_changed() - def show_extra_fairware_reminder_if_needed(self): - if self.results.mark_count > 100 and self.should_show_fairware_reminder: - self.view.show_extra_fairware_reminder() - def clean_empty_dirs(self, path): if self.options['clean_empty_dirs']: while delete_if_empty(path, ['.DS_Store']): @@ -278,14 +273,12 @@ class DupeGuru(RegistrableApplication, Broadcaster): if not self._check_demo(): return - self.show_extra_fairware_reminder_if_needed() jobid = JobType.Copy if copy else JobType.Move self.view.start_job(jobid, do) def delete_marked(self, replace_with_hardlinks=False): if not self._check_demo(): return - self.show_extra_fairware_reminder_if_needed() self.view.start_job(JobType.Delete, self._do_delete, args=[replace_with_hardlinks]) def export_to_xhtml(self): diff --git a/core/gui/extra_fairware_reminder.py b/core/gui/extra_fairware_reminder.py deleted file mode 100644 index a8c0039e..00000000 --- a/core/gui/extra_fairware_reminder.py +++ /dev/null @@ -1,30 +0,0 @@ -# Created By: Virgil Dupras -# Created On: 2011-03-04 -# Copyright 2011 Hardcoded Software (http://www.hardcoded.net) -# -# This software is licensed under the "BSD" License as described in the "LICENSE" file, -# which should be included with this package. The terms are also available at -# http://www.hardcoded.net/licenses/bsd_license - -import time - -from hscommon.trans import tr -from .base import GUIObject - -class ExtraFairwareReminder(GUIObject): - def start(self): - self.start_time = time.time() - self.view.start_timer() - - def update_button(self): - elapsed = time.time() - self.start_time - remaining = 60 - round(elapsed) - if remaining > 0: - text = tr("Continue ({})").format(remaining) - else: - text = tr("Continue") - self.view.enable_button() - self.view.stop_timer() - self.view.set_button_text(text) - - \ No newline at end of file diff --git a/qt/base/app.py b/qt/base/app.py index 5177263a..1604a1fb 100644 --- a/qt/base/app.py +++ b/qt/base/app.py @@ -27,7 +27,6 @@ from qtlib.recent import Recent from qtlib.reg import Registration from . import platform -from .extra_fairware_reminder import ExtraFairwareReminder from .result_window import ResultWindow from .directories_dialog import DirectoriesDialog from .problem_dialog import ProblemDialog @@ -285,10 +284,6 @@ class DupeGuru(QObject): reg = Registration(self.model) reg.show_demo_nag(prompt) - def show_extra_fairware_reminder(self): - dialog = ExtraFairwareReminder(self.directories_dialog, self) - dialog.exec() - def show_message(self, msg): window = QApplication.activeWindow() QMessageBox.information(window, '', msg) diff --git a/qt/base/extra_fairware_reminder.py b/qt/base/extra_fairware_reminder.py deleted file mode 100644 index 9cb39639..00000000 --- a/qt/base/extra_fairware_reminder.py +++ /dev/null @@ -1,107 +0,0 @@ -# Created By: Virgil Dupras -# Created On: 2011-03-04 -# Copyright 2011 Hardcoded Software (http://www.hardcoded.net) -# -# This software is licensed under the "BSD" License as described in the "LICENSE" file, -# which should be included with this package. The terms are also available at -# http://www.hardcoded.net/licenses/bsd_license - -import sys - -from PyQt4.QtCore import Qt, QUrl, QTimer -from PyQt4.QtGui import (QDialog, QDesktopServices, QApplication, QVBoxLayout, QHBoxLayout, QLabel, - QFont, QSpacerItem, QSizePolicy, QPushButton) - -from hscommon.plat import ISLINUX -from hscommon.trans import trget -from core.gui.extra_fairware_reminder import ExtraFairwareReminder as ExtraFairwareReminderModel - -tr = trget('ui') - -class ExtraFairwareReminder(QDialog): - def __init__(self, parent, app): - flags = Qt.CustomizeWindowHint | Qt.WindowTitleHint - QDialog.__init__(self, parent, flags) - self.setModal(True) - self.app = app - self.model = ExtraFairwareReminderModel(self, app) - self._setupUi() - - self.continueButton.setEnabled(False) - self.continueButton.clicked.connect(self.accept) - self.contributeButton.clicked.connect(self.contributeClicked) - self.model.start() - - def _setupUi(self): - self.setWindowTitle(tr("Sorry, I must insist")) - dlg_height = 410 if ISLINUX else 330 - self.resize(380, dlg_height) - self.verticalLayout = QVBoxLayout(self) - self.descLabel = QLabel(self) - msg = tr("It seems that you found a lot of duplicates. Nice! I must insist, however, that " - "contributions are expected when there are unpaid hours on the project.\n" - "\n" - "You might think \"but I'm only going to use this once, I don't have to contribute\". " - "The problem is that most people use dupeGuru only once in a while. If everyone thinks " - "like that, dupeGuru development cannot be funded. It's because of this tendency " - "inherent to dupeGuru's nature that I have to insist here.\n" - "\n" - "If you can't afford to contribute, you can ignore this reminder or send me an e-mail " - "at hsoft@hardcoded.net so I can give you a key to remove this reminder.") - self.descLabel.setText(msg) - self.descLabel.setWordWrap(True) - self.verticalLayout.addWidget(self.descLabel) - self.reasonLabel = QLabel(self) - msg = tr("This reminder showed up because:\n" - "\n" - "1. You are processing more than 100 duplicates\n" - "2. You have not yet contributed to dupeGuru\n" - "3. There are unpaid hours in the project") - self.reasonLabel.setText(msg) - self.reasonLabel.setWordWrap(True) - font = QFont() - font.setWeight(75) - font.setBold(True) - self.reasonLabel.setFont(font) - self.verticalLayout.addWidget(self.reasonLabel) - self.horizontalLayout = QHBoxLayout() - spacerItem = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum) - self.horizontalLayout.addItem(spacerItem) - self.contributeButton = QPushButton(self) - self.contributeButton.setText(tr("Contribute")) - self.horizontalLayout.addWidget(self.contributeButton) - self.continueButton = QPushButton(self) - self.continueButton.setText(tr("Continue")) - self.horizontalLayout.addWidget(self.continueButton) - self.verticalLayout.addLayout(self.horizontalLayout) - - #--- model --> view - def start_timer(self): - self._timer = QTimer() - self._timer.setInterval(200) - self._timer.timeout.connect(self.model.update_button) - self._timer.start() - - def stop_timer(self): - self._timer.stop() - del self._timer - - def enable_button(self): - self.continueButton.setEnabled(True) - - def set_button_text(self, text): - self.continueButton.setText(text) - - #--- Events - def contributeClicked(self): - url = QUrl('http://open.hardcoded.net/contribute/') - QDesktopServices.openUrl(url) - - -if __name__ == '__main__': - app = QApplication([]) - class FakeReg: - app = app - dialog = ExtraFairwareReminder(None, FakeReg()) - dialog.show() - sys.exit(app.exec_())