Fixed PE's Clear Picture Cache action under Qt.

Also, added the ability to sort by 'marked' status.

.hgignore

@@ -1,25 +1,37 @@
 syntax: glob
 
 .DS_Store
+run.py
 *.pyc
 *.so
-*.mode1v3
-*.pbxuser
-*.tm_build_errors
+*.mo
 *.pyd
-conf.yaml
+.tm_*
+*.xcodeproj/xcuserdata
+*.xcodeproj/project.xcworkspace/xcuserdata
+conf.json
 build
+dist
+install
+installer_tmp-cache
+cocoa/autogen
 cocoa/*/Info.plist
 cocoa/*/build
+cocoa/*/*.app
 cocoa/*/dg_cocoa.plugin
+cocoa/*/fr.lproj/*.xib
+cocoa/*/de.lproj/*.xib
+cocoa/*/zh_CN.lproj/*.xib
+cocoa/*/cs.lproj/*.xib
+cocoa/*/it.lproj/*.xib
+cs.lproj
+de.lproj
+fr.lproj
+it.lproj
+hy.lproj
+ru.lproj
+uk.lproj
+zh_CN.lproj
 qt/base/*_rc.py
-qt/base/*_ui.py
-qt/*/*_ui.py
-qt/*/build
-qt/*/dist
-qt/*/install
-qt/*/logdict*.log
-qt/*/warn*.txt
-help_se/dupeguru_help
-help_me/dupeguru_me_help
-help_pe/dupeguru_pe_help
+help/*/conf.py
+help/*/changelog.rst

.hgtags

@@ -16,3 +16,57 @@ cbcf9c80fee4c908ef2efbf1c143c9e47676c9b2 pe1.8.0
 0a71306434bca51bea9a5d5ae54fe1bf0e4900d8 pe1.8.5
 556baf4a410779e9bbf43129de133e4c4b26d679 pe1.8.6
 9149024283959a50fe9a47a5f175b905d1672c19 se2.10.0
+388a7e5aef6385e515189f4a15b4c4fed3ae2fcf me5.8.0
+27501167e3b9262ecb60c967941294f36d77eb25 pe1.9.0
+cb0a860430bacd712820bce426bcf47a4135efe1 se2.10.1
+cb0a860430bacd712820bce426bcf47a4135efe1 se2.10.1
+f71d405e62badcfdc1b037facaac043cece40ee5 se2.10.1
+3742e83edd9eadf44e1a501859f5e2462b1ef6fd me5.8.1
+724ff565dd785fb739774588c6ee652cfc0612d5 pe1.9.1
+634b66415c6529f46ae4f837318027cc9d70c3b5 before-py3k
+2b67955db2b0580a8b0854dc918b6ab0d1fa3b88 se2.11.0
+b56fe4dd8c95bca270b078a09e86848df77e2b2d me5.9.0
+618a7365457d56fdc6920c70843a244762e2ea00 pe1.10.0
+95b3a4b564c6222b414f2b40182dde2bd6d0e8a4 me5.9.1
+9735a5218d2b5b3b1e1dfe17f2f874177cf8f61c se2.11.1
+dbfee3ee2fa5cbb9e7ab36570659c17cd5b8561f se2.12.0
+d3fe0d0dcda1e0bf1100d02f117503d3bf6baacf me5.10.0
+b07ac1398703dd358912c1f3d20bd995633db9fe pe1.11.0
+96b6aee668398d663b04eafc8d5dae05e18500ee before-fairware
+22239f94589baf2a9fad2123045b8a718dbd68f5 se2.12.2
+f9cae82a0752191276b24ffb2cc4e4a8afb5d754 me5.10.2
+154c8cb6f018d446d88fa099490c900906e86386 pe1.11.2
+ca93352ce35184853ad9fcb881935a43a8b1e249 me5.10.3
+44f6ff67066c083f79daa18a9d2f1ab909e0a62e me5.10.4
+3f71a8f5bf8f6d0729748a27af9163e013723294 pe1.11.3
+0056293b0dade8b8230f68c1fe6f0c2d1e0b74d8 se2.12.3
+8d12cab3b12b723e3a86d02cf8002731a0f73f95 se3.0.0
+778876a8a9787658aa6adf6944b53aebcb7faeea se3.0.1
+f1d40b556c01f32c58f9ef9f9acac5b78e01ba7a pe2.0.0
+2fd901a516f8cb6b4438491f63f2ebfd52a57c13 me6.0.0
+ff43c6d9feb388f103b7857eaa6f7809185f78ec before-pluginbuilder
+d274bcb98f2d02b86470a04cd62e718eff33b74f pe2.1.0
+77e169f757195c11e9c1c5febeb2db8eb3589510 se3.0.2
+97893f37d7d0767b5aedf1b4b40de57ee36d426b se3.1.0
+e44d5127ed605daa7a17a01eee65d0a157de20c0 pe2.2.0
+ecf9aaa568340e3d03e8854b7556edd5a3285107 pe2.2.1
+db1f325c907ffa9808a49cb7bc2886b9fca7aee2 se3.1.1
+e62183e907d6177cf0bac354e31afa9546c199e6 se3.1.2
+28ba95706dc54ba32b1c0cf4e1e6350515d19ba3 me6.0.2
+925847384dcef62a5c3518fc9e5ce42feab2b093 pe2.2.2
+383b14d6e8555ed2c8d5552259bc7ce600dfb1d0 before-leopard-drop
+a2f7b7302e178f08725a6404ddc28464409510b1 se3.2.0
+5a5134a4fa9bb7ca80ae3e32010030f5bd7ba434 me6.1.0
+0fd77be57ff716d5c93232e829dc02acec036d7c se3.2.1
+3dd08060135b0b9cef70b6f5a81f191ea339c8d5 me6.1.1
+4e6cbef6bcdfcc0e56ff9690fbfe1cac1f4b1b09 pe2.3.0
+9ea9af1b886cd1adc4f42fd2276cc2b38376eab0 se3.3.0
+6e3379be6821bb36d7f0877a17dd6c07aa037b0a se3.3.1
+015ba7e2c10d09afb944f387c2a9c97f7eff7571 me6.2.0
+8178bda48324461a17118c98634241952c074f29 pe2.4.0
+2a96f2fb3ddb6f1e0ae87951586733fc3e4a28a0 se3.3.2
+6a08c1205dfe5e537e5c2dc99d05e05d1d3928f6 me6.2.1
+a619f313712e2923160b8f90d8250ee0e184c7b9 pe2.4.1
+fad463ae749b7189dce92f1e42a57ac4ee03987d se3.3.3
+236cf9b690a144392e7e86e7c9749fc834a8b271 me6.3.0
+90318f1303858d9d01065d92d78d98b888b38ea0 se3.4.0

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2010 Hardcoded Software Inc. (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software Inc. (http://www.hardcoded.net)
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
@@ -6,6 +6,5 @@ Redistribution and use in source and binary forms, with or without modification,
     * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
     * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
     * Neither the name of Hardcoded Software Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-    * If the source code has been published less than two years ago, any redistribution, in whole or in part, must retain full licensing functionality, without any attempt to change, obscure or in other ways circumvent its intent.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README

@@ -1,57 +1,107 @@
 Contents
-=====
+========
 
-This package contains the source for dupeGuru. To learns how to build it, refer to the "Build dupeGuru" section. Below is the description of the various subfolders:
+This package contains the source for dupeGuru. To learn how to build it, refer to the "Build dupeGuru" section. Below is the description of the various subfolders:
 
 - core: Contains the core logic code for dupeGuru. It's Python code written in TDD style.
 - core_*: Edition-specific-cross-toolkit code written in Python.
 - cocoa: UI code for the Cocoa toolkit. It's Objective-C code.
-- qt: UI code for the Qt toolkit. It's written in Python and uses PyQt. Before redistributing changes in this part of the code, read the "qt/WARNING" file.
+- qt: UI code for the Qt toolkit. It's written in Python and uses PyQt.
 - images: Images used by the different UI codebases.
+- debian_*: Skeleton files required to create a .deb package
+- help: Help document, written for Sphinx.
 
 There are also other sub-folder that comes from external repositories (automatically checked out
-with svn:externals):
+with as mercurial subrepos):
 
-- hsutil: A collection of helpers used across HS applications.
-- hsdocgen: An ad-hoc document generation used across HS project (used for help files)
-- hsmedia: A library to read audio file metadata, used in dupeGuru ME.
+- hscommon: A collection of helpers used across HS applications.
 - cocoalib: A collection of helpers used across Cocoa UI codebases of HS applications.
 - qtlib: A collection of helpers used across Qt UI codebases of HS applications.
 
 dupeGuru Dependencies
-=====
+=====================
 
 Before being able to build dupeGuru, a few dependencies have to be installed:
 
 General dependencies
------
+--------------------
 
-- Python 2.6 (http://www.python.org)
-- Send2Trash (http://hg.hardcoded.net/send2trash)
-- lxml, to read and write XML files. (http://codespeak.net/lxml/)
-- Mako, to generate help files. (http://www.makotemplates.org/)
-- PyYaml, for help files and the build system. (http://pyyaml.org/)
-- Nose, to run unit tests. (http://somethingaboutorange.com/mrl/projects/nose/)
+- Python 3.2 (http://www.python.org)
+- Send2Trash3k (http://hg.hardcoded.net/send2trash)
+- hsaudiotag3k 1.1.0 (for ME) (http://hg.hardcoded.net/hsaudiotag)
+- jobprogress 1.0.3 (http://hg.hardcoded.net/jobprogress)
+- Sphinx 1.1 (http://sphinx.pocoo.org/)
+- polib 0.7.0 (http://bitbucket.org/izi/polib)
+- pytest 2.0.0, to run unit tests. (http://pytest.org/)
 
 OS X prerequisites
------
+------------------
 
-- XCode 3.1 (http://developer.apple.com/TOOLS/xcode/)
+- XCode 4.1
 - Sparkle (http://sparkle.andymatuschak.org/)
-- PyObjC 2.2. (http://pyobjc.sourceforge.net/)
-- py2app (http://svn.pythonmac.org/py2app/py2app/trunk/doc/index.html)
+- objp 1.1.0 (http://bitbucket.org/hsoft/objp)
+- pluginbuilder 1.1.0 (http://bitbucket.org/hsoft/pluginbuilder)
+- appscript 1.0.0 for ME and PE (http://appscript.sourceforge.net/)
 
 Windows prerequisites
----
+---------------------
 
 - Visual Studio 2008 (Express is enough) is needed to build C extensions. (http://www.microsoft.com/Express/)
-- PyQt 4.6 (http://www.riverbankcomputing.co.uk/news)
-- Python Imaging Library for dupeGuru PE. (http://www.pythonware.com/products/pil/)
+- PyQt 4.7.5 (http://www.riverbankcomputing.co.uk/news)
 - cx_Freeze, if you want to build a exe. You don't need it if you just want to run dupeGuru. (http://cx-freeze.sourceforge.net/)
 - Advanced Installer, if you want to build the installer file. (http://www.advancedinstaller.com/)
 
+Linux prerequisites
+-------------------
+
+- PyQt 4.7.5 (http://www.riverbankcomputing.co.uk/news)
+
+The easy way!
+-------------
+
+There's an easy way to install the majority of the prerequisites above, and it's `pip <http://www.pip-installer.org/>`_ which has recently started to support Python 3. So install it and then run::
+
+    pip install -r requirements-[osx|win].txt
+
+([osx|win] depends, of course, on your platform. On other platforms, just use requirements.txt). 
+You might have to compile PyObjC manually (see gotchas below). Sparkle and 
+Advanced Installer, having nothing to do with Python, are also manual installs.
+
+PyQt isn't in the requirements file either (there's no package uploaded on PyPI) and you also have
+to install it manually.
+
+Prerequisite gotchas
+--------------------
+
+Correctly installing the prerequisites is tricky. Make sure you have at least the version number 
+required for each prerequisite.
+
+If you didn't use mercurial to download this source, you probably have an incomplete source folder!
+External projects (hscommon, qtlib, cocoalib) need to be at the root of the dupeGuru project folder.
+You'll have to download those separately. Or use mercurial, it's much easier.
+
+As far as I can tell, you don't *have* to compile/install everything manually and you can normally
+use `easy_install` to install python dependencies. However, be aware that compiling/installing
+manually from the repositories of each project is what I personally do, so if you hit a snag 
+somewhere, you might want to try the manual way.
+
+PyObjC's website is badly outdated. Also, as far as I can tell, the package installable with
+`easy_install` has good chances of not working. Your best bet is to download the latest tagged
+version from the repository and compile it from source.
+
+Another one on OS X: I wouldn't use macports/fink/whatever. Whenever I tried using those, I always 
+ended up with problems.
+
+On OSX Lion, for dupeGuru PE, make sure that you installed the latest version of macholib because there was a
+10.7 related bug that was fixed recently. Right now, the fix hasn't even been released yet so you 
+have to install directly from the repo ( http://bitbucket.org/ronaldoussoren/macholib ). The fix
+in question is at http://bitbucket.org/ronaldoussoren/macholib/changeset/4ab0de0f5b60
+
+Whenever you have a problem, always double-check that you're running the correct python version. 
+You'll probably have to tweak your $PATH.
+
 Building dupeGuru
-=====
+=================
 
 First, make sure you meet the dependencies listed in the section above. Then you need to configure your build with:
 
@@ -67,8 +117,3 @@ Then, just build the thing and then run it with:
 If you want to create ready-to-upload package, run:
 
 	python package.py
-
-64-bit on OS X
----
-
-The "release" configuration of dupeGuru's XCode project build with archs "i386 x86_64 ppc". However there are currently problems with py2app and 64 bit. If you want to correctly build 64-bit apps, refer to http://www.hardcoded.net/articles/building-64-bit-pyobjc-applications-with-py2app.htm .

build.py

@@ -1,106 +1,288 @@
-# -*- coding: utf-8 -*-
 # Created By: Virgil Dupras
 # Created On: 2009-12-30
-# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
 
 import sys
 import os
 import os.path as op
+from optparse import OptionParser
 import shutil
+import json
+import importlib
 
-from setuptools import setup
-import yaml
+from setuptools import setup, Extension
 
-from hsdocgen import generate_help, filters
-from hsutil.build import add_to_pythonpath, print_and_do, build_all_qt_ui, copy_packages
+from hscommon import sphinxgen
+from hscommon.build import (add_to_pythonpath, print_and_do, copy_packages, filereplace,
+    get_module_version, build_all_cocoa_locs, move_all, copy_sysconfig_files_for_embed, copy_all,
+    move)
+from hscommon import loc
 
-def build_cocoa(edition, dev, help_destpath):
-    if not dev:
-        print "Building help index"
-        os.system('open -a /Developer/Applications/Utilities/Help\\ Indexer.app {0}'.format(help_destpath))
+def parse_args():
+    usage = "usage: %prog [options]"
+    parser = OptionParser(usage=usage)
+    parser.add_option('--clean', action='store_true', dest='clean',
+        help="Clean build folder before building")
+    parser.add_option('--doc', action='store_true', dest='doc',
+        help="Build only the help file")
+    parser.add_option('--loc', action='store_true', dest='loc',
+        help="Build only localization")
+    parser.add_option('--cocoamod', action='store_true', dest='cocoamod',
+        help="Build only Cocoa modules")
+    parser.add_option('--updatepot', action='store_true', dest='updatepot',
+        help="Generate .pot files from source code.")
+    parser.add_option('--mergepot', action='store_true', dest='mergepot',
+        help="Update all .po files based on .pot files.")
+    (options, args) = parser.parse_args()
+    return options
 
-    print "Building dg_cocoa.plugin"
-    if op.exists('build'):
-        shutil.rmtree('build')
-    os.mkdir('build')
-    if not dev:
-        specific_packages = {
-            'se': ['core_se'],
-            'me': ['core_me', 'hsmedia'],
-            'pe': ['core_pe'],
-        }[edition]
-        copy_packages(['core', 'hsutil'] + specific_packages, 'build')
+def build_cocoa(edition, dev):
+    build_cocoa_proxy_module()
+    build_cocoa_bridging_interfaces(edition)
+    print("Building the cocoa layer")
+    from pluginbuilder import copy_embeddable_python_dylib, get_python_header_folder, collect_dependencies
+    copy_embeddable_python_dylib('build')
+    if not op.exists('build/PythonHeaders'):
+        os.symlink(get_python_header_folder(), 'build/PythonHeaders')
+    if not op.exists('build/py'):
+        os.mkdir('build/py')
     cocoa_project_path = 'cocoa/{0}'.format(edition)
     shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build')
-    os.chdir('build')
-    script_args = ['py2app', '-A'] if dev else ['py2app']
-    setup(
-        script_args = script_args,
-        plugin = ['dg_cocoa.py'],
-        setup_requires = ['py2app'],
-    )
-    os.chdir('..')
-    pluginpath = op.join(cocoa_project_path, 'dg_cocoa.plugin')
-    if op.exists(pluginpath):
-        shutil.rmtree(pluginpath)
-    shutil.move('build/dist/dg_cocoa.plugin', pluginpath)
+    specific_packages = {
+        'se': ['core_se'],
+        'me': ['core_me'],
+        'pe': ['core_pe'],
+    }[edition]
+    tocopy = ['core', 'hscommon', 'cocoa/inter', 'cocoalib/cocoa'] + specific_packages
+    copy_packages(tocopy, 'build')
+    sys.path.insert(0, 'build')
+    collect_dependencies('build/dg_cocoa.py', 'build/py', excludes=['PyQt4'])
+    del sys.path[0]
     if dev:
-        # In alias mode, the tweakings we do to the pythonpath aren't counted in. We have to
-        # manually put a .pth in the plugin
-        pthpath = op.join(pluginpath, 'Contents/Resources/dev.pth')
-        open(pthpath, 'w').write(op.abspath('.'))
+        copy_packages(tocopy, 'build/py', create_links=True)
+    # Views are not referenced by python code, so they're not found by the collector.
+    copy_all('build/inter/*.so', 'build/py/inter')
+    copy_sysconfig_files_for_embed('build/py')
     os.chdir(cocoa_project_path)
-    print "Building the XCode project"
-    args = []
+    print('Generating Info.plist')
+    app_version = get_module_version('core_{}'.format(edition))
+    filereplace('InfoTemplate.plist', 'Info.plist', version=app_version)
+    print("Building the XCode project")
+    args = ['-project dupeguru.xcodeproj']
     if dev:
         args.append('-configuration dev')
     else:
         args.append('-configuration release')
     args = ' '.join(args)
     os.system('xcodebuild {0}'.format(args))
-    os.chdir('..')
+    os.chdir('../..')
+    print("Creating the run.py file")
+    app_path = {
+        'se': 'cocoa/se/dupeGuru.app',
+        'me': 'cocoa/me/dupeGuru\\ ME.app',
+        'pe': 'cocoa/pe/dupeGuru\\ PE.app',
+    }[edition]
+    tmpl = open('run_template_cocoa.py', 'rt').read()
+    run_contents = tmpl.replace('{{app_path}}', app_path)
+    open('run.py', 'wt').write(run_contents)
 
 def build_qt(edition, dev):
-    build_all_qt_ui(op.join('qtlib', 'ui'))
-    build_all_qt_ui(op.join('qt', 'base'))
-    build_all_qt_ui(op.join('qt', edition))
-    print_and_do("pyrcc4 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py')))
-    if edition == 'pe':
-        os.chdir(op.join('qt', edition))
-        os.system('python gen.py')
-        os.chdir(op.join('..', '..'))
+    print("Building Qt stuff")
+    print_and_do("pyrcc4 -py3 {0} > {1}".format(op.join('qt', 'base', 'dg.qrc'), op.join('qt', 'base', 'dg_rc.py')))
+    print("Creating the run.py file")
+    tmpl = open('run_template_qt.py', 'rt').read()
+    run_contents = tmpl.replace('{{edition}}', edition)
+    open('run.py', 'wt').write(run_contents)
 
-def main():
-    conf = yaml.load(open('conf.yaml'))
-    edition = conf['edition']
-    ui = conf['ui']
-    dev = conf['dev']
-    print "Building dupeGuru {0} with UI {1}".format(edition.upper(), ui)
-    if dev:
-        print "Building in Dev mode"
-    add_to_pythonpath('.')
-    print "Generating Help"
-    windows = sys.platform == 'win32'
-    tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}")
-    help_dir = 'help_{0}'.format(edition)
-    dest_dir = 'dupeguru_{0}_help'.format(edition) if edition != 'se' else 'dupeguru_help'
-    help_basepath = op.abspath(help_dir)
-    help_destpath = op.abspath(op.join(help_dir, dest_dir))
-    generate_help.main(help_basepath, help_destpath, force_render=not dev, tix=tix, windows=windows)
+def build_help(edition):
+    print("Generating Help")
+    current_path = op.abspath('.')
+    help_basepath = op.join(current_path, 'help', 'en')
+    help_destpath = op.join(current_path, 'build', 'help'.format(edition))
+    changelog_path = op.join(current_path, 'help', 'changelog_{}'.format(edition))
+    tixurl = "https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}"
+    appname = {'se': 'dupeGuru', 'me': 'dupeGuru Music Edition', 'pe': 'dupeGuru Picture Edition'}[edition]
+    homepage = 'http://www.hardcoded.net/dupeguru{}/'.format('_' + edition if edition != 'se' else '')
+    confrepl = {'edition': edition, 'appname': appname, 'homepage': homepage, 'language': 'en'}
+    changelogtmpl = op.join(current_path, 'help', 'changelog.tmpl')
+    conftmpl = op.join(current_path, 'help', 'conf.tmpl')
+    sphinxgen.gen(help_basepath, help_destpath, changelog_path, tixurl, confrepl, conftmpl, changelogtmpl)
 
-    print "Building dupeGuru"
-    if edition == 'pe':
-        os.chdir('core_pe')
-        os.system('python gen.py')
-        os.chdir('..')
+def build_localizations(ui, edition):
+    print("Building localizations")
+    loc.compile_all_po('locale')
+    loc.compile_all_po(op.join('hscommon', 'locale'))
+    loc.merge_locale_dir(op.join('hscommon', 'locale'), 'locale')
+    if op.exists(op.join('build', 'locale')):
+        shutil.rmtree(op.join('build', 'locale'))
+    shutil.copytree('locale', op.join('build', 'locale'), ignore=shutil.ignore_patterns('*.po', '*.pot'))
     if ui == 'cocoa':
-        build_cocoa(edition, dev, help_destpath)
+        print("Creating lproj folders based on .po files")
+        for lang in loc.get_langs('locale'):
+            if lang == 'en':
+                continue
+            pofile = op.join('locale', lang, 'LC_MESSAGES', 'ui.po')
+            for edition_folder in ['base', 'se', 'me', 'pe']:
+                enlproj = op.join('cocoa', edition_folder, 'en.lproj')
+                dest_lproj = op.join('cocoa', edition_folder, lang + '.lproj')
+                loc.po2allxibstrings(pofile, enlproj, dest_lproj)
+                if edition_folder == 'base':
+                    loc.po2strings(pofile, op.join(enlproj, 'Localizable.strings'), op.join(dest_lproj, 'Localizable.strings'))
+            pofile = op.join('cocoalib', 'locale', lang, 'LC_MESSAGES', 'cocoalib.po')
+            loc.po2allxibstrings(pofile, op.join('cocoalib', 'en.lproj'), op.join('cocoalib', lang + '.lproj'))
+        build_all_cocoa_locs('cocoalib')
+        build_all_cocoa_locs(op.join('cocoa', 'base'))
+        build_all_cocoa_locs(op.join('cocoa', edition))
+    elif ui == 'qt':
+        loc.compile_all_po(op.join('qtlib', 'locale'))
+        loc.merge_locale_dir(op.join('qtlib', 'locale'), 'locale')
+
+def build_updatepot():
+    print("Building .pot files from source files")
+    print("Building core.pot")
+    all_cores = ['core', 'core_se', 'core_me', 'core_pe']
+    loc.generate_pot(all_cores, op.join('locale', 'core.pot'), ['tr'])
+    print("Building columns.pot")
+    loc.generate_pot(all_cores, op.join('locale', 'columns.pot'), ['coltr'])
+    print("Building ui.pot")
+    ui_packages = ['qt', op.join('cocoa', 'inter')]
+    loc.generate_pot(ui_packages, op.join('locale', 'ui.pot'), ['tr'])
+    print("Building hscommon.pot")
+    loc.generate_pot(['hscommon'], op.join('hscommon', 'locale', 'hscommon.pot'), ['tr'])
+    print("Building qtlib.pot")
+    loc.generate_pot(['qtlib'], op.join('qtlib', 'locale', 'qtlib.pot'), ['tr'])
+    print("Building cocoalib.pot")
+    loc.allstrings2pot(op.join('cocoalib', 'en.lproj'), op.join('cocoalib', 'locale', 'cocoalib.pot'))
+    print("Enhancing ui.pot with Cocoa's strings files")
+    loc.allstrings2pot(op.join('cocoa', 'base', 'en.lproj'), op.join('locale', 'ui.pot'),
+        excludes={'core', 'message', 'columns'})
+    loc.allstrings2pot(op.join('cocoa', 'se', 'en.lproj'), op.join('locale', 'ui.pot'))
+    loc.allstrings2pot(op.join('cocoa', 'me', 'en.lproj'), op.join('locale', 'ui.pot'))
+    loc.allstrings2pot(op.join('cocoa', 'pe', 'en.lproj'), op.join('locale', 'ui.pot'))
+
+def build_mergepot():
+    print("Updating .po files using .pot files")
+    loc.merge_pots_into_pos('locale')
+    loc.merge_pots_into_pos(op.join('hscommon', 'locale'))
+    loc.merge_pots_into_pos(op.join('qtlib', 'locale'))
+    loc.merge_pots_into_pos(op.join('cocoalib', 'locale'))
+
+def build_cocoa_ext(extname, dest, source_files, extra_frameworks=(), extra_includes=()):
+    extra_link_args = ["-framework", "CoreFoundation", "-framework", "Foundation"]
+    for extra in extra_frameworks:
+        extra_link_args += ['-framework', extra]
+    ext = Extension(extname, source_files, extra_link_args=extra_link_args, include_dirs=extra_includes)
+    setup(script_args=['build_ext', '--inplace'], ext_modules=[ext])
+    fn = extname + '.so'
+    assert op.exists(fn)
+    move(fn, op.join(dest, fn))
+
+def build_cocoa_proxy_module():
+    print("Building Cocoa Proxy")
+    import objp.p2o
+    objp.p2o.generate_python_proxy_code('cocoalib/cocoa/CocoaProxy.h', 'build/CocoaProxy.m')
+    build_cocoa_ext("CocoaProxy", 'cocoalib/cocoa',
+        ['cocoalib/cocoa/CocoaProxy.m', 'build/CocoaProxy.m', 'build/ObjP.m', 'cocoalib/HSErrorReportWindow.m'],
+        ['AppKit', 'CoreServices'],
+        ['cocoalib'])
+
+def build_cocoa_bridging_interfaces(edition):
+    print("Building Cocoa Bridging Interfaces")
+    import objp.o2p
+    import objp.p2o
+    add_to_pythonpath('cocoa')
+    add_to_pythonpath('cocoalib')
+    from cocoa.inter import (PyGUIObject, GUIObjectView, PyColumns, ColumnsView, PyOutline,
+        OutlineView, PySelectableList, SelectableListView, PyTable, TableView, PyFairware)
+    from inter.details_panel import PyDetailsPanel, DetailsPanelView
+    from inter.directory_outline import PyDirectoryOutline, DirectoryOutlineView
+    from inter.prioritize_dialog import PyPrioritizeDialog, PrioritizeDialogView
+    from inter.prioritize_list import PyPrioritizeList, PrioritizeListView
+    from inter.problem_dialog import PyProblemDialog
+    from inter.ignore_list_dialog import PyIgnoreListDialog, IgnoreListDialogView
+    from inter.result_table import PyResultTable, ResultTableView
+    from inter.stats_label import PyStatsLabel, StatsLabelView
+    from inter.app import PyDupeGuruBase, DupeGuruView
+    appmod = importlib.import_module('inter.app_{}'.format(edition))
+    allclasses = [PyGUIObject, PyColumns, PyOutline, PySelectableList, PyTable, PyFairware,
+        PyDetailsPanel, PyDirectoryOutline, PyPrioritizeDialog, PyPrioritizeList, PyProblemDialog,
+        PyIgnoreListDialog, 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, PrioritizeDialogView, PrioritizeListView,
+        IgnoreListDialogView, 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'])
+
+def build_pe_modules(ui):
+    print("Building PE Modules")
+    exts = [
+        Extension("_block", [op.join('core_pe', 'modules', 'block.c'), op.join('core_pe', 'modules', 'common.c')]),
+        Extension("_cache", [op.join('core_pe', 'modules', 'cache.c'), op.join('core_pe', 'modules', 'common.c')]),
+    ]
+    if ui == 'qt':
+        exts.append(Extension("_block_qt", [op.join('qt', 'pe', 'modules', 'block.c')]))
+    elif ui == 'cocoa':
+        exts.append(Extension(
+            "_block_osx", [op.join('core_pe', 'modules', 'block_osx.m'), op.join('core_pe', 'modules', 'common.c')],
+            extra_link_args=[
+                "-framework", "CoreFoundation",
+                "-framework", "Foundation",
+                "-framework", "ApplicationServices",]
+        ))
+    setup(
+        script_args = ['build_ext', '--inplace'],
+        ext_modules = exts,
+    )
+    move_all('_block_qt*', op.join('qt', 'pe'))
+    move_all('_block*', 'core_pe')
+    move_all('_cache*', 'core_pe')
+
+def build_normal(edition, ui, dev):
+    print("Building dupeGuru {0} with UI {1}".format(edition.upper(), ui))
+    add_to_pythonpath('.')
+    build_help(edition)
+    build_localizations(ui, edition)
+    print("Building dupeGuru")
+    if edition == 'pe':
+        build_pe_modules(ui)
+    if ui == 'cocoa':
+        build_cocoa(edition, dev)
     elif ui == 'qt':
         build_qt(edition, dev)
 
+def main():
+    options = parse_args()
+    conf = json.load(open('conf.json'))
+    edition = conf['edition']
+    ui = conf['ui']
+    dev = conf['dev']
+    if dev:
+        print("Building in Dev mode")
+    if options.clean:
+        if op.exists('build'):
+            shutil.rmtree('build')
+    if not op.exists('build'):
+        os.mkdir('build')
+    if options.doc:
+        build_help(edition)
+    elif options.loc:
+        build_localizations(ui, edition)
+    elif options.updatepot:
+        build_updatepot()
+    elif options.mergepot:
+        build_mergepot()
+    elif options.cocoamod:
+        build_cocoa_proxy_module()
+        build_cocoa_bridging_interfaces(edition)
+    else:
+        build_normal(edition, ui, dev)
+
 if __name__ == '__main__':
     main()

cocoa/base/AppDelegate.h

@@ -1,34 +1,71 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "RecentDirectories.h"
 #import "PyDupeGuru.h"
 #import "ResultWindow.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "IgnoreListDialog.h"
+#import "HSAboutBox.h"
+#import "HSRecentFiles.h"
 
 @interface AppDelegateBase : NSObject
 {
-    IBOutlet PyDupeGuruBase *py;
-    IBOutlet RecentDirectories *recentDirectories;
-    IBOutlet NSMenuItem *unlockMenuItem;
-    IBOutlet ResultWindowBase *result;
+    IBOutlet NSMenu *recentResultsMenu;
+    IBOutlet NSMenu *actionsMenu;
+    IBOutlet NSMenu *columnsMenu;
     
+    PyDupeGuru *model;
+    ResultWindowBase *_resultWindow;
     DirectoryPanel *_directoryPanel;
     DetailsPanel *_detailsPanel;
-    BOOL _savedResults;
+    IgnoreListDialog *_ignoreListDialog;
+    NSWindowController *_preferencesPanel;
+    HSAboutBox *_aboutBox;
+    HSRecentFiles *_recentResults;
 }
-- (IBAction)unlockApp:(id)sender;
 
-- (PyDupeGuruBase *)py;
-- (RecentDirectories *)recentDirectories;
+/* Virtual */
+- (PyDupeGuru *)model;
+- (ResultWindowBase *)createResultWindow;
+- (DirectoryPanel *)createDirectoryPanel;
+- (DetailsPanel *)createDetailsPanel;
+- (NSString *)homepageURL;
+
+/* Public */
+- (ResultWindowBase *)resultWindow;
 - (DirectoryPanel *)directoryPanel;
 - (DetailsPanel *)detailsPanel;
-- (void)saveResults;
+- (HSRecentFiles *)recentResults;
+- (NSMenu *)columnsMenu;
+
+/* Delegate */
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification;
+- (void)applicationWillBecomeActive:(NSNotification *)aNotification;
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
+- (void)applicationWillTerminate:(NSNotification *)aNotification;
+- (void)recentFileClicked:(NSString *)path;
+
+/* Actions */
+- (IBAction)loadResults:(id)sender;
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)openHelp:(id)sender;
+- (IBAction)showAboutBox:(id)sender;
+- (IBAction)showDirectoryWindow:(id)sender;
+- (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)showResultWindow:(id)sender;
+- (IBAction)showIgnoreList:(id)sender;
+- (IBAction)startScanning:(id)sender;
+
+/* model --> view */
+- (void)showMessage:(NSString *)msg;
+- (void)setupAsRegistered;
+- (void)showFairwareNagWithPrompt:(NSString *)prompt;
+- (void)showDemoNagWithPrompt:(NSString *)prompt;
 @end

cocoa/base/AppDelegate.m

@@ -1,117 +1,261 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
+#import "HSFairwareReminder.h"
 #import "Utils.h"
 #import "Consts.h"
+#import "Dialogs.h"
+#import "ValueTransformers.h"
 #import <Sparkle/SUUpdater.h>
 
 @implementation AppDelegateBase
-- (IBAction)unlockApp:(id)sender
++ (void)initialize
 {
-    if ([[self py] isRegistered])
-        return;
-    RegistrationInterface *ri = [[RegistrationInterface alloc] initWithApp:[self py]];
-    if ([ri enterCode] == NSOKButton)
-    {
-        NSString *menuTitle = [NSString stringWithFormat:@"Thanks for buying %@!",[py appName]];
-        [unlockMenuItem setTitle:menuTitle];
-    }
-    [ri release];
+    HSVTAdd *vt = [[[HSVTAdd alloc] initWithValue:4] autorelease];
+    [NSValueTransformer setValueTransformer:vt forName:@"vtRowHeightOffset"];
+}
+
+- (void)awakeFromNib
+{
+    model = [[PyDupeGuru alloc] init];
+    [model bindCallback:createCallback(@"DupeGuruView", self)];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    /* Because the pref pane is lazily loaded, we have to manually do the update check if the
+       preference is set.
+    */
+    if ([ud boolForKey:@"SUEnableAutomaticChecks"]) {
+        [[SUUpdater sharedUpdater] checkForUpdatesInBackground];
+    }
+    _recentResults = [[HSRecentFiles alloc] initWithName:@"recentResults" menu:recentResultsMenu];
+    [_recentResults setDelegate:self];
+    _resultWindow = [self createResultWindow];
+    _directoryPanel = [self createDirectoryPanel];
+    _detailsPanel = [self createDetailsPanel];
+    _ignoreListDialog = [[IgnoreListDialog alloc] initWithPyRef:[model ignoreListDialog]];
+    _aboutBox = nil; // Lazily loaded
+    _preferencesPanel = nil; // Lazily loaded
+    [[[self directoryPanel] window] makeKeyAndOrderFront:self];
+}
+
+/* Virtual */
+
+- (PyDupeGuru *)model
+{
+    return model;
+}
+
+- (ResultWindowBase *)createResultWindow
+{
+    return nil; // must be overriden by all editions
+}
+
+- (DirectoryPanel *)createDirectoryPanel
+{
+    return [[DirectoryPanel alloc] initWithParentApp:self];
+}
+
+- (DetailsPanel *)createDetailsPanel
+{
+    return [[DetailsPanel alloc] initWithPyRef:[model detailsPanel]];
+}
+
+- (NSString *)homepageURL
+{
+    return @""; // must be overriden by all editions
+}
+
+/* Public */
+- (ResultWindowBase *)resultWindow
+{
+    return _resultWindow;
 }
 
-- (PyDupeGuruBase *)py { return py; }
-- (RecentDirectories *)recentDirectories { return recentDirectories; }
 - (DirectoryPanel *)directoryPanel
 {
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanel alloc] initWithParentApp:self];
     return _directoryPanel;
 }
 
 - (DetailsPanel *)detailsPanel
 {
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanel alloc] initWithPy:py];
     return _detailsPanel;
 }
 
-- (void)saveResults
+- (HSRecentFiles *)recentResults
 {
-    if (_savedResults) {
-        return;
-    }
-    [py saveIgnoreList];
-    [py saveResults];
-    _savedResults = YES;
+    return _recentResults;
 }
 
+- (NSMenu *)columnsMenu { return columnsMenu; }
+
+/* Actions */
+- (IBAction)loadResults:(id)sender
+{
+    NSOpenPanel *op = [NSOpenPanel openPanel];
+    [op setCanChooseFiles:YES];
+    [op setCanChooseDirectories:NO];
+    [op setCanCreateDirectories:NO];
+    [op setAllowsMultipleSelection:NO];
+    [op setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
+    [op setTitle:TR(@"Select a results file to load")];
+    if ([op runModal] == NSOKButton) {
+        NSString *filename = [[op filenames] objectAtIndex:0];
+        [model loadResultsFrom:filename];
+        [[self recentResults] addFile:filename];
+    }
+}
+
+- (IBAction)openWebsite:(id)sender
+{
+    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:[self homepageURL]]];
+}
+
+- (IBAction)openHelp:(id)sender
+{
+    NSBundle *b = [NSBundle mainBundle];
+    NSString *p = [b pathForResource:@"index" ofType:@"html" inDirectory:@"help"];
+    NSURL *u = [NSURL fileURLWithPath:p];
+    [[NSWorkspace sharedWorkspace] openURL:u];
+}
+
+- (IBAction)showAboutBox:(id)sender
+{
+    if (_aboutBox == nil) {
+        _aboutBox = [[HSAboutBox alloc] initWithApp:model];
+    }
+    [[_aboutBox window] makeKeyAndOrderFront:sender];
+}
+
+- (IBAction)showDirectoryWindow:(id)sender
+{
+    [[[self directoryPanel] window] makeKeyAndOrderFront:nil];
+}
+
+- (IBAction)showPreferencesPanel:(id)sender
+{
+    if (_preferencesPanel == nil) {
+        _preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
+    }
+    [_preferencesPanel showWindow:sender];
+}
+
+- (IBAction)showResultWindow:(id)sender
+{
+    [[[self resultWindow] window] makeKeyAndOrderFront:nil];
+}
+
+- (IBAction)showIgnoreList:(id)sender
+{
+    [model showIgnoreList];
+}
+
+- (IBAction)startScanning:(id)sender
+{
+    [[self resultWindow] startDuplicateScan:sender];
+}
+
+
 /* Delegate */
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    [[ProgressController mainProgressController] setWorker:py];
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    //Restore Columns
-    NSArray *columnsOrder = [ud arrayForKey:@"columnsOrder"];
-    NSDictionary *columnsWidth = [ud dictionaryForKey:@"columnsWidth"];
-    if ([columnsOrder count])
-        [result restoreColumnsPosition:columnsOrder widths:columnsWidth];
-    else
-        [result resetColumnsToDefault:nil];
-    //Reg stuff
-    if ([RegistrationInterface showNagWithApp:[self py]])
-        [unlockMenuItem setTitle:[NSString stringWithFormat:@"Thanks for buying %@!",[py appName]]];
-    //Restore results
-    [py loadIgnoreList];
-    [py loadResults];
-    _savedResults = NO;
+    [[ProgressController mainProgressController] setWorker:model];
+    [model initialRegistrationSetup];
+    [model loadSession];
 }
 
 - (void)applicationWillBecomeActive:(NSNotification *)aNotification
 {
-    if (![[result window] isVisible])
-        [result showWindow:NSApp];
+    if (![[[self directoryPanel] window] isVisible]) {
+        [[self directoryPanel] showWindow:NSApp];
+    }
+}
+
+- (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender
+{
+    if ([model resultsAreModified]) {
+        NSString *msg = TR(@"You have unsaved results, do you really want to quit?");
+        if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) { // NO
+            return NSTerminateCancel;
+        }
+    }
+    return NSTerminateNow;
 }
 
 - (void)applicationWillTerminate:(NSNotification *)aNotification
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [ud setObject: [result getColumnsOrder] forKey:@"columnsOrder"];
-    [ud setObject: [result getColumnsWidth] forKey:@"columnsWidth"];
-    [self saveResults];
     NSInteger sc = [ud integerForKey:@"sessionCountSinceLastIgnorePurge"];
-    if (sc >= 10)
-    {
+    if (sc >= 10) {
         sc = -1;
-        [py purgeIgnoreList];
+        [model purgeIgnoreList];
     }
     sc++;
+    [model saveSession];
     [ud setInteger:sc forKey:@"sessionCountSinceLastIgnorePurge"];
     // NSApplication does not release nib instances objects, we must do it manually
     // Well, it isn't needed because the memory is freed anyway (we are quitting the application
-    // But I need to release RecentDirectories so it saves the user defaults
-    [recentDirectories release];
+    // But I need to release HSRecentFiles so it saves the user defaults
+    [_directoryPanel release];
+    [_recentResults release];
 }
 
-- (void)recentDirecoryClicked:(NSString *)directory
+- (void)recentFileClicked:(NSString *)path
 {
-    [[self directoryPanel] addDirectory:directory];
+    [model loadResultsFrom:path];
 }
 
-/* SUUpdater delegate */
 
-- (BOOL)updater:(SUUpdater *)updater shouldPostponeRelaunchForUpdate:(SUAppcastItem *)update untilInvoking:(NSInvocation *)invocation;
+/* model --> view */
+- (void)showMessage:(NSString *)msg
 {
-    /* If results aren't saved now, we might get a weird utf-8 lookup error when saving later.
-    **/
-    [self saveResults];
-    return NO;
+    [Dialogs showMessage:msg];
 }
+
+- (BOOL)askYesNoWithPrompt:(NSString *)prompt
+{
+    return [Dialogs askYesNo:prompt] == NSAlertFirstButtonReturn;
+}
+
+- (void)showProblemDialog
+{
+    [[self resultWindow] showProblemDialog];
+}
+
+- (void)setupAsRegistered
+{
+    // Nothing to do.
+}
+
+- (void)showFairwareNagWithPrompt:(NSString *)prompt
+{
+    [HSFairwareReminder showFairwareNagWithApp:[self model] prompt:prompt];
+}
+
+- (void)showDemoNagWithPrompt:(NSString *)prompt
+{
+    [HSFairwareReminder showDemoNagWithApp:[self model] prompt:prompt];
+}
+
+- (NSString *)selectDestFolderWithPrompt:(NSString *)prompt
+{
+    NSOpenPanel *op = [NSOpenPanel openPanel];
+    [op setCanChooseFiles:NO];
+    [op setCanChooseDirectories:YES];
+    [op setCanCreateDirectories:YES];
+    [op setAllowsMultipleSelection:NO];
+    [op setTitle:prompt];
+    if ([op runModal] == NSOKButton) {
+        return [[op filenames] objectAtIndex:0];
+    }
+    else {
+        return nil;
+    }
+}
+
 @end

cocoa/base/Consts.h

@@ -1,19 +1,21 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
-#import <Cocoa/Cocoa.h>
+#import "HSConsts.h"
 
-#define RegistrationRequired @"RegistrationRequired"
 #define JobStarted @"JobStarted"
 #define JobInProgress @"JobInProgress"
+#define TableFontSize @"TableFontSize"
 
 #define jobLoad @"job_load"
 #define jobScan @"job_scan"
 #define jobCopy @"job_copy"
 #define jobMove @"job_move"
 #define jobDelete @"job_delete"
+
+#define DGPrioritizeIndexPasteboardType @"DGPrioritizeIndexPasteboardType"

cocoa/base/DetailsPanel.h

@@ -1,23 +1,25 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSWindowController.h"
-#import "PyApp.h"
+#import <Python.h>
 #import "PyDetailsPanel.h"
 
-@interface DetailsPanel : HSWindowController
+@interface DetailsPanel : NSWindowController
 {
     IBOutlet NSTableView *detailsTable;
-}
-- (id)initWithPy:(PyApp *)aPy;
-- (PyDetailsPanel *)py;
     
+    PyDetailsPanel *model;
+}
+- (id)initWithPyRef:(PyObject *)aPyRef;
+- (PyDetailsPanel *)model;
+
+- (BOOL)isVisible;
 - (void)toggleVisibility;
 
 /* Python --> Cocoa */

cocoa/base/DetailsPanel.m

@@ -1,32 +1,33 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DetailsPanel.h"
 #import "Utils.h"
 
 @implementation DetailsPanel
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithPyRef:(PyObject *)aPyRef
 {
-    self = [super initWithNibName:@"DetailsPanel" pyClassName:@"PyDetailsPanel" pyParent:aPy];
+    self = [super initWithWindowNibName:@"DetailsPanel"];
     [self window]; //So the detailsTable is initialized.
-    [self connect];
+    model = [[PyDetailsPanel alloc] initWithModel:aPyRef];
+    [model bindCallback:createCallback(@"DetailsPanelView", self)];
     return self;
 }
 
 - (void)dealloc
 {
-    [self disconnect];
+    [model release];
     [super dealloc];
 }
 
-- (PyDetailsPanel *)py
+- (PyDetailsPanel *)model
 {
-    return (PyDetailsPanel *)py;
+    return (PyDetailsPanel *)model;
 }
 
 - (void)refreshDetails
@@ -34,9 +35,14 @@ http://www.hardcoded.net/licenses/hs_license
     [detailsTable reloadData];
 }
 
+- (BOOL)isVisible
+{
+    return [[self window] isVisible];
+}
+
 - (void)toggleVisibility
 {
-    if ([[self window] isVisible]) {
+    if ([self isVisible]) {
         [[self window] close];
     }
     else {
@@ -48,12 +54,12 @@ http://www.hardcoded.net/licenses/hs_license
 /* NSTableView Delegate */
 - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView
 {
-    return [[self py] numberOfRows];
+    return [[self model] numberOfRows];
 }
 
 - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
 {
-    return [[self py] valueForColumn:[column identifier] row:row];
+    return [[self model] valueForColumn:[column identifier] row:row];
 }
 
 /* Python --> Cocoa */

cocoa/base/DirectoryOutline.h

@@ -1,16 +1,19 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
+#import <Python.h>
 #import "HSOutline.h"
 #import "PyDirectoryOutline.h"
 
+#define DGAddedFoldersNotification @"DGAddedFoldersNotification"
+
 @interface DirectoryOutline : HSOutline {}
-- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView;
-- (PyDirectoryOutline *)py;
+- (id)initWithPyRef:(PyObject *)aPyRef outlineView:(HSOutlineView *)aOutlineView;
+- (PyDirectoryOutline *)model;
 @end;

cocoa/base/DirectoryOutline.m

@@ -1,31 +1,25 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryOutline.h"
 
 @implementation DirectoryOutline
-- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
+- (id)initWithPyRef:(PyObject *)aPyRef outlineView:(HSOutlineView *)aOutlineView
 {
-    self = [super initWithPyClassName:@"PyDirectoryOutline" pyParent:aPyParent view:aOutlineView];
-    [outlineView registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
-    [self connect];
+    self = [super initWithPyRef:aPyRef wrapperClass:[PyDirectoryOutline class]
+        callbackClassName:@"DirectoryOutlineView" view:aOutlineView];
+    [[self view] registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
     return self;
 }
 
-- (void)dealloc
+- (PyDirectoryOutline *)model
 {
-    [self disconnect];
-    [super dealloc];
-}
-
-- (PyDirectoryOutline *)py
-{
-    return (PyDirectoryOutline *)py;
+    return (PyDirectoryOutline *)model;
 }
 
 /* Delegate */
@@ -49,12 +43,15 @@ http://www.hardcoded.net/licenses/hs_license
     sourceDragMask = [info draggingSourceOperationMask];
     pboard = [info draggingPasteboard];
     if ([[pboard types] containsObject:NSFilenamesPboardType]) {
-        NSArray *filenames = [pboard propertyListForType:NSFilenamesPboardType];
+        NSArray *foldernames = [pboard propertyListForType:NSFilenamesPboardType];
         if (!(sourceDragMask & NSDragOperationLink))
             return NO;
-        for (NSString *filename in filenames) {
-            [[self py] addDirectory:filename];
+        for (NSString *foldername in foldernames) {
+            [[self model] addDirectory:foldername];
         }
+        NSDictionary *userInfo = [NSDictionary dictionaryWithObject:foldernames forKey:@"foldernames"];
+        [[NSNotificationCenter defaultCenter] postNotificationName:DGAddedFoldersNotification
+            object:self userInfo:userInfo];
     }
     return YES;
 }
@@ -64,7 +61,7 @@ http://www.hardcoded.net/licenses/hs_license
     if ([cell isKindOfClass:[NSTextFieldCell class]]) {
         NSTextFieldCell *textCell = cell;
         NSIndexPath *path = item;
-        BOOL selected = [path isEqualTo:[outlineView selectedPath]];
+        BOOL selected = [path isEqualTo:[[self view] selectedPath]];
         if (selected) {
             [textCell setTextColor:[NSColor blackColor]];
             return;

cocoa/base/DirectoryPanel.h

@@ -1,33 +1,42 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "RecentDirectories.h"
 #import "HSOutlineView.h"
+#import "HSRecentFiles.h"
 #import "DirectoryOutline.h"
 #import "PyDupeGuru.h"
 
-@interface DirectoryPanel : NSWindowController
+@class AppDelegateBase;
+
+@interface DirectoryPanel : NSWindowController <NSOpenSavePanelDelegate>
 {
     IBOutlet NSPopUpButton *addButtonPopUp;
+    IBOutlet NSPopUpButton *loadRecentButtonPopUp;
     IBOutlet HSOutlineView *outlineView;
     IBOutlet NSButton *removeButton;
+    IBOutlet NSButton *loadResultsButton;
     
-    PyDupeGuruBase *_py;
-    RecentDirectories *_recentDirectories;
+    AppDelegateBase *_app;
+    PyDupeGuru *model;
+    HSRecentFiles *_recentDirectories;
     DirectoryOutline *outline;
+    BOOL _alwaysShowPopUp;
 }
-- (id)initWithParentApp:(id)aParentApp;
+- (id)initWithParentApp:(AppDelegateBase *)aParentApp;
+
+- (void)fillPopUpMenu; // Virtual
+- (void)adjustUIToLocalization;
 
 - (IBAction)askForDirectory:(id)sender;
 - (IBAction)popupAddDirectoryMenu:(id)sender;
+- (IBAction)popupLoadRecentMenu:(id)sender;
 - (IBAction)removeSelectedDirectory:(id)sender;
-- (IBAction)toggleVisible:(id)sender;
 
 - (void)addDirectory:(NSString *)directory;
 - (void)refreshRemoveButtonText;

cocoa/base/DirectoryPanel.m

@@ -1,37 +1,78 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryPanel.h"
 #import "Dialogs.h"
 #import "Utils.h"
 #import "AppDelegate.h"
+#import "Consts.h"
 
 @implementation DirectoryPanel
-- (id)initWithParentApp:(id)aParentApp
+- (id)initWithParentApp:(AppDelegateBase *)aParentApp
 {
     self = [super initWithWindowNibName:@"DirectoryPanel"];
     [self window];
-    AppDelegateBase *app = aParentApp;
-    _py = [app py];
-    _recentDirectories = [app recentDirectories];
-    outline = [[DirectoryOutline alloc] initWithPyParent:_py view:outlineView];
+    _app = aParentApp;
+    model = [_app model];
+    [[self window] setTitle:[model appName]];
+    _alwaysShowPopUp = NO;
+    [self fillPopUpMenu];
+    _recentDirectories = [[HSRecentFiles alloc] initWithName:@"recentDirectories" menu:[addButtonPopUp menu]];
+    [_recentDirectories setDelegate:self];
+    outline = [[DirectoryOutline alloc] initWithPyRef:[model directoryTree] outlineView:outlineView];
     [self refreshRemoveButtonText];
+    [self adjustUIToLocalization];
+    
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(directorySelectionChanged:)
         name:NSOutlineViewSelectionDidChangeNotification object:outlineView];
+    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(outlineAddedFolders:)
+        name:DGAddedFoldersNotification object:outline];
     return self;
 }
 
 - (void)dealloc
 {
     [outline release];
+    [_recentDirectories release];
     [super dealloc];
 }
 
+/* Private */
+
+- (void)fillPopUpMenu
+{
+    NSMenu *m = [addButtonPopUp menu];
+    NSMenuItem *mi = [m addItemWithTitle:TR(@"Add New Folder...") action:@selector(askForDirectory:) keyEquivalent:@""];
+    [mi setTarget:self];
+    [m addItem:[NSMenuItem separatorItem]];
+}
+
+- (void)adjustUIToLocalization
+{
+    NSString *lang = [[NSBundle preferredLocalizationsFromArray:[[NSBundle mainBundle] localizations]] objectAtIndex:0];
+    NSInteger loadResultsWidthDelta = 0;
+    if ([lang isEqual:@"ru"]) {
+        loadResultsWidthDelta = 50;
+    }
+    else if ([lang isEqual:@"uk"]) {
+        loadResultsWidthDelta = 70;
+    }
+    else if ([lang isEqual:@"hy"]) {
+        loadResultsWidthDelta = 30;
+    }
+    if (loadResultsWidthDelta) {
+        NSRect r = [loadResultsButton frame];
+        r.size.width += loadResultsWidthDelta;
+        r.origin.x -= loadResultsWidthDelta;
+        [loadResultsButton setFrame:r];
+    }
+}
+
 /* Actions */
 
 - (IBAction)askForDirectory:(id)sender
@@ -39,76 +80,68 @@ http://www.hardcoded.net/licenses/hs_license
     NSOpenPanel *op = [NSOpenPanel openPanel];
     [op setCanChooseFiles:YES];
     [op setCanChooseDirectories:YES];
-    [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to add to the scanning list"];
+    [op setAllowsMultipleSelection:YES];
+    [op setTitle:TR(@"Select a folder to add to the scanning list")];
     [op setDelegate:self];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
-        NSString *directory = [[op filenames] objectAtIndex:0];
-        [self addDirectory:directory];
+    if ([op runModal] == NSOKButton) {
+        for (NSString *directory in [op filenames]) {
+            [self addDirectory:directory];
+        }
     }
 }
 
 - (IBAction)popupAddDirectoryMenu:(id)sender
 {
-    if ([[_recentDirectories directories] count] == 0)
-    {
+    if ((!_alwaysShowPopUp) && ([[_recentDirectories filepaths] count] == 0)) {
         [self askForDirectory:sender];
-        return;
     }
-    NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    else {
+        [addButtonPopUp selectItem:nil];
+        [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    }
+}
+
+- (IBAction)popupLoadRecentMenu:(id)sender
+{
+    if ([[[_app recentResults] filepaths] count] > 0) {
+        NSMenu *m = [loadRecentButtonPopUp menu];
+        while ([m numberOfItems] > 0) {
+            [m removeItemAtIndex:0];
+        }
+        NSMenuItem *mi = [m addItemWithTitle:TR(@"Load from file...") action:@selector(loadResults:) keyEquivalent:@""];
+        [mi setTarget:_app];
+        [m addItem:[NSMenuItem separatorItem]];
+        [[_app recentResults] fillMenu:m];
+        [loadRecentButtonPopUp selectItem:nil];
+        [[loadRecentButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+    }
+    else {
+        [_app loadResults:nil];
+    }
 }
 
 - (IBAction)removeSelectedDirectory:(id)sender
 {
     [[self window] makeKeyAndOrderFront:nil];
-    if ([outlineView selectedRow] < 0)
-        return;
-    NSIndexPath *path = [outline selectedIndexPath];
-    NSInteger state = [outline intProperty:@"state" valueAtPath:path];
-    if (([path length] == 1) && (state != 2)) {
-        [_py removeDirectory:i2n([path indexAtPosition:0])];
-    }
-    else {
-        NSInteger newState = state == 2 ? 0 : 2; // If excluded, put it back
-        [outline setIntProperty:@"state" value:newState atPath:path];
-        [outlineView display];
-    }
+    [[outline model] removeSelectedDirectory];
     [self refreshRemoveButtonText];
 }
 
-- (IBAction)toggleVisible:(id)sender
-{
-    [[self window] makeKeyAndOrderFront:nil];
-}
-
 /* Public */
 - (void)addDirectory:(NSString *)directory
 {
-    NSInteger r = [[_py addDirectory:directory] intValue];
+    NSInteger r = [model addDirectory:directory];
     if (r) {
-        NSString *m;
-        switch (r) {
-            case 1: {
-                m = @"This directory already is in the list.";
-                break;
-            }
-            case 2: {
-                m = @"This directory does not exist.";
-                break;
-            }
+        NSString *m = @"";
+        if (r == 1) {
+            m = TR(@"'%@' already is in the list.");
         }
-        [Dialogs showMessage:m];
+        else if (r == 2) {
+            m = TR(@"'%@' does not exist.");
+        }
+        [Dialogs showMessage:[NSString stringWithFormat:m,directory]];
     }
-    [_recentDirectories addDirectory:directory];
+    [_recentDirectories addFile:directory];
     [[self window] makeKeyAndOrderFront:nil];
 }
 
@@ -119,9 +152,13 @@ http://www.hardcoded.net/licenses/hs_license
         return;
     }
     [removeButton setEnabled:YES];
-    NSInteger state = [outline intProperty:@"state" valueAtPath:[outline selectedIndexPath]];
-    NSString *buttonText = state == 2 ? @"Put Back" : @"Remove";
-    [removeButton setTitle:buttonText];
+    NSIndexPath *path = [outline selectedIndexPath];
+    if (path != nil) {
+        NSInteger state = [outline intProperty:@"state" valueAtPath:path];
+        BOOL shouldDisplayArrow = ([path length] > 1) && (state == 2);
+        NSString *imgName = shouldDisplayArrow ? @"NSGoLeftTemplate" : @"NSRemoveTemplate";
+        [removeButton setImage:[NSImage imageNamed:imgName]];
+    }
 }
 
 /* Delegate */
@@ -132,6 +169,11 @@ http://www.hardcoded.net/licenses/hs_license
     return isdir;
 }
 
+- (void)recentFileClicked:(NSString *)path
+{
+    [self addDirectory:path];
+}
+
 /* Notifications */
 
 - (void)directorySelectionChanged:(NSNotification *)aNotification
@@ -139,4 +181,12 @@ http://www.hardcoded.net/licenses/hs_license
     [self refreshRemoveButtonText];
 }
 
+- (void)outlineAddedFolders:(NSNotification *)aNotification
+{
+    NSArray *foldernames = [[aNotification userInfo] objectForKey:@"foldernames"];
+    for (NSString *foldername in foldernames) {
+        [_recentDirectories addFile:foldername];
+    }
+}
+
 @end

cocoa/base/IgnoreListDialog.h

@@ -0,0 +1,25 @@
+/* 
+Copyright 2012 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 <Cocoa/Cocoa.h>
+#import "PyIgnoreListDialog.h"
+#import "HSTable.h"
+
+@interface IgnoreListDialog : NSWindowController
+{
+    IBOutlet NSTableView *ignoreListTableView;
+    
+    PyIgnoreListDialog *model;
+    HSTable *ignoreListTable;
+}
+- (id)initWithPyRef:(PyObject *)aPyRef;
+
+- (void)initializeColumns;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)clear:(id)sender;
+@end

cocoa/base/IgnoreListDialog.m

@@ -0,0 +1,57 @@
+/* 
+Copyright 2012 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 "IgnoreListDialog.h"
+#import "Utils.h"
+
+@implementation IgnoreListDialog
+- (id)initWithPyRef:(PyObject *)aPyRef
+{
+    self = [super initWithWindowNibName:@"IgnoreListDialog"];
+    [self window]; //So the detailsTable is initialized.
+    model = [[PyIgnoreListDialog alloc] initWithModel:aPyRef];
+    [model bindCallback:createCallback(@"IgnoreListDialogView", self)];
+    ignoreListTable = [[HSTable alloc] initWithPyRef:[model ignoreListTable] tableView:ignoreListTableView];
+    [self initializeColumns];
+    return self;
+}
+
+- (void)dealloc
+{
+    [ignoreListTable release];
+    [model release];
+    [super dealloc];
+}
+
+- (void)initializeColumns
+{
+    HSColumnDef defs[] = {
+        {@"path1", 240, 40, 0, NO, nil},
+        {@"path2", 240, 40, 0, NO, nil},
+        nil
+    };
+    [[ignoreListTable columns] initializeColumns:defs];
+    [[ignoreListTable columns] setColumnsAsReadOnly];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    [model removeSelected];
+}
+
+- (IBAction)clear:(id)sender
+{
+    [model clear];
+}
+
+/* model --> view */
+- (void)show
+{
+    [self showWindow:self];
+}
+@end

cocoa/base/PrioritizeDialog.h

@@ -0,0 +1,34 @@
+/* 
+Copyright 2012 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 <Cocoa/Cocoa.h>
+#import "PyPrioritizeDialog.h"
+#import "HSPopUpList.h"
+#import "HSSelectableList.h"
+#import "PrioritizeList.h"
+#import "PyDupeGuru.h"
+
+@interface PrioritizeDialog : NSWindowController
+{
+    IBOutlet NSPopUpButton *categoryPopUpView;
+    IBOutlet NSTableView *criteriaTableView;
+    IBOutlet NSTableView *prioritizationTableView;
+    
+    PyPrioritizeDialog *model;
+    HSPopUpList *categoryPopUp;
+    HSSelectableList *criteriaList;
+    PrioritizeList *prioritizationList;
+}
+- (id)initWithApp:(PyDupeGuru *)aApp;
+- (PyPrioritizeDialog *)model;
+
+- (IBAction)addSelected:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)ok:(id)sender;
+- (IBAction)cancel:(id)sender;
+@end;

cocoa/base/PrioritizeDialog.m

@@ -0,0 +1,60 @@
+/* 
+Copyright 2012 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 "PrioritizeDialog.h"
+#import "Utils.h"
+
+@implementation PrioritizeDialog
+- (id)initWithApp:(PyDupeGuru *)aApp
+{
+    self = [super initWithWindowNibName:@"PrioritizeDialog"];
+    [self window];
+    model = [[PyPrioritizeDialog alloc] initWithApp:[aApp pyRef]];
+    categoryPopUp = [[HSPopUpList alloc] initWithPyRef:[[self model] categoryList] popupView:categoryPopUpView];
+    criteriaList = [[HSSelectableList alloc] initWithPyRef:[[self model] criteriaList] tableView:criteriaTableView];
+    prioritizationList = [[PrioritizeList alloc] initWithPyRef:[[self model] prioritizationList] tableView:prioritizationTableView];
+    [model bindCallback:createCallback(@"PrioritizeDialogView", self)];
+    return self;
+}
+
+- (void)dealloc
+{
+    [categoryPopUp release];
+    [criteriaList release];
+    [prioritizationList release];
+    [model release];
+    [super dealloc];
+}
+
+- (PyPrioritizeDialog *)model
+{
+    return (PyPrioritizeDialog *)model;
+}
+
+- (IBAction)addSelected:(id)sender
+{
+    [[self model] addSelected];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    [[self model] removeSelected];
+}
+
+- (IBAction)ok:(id)sender
+{
+    [NSApp stopModal];
+    [self close];
+}
+
+- (IBAction)cancel:(id)sender
+{
+    [NSApp abortModal];
+    [self close];
+}
+@end

cocoa/base/PrioritizeList.h

@@ -0,0 +1,16 @@
+/* 
+Copyright 2012 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 <Cocoa/Cocoa.h>
+#import "HSSelectableList.h"
+#import "PyPrioritizeList.h"
+
+@interface PrioritizeList : HSSelectableList {}
+- (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView;
+- (PyPrioritizeList *)model;
+@end

cocoa/base/PrioritizeList.m

@@ -0,0 +1,58 @@
+/* 
+Copyright 2012 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 "PrioritizeList.h"
+#import "Utils.h"
+#import "Consts.h"
+
+@implementation PrioritizeList
+- (id)initWithPyRef:(PyObject *)aPyRef tableView:(NSTableView *)aTableView
+{
+    self = [super initWithPyRef:aPyRef wrapperClass:[PyPrioritizeList class]
+        callbackClassName:@"PrioritizeListView" view:aTableView];
+    return self;
+}
+
+- (PyPrioritizeList *)model
+{
+    return (PyPrioritizeList *)model;
+}
+
+- (void)setView:(NSTableView *)aTableView
+{
+    [super setView:aTableView];
+    [[self view] registerForDraggedTypes:[NSArray arrayWithObject:DGPrioritizeIndexPasteboardType]];
+}
+
+- (BOOL)tableView:(NSTableView *)tv writeRowsWithIndexes:(NSIndexSet *)rowIndexes toPasteboard:(NSPasteboard*)pboard
+{
+    NSData *data = [NSKeyedArchiver archivedDataWithRootObject:rowIndexes];
+    [pboard declareTypes:[NSArray arrayWithObject:DGPrioritizeIndexPasteboardType] owner:self];
+    [pboard setData:data forType:DGPrioritizeIndexPasteboardType];
+    return YES;
+}
+
+- (NSDragOperation)tableView:(NSTableView*)tv validateDrop:(id <NSDraggingInfo>)info proposedRow:(NSInteger)row 
+       proposedDropOperation:(NSTableViewDropOperation)op
+{
+    if (op == NSTableViewDropAbove) {
+        return NSDragOperationMove;
+    }
+    return NSDragOperationNone;
+}
+
+- (BOOL)tableView:(NSTableView *)aTableView acceptDrop:(id <NSDraggingInfo>)info
+              row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation
+{
+    NSPasteboard* pboard = [info draggingPasteboard];
+    NSData* rowData = [pboard dataForType:DGPrioritizeIndexPasteboardType];
+    NSIndexSet* rowIndexes = [NSKeyedUnarchiver unarchiveObjectWithData:rowData];
+    [[self model] moveIndexes:[Utils indexSet2Array:rowIndexes] toIndex:row];
+    return YES;
+}
+@end

cocoa/base/ProblemDialog.h

@@ -1,25 +1,24 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSWindowController.h"
-#import "PyApp.h"
 #import "PyProblemDialog.h"
 #import "HSTable.h"
 
-@interface ProblemDialog : HSWindowController
+@interface ProblemDialog : NSWindowController
 {
     IBOutlet NSTableView *problemTableView;
     
+    PyProblemDialog *model;
     HSTable *problemTable;
 }
-- (id)initWithPy:(PyApp *)aPy;
-- (PyProblemDialog *)py;
+- (id)initWithPyRef:(PyObject *)aPyRef;
 
+- (void)initializeColumns;
 - (IBAction)revealSelected:(id)sender;
 @end

cocoa/base/ProblemDialog.m

@@ -1,40 +1,44 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ProblemDialog.h"
 #import "Utils.h"
 
 @implementation ProblemDialog
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithPyRef:(PyObject *)aPyRef
 {
-    self = [super initWithNibName:@"ProblemDialog" pyClassName:@"PyProblemDialog" pyParent:aPy];
+    self = [super initWithWindowNibName:@"ProblemDialog"];
     [self window]; //So the detailsTable is initialized.
-    problemTable = [[HSTable alloc] initWithPyClassName:@"PyProblemTable" pyParent:[self py] view:problemTableView];
-    [self connect];
-    [problemTable connect];
+    model = [[PyProblemDialog alloc] initWithModel:aPyRef];
+    problemTable = [[HSTable alloc] initWithPyRef:[model problemTable] tableView:problemTableView];
+    [self initializeColumns];
     return self;
 }
 
 - (void)dealloc
 {
-    [problemTable disconnect];
-    [self disconnect];
     [problemTable release];
+    [model release];
     [super dealloc];
 }
 
-- (PyProblemDialog *)py
+- (void)initializeColumns
 {
-    return (PyProblemDialog *)py;
+    HSColumnDef defs[] = {
+        {@"path", 202, 40, 0, NO, nil},
+        {@"msg", 228, 40, 0, NO, nil},
+        nil
+    };
+    [[problemTable columns] initializeColumns:defs];
 }
 
 - (IBAction)revealSelected:(id)sender
 {
-    [[self py] revealSelected];
+    [model revealSelected];
 }
 @end

cocoa/base/PyDetailsPanel.h

@@ -1,15 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyGUI.h"
-
-@interface PyDetailsPanel : PyGUI
-- (NSInteger)numberOfRows;
-- (id)valueForColumn:(NSString *)column row:(NSInteger)row;
-@end

cocoa/base/PyDirectoryOutline.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyOutline.h"
-
-@interface PyDirectoryOutline : PyOutline
-- (void)addDirectory:(NSString *)directoryPath;
-@end

cocoa/base/PyDupeGuru.h

@@ -1,53 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyApp.h"
-
-@interface PyDupeGuruBase : PyApp
-//Actions
-- (NSNumber *)addDirectory:(NSString *)name;
-- (void)removeDirectory:(NSNumber *)index;
-- (void)loadResults;
-- (void)saveResults;
-- (void)loadIgnoreList;
-- (void)saveIgnoreList;
-- (void)clearIgnoreList;
-- (void)purgeIgnoreList;
-- (NSString *)exportToXHTMLwithColumns:(NSArray *)aColIds;
-- (void)invokeCommand:(NSString *)cmd;
-
-- (NSNumber *)doScan;
-
-- (void)toggleSelectedMark;
-- (void)markAll;
-- (void)markInvert;
-- (void)markNone;
-
-- (void)addSelectedToIgnoreList;
-- (void)openSelected;
-- (void)revealSelected;
-- (void)makeSelectedReference;
-- (void)applyFilter:(NSString *)filter;
-
-- (void)copyOrMove:(NSNumber *)aCopy markedTo:(NSString *)destination recreatePath:(NSNumber *)aRecreateType;
-- (void)deleteMarked;
-- (void)removeMarked;
-
-//Data
-- (NSNumber *)getIgnoreListCount;
-- (NSNumber *)getMarkCount;
-- (BOOL)scanWasProblematic;
-
-//Scanning options
-- (void)setMinMatchPercentage:(NSNumber *)percentage;
-- (void)setMixFileKind:(NSNumber *)mix_file_kind;
-- (void)setEscapeFilterRegexp:(NSNumber *)escape_filter_regexp;
-- (void)setRemoveEmptyFolders:(NSNumber *)remove_empty_folders;
-- (void)setSizeThreshold:(NSInteger)size_threshold;
-@end

cocoa/base/PyProblemDialog.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyGUI.h"
-
-@interface PyProblemDialog : PyGUI
-- (void)revealSelected;
-@end

cocoa/base/PyResultTree.h

@@ -1,24 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyOutline.h"
-
-@interface PyResultTree : PyOutline
-- (BOOL)powerMarkerMode;
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
-- (BOOL)deltaValuesMode;
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
-
-- (NSString *)valueForPath:(NSArray *)aPath column:(NSInteger)aColumn;
-- (BOOL)renameSelected:(NSString *)aNewName;
-- (void)sortBy:(NSInteger)aIdentifier ascending:(BOOL)aAscending;
-- (void)markSelected;
-- (void)removeSelected;
-- (NSArray *)rootChildrenCounts;
-@end

cocoa/base/PyStatsLabel.h

@@ -1,14 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "PyGUI.h"
-
-@interface PyStatsLabel : PyGUI
-- (NSString *)display;
-@end

cocoa/base/ResultOutline.h

@@ -1,26 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "HSOutline.h"
-#import "PyResultTree.h"
-
-@interface ResultOutline : HSOutline
-{
-    NSIndexSet *_deltaColumns;
-    NSArray *_rootChildrenCounts;
-}
-- (PyResultTree *)py;
-- (BOOL)powerMarkerMode;
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
-- (BOOL)deltaValuesMode;
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
-- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns;
-- (NSInteger)selectedDupeCount;
-- (void)removeSelected;
-@end;

cocoa/base/ResultOutline.m

@@ -1,207 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import "ResultOutline.h"
-#import "Dialogs.h"
-#import "Utils.h"
-#import "Consts.h"
-
-@implementation ResultOutline
-- (id)initWithPyParent:(id)aPyParent view:(HSOutlineView *)aOutlineView
-{
-    self = [super initWithPyClassName:@"PyResultOutline" pyParent:aPyParent view:aOutlineView];
-    _rootChildrenCounts = nil;
-    [self connect];
-    return self;
-}
-
-- (void)dealloc
-{
-    [self disconnect];
-    [_deltaColumns release];
-    [super dealloc];
-}
-
-- (PyResultTree *)py
-{
-    return (PyResultTree *)py;
-}
-
-/* Public */
-- (BOOL)powerMarkerMode
-{
-    return [[self py] powerMarkerMode];
-}
-
-- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
-{
-    [[self py] setPowerMarkerMode:aPowerMarkerMode];
-}
-
-- (BOOL)deltaValuesMode
-{
-    return [[self py] deltaValuesMode];
-}
-
-- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
-{
-    [[self py] setDeltaValuesMode:aDeltaValuesMode];
-}
-
-- (void)setDeltaColumns:(NSIndexSet *)aDeltaColumns
-{
-    [_deltaColumns release];
-    _deltaColumns = [aDeltaColumns retain];
-}
-
-- (NSInteger)selectedDupeCount
-{
-    NSArray *selected = [self selectedIndexPaths];
-    if ([self powerMarkerMode]) {
-        return [selected count];
-    }
-    else {
-        NSInteger r = 0;
-        for (NSIndexPath *path in selected) {
-            if ([path length] == 2) {
-                r++;
-            }
-        }
-        return r;
-    }
-}
-
-- (void)removeSelected
-{
-    NSInteger selectedDupeCount = [self selectedDupeCount];
-    if (!selectedDupeCount)
-        return;
-    NSString *msg = [NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",selectedDupeCount];
-    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
-        return;
-    [[self py] removeSelected];
-}
-
-/* Datasource */
-- (NSInteger)outlineView:(NSOutlineView *)aOutlineView numberOfChildrenOfItem:(id)item
-{
-    NSIndexPath *path = item;
-    if ((path != nil) && ([path length] == 1)) {
-        if (_rootChildrenCounts == nil) {
-            _rootChildrenCounts = [[[self py] rootChildrenCounts] retain];
-        }
-        NSInteger index = [path indexAtPosition:0];
-        return n2i([_rootChildrenCounts objectAtIndex:index]);
-    }
-    return [super outlineView:aOutlineView numberOfChildrenOfItem:item];
-}
-
-- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)column byItem:(id)item
-{
-    NSIndexPath *path = item;
-    NSString *identifier = [column identifier];
-    if ([identifier isEqual:@"marked"]) {
-        return b2n([self boolProperty:@"marked" valueAtPath:path]);
-    }
-    NSInteger columnId = [identifier integerValue];
-    return [[self py] valueForPath:p2a(path) column:columnId];
-}
-
-- (void)outlineView:(NSOutlineView *)aOutlineView setObjectValue:(id)object forTableColumn:(NSTableColumn *)tableColumn byItem:(id)item
-{
-    if ([[tableColumn identifier] isEqual:@"0"]) {
-        NSIndexPath *path = item;
-        NSString *oldName = [[self py] valueForPath:p2a(path) column:0];
-        NSString *newName = object;
-        if (![newName isEqual:oldName]) {
-            BOOL renamed = [[self py] renameSelected:newName];
-            if (!renamed) {
-                [Dialogs showMessage:[NSString stringWithFormat:@"The name '%@' already exists.", newName]];
-            }
-            else {
-                [self refreshItemAtPath:path];
-            }
-        }
-    }
-    else {
-        [super outlineView:aOutlineView setObjectValue:object forTableColumn:tableColumn byItem:item];
-    }
-}
-
-/* Delegate */
-- (void)outlineView:(NSOutlineView *)aOutlineView didClickTableColumn:(NSTableColumn *)tableColumn
-{
-    if ([[outlineView sortDescriptors] count] < 1)
-        return;
-    NSSortDescriptor *sd = [[outlineView sortDescriptors] objectAtIndex:0];
-    [[self py] sortBy:[[sd key] integerValue] ascending:[sd ascending]];
-}
-
-- (void)outlineView:(NSOutlineView *)outlineView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)tableColumn item:(id)item
-{ 
-    NSIndexPath *path = item;
-    BOOL isMarkable = [self boolProperty:@"markable" valueAtPath:path];
-    if ([[tableColumn identifier] isEqual:@"marked"]) {
-        [cell setEnabled:isMarkable];
-    }
-    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
-        // Determine if the text color will be blue due to directory being reference.
-        NSTextFieldCell *textCell = cell;
-        if (isMarkable) {
-            [textCell setTextColor:[NSColor blackColor]];
-        }
-        else {
-            [textCell setTextColor:[NSColor blueColor]];
-        }
-        if (([self deltaValuesMode]) && ([self powerMarkerMode] || ([path length] > 1))) {
-            NSInteger i = [[tableColumn identifier] integerValue];
-            if ([_deltaColumns containsIndex:i]) {
-                [textCell setTextColor:[NSColor orangeColor]];
-            }
-        }
-    }
-}
-
-- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
-{
-    [self removeSelected];
-    return YES;
-}
-
-- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
-{
-    [[self py] markSelected];
-    return YES;
-}
-
-/* don't calls saveEdits and cancelEdits */
-- (void)outlineViewDidEndEditing:(HSOutlineView *)outlineView
-{
-}
-
-- (void)outlineViewCancelsEdition:(HSOutlineView *)outlineView
-{
-}
-
-/* Python --> Cocoa */
-- (void)refresh /* Override */
-{
-    [_rootChildrenCounts release];
-    _rootChildrenCounts = nil;
-    [super refresh];
-    [outlineView expandItem:nil expandChildren:YES];
-}
-
-- (void)invalidateMarkings
-{
-    for (NSMutableDictionary *props in [itemData objectEnumerator]) {
-        [props removeObjectForKey:@"marked"];
-    }
-    [outlineView setNeedsDisplay:YES];
-}
-@end

cocoa/base/ResultTable.h

@@ -0,0 +1,24 @@
+/* 
+Copyright 2012 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 <Cocoa/Cocoa.h>
+#import <Quartz/Quartz.h>
+#import "HSTable.h"
+#import "PyResultTable.h"
+
+@interface ResultTable : HSTable <QLPreviewPanelDataSource, QLPreviewPanelDelegate>
+{
+    NSSet *_deltaColumns;
+}
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTableView *)aTableView;
+- (PyResultTable *)model;
+- (BOOL)powerMarkerMode;
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode;
+- (BOOL)deltaValuesMode;
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode;
+@end;

cocoa/base/ResultTable.m

@@ -0,0 +1,190 @@
+/* 
+Copyright 2012 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 "ResultTable.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "Consts.h"
+#import "HSQuicklook.h"
+
+@interface HSTable (private)
+- (void)setPySelection;
+- (void)setViewSelection;
+@end
+
+@implementation ResultTable
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTableView *)aTableView
+{
+    self = [super initWithPyRef:aPyRef wrapperClass:[PyResultTable class] callbackClassName:@"ResultTableView" view:aTableView];
+    _deltaColumns = [[NSSet setWithArray:[[self model] deltaColumns]] retain];
+    return self;
+}
+
+- (void)dealloc
+{
+    [_deltaColumns release];
+    [super dealloc];
+}
+
+- (PyResultTable *)model
+{
+    return (PyResultTable *)model;
+}
+
+/* Private */
+- (void)updateQuicklookIfNeeded
+{
+    if ([[QLPreviewPanel sharedPreviewPanel] dataSource] == self) { 
+        [[QLPreviewPanel sharedPreviewPanel] reloadData];
+    }
+}
+
+- (void)setPySelection
+{
+    [super setPySelection];
+    [self updateQuicklookIfNeeded];
+}
+
+- (void)setViewSelection
+{
+    [super setViewSelection];
+    [self updateQuicklookIfNeeded];
+}
+
+/* Public */
+- (BOOL)powerMarkerMode
+{
+    return [[self model] powerMarkerMode];
+}
+
+- (void)setPowerMarkerMode:(BOOL)aPowerMarkerMode
+{
+    [[self model] setPowerMarkerMode:aPowerMarkerMode];
+}
+
+- (BOOL)deltaValuesMode
+{
+    return [[self model] deltaValuesMode];
+}
+
+- (void)setDeltaValuesMode:(BOOL)aDeltaValuesMode
+{
+    [[self model] setDeltaValuesMode:aDeltaValuesMode];
+}
+
+/* Datasource */
+- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"marked"]) {
+        return [[self model] valueForColumn:@"marked" row:row];
+    }
+    return [[self model] valueForRow:row column:identifier];
+}
+
+- (void)tableView:(NSTableView *)aTableView setObjectValue:(id)object forTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{
+    NSString *identifier = [column identifier];
+    if ([identifier isEqual:@"marked"]) {
+        [[self model] setValue:object forColumn:identifier row:row];
+    }
+    else if ([identifier isEqual:@"name"]) {
+        NSString *oldName = [[self model] valueForRow:row column:identifier];
+        NSString *newName = object;
+        if (![newName isEqual:oldName]) {
+            BOOL renamed = [[self model] renameSelected:newName];
+            if (!renamed) {
+                [Dialogs showMessage:[NSString stringWithFormat:TR(@"The name '%@' already exists."), newName]];
+            }
+            else {
+                [[self view] setNeedsDisplay:YES];
+            }
+        }
+    }
+}
+
+/* Delegate */
+- (void)tableView:(NSTableView *)aTableView didClickTableColumn:(NSTableColumn *)tableColumn
+{
+    if ([[[self view] sortDescriptors] count] < 1)
+        return;
+    NSSortDescriptor *sd = [[[self view] sortDescriptors] objectAtIndex:0];
+    [[self model] sortBy:[sd key] ascending:[sd ascending]];
+}
+
+- (void)tableView:(NSTableView *)aTableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)column row:(NSInteger)row
+{
+    BOOL isSelected = [[self view] isRowSelected:row];
+    BOOL isMarkable = n2b([[self model] valueForColumn:@"markable" row:row]);
+    if ([[column identifier] isEqual:@"marked"]) {
+        [cell setEnabled:isMarkable];
+        // Low-tech solution, for indentation, but it works...
+        NSCellImagePosition pos = isMarkable ? NSImageRight : NSImageLeft;
+        [cell setImagePosition:pos];
+    }
+    if ([cell isKindOfClass:[NSTextFieldCell class]]) {
+        NSColor *color = [NSColor textColor];
+        if (isSelected) {
+            color = [NSColor selectedTextColor];
+        }
+        else if (isMarkable) {
+            if ([self deltaValuesMode]) {
+                if ([_deltaColumns containsObject:[column identifier]]) {
+                    color = [NSColor orangeColor];
+                }
+            }
+        }
+        else {
+            color = [NSColor blueColor];
+        }
+        [(NSTextFieldCell *)cell setTextColor:color];
+    }
+}
+
+- (BOOL)tableViewHadDeletePressed:(NSTableView *)tableView
+{
+    [[self model] removeSelected];
+    return YES;
+}
+
+- (BOOL)tableViewHadSpacePressed:(NSTableView *)tableView
+{
+    [[self model] markSelected];
+    return YES;
+}
+
+/* Quicklook */
+- (NSInteger)numberOfPreviewItemsInPreviewPanel:(QLPreviewPanel *)panel
+{
+    return [[[self model] selectedRows] count];
+}
+
+- (id <QLPreviewItem>)previewPanel:(QLPreviewPanel *)panel previewItemAtIndex:(NSInteger)index
+{
+    NSArray *selectedRows = [[self model] selectedRows];
+    NSInteger absIndex = n2i([selectedRows objectAtIndex:index]);
+    NSString *path = [[self model] pathAtIndex:absIndex];
+    return [[HSQLPreviewItem alloc] initWithUrl:[NSURL fileURLWithPath:path] title:path];
+}
+
+- (BOOL)previewPanel:(QLPreviewPanel *)panel handleEvent:(NSEvent *)event
+{
+    // redirect all key down events to the table view
+    if ([event type] == NSKeyDown) {
+        [[self view] keyDown:event];
+        return YES;
+    }
+    return NO;
+}
+
+/* Python --> Cocoa */
+- (void)invalidateMarkings
+{
+    [[self view] setNeedsDisplay:YES];
+}
+@end

cocoa/base/ResultWindow.h

@@ -1,50 +1,56 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
-#import "HSOutlineView.h"
+#import <Quartz/Quartz.h>
 #import "StatsLabel.h"
-#import "ResultOutline.h"
+#import "ResultTable.h"
 #import "ProblemDialog.h"
+#import "HSTableView.h"
 #import "PyDupeGuru.h"
 
+@class AppDelegateBase;
+
 @interface ResultWindowBase : NSWindowController
 {
 @protected
-    IBOutlet PyDupeGuruBase *py;
-    IBOutlet id app;
-    IBOutlet NSSegmentedControl *deltaSwitch;
-    IBOutlet HSOutlineView *matches;
-	IBOutlet NSSegmentedControl *pmSwitch;
-	IBOutlet NSTextField *stats;
-	IBOutlet NSMenu *columnsMenu;
-	IBOutlet NSSearchField *filterField;
+    IBOutlet NSSegmentedControl *optionsSwitch;
+    IBOutlet NSToolbarItem *optionsToolbarItem;
+    IBOutlet HSTableView *matches;
+    IBOutlet NSTextField *stats;
+    IBOutlet NSSearchField *filterField;
     
-    NSMutableArray *_resultColumns;
-    NSWindowController *preferencesPanel;
-    ResultOutline *outline;
+    AppDelegateBase *app;
+    PyDupeGuru *model;
+    NSMenu *columnsMenu;
+    ResultTable *table;
     StatsLabel *statsLabel;
     ProblemDialog *problemDialog;
+    QLPreviewPanel* previewPanel;
 }
+- (id)initWithParentApp:(AppDelegateBase *)app;
+
+/* Virtual */
+- (void)initResultColumns;
+- (void)setScanOptions;
+
 /* Helpers */
 - (void)fillColumnsMenu;
-- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn;
-- (NSArray *)getColumnsOrder;
-- (NSDictionary *)getColumnsWidth;
-- (void)initResultColumns;
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;
+- (void)sendMarkedToTrash:(BOOL)hardlinkDeleted;
+- (void)updateOptionSegments;
+- (void)showProblemDialog;
+- (void)adjustUIToLocalization;
 
 /* Actions */
-- (IBAction)clearIgnoreList:(id)sender;
-- (IBAction)changeDelta:(id)sender;
-- (IBAction)changePowerMarker:(id)sender;
+- (IBAction)changeOptions:(id)sender;
 - (IBAction)copyMarked:(id)sender;
 - (IBAction)deleteMarked:(id)sender;
+- (IBAction)hardlinkMarked:(id)sender;
 - (IBAction)exportToXHTML:(id)sender;
 - (IBAction)filter:(id)sender;
 - (IBAction)ignoreSelected:(id)sender;
@@ -59,16 +65,15 @@ http://www.hardcoded.net/licenses/hs_license
 - (IBAction)removeMarked:(id)sender;
 - (IBAction)removeSelected:(id)sender;
 - (IBAction)renameSelected:(id)sender;
+- (IBAction)reprioritizeResults:(id)sender;
 - (IBAction)resetColumnsToDefault:(id)sender;
 - (IBAction)revealSelected:(id)sender;
-- (IBAction)showPreferencesPanel:(id)sender;
+- (IBAction)saveResults:(id)sender;
 - (IBAction)startDuplicateScan:(id)sender;
 - (IBAction)switchSelected:(id)sender;
 - (IBAction)toggleColumn:(id)sender;
 - (IBAction)toggleDelta:(id)sender;
 - (IBAction)toggleDetailsPanel:(id)sender;
 - (IBAction)togglePowerMarker:(id)sender;
-
-/* Notifications */
-- (void)jobCompleted:(NSNotification *)aNotification;
+- (IBAction)toggleQuicklookPanel:(id)sender;
 @end

cocoa/base/ResultWindow.m

@@ -1,255 +1,209 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
 #import "Dialogs.h"
 #import "ProgressController.h"
 #import "Utils.h"
-#import "RegistrationInterface.h"
 #import "AppDelegate.h"
 #import "Consts.h"
+#import "PrioritizeDialog.h"
 
 @implementation ResultWindowBase
-- (void)awakeFromNib
+- (id)initWithParentApp:(AppDelegateBase *)aApp;
 {
-    [self window];
-    preferencesPanel = [[NSWindowController alloc] initWithWindowNibName:@"Preferences"];
-    outline = [[ResultOutline alloc] initWithPyParent:py view:matches];
-    statsLabel = [[StatsLabel alloc] initWithPyParent:py labelView:stats];
-    problemDialog = [[ProblemDialog alloc] initWithPy:py];
+    self = [super initWithWindowNibName:@"ResultWindow"];
+    app = aApp;
+    model = [app model];
+    [[self window] setTitle:fmt(@"%@ Results", [model appName])];
+    columnsMenu = [app columnsMenu];
+    /* Put a cute iTunes-like bottom bar */
+    [[self window] setContentBorderThickness:28 forEdge:NSMinYEdge];
+    table = [[ResultTable alloc] initWithPyRef:[model resultTable] view:matches];
+    statsLabel = [[StatsLabel alloc] initWithPyRef:[model statsLabel] view:stats];
+    problemDialog = [[ProblemDialog alloc] initWithPyRef:[model problemDialog]];
     [self initResultColumns];
     [self fillColumnsMenu];
-    [deltaSwitch setSelectedSegment:0];
-    [pmSwitch setSelectedSegment:0];
     [matches setTarget:self];
     [matches setDoubleAction:@selector(openClicked:)];
+    [self adjustUIToLocalization];
     
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(registrationRequired:) name:RegistrationRequired object:nil];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobStarted:) name:JobStarted object:nil];
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobInProgress:) name:JobInProgress object:nil];
+    return self;
 }
 
 - (void)dealloc
 {
-    [outline release];
-    [preferencesPanel release];
+    [table release];
     [statsLabel release];
     [problemDialog release];
     [super dealloc];
 }
 
+/* Virtual */
+- (void)initResultColumns
+{
+}
+
+- (void)setScanOptions
+{
+}
+
 /* Helpers */
 - (void)fillColumnsMenu
 {
-    // The columns menu is supposed to be empty and initResultColumns must have been called
-    for (NSTableColumn *col in _resultColumns)
-    {
-        NSMenuItem *mi = [columnsMenu addItemWithTitle:[[col headerCell] stringValue] action:@selector(toggleColumn:) keyEquivalent:@""];
-        [mi setTag:[[col identifier] integerValue]];
+    NSArray *menuItems = [[[table columns] model] menuItems];
+    for (NSInteger i=0; i < [menuItems count]; i++) {
+        NSArray *pair = [menuItems objectAtIndex:i];
+        NSString *display = [pair objectAtIndex:0];
+        BOOL marked = n2b([pair objectAtIndex:1]);
+        NSMenuItem *mi = [columnsMenu addItemWithTitle:display action:@selector(toggleColumn:) keyEquivalent:@""];
         [mi setTarget:self];
-        if ([[matches tableColumns] containsObject:col])
-            [mi setState:NSOnState];
+        [mi setState:marked ? NSOnState : NSOffState];
+        [mi setTag:i];
     }
     [columnsMenu addItem:[NSMenuItem separatorItem]];
-    NSMenuItem *mi = [columnsMenu addItemWithTitle:@"Reset to Default" action:@selector(resetColumnsToDefault:) keyEquivalent:@""];
+    NSMenuItem *mi = [columnsMenu addItemWithTitle:TR(@"Reset to Default")
+        action:@selector(resetColumnsToDefault:) keyEquivalent:@""];
     [mi setTarget:self];
 }
 
-- (NSTableColumn *)getColumnForIdentifier:(NSInteger)aIdentifier title:(NSString *)aTitle width:(NSInteger)aWidth refCol:(NSTableColumn *)aColumn
+- (void)sendMarkedToTrash:(BOOL)hardlinkDeleted
 {
-    NSNumber *n = [NSNumber numberWithInteger:aIdentifier];
-    NSTableColumn *col = [[NSTableColumn alloc] initWithIdentifier:[n stringValue]];
-    [col setWidth:aWidth];
-    [col setEditable:NO];
-    [[col dataCell] setFont:[[aColumn dataCell] font]];
-    [[col headerCell] setStringValue:aTitle];
-    [col setResizingMask:NSTableColumnUserResizingMask];
-    [col setSortDescriptorPrototype:[[NSSortDescriptor alloc] initWithKey:[n stringValue] ascending:YES]];
-    return col;
-}
-
-//Returns an array of identifiers, in order.
-- (NSArray *)getColumnsOrder
-{
-    NSMutableArray *result = [NSMutableArray array];
-    for (NSTableColumn *col in [matches tableColumns]) {
-        NSString *colId = [col identifier];
-        [result addObject:colId];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+    if (hardlinkDeleted) {
+        [model hardlinkMarked];
     }
-    return result;
-}
-
-- (NSDictionary *)getColumnsWidth
-{
-    NSMutableDictionary *result = [NSMutableDictionary dictionary];
-    for (NSTableColumn *col in [matches tableColumns]) {
-        NSString *colId = [col identifier];
-        NSNumber *width = [NSNumber numberWithDouble:[col width]];
-        [result setObject:width forKey:colId];
+    else {
+        [model deleteMarked];
     }
-    return result;
 }
 
-- (void)initResultColumns
+- (void)updateOptionSegments
 {
-    // Virtual
+    [optionsSwitch setSelected:[[app detailsPanel] isVisible] forSegment:0];
+    [optionsSwitch setSelected:[table powerMarkerMode] forSegment:1];
+    [optionsSwitch setSelected:[table deltaValuesMode] forSegment:2];
 }
 
-- (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth
+- (void)showProblemDialog
 {
-    for (NSMenuItem *mi in [columnsMenu itemArray]) {
-        if ([mi state] == NSOnState) {
-            [self toggleColumn:mi];
-        }
+    [problemDialog showWindow:self];
+}
+
+- (void)adjustUIToLocalization
+{
+    NSString *lang = [[NSBundle preferredLocalizationsFromArray:[[NSBundle mainBundle] localizations]] objectAtIndex:0];
+    NSInteger seg1delta = 0;
+    NSInteger seg2delta = 0;
+    if ([lang isEqual:@"ru"]) {
+        seg2delta = 20;
     }
-    //Add columns and set widths
-    for (NSString *colId in aColumnsOrder) {
-        NSInteger colIndex = [colId integerValue];
-        if ((colIndex == 0) && (![colId isEqual:@"0"])) {
-            continue;
-        }
-        NSTableColumn *col = [_resultColumns objectAtIndex:colIndex];
-        NSNumber *width = [aColumnsWidth objectForKey:[col identifier]];
-        NSMenuItem *mi = [columnsMenu itemWithTag:colIndex];
-        if (width) {
-            [col setWidth:[width floatValue]];
-        }
-        [self toggleColumn:mi];
+    else if ([lang isEqual:@"uk"]) {
+        seg2delta = 20;
+    }
+    else if ([lang isEqual:@"hy"]) {
+        seg1delta = 20;
+    }
+    if (seg1delta || seg2delta) {
+        [optionsSwitch setWidth:[optionsSwitch widthForSegment:0]+seg1delta forSegment:0];
+        [optionsSwitch setWidth:[optionsSwitch widthForSegment:1]+seg2delta forSegment:1];
+        NSSize s = [optionsToolbarItem maxSize];
+        s.width += seg1delta + seg2delta;
+        [optionsToolbarItem setMaxSize:s];
+        [optionsToolbarItem setMinSize:s];
     }
 }
 
 /* Actions */
-- (IBAction)clearIgnoreList:(id)sender
+- (IBAction)changeOptions:(id)sender
 {
-    NSInteger i = n2i([py getIgnoreListCount]);
-    if (!i)
-        return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"Do you really want to remove all %d items from the ignore list?",i]] == NSAlertSecondButtonReturn) // NO
-        return;
-    [py clearIgnoreList];
-}
-
-- (IBAction)changeDelta:(id)sender
-{
-    [outline setDeltaValuesMode:[deltaSwitch selectedSegment] == 1];
-}
-
-- (IBAction)changePowerMarker:(id)sender
-{
-    [outline setPowerMarkerMode:[pmSwitch selectedSegment] == 1];
+    NSInteger seg = [optionsSwitch selectedSegment];
+    if (seg == 0) {
+        [self toggleDetailsPanel:sender];
+    }
+    else if (seg == 1) {
+        [self togglePowerMarker:sender];
+    }
+    else if (seg == 2) {
+        [self toggleDelta:sender];
+    }
 }
 
 - (IBAction)copyMarked:(id)sender
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
-    if (!mark_count)
-        return;
-    NSOpenPanel *op = [NSOpenPanel openPanel];
-    [op setCanChooseFiles:NO];
-    [op setCanChooseDirectories:YES];
-    [op setCanCreateDirectories:YES];
-    [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to copy marked files to"];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
-        NSString *directory = [[op filenames] objectAtIndex:0];
-        NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-        [py copyOrMove:b2n(YES) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
-    }
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+    [model setCopyMoveDestType:n2i([ud objectForKey:@"recreatePathType"])];
+    [model copyMarked];
 }
 
 - (IBAction)deleteMarked:(id)sender
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
-    if (!mark_count)
-        return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to send %d files to Trash. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
-        return;
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [py setRemoveEmptyFolders:[ud objectForKey:@"removeEmptyFolders"]];
-    [py deleteMarked];
+    [self sendMarkedToTrash:NO];
+}
+
+- (IBAction)hardlinkMarked:(id)sender
+{
+    [self sendMarkedToTrash:YES];
 }
 
 - (IBAction)exportToXHTML:(id)sender
 {
-    NSString *exported = [py exportToXHTMLwithColumns:[self getColumnsOrder]];
+    NSString *exported = [model exportToXHTML];
     [[NSWorkspace sharedWorkspace] openFile:exported];
 }
 
 - (IBAction)filter:(id)sender
 {
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
-    [py applyFilter:[filterField stringValue]];
+    [model setEscapeFilterRegexp:!n2b([ud objectForKey:@"useRegexpFilter"])];
+    [model applyFilter:[filterField stringValue]];
 }
 
 - (IBAction)ignoreSelected:(id)sender
 {
-    NSInteger selectedDupeCount = [outline selectedDupeCount];
-    if (!selectedDupeCount)
-        return;
-    NSString *msg = [NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",selectedDupeCount];
-    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
-        return;
-    [py addSelectedToIgnoreList];
+    [model addSelectedToIgnoreList];
 }
 
 - (IBAction)invokeCustomCommand:(id)sender
 {
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    NSString *cmd = [ud stringForKey:@"CustomCommand"];
-    if ((cmd != nil) && ([cmd length] > 0)) {
-        [py invokeCommand:cmd];
-    }
-    else {
-        [Dialogs showMessage:@"You have no custom command set up. Set it up in your preferences."];
-    }
+    [model invokeCustomCommand];
 }
 
 - (IBAction)markAll:(id)sender
 {
-    [py markAll];
+    [model markAll];
 }
 
 - (IBAction)markInvert:(id)sender
 {
-    [py markInvert];
+    [model markInvert];
 }
 
 - (IBAction)markNone:(id)sender
 {
-    [py markNone];
+    [model markNone];
 }
 
 - (IBAction)markSelected:(id)sender
 {
-    [py toggleSelectedMark];
+    [model toggleSelectedMark];
 }
 
 - (IBAction)moveMarked:(id)sender
 {
-    NSInteger mark_count = [[py getMarkCount] intValue];
-    if (!mark_count)
-        return;
-    NSOpenPanel *op = [NSOpenPanel openPanel];
-    [op setCanChooseFiles:NO];
-    [op setCanChooseDirectories:YES];
-    [op setCanCreateDirectories:YES];
-    [op setAllowsMultipleSelection:NO];
-    [op setTitle:@"Select a directory to move marked files to"];
-    if ([op runModalForTypes:nil] == NSOKButton)
-    {
-        NSString *directory = [[op filenames] objectAtIndex:0];
-        NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-        [py setRemoveEmptyFolders:[ud objectForKey:@"removeEmptyFolders"]];
-        [py copyOrMove:b2n(NO) markedTo:directory recreatePath:[ud objectForKey:@"recreatePathType"]];
-    }
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setRemoveEmptyFolders:n2b([ud objectForKey:@"removeEmptyFolders"])];
+    [model setCopyMoveDestType:n2i([ud objectForKey:@"recreatePathType"])];
+    [model moveMarked];
 }
 
 - (IBAction)openClicked:(id)sender
@@ -258,27 +212,22 @@ http://www.hardcoded.net/licenses/hs_license
         return;
     }
     [matches selectRowIndexes:[NSIndexSet indexSetWithIndex:[matches clickedRow]] byExtendingSelection:NO];
-    [py openSelected];
+    [model openSelected];
 }
 
 - (IBAction)openSelected:(id)sender
 {
-    [py openSelected];
+    [model openSelected];
 }
 
 - (IBAction)removeMarked:(id)sender
 {
-    int mark_count = [[py getMarkCount] intValue];
-    if (!mark_count)
-        return;
-    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
-        return;
-    [py removeMarked];
+    [model removeMarked];
 }
 
 - (IBAction)removeSelected:(id)sender
 {
-    [outline removeSelected];
+    [model removeSelected];
 }
 
 - (IBAction)renameSelected:(id)sender
@@ -288,125 +237,121 @@ http://www.hardcoded.net/licenses/hs_license
     [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
 }
 
+- (IBAction)reprioritizeResults:(id)sender
+{
+    PrioritizeDialog *dlg = [[PrioritizeDialog alloc] initWithApp:model];
+    NSInteger result = [NSApp runModalForWindow:[dlg window]];
+    if (result == NSRunStoppedResponse) {
+        [[dlg model] performReprioritization];
+    }
+    [dlg release];
+    [[self window] makeKeyAndOrderFront:nil];
+}
+
 - (IBAction)resetColumnsToDefault:(id)sender
 {
-    // Virtual
+    [[[table columns] model] resetToDefaults];
 }
 
 - (IBAction)revealSelected:(id)sender
 {
-    [py revealSelected];
+    [model revealSelected];
 }
 
-- (IBAction)showPreferencesPanel:(id)sender
+- (IBAction)saveResults:(id)sender
 {
-    [preferencesPanel showWindow:sender];
+    NSSavePanel *sp = [NSSavePanel savePanel];
+    [sp setCanCreateDirectories:YES];
+    [sp setAllowedFileTypes:[NSArray arrayWithObject:@"dupeguru"]];
+    [sp setTitle:TR(@"Select a file to save your results to")];
+    if ([sp runModal] == NSOKButton) {
+        [model saveResultsAs:[sp filename]];
+        [[app recentResults] addFile:[sp filename]];
+    }
 }
 
 - (IBAction)startDuplicateScan:(id)sender
 {
-    // Virtual
+    if ([model resultsAreModified]) {
+        if ([Dialogs askYesNo:TR(@"You have unsaved results, do you really want to continue?")] == NSAlertSecondButtonReturn) // NO
+            return;
+    }
+    [self setScanOptions];
+    [model doScan];
 }
 
 - (IBAction)switchSelected:(id)sender
 {
-    [py makeSelectedReference];
+    [model makeSelectedReference];
 }
 
 - (IBAction)toggleColumn:(id)sender
 {
     NSMenuItem *mi = sender;
-    NSString *colId = [NSString stringWithFormat:@"%d",[mi tag]];
-    NSTableColumn *col = [matches tableColumnWithIdentifier:colId];
-    if (col == nil)
-    {
-        //Add Column
-        col = [_resultColumns objectAtIndex:[mi tag]];
-        [matches addTableColumn:col];
-        [mi setState:NSOnState];
-    }
-    else
-    {
-        //Remove column
-        [matches removeTableColumn:col];
-        [mi setState:NSOffState];
-    }
-}
-
-- (IBAction)toggleDelta:(id)sender
-{
-    if ([deltaSwitch selectedSegment] == 1)
-        [deltaSwitch setSelectedSegment:0];
-    else
-        [deltaSwitch setSelectedSegment:1];
-    [self changeDelta:sender];
+    BOOL checked = [[[table columns] model] toggleMenuItem:[mi tag]];
+    [mi setState:checked ? NSOnState : NSOffState];
 }
 
 - (IBAction)toggleDetailsPanel:(id)sender
 {
-    [[(AppDelegateBase *)app detailsPanel] toggleVisibility];
+    [[app detailsPanel] toggleVisibility];
+    [self updateOptionSegments];
+}
+
+- (IBAction)toggleDelta:(id)sender
+{
+    [table setDeltaValuesMode:![table deltaValuesMode]];
+    [self updateOptionSegments];
 }
 
 - (IBAction)togglePowerMarker:(id)sender
 {
-    if ([pmSwitch selectedSegment] == 1)
-        [pmSwitch setSelectedSegment:0];
-    else
-        [pmSwitch setSelectedSegment:1];
-    [self changePowerMarker:sender];
+    [table setPowerMarkerMode:![table powerMarkerMode]];
+    [self updateOptionSegments];
 }
 
-/* Notifications */
-- (void)windowWillClose:(NSNotification *)aNotification
+- (IBAction)toggleQuicklookPanel:(id)sender
 {
-    [NSApp hide:NSApp];
+    if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]) {
+        [[QLPreviewPanel sharedPreviewPanel] orderOut:nil];
+    } 
+    else {
+        [[QLPreviewPanel sharedPreviewPanel] makeKeyAndOrderFront:nil];
+    }
 }
 
-- (void)jobCompleted:(NSNotification *)aNotification
+/* Quicklook */
+- (BOOL)acceptsPreviewPanelControl:(QLPreviewPanel *)panel;
 {
-    id lastAction = [[ProgressController mainProgressController] jobId];
-    if ([lastAction isEqualTo:jobCopy]) {
-        if ([py scanWasProblematic]) {
-            [problemDialog showWindow:self];
-        }
-        else {
-            [Dialogs showMessage:@"All marked files were copied sucessfully."];
-        }
-    }
-    else if ([lastAction isEqualTo:jobMove]) {
-        if ([py scanWasProblematic]) {
-            [problemDialog showWindow:self];
-        }
-        else {
-            [Dialogs showMessage:@"All marked files were moved sucessfully."];
-        }
-    }
-    else if ([lastAction isEqualTo:jobDelete]) {
-        if ([py scanWasProblematic]) {
-            [problemDialog showWindow:self];
-        }
-        else {
-            [Dialogs showMessage:@"All marked files were sucessfully sent to Trash."];
-        }
-    }
-    else if ([lastAction isEqualTo:jobScan]) {
-        NSInteger groupCount = [outline intProperty:@"children_count" valueAtPath:nil];
-        if (groupCount == 0)
-            [Dialogs showMessage:@"No duplicates found."];
-    }
+    return YES;
+}
 
-    // Re-activate toolbar items right after the progress bar stops showing instead of waiting until
-    // a mouse-over is performed
-    [[[self window] toolbar] validateVisibleItems];
+- (void)beginPreviewPanelControl:(QLPreviewPanel *)panel
+{
+    // This document is now responsible of the preview panel
+    // It is allowed to set the delegate, data source and refresh panel.
+    previewPanel = [panel retain];
+    panel.delegate = table;
+    panel.dataSource = table;
+}
+
+- (void)endPreviewPanelControl:(QLPreviewPanel *)panel
+{
+    // This document loses its responsisibility on the preview panel
+    // Until the next call to -beginPreviewPanelControl: it must not
+    // change the panel's delegate, data source or refresh it.
+    [previewPanel release];
+    previewPanel = nil;
 }
 
 - (void)jobInProgress:(NSNotification *)aNotification
 {
-    [Dialogs showMessage:@"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again."];
+    [Dialogs showMessage:TR(@"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.")];
 }
 
 - (void)jobStarted:(NSNotification *)aNotification
 {
+    [[self window] makeKeyAndOrderFront:nil];
     NSDictionary *ui = [aNotification userInfo];
     NSString *desc = [ui valueForKey:@"desc"];
     [[ProgressController mainProgressController] setJobDesc:desc];
@@ -415,12 +360,6 @@ http://www.hardcoded.net/licenses/hs_license
     [[ProgressController mainProgressController] showSheetForParent:[self window]];
 }
 
-- (void)registrationRequired:(NSNotification *)aNotification
-{
-    NSString *msg = @"This is a demo version, which only allows you 10 delete/copy/move actions per session. You cannot continue.";
-    [Dialogs showMessage:msg];
-}
-
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem
 {
     return ![[ProgressController mainProgressController] isShown];

cocoa/base/StatsLabel.h

@@ -1,19 +1,17 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 #import "HSGUIController.h"
 #import "PyStatsLabel.h"
 
-@interface StatsLabel : HSGUIController
-{
-    NSTextField *labelView;
-}
-- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView;
-- (PyStatsLabel *)py;
+@interface StatsLabel : HSGUIController {}
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTextField *)aLabelView;
+- (PyStatsLabel *)model;
+- (NSTextField *)labelView;
 @end

cocoa/base/StatsLabel.m

@@ -1,38 +1,34 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "StatsLabel.h"
 #import "Utils.h"
 
 @implementation StatsLabel
-- (id)initWithPyParent:(id)aPyParent labelView:(NSTextField *)aLabelView
+- (id)initWithPyRef:(PyObject *)aPyRef view:(NSTextField *)aLabelView
 {
-    self = [super initWithPyClassName:@"PyStatsLabel" pyParent:aPyParent];
-    labelView = [aLabelView retain];
-    [self connect];
-    return self;
+    return [super initWithPyRef:aPyRef wrapperClass:[PyStatsLabel class]
+        callbackClassName:@"StatsLabelView" view:aLabelView];
 }
 
-- (void)dealloc
+- (PyStatsLabel *)model
 {
-    [self disconnect];
-    [labelView release];
-    [super dealloc];
+    return (PyStatsLabel *)model;
 }
 
-- (PyStatsLabel *)py
+- (NSTextField *)labelView
 {
-    return (PyStatsLabel *)py;
+    return (NSTextField *)view;
 }
 
 /* Python --> Cocoa */
 - (void)refresh
 {
-    [labelView setStringValue:[[self py] display]];
+    [[self labelView] setStringValue:[[self model] display]];
 }
 @end

cocoa/base/en.lproj/DetailsPanel.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Details of Selected File";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Selected";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Reference";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Attribute";

cocoa/base/en.lproj/DetailsPanel.xib

@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">1617</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSView</string>
+			<string>NSCustomObject</string>
+			<string>NSScrollView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSTextFieldCell</string>
+			<string>NSTableHeaderView</string>
+			<string>NSTableColumn</string>
+			<string>NSScroller</string>
+			<string>NSTableView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="247693826">
+			<object class="NSCustomObject" id="449947658">
+				<string key="NSClassName">DetailsPanel</string>
+			</object>
+			<object class="NSCustomObject" id="176092317">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="492866996">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="476890502">
+				<int key="NSWindowStyleMask">155</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{33, 261}, {451, 146}}</string>
+				<int key="NSWTFlags">-260571136</int>
+				<string key="NSWindowTitle">Details of Selected File</string>
+				<object class="NSMutableString" key="NSWindowClass">
+					<characters key="NS.bytes">NSPanel</characters>
+				</object>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{451, 146}</string>
+				<object class="NSView" key="NSWindowView" id="1027711962">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSScrollView" id="362108788">
+							<reference key="NSNextResponder" ref="1027711962"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="488480549">
+									<reference key="NSNextResponder" ref="362108788"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="251969872">
+											<reference key="NSNextResponder" ref="488480549"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{449, 128}</string>
+											<reference key="NSSuperview" ref="488480549"/>
+											<reference key="NSWindow"/>
+											<int key="NSTag">2</int>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="374654484">
+												<reference key="NSNextResponder" ref="110085834"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{449, 17}</string>
+												<reference key="NSSuperview" ref="110085834"/>
+												<reference key="NSWindow"/>
+												<reference key="NSTableView" ref="251969872"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="717380566">
+												<reference key="NSNextResponder" ref="362108788"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="362108788"/>
+												<reference key="NSWindow"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="920315484">
+													<string key="NSIdentifier">0</string>
+													<double key="NSWidth">70</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Attribute</string>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">11</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor" id="690482064">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="427935076">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<object class="NSColor" key="NSColor" id="45430568">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="402714943">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="251969872"/>
+														<object class="NSColor" key="NSBackgroundColor" id="1015576963">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="183338835">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="45430568"/>
+														</object>
+													</object>
+													<int key="NSResizingMask">2</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="251969872"/>
+												</object>
+												<object class="NSTableColumn" id="683288430">
+													<string key="NSIdentifier">1</string>
+													<double key="NSWidth">198</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Selected</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="690482064"/>
+														<reference key="NSTextColor" ref="427935076"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="649788063">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="251969872"/>
+														<reference key="NSBackgroundColor" ref="1015576963"/>
+														<reference key="NSTextColor" ref="183338835"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="251969872"/>
+												</object>
+												<object class="NSTableColumn" id="694550305">
+													<string key="NSIdentifier">2</string>
+													<double key="NSWidth">172</double>
+													<double key="NSMinWidth">56.4755859375</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Reference</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<object class="NSColor" key="NSColor" id="666582600">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MQA</bytes>
+															</object>
+														</object>
+														<reference key="NSTextColor" ref="427935076"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="915876533">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="251969872"/>
+														<reference key="NSBackgroundColor" ref="1015576963"/>
+														<reference key="NSTextColor" ref="183338835"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="251969872"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="666582600"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">14</double>
+											<int key="NSTvFlags">1111523328</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {449, 128}}</string>
+									<reference key="NSSuperview" ref="362108788"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="251969872"/>
+									<reference key="NSDocView" ref="251969872"/>
+									<reference key="NSBGColor" ref="1015576963"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="733942317">
+									<reference key="NSNextResponder" ref="362108788"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{-30, 17}, {15, 129}}</string>
+									<reference key="NSSuperview" ref="362108788"/>
+									<reference key="NSWindow"/>
+									<reference key="NSTarget" ref="362108788"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.89375001192092896</double>
+								</object>
+								<object class="NSScroller" id="168632382">
+									<reference key="NSNextResponder" ref="362108788"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{-100, -100}, {394, 15}}</string>
+									<reference key="NSSuperview" ref="362108788"/>
+									<reference key="NSWindow"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="362108788"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.96332520246505737</double>
+								</object>
+								<object class="NSClipView" id="110085834">
+									<reference key="NSNextResponder" ref="362108788"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="374654484"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {449, 17}}</string>
+									<reference key="NSSuperview" ref="362108788"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="374654484"/>
+									<reference key="NSDocView" ref="374654484"/>
+									<reference key="NSBGColor" ref="1015576963"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="717380566"/>
+							</array>
+							<string key="NSFrameSize">{451, 146}</string>
+							<reference key="NSSuperview" ref="1027711962"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="488480549"/>
+							<int key="NSsFlags">133650</int>
+							<reference key="NSVScroller" ref="733942317"/>
+							<reference key="NSHScroller" ref="168632382"/>
+							<reference key="NSContentView" ref="488480549"/>
+							<reference key="NSHeaderClipView" ref="110085834"/>
+							<reference key="NSCornerView" ref="717380566"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
+						</object>
+					</array>
+					<string key="NSFrameSize">{451, 146}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMinSize">{451, 162}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<string key="NSFrameAutosaveName">DetailsPanel</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="449947658"/>
+						<reference key="destination" ref="476890502"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="251969872"/>
+						<reference key="destination" ref="449947658"/>
+					</object>
+					<int key="connectionID">21</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">detailsTable</string>
+						<reference key="source" ref="449947658"/>
+						<reference key="destination" ref="251969872"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="247693826"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="449947658"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="176092317"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="476890502"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1027711962"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">details</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="1027711962"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="362108788"/>
+						</array>
+						<reference key="parent" ref="476890502"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="362108788"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="251969872"/>
+							<reference ref="733942317"/>
+							<reference ref="168632382"/>
+							<reference ref="374654484"/>
+						</array>
+						<reference key="parent" ref="1027711962"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="251969872"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="683288430"/>
+							<reference ref="694550305"/>
+							<reference ref="920315484"/>
+						</array>
+						<reference key="parent" ref="362108788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="683288430"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="649788063"/>
+						</array>
+						<reference key="parent" ref="251969872"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="694550305"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="915876533"/>
+						</array>
+						<reference key="parent" ref="251969872"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="920315484"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="402714943"/>
+						</array>
+						<reference key="parent" ref="251969872"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="649788063"/>
+						<reference key="parent" ref="683288430"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="915876533"/>
+						<reference key="parent" ref="694550305"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="402714943"/>
+						<reference key="parent" ref="920315484"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="733942317"/>
+						<reference key="parent" ref="362108788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="168632382"/>
+						<reference key="parent" ref="362108788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="374654484"/>
+						<reference key="parent" ref="362108788"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="492866996"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="15.IBShouldRemoveOnLegacySave"/>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="16.IBShouldRemoveOnLegacySave"/>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="17.IBShouldRemoveOnLegacySave"/>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="18.IBShouldRemoveOnLegacySave"/>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="19.IBShouldRemoveOnLegacySave"/>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="20.IBShouldRemoveOnLegacySave"/>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBWindowTemplateEditedContentRect">{{109, 671}, {451, 146}}</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">22</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">DetailsPanel</string>
+					<string key="superclassName">HSWindowController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">detailsTable</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">detailsTable</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">detailsTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DetailsPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">HSWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/HSWindowController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<real value="4100" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

cocoa/base/en.lproj/DirectoryPanel.strings

@@ -0,0 +1,23 @@
+/* Class = "NSTableColumn"; headerCell.title = "State"; ObjectID = "13"; */
+"13.headerCell.title" = "State";
+
+/* Class = "NSTableColumn"; headerCell.title = "Name"; ObjectID = "15"; */
+"15.headerCell.title" = "Name";
+
+/* Class = "NSButtonCell"; title = "Scan"; ObjectID = "48"; */
+"48.title" = "Scan";
+
+/* Class = "NSMenuItem"; title = "Normal"; ObjectID = "55"; */
+"55.title" = "Normal";
+
+/* Class = "NSMenuItem"; title = "Reference"; ObjectID = "56"; */
+"56.title" = "Reference";
+
+/* Class = "NSMenuItem"; title = "Excluded"; ObjectID = "57"; */
+"57.title" = "Excluded";
+
+/* Class = "NSTextFieldCell"; title = "Select folders to scan and press \"Scan\"."; ObjectID = "71"; */
+"71.title" = "Select folders to scan and press \"Scan\".";
+
+/* Class = "NSButtonCell"; title = "Load Results"; ObjectID = "73"; */
+"73.title" = "Load Results";

cocoa/base/en.lproj/IgnoreListDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Ignore List"; ObjectID = "1"; */
+"1.title" = "Ignore List";
+
+/* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
+"19.title" = "Close";
+
+/* Class = "NSButtonCell"; title = "Remove Selected"; ObjectID = "21"; */
+"21.title" = "Remove Selected";
+
+/* Class = "NSButtonCell"; title = "Clear"; ObjectID = "28"; */
+"28.title" = "Clear";

cocoa/base/en.lproj/IgnoreListDialog.xib

@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11D50</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2177</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2177</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSView</string>
+			<string>NSTableView</string>
+			<string>NSScrollView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSTableHeaderView</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSScroller</string>
+			<string>NSCustomObject</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">IgnoreListDialog</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="359561441">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{477, 306}, {574, 347}}</string>
+				<int key="NSWTFlags">1685585920</int>
+				<string key="NSWindowTitle">Ignore List</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="976198330">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSScrollView" id="458371270">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="831830981">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="252791348">
+											<reference key="NSNextResponder" ref="831830981"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{532, 211}</string>
+											<reference key="NSSuperview" ref="831830981"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="777677330"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="903452051">
+												<reference key="NSNextResponder" ref="777677330"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{532, 17}</string>
+												<reference key="NSSuperview" ref="777677330"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="564034022"/>
+												<reference key="NSTableView" ref="252791348"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="564034022">
+												<reference key="NSNextResponder" ref="458371270"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="458371270"/>
+												<reference key="NSWindow"/>
+												<reference key="NSNextKeyView" ref="831830981"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns"/>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<object class="NSColor" key="NSBackgroundColor">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MQA</bytes>
+											</object>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">1512046592</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">NO</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {532, 249}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="252791348"/>
+									<reference key="NSDocView" ref="252791348"/>
+									<object class="NSColor" key="NSBGColor" id="765209443">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">controlBackgroundColor</string>
+										<object class="NSColor" key="NSColor">
+											<int key="NSColorSpace">3</int>
+											<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+										</object>
+									</object>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="99096694">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="47224920"/>
+									<reference key="NSTarget" ref="458371270"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99052132701421802</double>
+								</object>
+								<object class="NSScroller" id="47224920">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 154}, {438, 15}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="253286088"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="458371270"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.98871331828442433</double>
+								</object>
+								<object class="NSClipView" id="777677330">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="903452051"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {532, 17}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="903452051"/>
+									<reference key="NSDocView" ref="903452051"/>
+									<reference key="NSBGColor" ref="765209443"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="564034022"/>
+							</array>
+							<string key="NSFrame">{{20, 60}, {534, 267}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="831830981"/>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="99096694"/>
+							<reference key="NSHScroller" ref="47224920"/>
+							<reference key="NSContentView" ref="831830981"/>
+							<reference key="NSHeaderClipView" ref="777677330"/>
+							<reference key="NSCornerView" ref="564034022"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="4380169">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{464, 12}, {96, 32}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="373771329">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Close</string>
+								<object class="NSFont" key="NSSupport" id="680801460">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="4380169"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="253286088">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{14, 12}, {154, 32}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="983148229"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="671547957">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Remove Selected</string>
+								<reference key="NSSupport" ref="680801460"/>
+								<reference key="NSControlView" ref="253286088"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="983148229">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{162, 12}, {154, 32}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="4380169"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="409951495">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Clear</string>
+								<reference key="NSSupport" ref="680801460"/>
+								<reference key="NSControlView" ref="983148229"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{574, 347}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="458371270"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="359561441"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">ignoreListTableView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="252791348"/>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeSelected:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="253286088"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">clear:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="983148229"/>
+					</object>
+					<int key="connectionID">32</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClose:</string>
+						<reference key="source" ref="359561441"/>
+						<reference key="destination" ref="4380169"/>
+					</object>
+					<int key="connectionID">25</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="359561441"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="976198330"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="976198330"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="458371270"/>
+							<reference ref="4380169"/>
+							<reference ref="253286088"/>
+							<reference ref="983148229"/>
+						</array>
+						<reference key="parent" ref="359561441"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="458371270"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="99096694"/>
+							<reference ref="47224920"/>
+							<reference ref="252791348"/>
+							<reference ref="903452051"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="99096694"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="47224920"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="252791348"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="903452051"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="4380169"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="373771329"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="373771329"/>
+						<reference key="parent" ref="4380169"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="253286088"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="671547957"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="671547957"/>
+						<reference key="parent" ref="253286088"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="983148229"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="409951495"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="409951495"/>
+						<reference key="parent" ref="983148229"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{477, 306}, {480, 309}}</string>
+				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">32</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">IgnoreListDialog</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="clear:">id</string>
+						<string key="removeSelected:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="clear:">
+							<string key="name">clear:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeSelected:">
+							<string key="name">removeSelected:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">ignoreListTableView</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">ignoreListTableView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">ignoreListTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/IgnoreListDialog.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<real value="4100" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

cocoa/base/en.lproj/Localizable.strings

@@ -0,0 +1,27 @@
+"Add New Folder..." = "Add New Folder...";
+"Load from file..." = "Load from file...";
+"Reset to Default" = "Reset to Default";
+
+"Select a results file to load" = "Select a results file to load";
+"You have unsaved results, do you really want to quit?" = "You have unsaved results, do you really want to quit?";
+"Select a file to save your results to" = "Select a file to save your results to";
+"Select a folder to add to the scanning list" = "Select a folder to add to the scanning list";
+"You have unsaved results, do you really want to continue?" = "You have unsaved results, do you really want to continue?";
+"'%@' already is in the list." = "'%@' already is in the list.";
+"'%@' does not exist." = "'%@' does not exist.";
+"The name '%@' already exists." = "The name '%@' already exists.";
+"A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again." = "A previous action is still hanging in there. You can't start a new one yet. Wait a few seconds, then try again.";
+"Your iTunes Library contains %d dead tracks ready to be removed. Continue?" = "Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
+"You have no dead tracks in your iTunes Library" = "You have no dead tracks in your iTunes Library";
+"Do you really want to remove all your cached picture analysis?" = "Do you really want to remove all your cached picture analysis?";
+
+
+"Add iTunes Directory" = "Add iTunes Directory";
+"Remove Dead Tracks in iTunes" = "Remove Dead Tracks in iTunes";
+
+"Add iPhoto Library" = "Add iPhoto Library";
+"Clear Picture Cache" = "Clear Picture Cache";
+
+"Yes" = "Yes";
+"No" = "No";
+"OK" = "OK";

cocoa/base/en.lproj/MainMenu.strings

@@ -0,0 +1,177 @@
+
+/* Class = "NSMenuItem"; title = "Bring All to Front"; ObjectID = "5"; */
+"5.title" = "Bring All to Front";
+
+/* Class = "NSMenuItem"; title = "Window"; ObjectID = "19"; */
+"19.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "Minimize"; ObjectID = "23"; */
+"23.title" = "Minimize";
+
+/* Class = "NSMenu"; title = "Window"; ObjectID = "24"; */
+"24.title" = "Window";
+
+/* Class = "NSMenuItem"; title = "About dupeGuru"; ObjectID = "58"; */
+"58.title" = "About dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Help"; ObjectID = "103"; */
+"103.title" = "Help";
+
+/* Class = "NSMenu"; title = "Help"; ObjectID = "106"; */
+"106.title" = "Help";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Help"; ObjectID = "111"; */
+"111.title" = "dupeGuru Help";
+
+/* Class = "NSMenuItem"; title = "Hide dupeGuru"; ObjectID = "134"; */
+"134.title" = "Hide dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Quit dupeGuru"; ObjectID = "136"; */
+"136.title" = "Quit dupeGuru";
+
+/* Class = "NSMenuItem"; title = "Hide Others"; ObjectID = "145"; */
+"145.title" = "Hide Others";
+
+/* Class = "NSMenuItem"; title = "Show All"; ObjectID = "150"; */
+"150.title" = "Show All";
+
+/* Class = "NSMenuItem"; title = "Zoom"; ObjectID = "197"; */
+"197.title" = "Zoom";
+
+/* Class = "NSMenuItem"; title = "Details Panel"; ObjectID = "398"; */
+"398.title" = "Details Panel";
+
+/* Class = "NSMenuItem"; title = "Preferences..."; ObjectID = "541"; */
+"541.title" = "Preferences...";
+
+/* Class = "NSMenuItem"; title = "Folder Selection Window"; ObjectID = "579"; */
+"579.title" = "Folder Selection Window";
+
+/* Class = "NSMenuItem"; title = "Actions"; ObjectID = "597"; */
+"597.title" = "Actions";
+
+/* Class = "NSMenu"; title = "Actions"; ObjectID = "598"; */
+"598.title" = "Actions";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "599"; */
+"599.title" = "Send Marked to Trash";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "600"; */
+"600.title" = "Move Marked to...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "601"; */
+"601.title" = "Copy Marked to...";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "602"; */
+"602.title" = "Make Selected Reference";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "603"; */
+"603.title" = "Remove Marked from Results";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "605"; */
+"605.title" = "Remove Selected from Results";
+
+/* Class = "NSMenuItem"; title = "Columns"; ObjectID = "618"; */
+"618.title" = "Columns";
+
+/* Class = "NSMenu"; title = "Columns"; ObjectID = "619"; */
+"619.title" = "Columns";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "708"; */
+"708.title" = "Open Selected with Default Application";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "710"; */
+"710.title" = "Reveal Selected in Finder";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "922"; */
+"922.title" = "Add Selected to Ignore List";
+
+/* Class = "NSMenuItem"; title = "Close Window"; ObjectID = "924"; */
+"924.title" = "Close Window";
+
+/* Class = "NSMenuItem"; title = "Start Duplicate Scan"; ObjectID = "926"; */
+"926.title" = "Start Duplicate Scan";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "933"; */
+"933.title" = "Rename Selected";
+
+/* Class = "NSMenuItem"; title = "Export Results to XHTML"; ObjectID = "947"; */
+"947.title" = "Export Results to XHTML";
+
+/* Class = "NSMenuItem"; title = "Check for update..."; ObjectID = "950"; */
+"950.title" = "Check for update...";
+
+/* Class = "NSMenuItem"; title = "Mode"; ObjectID = "959"; */
+"959.title" = "Mode";
+
+/* Class = "NSMenu"; title = "Mode"; ObjectID = "960"; */
+"960.title" = "Mode";
+
+/* Class = "NSMenuItem"; title = "Show Dupes Only"; ObjectID = "961"; */
+"961.title" = "Show Dupes Only";
+
+/* Class = "NSMenuItem"; title = "Show Delta Values"; ObjectID = "962"; */
+"962.title" = "Show Delta Values";
+
+/* Class = "NSMenuItem"; title = "Edit"; ObjectID = "965"; */
+"965.title" = "Edit";
+
+/* Class = "NSMenu"; title = "Edit"; ObjectID = "966"; */
+"966.title" = "Edit";
+
+/* Class = "NSMenuItem"; title = "Cut"; ObjectID = "985"; */
+"985.title" = "Cut";
+
+/* Class = "NSMenuItem"; title = "Copy"; ObjectID = "986"; */
+"986.title" = "Copy";
+
+/* Class = "NSMenuItem"; title = "Paste"; ObjectID = "991"; */
+"991.title" = "Paste";
+
+/* Class = "NSMenuItem"; title = "Mark All"; ObjectID = "1011"; */
+"1011.title" = "Mark All";
+
+/* Class = "NSMenuItem"; title = "Mark None"; ObjectID = "1012"; */
+"1012.title" = "Mark None";
+
+/* Class = "NSMenuItem"; title = "Invert Marking"; ObjectID = "1013"; */
+"1013.title" = "Invert Marking";
+
+/* Class = "NSMenuItem"; title = "Mark Selected"; ObjectID = "1014"; */
+"1014.title" = "Mark Selected";
+
+/* Class = "NSMenuItem"; title = "dupeGuru Website"; ObjectID = "1023"; */
+"1023.title" = "dupeGuru Website";
+
+/* Class = "NSMenuItem"; title = "Invoke Custom Command"; ObjectID = "1177"; */
+"1177.title" = "Invoke Custom Command";
+
+/* Class = "NSMenuItem"; title = "File"; ObjectID = "1203"; */
+"1203.title" = "File";
+
+/* Class = "NSMenu"; title = "File"; ObjectID = "1204"; */
+"1204.title" = "File";
+
+/* Class = "NSMenuItem"; title = "Load Results..."; ObjectID = "1205"; */
+"1205.title" = "Load Results...";
+
+/* Class = "NSMenuItem"; title = "Save Results..."; ObjectID = "1206"; */
+"1206.title" = "Save Results...";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "1227"; */
+"1227.title" = "Delete Marked and Replace with Hardlinks";
+
+/* Class = "NSMenuItem"; title = "Load Recent Results"; ObjectID = "1239"; */
+"1239.title" = "Load Recent Results";
+
+/* Class = "NSMenu"; title = "Load Recent Results"; ObjectID = "1240"; */
+"1240.title" = "Load Recent Results";
+
+/* Class = "NSMenuItem"; title = "Results Window"; ObjectID = "1272"; */
+"1272.title" = "Results Window";
+
+/* Class = "NSMenuItem"; title = "Re-Prioritize Results"; ObjectID = "1276"; */
+"1276.title" = "Re-Prioritize Results";
+
+/* Class = "NSMenuItem"; title = "Ignore List"; ObjectID = "1283"; */
+"1283.title" = "Ignore List";

cocoa/base/en.lproj/PrioritizeDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Re-Prioritize duplicates"; ObjectID = "1"; */
+"1.title" = "Re-Prioritize duplicates";
+
+/* Class = "NSButtonCell"; title = "Ok"; ObjectID = "37"; */
+"37.title" = "Ok";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "39"; */
+"39.title" = "Cancel";
+
+/* Class = "NSTextFieldCell"; title = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information."; ObjectID = "41"; */
+"41.title" = "Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information.";

cocoa/base/en.lproj/PrioritizeDialog.xib

@@ -0,0 +1,897 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11D50</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2182</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSTextField</string>
+			<string>NSPopUpButton</string>
+			<string>NSScroller</string>
+			<string>NSButton</string>
+			<string>NSMenu</string>
+			<string>NSScrollView</string>
+			<string>NSTextFieldCell</string>
+			<string>NSButtonCell</string>
+			<string>NSTableView</string>
+			<string>NSCustomObject</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSPopUpButtonCell</string>
+			<string>NSTableColumn</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">PrioritizeDialog</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1005">
+				<int key="NSWindowStyleMask">9</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{196, 240}, {609, 401}}</string>
+				<int key="NSWTFlags">1618477056</int>
+				<string key="NSWindowTitle">Re-Prioritize duplicates</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="1006">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSPopUpButton" id="357095790">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 298}, {268, 26}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="386461059"/>
+							<string key="NSReuseIdentifierKey">_NS:179</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSPopUpButtonCell" key="NSCell" id="892922362">
+								<int key="NSCellFlags">-2076049856</int>
+								<int key="NSCellFlags2">2048</int>
+								<object class="NSFont" key="NSSupport" id="591283433">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<string key="NSCellIdentifier">_NS:179</string>
+								<reference key="NSControlView" ref="357095790"/>
+								<int key="NSButtonFlags">109199615</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">400</int>
+								<int key="NSPeriodicInterval">75</int>
+								<nil key="NSMenuItem"/>
+								<bool key="NSMenuItemRespectAlignment">YES</bool>
+								<object class="NSMenu" key="NSMenu" id="309249465">
+									<string key="NSTitle">OtherViews</string>
+									<array class="NSMutableArray" key="NSMenuItems"/>
+									<reference key="NSMenuFont" ref="591283433"/>
+								</object>
+								<int key="NSSelectedIndex">-1</int>
+								<int key="NSPreferredEdge">1</int>
+								<bool key="NSUsesItemFromMenu">YES</bool>
+								<bool key="NSAltersState">YES</bool>
+								<int key="NSArrowPosition">2</int>
+							</object>
+						</object>
+						<object class="NSScrollView" id="386461059">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">276</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="991694656">
+									<reference key="NSNextResponder" ref="386461059"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="675311684">
+											<reference key="NSNextResponder" ref="991694656"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{260, 233}</string>
+											<reference key="NSSuperview" ref="991694656"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="978953877"/>
+											<string key="NSReuseIdentifierKey">_NS:1197</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="_NSCornerView" key="NSCornerView">
+												<nil key="NSNextResponder"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<string key="NSReuseIdentifierKey">_NS:1202</string>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="331887935">
+													<double key="NSWidth">257</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents"/>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">11</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="165509352">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<object class="NSColor" key="NSColor" id="95789318">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="252516817">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2560</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="591283433"/>
+														<reference key="NSControlView" ref="675311684"/>
+														<object class="NSColor" key="NSBackgroundColor" id="768431893">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor" id="857981892">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="983887457">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="95789318"/>
+														</object>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="675311684"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<object class="NSColor" key="NSBackgroundColor" id="949356842">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MQA</bytes>
+											</object>
+											<object class="NSColor" key="NSGridColor" id="353256269">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">306184192</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">NO</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 1}, {260, 233}}</string>
+									<reference key="NSSuperview" ref="386461059"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="675311684"/>
+									<string key="NSReuseIdentifierKey">_NS:1195</string>
+									<reference key="NSDocView" ref="675311684"/>
+									<reference key="NSBGColor" ref="768431893"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="978953877">
+									<reference key="NSNextResponder" ref="386461059"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="386461059"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="1055237002"/>
+									<string key="NSReuseIdentifierKey">_NS:1214</string>
+									<reference key="NSTarget" ref="386461059"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.9925373134328358</double>
+								</object>
+								<object class="NSScroller" id="1055237002">
+									<reference key="NSNextResponder" ref="386461059"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 119}, {223, 15}}</string>
+									<reference key="NSSuperview" ref="386461059"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="878293971"/>
+									<string key="NSReuseIdentifierKey">_NS:1216</string>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="386461059"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99581589958159</double>
+								</object>
+							</array>
+							<string key="NSFrame">{{20, 60}, {262, 235}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="991694656"/>
+							<string key="NSReuseIdentifierKey">_NS:1193</string>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="978953877"/>
+							<reference key="NSHScroller" ref="1055237002"/>
+							<reference key="NSContentView" ref="991694656"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSScrollView" id="687805562">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="256485327">
+									<reference key="NSNextResponder" ref="687805562"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="69698213">
+											<reference key="NSNextResponder" ref="256485327"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{248, 260}</string>
+											<reference key="NSSuperview" ref="256485327"/>
+											<reference key="NSWindow"/>
+											<reference key="NSNextKeyView" ref="258173410"/>
+											<string key="NSReuseIdentifierKey">_NS:1197</string>
+											<bool key="NSEnabled">YES</bool>
+											<object class="_NSCornerView" key="NSCornerView">
+												<nil key="NSNextResponder"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<string key="NSReuseIdentifierKey">_NS:1202</string>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="604129553">
+													<double key="NSWidth">245</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
+														</object>
+														<reference key="NSTextColor" ref="165509352"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="998326916">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents"/>
+														<reference key="NSSupport" ref="591283433"/>
+														<reference key="NSControlView" ref="69698213"/>
+														<reference key="NSBackgroundColor" ref="768431893"/>
+														<reference key="NSTextColor" ref="983887457"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<bool key="NSIsEditable">YES</bool>
+													<reference key="NSTableView" ref="69698213"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="949356842"/>
+											<reference key="NSGridColor" ref="353256269"/>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">306184192</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">NO</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 1}, {248, 260}}</string>
+									<reference key="NSSuperview" ref="687805562"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="69698213"/>
+									<string key="NSReuseIdentifierKey">_NS:1195</string>
+									<reference key="NSDocView" ref="69698213"/>
+									<reference key="NSBGColor" ref="768431893"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="258173410">
+									<reference key="NSNextResponder" ref="687805562"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="687805562"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="218354894"/>
+									<string key="NSReuseIdentifierKey">_NS:1214</string>
+									<reference key="NSTarget" ref="687805562"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.9925373134328358</double>
+								</object>
+								<object class="NSScroller" id="218354894">
+									<reference key="NSNextResponder" ref="687805562"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 119}, {223, 15}}</string>
+									<reference key="NSSuperview" ref="687805562"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="955319632"/>
+									<string key="NSReuseIdentifierKey">_NS:1216</string>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="687805562"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.99581589958159</double>
+								</object>
+							</array>
+							<string key="NSFrame">{{339, 60}, {250, 262}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="256485327"/>
+							<string key="NSReuseIdentifierKey">_NS:1193</string>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="258173410"/>
+							<reference key="NSHScroller" ref="218354894"/>
+							<reference key="NSContentView" ref="256485327"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="878293971">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{284, 186}, {53, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="596965746"/>
+							<string key="NSReuseIdentifierKey">_NS:161</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="208161580">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">--&gt;</string>
+								<reference key="NSSupport" ref="591283433"/>
+								<string key="NSCellIdentifier">_NS:161</string>
+								<reference key="NSControlView" ref="878293971"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="596965746">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{284, 160}, {53, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="687805562"/>
+							<string key="NSReuseIdentifierKey">_NS:161</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="410417059">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">&lt;--</string>
+								<reference key="NSSupport" ref="591283433"/>
+								<string key="NSCellIdentifier">_NS:161</string>
+								<reference key="NSControlView" ref="596965746"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="620738811">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{495, 12}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<string key="NSReuseIdentifierKey">_NS:161</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="468133349">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Ok</string>
+								<reference key="NSSupport" ref="591283433"/>
+								<string key="NSCellIdentifier">_NS:161</string>
+								<reference key="NSControlView" ref="620738811"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="955319632">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{395, 12}, {100, 32}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="620738811"/>
+							<string key="NSReuseIdentifierKey">_NS:161</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="323479517">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="591283433"/>
+								<string key="NSCellIdentifier">_NS:161</string>
+								<reference key="NSControlView" ref="955319632"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">Gw</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSTextField" id="970734229">
+							<reference key="NSNextResponder" ref="1006"/>
+							<int key="NSvFlags">268</int>
+							<string key="NSFrame">{{17, 330}, {575, 51}}</string>
+							<reference key="NSSuperview" ref="1006"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="357095790"/>
+							<string key="NSReuseIdentifierKey">_NS:3936</string>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="424127272">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">4194304</int>
+								<string key="NSContents">Add criteria to the right box and click OK to send the dupes that correspond the best to these criteria to their respective group's reference position. Read the help file for more information.</string>
+								<reference key="NSSupport" ref="591283433"/>
+								<string key="NSCellIdentifier">_NS:3936</string>
+								<reference key="NSControlView" ref="970734229"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<reference key="NSColor" ref="857981892"/>
+								</object>
+								<reference key="NSTextColor" ref="983887457"/>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{609, 401}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+					<reference key="NSNextKeyView" ref="970734229"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">categoryPopUpView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="357095790"/>
+					</object>
+					<int key="connectionID">10</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">criteriaTableView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="675311684"/>
+					</object>
+					<int key="connectionID">20</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">prioritizationTableView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="69698213"/>
+					</object>
+					<int key="connectionID">33</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">addSelected:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="878293971"/>
+					</object>
+					<int key="connectionID">34</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">removeSelected:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="596965746"/>
+					</object>
+					<int key="connectionID">35</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="955319632"/>
+					</object>
+					<int key="connectionID">42</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">ok:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="620738811"/>
+					</object>
+					<int key="connectionID">43</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">44</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="1005"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1006"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="1006"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="970734229"/>
+							<reference ref="357095790"/>
+							<reference ref="386461059"/>
+							<reference ref="878293971"/>
+							<reference ref="596965746"/>
+							<reference ref="687805562"/>
+							<reference ref="620738811"/>
+							<reference ref="955319632"/>
+						</array>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="357095790"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="892922362"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="892922362"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="309249465"/>
+						</array>
+						<reference key="parent" ref="357095790"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="309249465"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="892922362"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="386461059"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="978953877"/>
+							<reference ref="1055237002"/>
+							<reference ref="675311684"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="978953877"/>
+						<reference key="parent" ref="386461059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="1055237002"/>
+						<reference key="parent" ref="386461059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="675311684"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="331887935"/>
+						</array>
+						<reference key="parent" ref="386461059"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="331887935"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="252516817"/>
+						</array>
+						<reference key="parent" ref="675311684"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="252516817"/>
+						<reference key="parent" ref="331887935"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="878293971"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="208161580"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="208161580"/>
+						<reference key="parent" ref="878293971"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">23</int>
+						<reference key="object" ref="596965746"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="410417059"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">24</int>
+						<reference key="object" ref="410417059"/>
+						<reference key="parent" ref="596965746"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">25</int>
+						<reference key="object" ref="687805562"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="69698213"/>
+							<reference ref="218354894"/>
+							<reference ref="258173410"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">26</int>
+						<reference key="object" ref="69698213"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="604129553"/>
+						</array>
+						<reference key="parent" ref="687805562"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="218354894"/>
+						<reference key="parent" ref="687805562"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">28</int>
+						<reference key="object" ref="258173410"/>
+						<reference key="parent" ref="687805562"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="604129553"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="998326916"/>
+						</array>
+						<reference key="parent" ref="69698213"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">30</int>
+						<reference key="object" ref="998326916"/>
+						<reference key="parent" ref="604129553"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">36</int>
+						<reference key="object" ref="620738811"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="468133349"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">37</int>
+						<reference key="object" ref="468133349"/>
+						<reference key="parent" ref="620738811"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">38</int>
+						<reference key="object" ref="955319632"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="323479517"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">39</int>
+						<reference key="object" ref="323479517"/>
+						<reference key="parent" ref="955319632"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">40</int>
+						<reference key="object" ref="970734229"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="424127272"/>
+						</array>
+						<reference key="parent" ref="1006"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">41</int>
+						<reference key="object" ref="424127272"/>
+						<reference key="parent" ref="970734229"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
+				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="12.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="22.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="24.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="25.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="26.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="28.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">44</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">PrioritizeDialog</string>
+					<string key="superclassName">NSWindowController</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="addSelected:">id</string>
+						<string key="cancel:">id</string>
+						<string key="ok:">id</string>
+						<string key="removeSelected:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="addSelected:">
+							<string key="name">addSelected:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="cancel:">
+							<string key="name">cancel:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="ok:">
+							<string key="name">ok:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="removeSelected:">
+							<string key="name">removeSelected:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="categoryPopUpView">NSPopUpButton</string>
+						<string key="criteriaTableView">NSTableView</string>
+						<string key="prioritizationTableView">NSTableView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="categoryPopUpView">
+							<string key="name">categoryPopUpView</string>
+							<string key="candidateClassName">NSPopUpButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="criteriaTableView">
+							<string key="name">criteriaTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="prioritizationTableView">
+							<string key="name">prioritizationTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/PrioritizeDialog.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<real value="4100" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

cocoa/base/en.lproj/ProblemDialog.strings

@@ -0,0 +1,12 @@
+
+/* Class = "NSWindow"; title = "Problems!"; ObjectID = "1"; */
+"1.title" = "Problems!";
+
+/* Class = "NSTextFieldCell"; title = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results."; ObjectID = "4"; */
+"4.title" = "There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results.";
+
+/* Class = "NSButtonCell"; title = "Close"; ObjectID = "19"; */
+"19.title" = "Close";
+
+/* Class = "NSButtonCell"; title = "Reveal Selected"; ObjectID = "21"; */
+"21.title" = "Reveal Selected";

cocoa/base/en.lproj/ProblemDialog.xib

@@ -0,0 +1,500 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11D50</string>
+		<string key="IBDocument.InterfaceBuilderVersion">2182</string>
+		<string key="IBDocument.AppKitVersion">1138.32</string>
+		<string key="IBDocument.HIToolboxVersion">568.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">2182</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSTextField</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSScrollView</string>
+			<string>NSCustomObject</string>
+			<string>NSTableView</string>
+			<string>NSTableHeaderView</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
+			<string>NSScroller</string>
+			<string>NSTextFieldCell</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">ProblemDialog</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="359561441">
+				<int key="NSWindowStyleMask">11</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{477, 306}, {480, 309}}</string>
+				<int key="NSWTFlags">1685585920</int>
+				<string key="NSWindowTitle">Problems!</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<nil key="NSViewClass"/>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<object class="NSView" key="NSWindowView" id="976198330">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSTextField" id="573725554">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">266</int>
+							<string key="NSFrame">{{17, 238}, {446, 51}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="1063844428">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">272891904</int>
+								<string key="NSContents">There were problems processing some (or all) of the files. The cause of these problems are described in the table below. Those files were not removed from your results.</string>
+								<object class="NSFont" key="NSSupport">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">16</int>
+								</object>
+								<reference key="NSControlView" ref="573725554"/>
+								<object class="NSColor" key="NSBackgroundColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor" id="869923403">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<object class="NSColor" key="NSColor">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSScrollView" id="458371270">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="831830981">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="252791348">
+											<reference key="NSNextResponder" ref="831830981"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{438, 152}</string>
+											<reference key="NSSuperview" ref="831830981"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="903452051">
+												<reference key="NSNextResponder" ref="777677330"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{438, 17}</string>
+												<reference key="NSSuperview" ref="777677330"/>
+												<reference key="NSWindow"/>
+												<reference key="NSTableView" ref="252791348"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="564034022">
+												<reference key="NSNextResponder" ref="458371270"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="458371270"/>
+												<reference key="NSWindow"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns"/>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<object class="NSColor" key="NSBackgroundColor">
+												<int key="NSColorSpace">3</int>
+												<bytes key="NSWhite">MQA</bytes>
+											</object>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">17</double>
+											<int key="NSTvFlags">-702545920</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">4</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {438, 152}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="252791348"/>
+									<reference key="NSDocView" ref="252791348"/>
+									<object class="NSColor" key="NSBGColor" id="765209443">
+										<int key="NSColorSpace">6</int>
+										<string key="NSCatalogName">System</string>
+										<string key="NSColorName">controlBackgroundColor</string>
+										<reference key="NSColor" ref="869923403"/>
+									</object>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="99096694">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSTarget" ref="458371270"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.90131578947368418</double>
+								</object>
+								<object class="NSScroller" id="47224920">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{1, 154}, {438, 15}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="458371270"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1</double>
+									<double key="NSPercent">0.98871331828442433</double>
+								</object>
+								<object class="NSClipView" id="777677330">
+									<reference key="NSNextResponder" ref="458371270"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="903452051"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {438, 17}}</string>
+									<reference key="NSSuperview" ref="458371270"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="903452051"/>
+									<reference key="NSDocView" ref="903452051"/>
+									<reference key="NSBGColor" ref="765209443"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="564034022"/>
+							</array>
+							<string key="NSFrame">{{20, 60}, {440, 170}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="831830981"/>
+							<int key="NSsFlags">133682</int>
+							<reference key="NSVScroller" ref="99096694"/>
+							<reference key="NSHScroller" ref="47224920"/>
+							<reference key="NSContentView" ref="831830981"/>
+							<reference key="NSHeaderClipView" ref="777677330"/>
+							<reference key="NSCornerView" ref="564034022"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+						</object>
+						<object class="NSButton" id="4380169">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">289</int>
+							<string key="NSFrame">{{356, 12}, {110, 32}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="373771329">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Close</string>
+								<object class="NSFont" key="NSSupport" id="680801460">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">13</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="4380169"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="253286088">
+							<reference key="NSNextResponder" ref="976198330"/>
+							<int key="NSvFlags">292</int>
+							<string key="NSFrame">{{14, 12}, {162, 32}}</string>
+							<reference key="NSSuperview" ref="976198330"/>
+							<reference key="NSWindow"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="671547957">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Reveal Selected</string>
+								<reference key="NSSupport" ref="680801460"/>
+								<reference key="NSControlView" ref="253286088"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">129</int>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+					</array>
+					<string key="NSFrameSize">{480, 309}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="359561441"/>
+					</object>
+					<int key="connectionID">22</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">revealSelected:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="253286088"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">problemTableView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="252791348"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">performClose:</string>
+						<reference key="source" ref="359561441"/>
+						<reference key="destination" ref="4380169"/>
+					</object>
+					<int key="connectionID">25</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="359561441"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="976198330"/>
+						</array>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2</int>
+						<reference key="object" ref="976198330"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="573725554"/>
+							<reference ref="458371270"/>
+							<reference ref="4380169"/>
+							<reference ref="253286088"/>
+						</array>
+						<reference key="parent" ref="359561441"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="573725554"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1063844428"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="1063844428"/>
+						<reference key="parent" ref="573725554"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="458371270"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="99096694"/>
+							<reference ref="47224920"/>
+							<reference ref="252791348"/>
+							<reference ref="903452051"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="99096694"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="47224920"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="252791348"/>
+						<array class="NSMutableArray" key="children"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="903452051"/>
+						<reference key="parent" ref="458371270"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="4380169"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="373771329"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="373771329"/>
+						<reference key="parent" ref="4380169"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="253286088"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="671547957"/>
+						</array>
+						<reference key="parent" ref="976198330"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="671547957"/>
+						<reference key="parent" ref="253286088"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="1.IBWindowTemplateEditedContentRect">{{477, 306}, {480, 309}}</string>
+				<boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="21.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">26</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">ProblemDialog</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">revealSelected:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">revealSelected:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">revealSelected:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">problemTableView</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">problemTableView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">problemTableView</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ProblemDialog.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<real value="4100" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>

cocoa/base/en.lproj/ResultWindow.strings

@@ -0,0 +1,96 @@
+
+/* Class = "NSWindow"; title = "dupeGuru Results"; ObjectID = "1"; */
+"1.title" = "dupeGuru Results";
+
+/* Class = "NSTextFieldCell"; title = "Marked: 0 files, 0 B. Total: 0 files, 0 B."; ObjectID = "6"; */
+"6.title" = "Marked: 0 files, 0 B. Total: 0 files, 0 B.";
+
+/* Class = "NSToolbarItem"; label = "Options"; ObjectID = "15"; */
+"15.label" = "Options";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Options"; ObjectID = "15"; */
+"15.paletteLabel" = "Options";
+
+/* Class = "NSToolbarItem"; label = "Filter"; ObjectID = "16"; */
+"16.label" = "Filter";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Filter"; ObjectID = "16"; */
+"16.paletteLabel" = "Filter";
+
+/* Class = "NSToolbarItem"; label = "Action"; ObjectID = "17"; */
+"17.label" = "Action";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Action"; ObjectID = "17"; */
+"17.paletteLabel" = "Action";
+
+/* Class = "NSToolbarItem"; label = "Directories"; ObjectID = "19"; */
+"19.label" = "Directories";
+
+/* Class = "NSToolbarItem"; paletteLabel = "Directories"; ObjectID = "19"; */
+"19.paletteLabel" = "Directories";
+
+/* Class = "NSMenuItem"; title = "Delete Marked and Replace with Hardlinks"; ObjectID = "27"; */
+"27.title" = "Delete Marked and Replace with Hardlinks";
+
+/* Class = "NSMenuItem"; title = "Send Marked to Trash"; ObjectID = "29"; */
+"29.title" = "Send Marked to Trash";
+
+/* Class = "NSMenuItem"; title = "Move Marked to..."; ObjectID = "30"; */
+"30.title" = "Move Marked to...";
+
+/* Class = "NSMenuItem"; title = "Copy Marked to..."; ObjectID = "31"; */
+"31.title" = "Copy Marked to...";
+
+/* Class = "NSMenuItem"; title = "Remove Marked from Results"; ObjectID = "32"; */
+"32.title" = "Remove Marked from Results";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "34"; */
+"34.title" = "Remove Selected from Results";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "35"; */
+"35.title" = "Add Selected to Ignore List";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "36"; */
+"36.title" = "Make Selected Reference";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "38"; */
+"38.title" = "Open Selected with Default Application";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "39"; */
+"39.title" = "Reveal Selected in Finder";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "40"; */
+"40.title" = "Rename Selected";
+
+/* Class = "NSSearchFieldCell"; placeholderString = "Filter"; ObjectID = "42"; */
+"42.placeholderString" = "Filter";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[0] = "Details"; ObjectID = "44"; */
+"44.ibShadowedLabels[0]" = "Details";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[1] = "Dupes Only"; ObjectID = "44"; */
+"44.ibShadowedLabels[1]" = "Dupes Only";
+
+/* Class = "NSSegmentedCell"; 44.ibShadowedLabels[2] = "Delta"; ObjectID = "44"; */
+"44.ibShadowedLabels[2]" = "Delta";
+
+/* Class = "NSMenu"; title = "Menu"; ObjectID = "67"; */
+"67.title" = "Menu";
+
+/* Class = "NSMenuItem"; title = "Add Selected to Ignore List"; ObjectID = "68"; */
+"68.title" = "Add Selected to Ignore List";
+
+/* Class = "NSMenuItem"; title = "Rename Selected"; ObjectID = "70"; */
+"70.title" = "Rename Selected";
+
+/* Class = "NSMenuItem"; title = "Remove Selected from Results"; ObjectID = "71"; */
+"71.title" = "Remove Selected from Results";
+
+/* Class = "NSMenuItem"; title = "Make Selected Reference"; ObjectID = "72"; */
+"72.title" = "Make Selected Reference";
+
+/* Class = "NSMenuItem"; title = "Reveal Selected in Finder"; ObjectID = "73"; */
+"73.title" = "Reveal Selected in Finder";
+
+/* Class = "NSMenuItem"; title = "Open Selected with Default Application"; ObjectID = "74"; */
+"74.title" = "Open Selected with Default Application";

cocoa/base/main.m

@@ -0,0 +1,41 @@
+/* 
+Copyright 2012 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 <Cocoa/Cocoa.h>
+#import <Python.h>
+#import <wchar.h>
+#import <locale.h>
+
+int main(int argc, char *argv[])
+{
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    /* We have to set the locate to UTF8 for mbstowcs() to correctly convert non-ascii chars in paths */
+    setlocale(LC_ALL, "en_US.UTF-8");
+    NSString *respath = [[NSBundle mainBundle] resourcePath];
+    NSString *mainpy = [respath stringByAppendingPathComponent:@"dg_cocoa.py"];
+    wchar_t wPythonPath[PATH_MAX+1];
+    NSString *pypath = [respath stringByAppendingPathComponent:@"py"];
+    mbstowcs(wPythonPath, [pypath fileSystemRepresentation], PATH_MAX+1);
+    Py_SetPath(wPythonPath);
+    Py_SetPythonHome(wPythonPath);
+    Py_Initialize();
+    PyEval_InitThreads();
+    PyGILState_STATE gilState = PyGILState_Ensure();
+    FILE* fp = fopen([mainpy UTF8String], "r");
+    PyRun_SimpleFile(fp, [mainpy UTF8String]);
+    fclose(fp);
+    PyGILState_Release(gilState);
+    if (gilState == PyGILState_LOCKED) {
+        PyThreadState_Swap(NULL);
+        PyEval_ReleaseLock();
+    }
+    int result = NSApplicationMain(argc,  (const char **) argv);
+    Py_Finalize();
+    [pool release];
+    return result;
+}

cocoa/inter/app.py

@@ -0,0 +1,219 @@
+import logging
+
+from objp.util import pyref, dontwrap
+from jobprogress import job
+import cocoa
+from cocoa import install_exception_hook, proxy
+from cocoa.inter import PyFairware, FairwareView
+from hscommon.trans import trget
+
+from core.app import JobType
+
+tr = trget('ui')
+
+JOBID2TITLE = {
+    JobType.Scan: tr("Scanning for duplicates"),
+    JobType.Load: tr("Loading"),
+    JobType.Move: tr("Moving"),
+    JobType.Copy: tr("Copying"),
+    JobType.Delete: tr("Sending to Trash"),
+}
+
+class DupeGuruView(FairwareView):
+    def askYesNoWithPrompt_(self, prompt: str) -> bool: pass
+    def showProblemDialog(self): pass
+    def selectDestFolderWithPrompt_(self, prompt: str) -> str: pass
+
+class PyDupeGuruBase(PyFairware):
+    FOLLOW_PROTOCOLS = ['Worker']
+    
+    @dontwrap
+    def _init(self, modelclass):
+        logging.basicConfig(level=logging.WARNING, format='%(levelname)s %(message)s')
+        install_exception_hook()
+        appdata = proxy.getAppdataPath()
+        self.model = modelclass(self, appdata)
+        self.progress = cocoa.ThreadedJobPerformer()
+    
+    #---Sub-proxies
+    def detailsPanel(self) -> pyref:
+        return self.model.details_panel
+    
+    def directoryTree(self) -> pyref:
+        return self.model.directory_tree
+    
+    def problemDialog(self) -> pyref:
+        return self.model.problem_dialog
+    
+    def statsLabel(self) -> pyref:
+        return self.model.stats_label
+    
+    def resultTable(self) -> pyref:
+        return self.model.result_table
+    
+    def ignoreListDialog(self) -> pyref:
+        return self.model.ignore_list_dialog
+    
+    #---Directories
+    def addDirectory_(self, directory: str) -> int:
+        return self.model.add_directory(directory)
+    
+    #---Results
+    def doScan(self):
+        self.model.start_scanning()
+    
+    def exportToXHTML(self) -> str:
+        return self.model.export_to_xhtml()
+    
+    def loadSession(self):
+        self.model.load()
+    
+    def loadResultsFrom_(self, filename: str):
+        self.model.load_from(filename)
+    
+    def markAll(self):
+        self.model.mark_all()
+    
+    def markNone(self):
+        self.model.mark_none()
+    
+    def markInvert(self):
+        self.model.mark_invert()
+    
+    def purgeIgnoreList(self):
+        self.model.purge_ignore_list()
+    
+    def toggleSelectedMark(self):
+        self.model.toggle_selected_mark_state()
+    
+    def saveSession(self):
+        self.model.save()
+    
+    def saveResultsAs_(self, filename: str):
+        self.model.save_as(filename)
+    
+    #---Actions
+    def addSelectedToIgnoreList(self):
+        self.model.add_selected_to_ignore_list()
+    
+    def deleteMarked(self):
+        self.model.delete_marked()
+    
+    def hardlinkMarked(self):
+        self.model.delete_marked(replace_with_hardlinks=True)
+    
+    def applyFilter_(self, filter: str):
+        self.model.apply_filter(filter)
+    
+    def makeSelectedReference(self):
+        self.model.make_selected_reference()
+    
+    def copyMarked(self):
+        self.model.copy_or_move_marked(copy=True)
+    
+    def moveMarked(self):
+        self.model.copy_or_move_marked(copy=False)
+    
+    def openSelected(self):
+        self.model.open_selected()
+    
+    def removeMarked(self):
+        self.model.remove_marked()
+    
+    def removeSelected(self):
+        self.model.remove_selected()
+    
+    def revealSelected(self):
+        self.model.reveal_selected()
+
+    def invokeCustomCommand(self):
+        self.model.invoke_custom_command()
+    
+    def showIgnoreList(self):
+        self.model.ignore_list_dialog.show()
+    
+    #---Information
+    def resultsAreModified(self) -> bool:
+        return self.model.results.is_modified
+    
+    #---Properties
+    def setMixFileKind_(self, mix_file_kind: bool):
+        self.model.scanner.mix_file_kind = mix_file_kind
+    
+    def setEscapeFilterRegexp_(self, escape_filter_regexp: bool):
+        self.model.options['escape_filter_regexp'] = escape_filter_regexp
+    
+    def setRemoveEmptyFolders_(self, remove_empty_folders: bool):
+        self.model.options['clean_empty_dirs'] = remove_empty_folders
+    
+    def setIgnoreHardlinkMatches_(self, ignore_hardlink_matches: bool):
+        self.model.options['ignore_hardlink_matches'] = ignore_hardlink_matches
+    
+    def setCopyMoveDestType_(self, copymove_dest_type: int):
+        self.model.options['copymove_dest_type'] = copymove_dest_type
+    
+    #---Worker
+    def getJobProgress(self) -> object: # NSNumber
+        try:
+            return self.progress.last_progress
+        except AttributeError:
+            # I have *no idea* why this can possible happen (last_progress is always set by
+            # create_job() *before* any threaded job notification, which shows the progress panel,
+            # is sent), but it happens anyway, so there we go. ref: #106
+            return -1
+    
+    def getJobDesc(self) -> str:
+        try:
+            return self.progress.last_desc
+        except AttributeError:
+            # see getJobProgress
+            return ''
+    
+    def cancelJob(self):
+        self.progress.job_cancelled = True
+    
+    def jobCompleted_(self, jobid: str):
+        result = self.model._job_completed(jobid, self.progress.last_error)
+        if not result:
+            self.progress.reraise_if_error()
+    
+    #--- model --> view
+    @dontwrap
+    def open_path(self, path):
+        proxy.openPath_(str(path))
+    
+    @dontwrap
+    def reveal_path(self, path):
+        proxy.revealPath_(str(path))
+    
+    @dontwrap
+    def start_job(self, jobid, func, args=()):
+        try:
+            j = self.progress.create_job()
+            args = tuple([j] + list(args))
+            self.progress.run_threaded(func, args=args)
+        except job.JobInProgressError:
+            proxy.postNotification_userInfo_('JobInProgress', None)
+        else:
+            ud = {'desc': JOBID2TITLE[jobid], 'jobid':jobid}
+            proxy.postNotification_userInfo_('JobStarted', ud)
+    
+    @dontwrap
+    def ask_yes_no(self, prompt):
+        return self.callback.askYesNoWithPrompt_(prompt)
+    
+    @dontwrap
+    def show_results_window(self):
+        # Not needed yet because our progress dialog is shown as a sheet of the results window,
+        # which causes it to be already visible when the scan/load ends.
+        # XXX Make progress sheet be a child of the folder selection window.
+        pass
+    
+    @dontwrap
+    def show_problem_dialog(self):
+        self.callback.showProblemDialog()
+    
+    @dontwrap
+    def select_dest_folder(self, prompt):
+        return self.callback.selectDestFolderWithPrompt_(prompt)
+    

cocoa/inter/app_me.py

@@ -0,0 +1,280 @@
+# Created By: Virgil Dupras
+# Created On: 2006/11/16
+# Copyright 2012 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 logging
+from appscript import app, its, k, CommandError, ApplicationNotFoundError
+import plistlib
+import time
+import os.path as op
+
+from cocoa import as_fetch, proxy
+from hscommon import io
+from hscommon.trans import trget
+from hscommon.path import Path
+
+from core import directories
+from core.app import JobType
+from core.scanner import ScanType
+from core_me.app import DupeGuru as DupeGuruBase
+from core_me import fs
+from .app import JOBID2TITLE, PyDupeGuruBase
+
+tr = trget('ui')
+
+JobType.RemoveDeadTracks = 'jobRemoveDeadTracks'
+JobType.ScanDeadTracks = 'jobScanDeadTracks'
+
+JOBID2TITLE.update({
+    JobType.RemoveDeadTracks: tr("Removing dead tracks from your iTunes Library"),
+    JobType.ScanDeadTracks: tr("Scanning the iTunes Library"),
+})
+
+ITUNES = 'iTunes'
+ITUNES_PATH = Path('iTunes Library')
+
+def get_itunes_library(a):
+    try:
+        [source] = [s for s in a.sources(timeout=0) if s.kind(timeout=0) == k.library]
+        [library] = source.library_playlists(timeout=0)
+        return library
+    except ValueError:
+        logging.warning('Some unexpected iTunes configuration encountered')
+        return None
+
+class ITunesSong(fs.MusicFile):
+    def __init__(self, song_data):
+        path = Path(proxy.url2path_(song_data['Location']))
+        fs.MusicFile.__init__(self, path)
+        self.id = song_data['Track ID']
+    
+    def remove_from_library(self):
+        try:
+            a = app(ITUNES)
+            library = get_itunes_library(a)
+            if library is None:
+                return
+            [song] = library.file_tracks[its.database_ID == self.id]()
+            a.delete(song, timeout=0)
+        except ValueError:
+            msg = "Could not find song '{}' (trackid: {}) in iTunes Library".format(str(self.path), self.id)
+            raise EnvironmentError(msg)
+        except (CommandError, RuntimeError) as e:
+            raise EnvironmentError(str(e))
+    
+    display_folder_path = ITUNES_PATH
+
+def get_itunes_database_path():
+    plisturls = proxy.prefValue_inDomain_('iTunesRecentDatabases', 'com.apple.iApps')
+    if not plisturls:
+        raise directories.InvalidPathError()
+    plistpath = proxy.url2path_(plisturls[0])
+    return Path(plistpath)
+
+def get_itunes_songs(plistpath):
+    if not io.exists(plistpath):
+        return []
+    plist = plistlib.readPlist(str(plistpath))
+    result = []
+    for song_data in plist['Tracks'].values():
+        if song_data['Track Type'] != 'File':
+            continue
+        song = ITunesSong(song_data)
+        if io.exists(song.path):
+            result.append(song)
+    return result
+
+class Directories(directories.Directories):
+    def __init__(self, fileclasses):
+        directories.Directories.__init__(self, fileclasses)
+        try:
+            self.itunes_libpath = get_itunes_database_path()
+        except directories.InvalidPathError:
+            self.itunes_libpath = None
+    
+    def _get_files(self, from_path, j):
+        if from_path == ITUNES_PATH:
+            if self.itunes_libpath is None:
+                return []
+            is_ref = self.get_state(from_path) == directories.DirectoryState.Reference
+            songs = get_itunes_songs(self.itunes_libpath)
+            for song in songs:
+                song.is_ref = is_ref
+            return songs
+        else:
+            return directories.Directories._get_files(self, from_path, j)
+    
+    @staticmethod
+    def get_subfolders(path):
+        if path == ITUNES_PATH:
+            return []
+        else:
+            return directories.Directories.get_subfolders(path)
+    
+    def add_path(self, path):
+        if path == ITUNES_PATH:
+            if path not in self:
+                self._dirs.append(path)
+        else:
+            directories.Directories.add_path(self, path)
+    
+    def has_itunes_path(self):
+        return any(path == ITUNES_PATH for path in self._dirs)
+    
+    def has_any_file(self):
+        # If we don't do that, it causes a hangup in the GUI when we click Start Scanning because
+        # checking if there's any file to scan involves reading the whole library. If we have the
+        # iTunes library, we assume we have at least one file.
+        if self.has_itunes_path():
+            return True
+        else:
+            return directories.Directories.has_any_file(self)
+    
+
+class DupeGuruME(DupeGuruBase):
+    def __init__(self, view, appdata):
+        appdata = op.join(appdata, 'dupeGuru Music Edition')
+        DupeGuruBase.__init__(self, view, appdata)
+        # Use fileclasses set in DupeGuruBase.__init__()
+        self.directories = Directories(fileclasses=self.directories.fileclasses)
+        self.dead_tracks = []
+    
+    def _do_delete(self, j, replace_with_hardlinks):
+        # XXX If I read correctly, Python 3.3 will allow us to go fetch inner function easily, so
+        # we'll be able to replace "op" below with DupeGuruBase._do_delete.op.
+        def op(dupe):
+            j.add_progress()
+            return self._do_delete_dupe(dupe, replace_with_hardlinks)
+        
+        marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
+        j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
+        if any(isinstance(dupe, ITunesSong) for dupe in marked):
+            j.add_progress(0, desc=tr("Talking to iTunes. Don't touch it!"))
+            try:
+                a = app(ITUNES)
+                a.activate(timeout=0)
+            except (CommandError, RuntimeError, ApplicationNotFoundError):
+                pass
+        self.results.perform_on_marked(op, True)
+    
+    def _do_delete_dupe(self, dupe, replace_with_hardlinks):
+        if isinstance(dupe, ITunesSong):
+            dupe.remove_from_library()
+        DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks)
+    
+    def _create_file(self, path):
+        if (self.directories.itunes_libpath is not None) and (path in self.directories.itunes_libpath[:-1]):
+            if not hasattr(self, 'itunes_songs'):
+                songs = get_itunes_songs(self.directories.itunes_libpath)
+                self.itunes_songs = {song.path: song for song in songs}
+            if path in self.itunes_songs:
+                return self.itunes_songs[path]
+            else:
+                pass # We'll return the default file type, as per the last line of this method
+        return DupeGuruBase._create_file(self, path)
+    
+    def _job_completed(self, jobid, exc):
+        if (jobid in {JobType.RemoveDeadTracks, JobType.ScanDeadTracks}) and (exc is not None):
+            msg = tr("There were communication problems with iTunes. The operation couldn't be completed.")
+            self.view.show_message(msg)
+            return True
+        if jobid == JobType.ScanDeadTracks:
+            dead_tracks_count = len(self.dead_tracks)
+            if dead_tracks_count > 0:
+                msg = tr("Your iTunes Library contains %d dead tracks ready to be removed. Continue?")
+                if self.view.ask_yes_no(msg % dead_tracks_count):
+                    self.remove_dead_tracks()
+            else:
+                msg = tr("You have no dead tracks in your iTunes Library")
+                self.view.show_message(msg)
+        if jobid == JobType.Load:
+            if hasattr(self, 'itunes_songs'):
+                # If we load another file, we want a refresh song list
+                del self.itunes_songs
+        DupeGuruBase._job_completed(self, jobid, exc)
+    
+    def copy_or_move(self, dupe, copy, destination, dest_type):
+        if isinstance(dupe, ITunesSong):
+            copy = True
+        return DupeGuruBase.copy_or_move(self, dupe, copy, destination, dest_type)
+    
+    def start_scanning(self):
+        if self.directories.has_itunes_path():
+            try:
+                app(ITUNES)
+            except ApplicationNotFoundError:
+                self.view.show_message(tr("The iTunes application couldn't be found."))
+                return
+        DupeGuruBase.start_scanning(self)
+    
+    def remove_dead_tracks(self):
+        def do(j):
+            a = app(ITUNES)
+            a.activate(timeout=0)
+            for index, track in enumerate(j.iter_with_progress(self.dead_tracks)):
+                if index % 100 == 0:
+                    time.sleep(.1)
+                try:
+                    track.delete(timeout=0)
+                except CommandError as e:
+                    logging.warning('Error while trying to remove a track from iTunes: %s' % str(e))
+        
+        self.view.start_job(JobType.RemoveDeadTracks, do)
+    
+    def scan_dead_tracks(self):
+        def do(j):
+            a = app(ITUNES)
+            a.activate(timeout=0)
+            library = get_itunes_library(a)
+            if library is None:
+                return
+            self.dead_tracks = []
+            tracks = as_fetch(library.file_tracks, k.file_track)
+            for index, track in enumerate(j.iter_with_progress(tracks)):
+                if index % 100 == 0:
+                    time.sleep(.1)
+                if track.location(timeout=0) == k.missing_value:
+                    self.dead_tracks.append(track)
+            logging.info('Found %d dead tracks' % len(self.dead_tracks))
+        
+        self.view.start_job(JobType.ScanDeadTracks, do)
+    
+class PyDupeGuru(PyDupeGuruBase):
+    def __init__(self):
+        self._init(DupeGuruME)
+    
+    def scanDeadTracks(self):
+        self.model.scan_dead_tracks()
+    
+    #---Properties
+    def setMinMatchPercentage_(self, percentage: int):
+        self.model.scanner.min_match_percentage = percentage
+    
+    def setScanType_(self, scan_type: int):
+        try:
+            self.model.scanner.scan_type = [
+                ScanType.Filename,
+                ScanType.Fields,
+                ScanType.FieldsNoOrder,
+                ScanType.Tag,
+                ScanType.Contents,
+                ScanType.ContentsAudio,
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self, words_are_weighted: bool):
+        self.model.scanner.word_weighting = words_are_weighted
+    
+    def setMatchSimilarWords_(self, match_similar_words: bool):
+        self.model.scanner.match_similar_words = match_similar_words
+    
+    def enable_scanForTag_(self, enable: bool, scan_tag: str):
+        if enable:
+            self.model.scanner.scanned_tags.add(scan_tag)
+        else:
+            self.model.scanner.scanned_tags.discard(scan_tag)

cocoa/inter/app_pe.py

@@ -0,0 +1,233 @@
+# Created By: Virgil Dupras
+# Created On: 2006/11/13
+# Copyright 2012 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 os.path as op
+import plistlib
+import logging
+import re
+
+from appscript import app, its, CommandError, ApplicationNotFoundError
+
+from hscommon import io
+from hscommon.util import remove_invalid_xml
+from hscommon.path import Path
+from hscommon.trans import trget
+from cocoa import proxy
+
+from core.scanner import ScanType
+from core import directories
+from core_pe import _block_osx
+from core_pe.photo import Photo as PhotoBase
+from core_pe.app import DupeGuru as DupeGuruBase
+from .app import PyDupeGuruBase
+
+tr = trget('ui')
+
+IPHOTO_PATH = Path('iPhoto Library')
+
+class Photo(PhotoBase):
+    HANDLED_EXTS = PhotoBase.HANDLED_EXTS.copy()
+    HANDLED_EXTS.update({'psd', 'nef', 'cr2', 'orf'})
+    
+    def _plat_get_dimensions(self):
+        return _block_osx.get_image_size(str(self.path))
+    
+    def _plat_get_blocks(self, block_count_per_side, orientation):
+        try:
+            blocks = _block_osx.getblocks(str(self.path), block_count_per_side, orientation)
+        except Exception as e:
+            raise IOError('The reading of "%s" failed with "%s"' % (str(self.path), str(e)))
+        if not blocks:
+            raise IOError('The picture %s could not be read' % str(self.path))
+        return blocks
+    
+
+class IPhoto(Photo):
+    @property
+    def display_folder_path(self):
+        return IPHOTO_PATH
+    
+def get_iphoto_database_path():
+    plisturls = proxy.prefValue_inDomain_('iPhotoRecentDatabases', 'com.apple.iApps')
+    if not plisturls:
+        raise directories.InvalidPathError()
+    plistpath = proxy.url2path_(plisturls[0])
+    return Path(plistpath)
+
+def get_iphoto_pictures(plistpath):
+    if not io.exists(plistpath):
+        return []
+    s = io.open(plistpath, 'rt', encoding='utf-8').read()
+    # There was a case where a guy had 0x10 chars in his plist, causing expat errors on loading
+    s = remove_invalid_xml(s, replace_with='')
+    # It seems that iPhoto sometimes doesn't properly escape & chars. The regexp below is to find
+    # any & char that is not a &-based entity (&, ", etc.). based on TextMate's XML
+    # bundle's regexp
+    s, count = re.subn(r'&(?![a-zA-Z0-9_-]+|#[0-9]+|#x[0-9a-fA-F]+;)', '', s)
+    if count:
+        logging.warning("%d invalid XML entities replacement made", count)
+    plist = plistlib.readPlistFromBytes(s.encode('utf-8'))
+    result = []
+    for photo_data in plist['Master Image List'].values():
+        if photo_data['MediaType'] != 'Image':
+            continue
+        photo_path = Path(photo_data['ImagePath'])
+        photo = IPhoto(photo_path)
+        result.append(photo)
+    return result
+
+class Directories(directories.Directories):
+    def __init__(self):
+        directories.Directories.__init__(self, fileclasses=[Photo])
+        try:
+            self.iphoto_libpath = get_iphoto_database_path()
+            self.set_state(self.iphoto_libpath[:-1], directories.DirectoryState.Excluded)
+        except directories.InvalidPathError:
+            self.iphoto_libpath = None
+    
+    def _get_files(self, from_path, j):
+        if from_path == IPHOTO_PATH:
+            if self.iphoto_libpath is None:
+                return []
+            is_ref = self.get_state(from_path) == directories.DirectoryState.Reference
+            photos = get_iphoto_pictures(self.iphoto_libpath)
+            for photo in photos:
+                photo.is_ref = is_ref
+            return photos
+        else:
+            return directories.Directories._get_files(self, from_path, j)
+    
+    @staticmethod
+    def get_subfolders(path):
+        if path == IPHOTO_PATH:
+            return []
+        else:
+            return directories.Directories.get_subfolders(path)
+    
+    def add_path(self, path):
+        if path == IPHOTO_PATH:
+            if path not in self:
+                self._dirs.append(path)
+        else:
+            directories.Directories.add_path(self, path)
+    
+    def has_iphoto_path(self):
+        return any(path == IPHOTO_PATH for path in self._dirs)
+    
+    def has_any_file(self):
+        # If we don't do that, it causes a hangup in the GUI when we click Start Scanning because
+        # checking if there's any file to scan involves reading the whole library. If we have the
+        # iPhoto library, we assume we have at least one file.
+        if self.has_iphoto_path():
+            return True
+        else:
+            return directories.Directories.has_any_file(self)
+    
+
+class DupeGuruPE(DupeGuruBase):
+    def __init__(self, view, appdata):
+        appdata = op.join(appdata, 'dupeGuru Picture Edition')
+        DupeGuruBase.__init__(self, view, appdata)
+        self.directories = Directories()
+    
+    def _do_delete(self, j, replace_with_hardlinks):
+        def op(dupe):
+            j.add_progress()
+            return self._do_delete_dupe(dupe, replace_with_hardlinks)
+        
+        marked = [dupe for dupe in self.results.dupes if self.results.is_marked(dupe)]
+        j.start_job(self.results.mark_count, tr("Sending dupes to the Trash"))
+        if any(isinstance(dupe, IPhoto) for dupe in marked):
+            j.add_progress(0, desc=tr("Talking to iPhoto. Don't touch it!"))
+            try:
+                a = app('iPhoto')
+                a.activate(timeout=0)
+                a.select(a.photo_library_album(timeout=0), timeout=0)
+            except (CommandError, RuntimeError, ApplicationNotFoundError):
+                pass
+        self.results.perform_on_marked(op, True)
+    
+    def _do_delete_dupe(self, dupe, replace_with_hardlinks):
+        if isinstance(dupe, IPhoto):
+            try:
+                a = app('iPhoto')
+                album = a.photo_library_album()
+                if album is None:
+                    msg = "There are communication problems with iPhoto. Try opening iPhoto first, it might solve it."
+                    raise EnvironmentError(msg)
+                [photo] = album.photos[its.image_path == str(dupe.path)]()
+                a.remove(photo, timeout=0)
+            except ValueError:
+                msg = "Could not find photo '{}' in iPhoto Library".format(str(dupe.path))
+                raise EnvironmentError(msg)
+            except (CommandError, RuntimeError) as e:
+                raise EnvironmentError(str(e))
+        else:
+            DupeGuruBase._do_delete_dupe(self, dupe, replace_with_hardlinks)
+    
+    def _create_file(self, path):
+        if (self.directories.iphoto_libpath is not None) and (path in self.directories.iphoto_libpath[:-1]):
+            return IPhoto(path)
+        return DupeGuruBase._create_file(self, path)
+    
+    def copy_or_move(self, dupe, copy, destination, dest_type):
+        if isinstance(dupe, IPhoto):
+            copy = True
+        return DupeGuruBase.copy_or_move(self, dupe, copy, destination, dest_type)
+    
+    def selected_dupe_path(self):
+        if not self.selected_dupes:
+            return None
+        return self.selected_dupes[0].path
+    
+    def selected_dupe_ref_path(self):
+        if not self.selected_dupes:
+            return None
+        ref = self.results.get_group_of_duplicate(self.selected_dupes[0]).ref
+        if ref is self.selected_dupes[0]: # we don't want the same pic to be displayed on both sides
+            return None
+        return ref.path
+    
+    def start_scanning(self):
+        if self.directories.has_iphoto_path():
+            try:
+                app('iPhoto')
+            except ApplicationNotFoundError:
+                self.view.show_message(tr("The iPhoto application couldn't be found."))
+                return
+        DupeGuruBase.start_scanning(self)
+    
+class PyDupeGuru(PyDupeGuruBase):
+    def __init__(self):
+        self._init(DupeGuruPE)
+    
+    def clearPictureCache(self):
+        self.model.scanner.clear_picture_cache()
+    
+    #---Information    
+    def getSelectedDupePath(self) -> str:
+        return str(self.model.selected_dupe_path())
+    
+    def getSelectedDupeRefPath(self) -> str:
+        return str(self.model.selected_dupe_ref_path())
+    
+    #---Properties
+    def setScanType_(self, scan_type: int):
+        try:
+            self.model.scanner.scan_type = [
+                ScanType.FuzzyBlock,
+                ScanType.ExifTimestamp,
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setMatchScaled_(self, match_scaled: bool):
+        self.model.scanner.match_scaled = match_scaled
+    
+    def setMinMatchPercentage_(self, percentage: int):
+        self.model.scanner.threshold = percentage

cocoa/inter/app_se.py

@@ -0,0 +1,102 @@
+# Created By: Virgil Dupras
+# Created On: 2009-05-24
+# Copyright 2012 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 logging
+import os.path as op
+
+from hscommon import io
+from hscommon.path import Path
+from cocoa import proxy
+
+from core.scanner import ScanType
+from core import fs
+from core.directories import Directories as DirectoriesBase, DirectoryState
+from core_se.app import DupeGuru as DupeGuruBase
+from .app import PyDupeGuruBase
+
+def is_bundle(str_path):
+    uti = proxy.getUTI_(str_path)
+    if uti is None:
+        logging.warning('There was an error trying to detect the UTI of %s', str_path)
+    return proxy.type_conformsToType_(uti, 'com.apple.bundle') or proxy.type_conformsToType_(uti, 'com.apple.package')
+
+class Bundle(fs.Folder):
+    @classmethod
+    def can_handle(cls, path):
+        return not io.islink(path) and io.isdir(path) and is_bundle(str(path))
+    
+
+class Directories(DirectoriesBase):
+    ROOT_PATH_TO_EXCLUDE = list(map(Path, ['/Library', '/Volumes', '/System', '/bin', '/sbin', '/opt', '/private', '/dev']))
+    HOME_PATH_TO_EXCLUDE = [Path('Library')]
+    def __init__(self):
+        DirectoriesBase.__init__(self, fileclasses=[Bundle, fs.File])
+    
+    def _default_state_for_path(self, path):
+        result = DirectoriesBase._default_state_for_path(self, path)
+        if result is not None:
+            return result
+        if path in self.ROOT_PATH_TO_EXCLUDE:
+            return DirectoryState.Excluded
+        if path[:2] == Path('/Users') and path[3:] in self.HOME_PATH_TO_EXCLUDE:
+            return DirectoryState.Excluded
+    
+    def _get_folders(self, from_folder, j):
+        # We don't want to scan bundle's subfolder even in Folders mode. Bundle's integrity has to
+        # stay intact.
+        if is_bundle(str(from_folder.path)):
+            # just yield the current folder and bail
+            state = self.get_state(from_folder.path)
+            if state != DirectoryState.Excluded:
+                from_folder.is_ref = state == DirectoryState.Reference
+                yield from_folder
+            return
+        else:
+            for folder in DirectoriesBase._get_folders(self, from_folder, j):
+                yield folder
+    
+    @staticmethod
+    def get_subfolders(path):
+        result = DirectoriesBase.get_subfolders(path)
+        return [p for p in result if not is_bundle(str(p))]
+    
+
+class DupeGuru(DupeGuruBase):
+    def __init__(self, view, appdata):
+        appdata = op.join(appdata, 'dupeGuru')
+        DupeGuruBase.__init__(self, view, appdata)
+        self.directories = Directories()
+    
+
+class PyDupeGuru(PyDupeGuruBase):
+    def __init__(self):
+        self._init(DupeGuru)
+    
+    #---Properties
+    def setMinMatchPercentage_(self, percentage: int):
+        self.model.scanner.min_match_percentage = int(percentage)
+    
+    def setScanType_(self, scan_type: int):
+        try:
+            self.model.scanner.scan_type = [
+                ScanType.Filename,
+                ScanType.Contents,
+                ScanType.Folders,
+            ][scan_type]
+        except IndexError:
+            pass
+    
+    def setWordWeighting_(self, words_are_weighted: bool):
+        self.model.scanner.word_weighting = words_are_weighted
+    
+    def setMatchSimilarWords_(self, match_similar_words: bool):
+        self.model.scanner.match_similar_words = match_similar_words
+    
+    def setSizeThreshold_(self, size_threshold: int):
+        self.model.scanner.size_threshold = size_threshold
+    

cocoa/inter/details_panel.py

@@ -0,0 +1,11 @@
+from cocoa.inter import PyGUIObject, GUIObjectView
+
+class DetailsPanelView(GUIObjectView):
+    pass
+
+class PyDetailsPanel(PyGUIObject):
+    def numberOfRows(self) -> int:
+        return self.model.row_count()
+    
+    def valueForColumn_row_(self, column: str, row: int) -> object:
+        return self.model.row(row)[int(column)]

cocoa/inter/directory_outline.py

@@ -0,0 +1,18 @@
+from objp.util import dontwrap
+from cocoa.inter import PyOutline, GUIObjectView
+
+class DirectoryOutlineView(GUIObjectView):
+    pass
+
+class PyDirectoryOutline(PyOutline):
+    def addDirectory_(self, path: str):
+        self.model.add_directory(path)
+    
+    def removeSelectedDirectory(self):
+        self.model.remove_selected()
+    
+    # python --> cocoa
+    @dontwrap
+    def refresh_states(self):
+        # Under cocoa, both refresh() and refresh_states() do the same thing.
+        self.callback.refresh()

cocoa/inter/ignore_list_dialog.py

@@ -0,0 +1,20 @@
+from objp.util import pyref
+from cocoa.inter import PyGUIObject, GUIObjectView
+
+class IgnoreListDialogView(GUIObjectView):
+    def show(self): pass
+
+class PyIgnoreListDialog(PyGUIObject):
+    def ignoreListTable(self) -> pyref:
+        return self.model.ignore_list_table
+    
+    def removeSelected(self):
+        self.model.remove_selected()
+    
+    def clear(self):
+        self.model.clear()
+    
+    #--- model --> view
+    def show(self):
+        self.callback.show()
+    

cocoa/inter/prioritize_dialog.py

@@ -0,0 +1,29 @@
+from objp.util import pyref
+from cocoa.inter import PyGUIObject, GUIObjectView
+from core.gui.prioritize_dialog import PrioritizeDialog
+
+class PrioritizeDialogView(GUIObjectView):
+    pass
+
+class PyPrioritizeDialog(PyGUIObject):
+    def __init__(self, app: pyref):
+        model = PrioritizeDialog(app.model)
+        PyGUIObject.__init__(self, model)
+    
+    def categoryList(self) -> pyref:
+        return self.model.category_list
+    
+    def criteriaList(self) -> pyref:
+        return self.model.criteria_list
+    
+    def prioritizationList(self) -> pyref:
+        return self.model.prioritization_list
+    
+    def addSelected(self):
+        self.model.add_selected()
+    
+    def removeSelected(self):
+        self.model.remove_selected()
+    
+    def performReprioritization(self):
+        self.model.perform_reprioritization()

cocoa/inter/prioritize_list.py

@@ -0,0 +1,8 @@
+from cocoa.inter import PySelectableList, SelectableListView
+
+class PrioritizeListView(SelectableListView):
+    pass
+
+class PyPrioritizeList(PySelectableList):
+    def moveIndexes_toIndex_(self, indexes: list, dest_index: int):
+        self.model.move_indexes(indexes, dest_index)

cocoa/inter/problem_dialog.py

@@ -0,0 +1,9 @@
+from objp.util import pyref
+from cocoa.inter import PyGUIObject
+
+class PyProblemDialog(PyGUIObject):
+    def problemTable(self) -> pyref:
+        return self.model.problem_table
+    
+    def revealSelected(self):
+        self.model.reveal_selected_dupe()

cocoa/inter/result_table.py

@@ -0,0 +1,49 @@
+from objp.util import dontwrap
+from cocoa.inter import PyTable, TableView
+
+class ResultTableView(TableView):
+    def invalidateMarkings(self): pass
+
+class PyResultTable(PyTable):
+    def powerMarkerMode(self) -> bool:
+        return self.model.power_marker
+    
+    def setPowerMarkerMode_(self, value: bool):
+        self.model.power_marker = value
+    
+    def deltaValuesMode(self) -> bool:
+        return self.model.delta_values
+    
+    def setDeltaValuesMode_(self, value: bool):
+        self.model.delta_values = value
+    
+    def deltaColumns(self) -> list:
+        return list(self.model.DELTA_COLUMNS)
+    
+    def valueForRow_column_(self, row_index: int, column: str) -> object:
+        return self.model.get_row_value(row_index, column)
+    
+    def renameSelected_(self, newname: str) -> bool:
+        return self.model.rename_selected(newname)
+    
+    def sortBy_ascending_(self, key: str, asc: bool):
+        self.model.sort(key, asc)
+    
+    def markSelected(self):
+        self.model.app.toggle_selected_mark_state()
+    
+    def removeSelected(self):
+        self.model.app.remove_selected()
+    
+    def selectedDupeCount(self) -> int:
+        return self.model.selected_dupe_count
+    
+    def pathAtIndex_(self, index: int) -> str:
+        row = self.model[index]
+        return str(row._dupe.path)
+    
+    # python --> cocoa
+    @dontwrap
+    def invalidate_markings(self):
+        self.callback.invalidateMarkings()
+    

cocoa/inter/stats_label.py

@@ -0,0 +1,9 @@
+from cocoa.inter import PyGUIObject, GUIObjectView
+
+class StatsLabelView(GUIObjectView):
+    pass
+
+class PyStatsLabel(PyGUIObject):
+    
+    def display(self) -> str:
+        return self.model.display

cocoa/me/AppDelegate.h

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -12,8 +12,4 @@ http://www.hardcoded.net/licenses/hs_license
 #import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
-- (PyDupeGuru *)py;
 @end

cocoa/me/AppDelegate.m

@@ -1,33 +1,36 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
-#import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
-#import "../../cocoalib/Utils.h"
-#import "../../cocoalib/ValueTransformers.h"
-#import "../../cocoalib/Dialogs.h"
+#import "ProgressController.h"
+#import "Utils.h"
+#import "ValueTransformers.h"
+#import "Dialogs.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "ResultWindow.h"
 #import "Consts.h"
 
 @implementation AppDelegate
 + (void)initialize
 {
+    [super initialize];
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithCapacity:10];
     [d setObject:i2n(3) forKey:@"scanType"];
     [d setObject:i2n(80) forKey:@"minMatchPercentage"];
     [d setObject:i2n(1) forKey:@"recreatePathType"];
+    [d setObject:i2n(11) forKey:TableFontSize];
     [d setObject:b2n(NO) forKey:@"wordWeighting"];
     [d setObject:b2n(NO) forKey:@"matchSimilarWords"];
     [d setObject:b2n(YES) forKey:@"mixFileKind"];
     [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
+    [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"];
     [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
     [d setObject:b2n(NO) forKey:@"debug"];
     [d setObject:b2n(NO) forKey:@"scanTagTrack"];
@@ -56,32 +59,28 @@ http://www.hardcoded.net/licenses/hs_license
     return self;
 }
 
-- (IBAction)openWebsite:(id)sender
+- (NSString *)homepageURL
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_me"]];
+    return @"http://www.hardcoded.net/dupeguru_me/";
 }
 
-- (IBAction)toggleDirectories:(id)sender
+- (ResultWindowBase *)createResultWindow
 {
-    [[self directoryPanel] toggleVisible:sender];
+    return [[ResultWindow alloc] initWithParentApp:self];
 }
 
-- (DirectoryPanel *)directoryPanel
+- (DirectoryPanel *)createDirectoryPanel
 {
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanelME alloc] initWithParentApp:self];
-    return _directoryPanel;
+    return [[DirectoryPanelME alloc] initWithParentApp:self];
 }
-- (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
     // index 3 is just after "Export Results to XHTML"
-    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Remove Dead Tracks in iTunes" 
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:TR(@"Remove Dead Tracks in iTunes")
         action:@selector(removeDeadTracks:) keyEquivalent:@"" atIndex:3];
-    [mi setTarget:result];
+    [mi setTarget:[self resultWindow]];
     [super applicationDidFinishLaunching:aNotification];
 }
 @end

cocoa/me/Consts.h

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "../base/Consts.h"

cocoa/me/DirectoryPanel.h

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/me/DirectoryPanel.m

@@ -1,31 +1,33 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryPanel.h"
+#import "Consts.h"
 
 @implementation DirectoryPanelME
-- (IBAction)addiTunes:(id)sender
+- (id)initWithParentApp:(id)aParentApp
 {
-    [self addDirectory:[@"~/Music/iTunes/iTunes Music" stringByExpandingTildeInPath]];
+    self = [super initWithParentApp:aParentApp];
+    _alwaysShowPopUp = YES;
+    return self;
 }
 
-- (IBAction)popupAddDirectoryMenu:(id)sender
+- (void)fillPopUpMenu
 {
+    [super fillPopUpMenu];
     NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
+    NSMenuItem *mi = [m insertItemWithTitle:TR(@"Add iTunes Library") action:@selector(addiTunes:)
+        keyEquivalent:@"" atIndex:1];
     [mi setTarget:self];
-    mi = [m addItemWithTitle:@"Add iTunes Directory" action:@selector(addiTunes:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem: nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
+}
+
+- (IBAction)addiTunes:(id)sender
+{
+    [self addDirectory:@"iTunes Library"];
 }
 @end

cocoa/me/InfoTemplate.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>dupeguru</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.hardcoded_software.dupeguru_me</string>
+	<string>com.hardcoded-software.dupeguru-me</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,14 +22,16 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{version}</string>
 	<key>CFBundleVersion</key>
-	<string>5.8.0</string>
+	<string>{version}</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2010</string>
+	<string>© Hardcoded Software, 2012</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_me.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/me/PyDupeGuru.h

@@ -1,23 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "../base/PyDupeGuru.h"
-
-@interface PyDupeGuru : PyDupeGuruBase
-//Scanning options
-- (void)setScanType:(NSNumber *)scan_type;
-- (void)setMinWordCount:(NSNumber *)word_count;
-- (void)setMinWordLength:(NSNumber *)word_length;
-- (void)setWordWeighting:(NSNumber *)words_are_weighted;
-- (void)setMatchSimilarWords:(NSNumber *)match_similar_words;
-- (void)enable:(NSNumber *)enable scanForTag:(NSString *)tag;
-- (void)scanDeadTracks;
-- (void)removeDeadTracks;
-- (NSInteger)deadTrackCount;
-@end

cocoa/me/ResultWindow.h

@@ -1,14 +1,13 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 #import "../base/ResultWindow.h"
-#import "DirectoryPanel.h"
 
 @interface ResultWindow : ResultWindowBase {}
 - (IBAction)removeDeadTracks:(id)sender;

cocoa/me/ResultWindow.m

@@ -1,133 +1,77 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
-#import "../../cocoalib/Dialogs.h"
-#import "../../cocoalib/ProgressController.h"
-#import "../../cocoalib/RegistrationInterface.h"
-#import "../../cocoalib/Utils.h"
-#import "AppDelegate.h"
+#import "Dialogs.h"
+#import "Utils.h"
+#import "PyDupeGuru.h"
 #import "Consts.h"
+#import "ProgressController.h"
 
 @implementation ResultWindow
 /* Override */
-- (void)awakeFromNib
+- (void)setScanOptions
 {
-    [super awakeFromNib];
-    [[self window] setTitle:@"dupeGuru Music Edition"];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,7)];
-    [deltaColumns removeIndex:6];
-    [outline setDeltaColumns:deltaColumns];
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setScanType:n2i([ud objectForKey:@"scanType"])];
+    [model enable:n2b([ud objectForKey:@"scanTagTrack"]) scanForTag:@"track"];
+    [model enable:n2b([ud objectForKey:@"scanTagArtist"]) scanForTag:@"artist"];
+    [model enable:n2b([ud objectForKey:@"scanTagAlbum"]) scanForTag:@"album"];
+    [model enable:n2b([ud objectForKey:@"scanTagTitle"]) scanForTag:@"title"];
+    [model enable:n2b([ud objectForKey:@"scanTagGenre"]) scanForTag:@"genre"];
+    [model enable:n2b([ud objectForKey:@"scanTagYear"]) scanForTag:@"year"];
+    [model setMinMatchPercentage:n2i([ud objectForKey:@"minMatchPercentage"])];
+    [model setWordWeighting:n2b([ud objectForKey:@"wordWeighting"])];
+    [model setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
+    [model setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
+    [model setMatchSimilarWords:n2b([ud objectForKey:@"matchSimilarWords"])];
+}
+
+- (void)initResultColumns
+{
+    HSColumnDef defs[] = {
+        {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
+        {@"name", 235, 16, 0, YES, nil},
+        {@"folder_path", 120, 16, 0, YES, nil},
+        {@"size", 63, 16, 0, YES, nil},
+        {@"duration", 50, 16, 0, YES, nil},
+        {@"bitrate", 50, 16, 0, YES, nil},
+        {@"samplerate", 60, 16, 0, YES, nil},
+        {@"extension", 40, 16, 0, YES, nil},
+        {@"mtime", 120, 16, 0, YES, nil},
+        {@"title", 120, 16, 0, YES, nil},
+        {@"artist", 120, 16, 0, YES, nil},
+        {@"album", 120, 16, 0, YES, nil},
+        {@"genre", 80, 16, 0, YES, nil},
+        {@"year", 40, 16, 0, YES, nil},
+        {@"track", 40, 16, 0, YES, nil},
+        {@"comment", 120, 16, 0, YES, nil},
+        {@"percentage", 57, 16, 0, YES, nil},
+        {@"words", 120, 16, 0, YES, nil},
+        {@"dupe_count", 80, 16, 0, YES, nil},
+        nil
+    };
+    [[table columns] initializeColumns:defs];
+    NSTableColumn *c = [matches tableColumnWithIdentifier:@"marked"];
+    [[c dataCell] setButtonType:NSSwitchButton];
+    [[c dataCell] setControlSize:NSSmallControlSize];
+    c = [matches tableColumnWithIdentifier:@"size"];
+    [[c dataCell] setAlignment:NSRightTextAlignment];
+    c = [matches tableColumnWithIdentifier:@"duration"];
+    [[c dataCell] setAlignment:NSRightTextAlignment];
+    c = [matches tableColumnWithIdentifier:@"bitrate"];
+    [[c dataCell] setAlignment:NSRightTextAlignment];
+    [[table columns] restoreColumns];
 }
 
 /* Actions */
 - (IBAction)removeDeadTracks:(id)sender
 {
-    [(PyDupeGuru *)py scanDeadTracks];
-}
-
-- (IBAction)resetColumnsToDefault:(id)sender
-{
-    NSMutableArray *columnsOrder = [NSMutableArray array];
-    [columnsOrder addObject:@"0"];
-    [columnsOrder addObject:@"2"];
-    [columnsOrder addObject:@"3"];
-    [columnsOrder addObject:@"4"];
-    [columnsOrder addObject:@"16"];
-    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(214) forKey:@"0"];
-    [columnsWidth setObject:i2n(63) forKey:@"2"];
-    [columnsWidth setObject:i2n(50) forKey:@"3"];
-    [columnsWidth setObject:i2n(50) forKey:@"4"];
-    [columnsWidth setObject:i2n(57) forKey:@"16"];
-    [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
-}
-
-- (IBAction)startDuplicateScan:(id)sender
-{
-    if ([matches numberOfRows] > 0)
-    {
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
-            return;
-    }
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    PyDupeGuru *_py = (PyDupeGuru *)py;
-    [_py setScanType:[ud objectForKey:@"scanType"]];
-    [_py enable:[ud objectForKey:@"scanTagTrack"] scanForTag:@"track"];
-    [_py enable:[ud objectForKey:@"scanTagArtist"] scanForTag:@"artist"];
-    [_py enable:[ud objectForKey:@"scanTagAlbum"] scanForTag:@"album"];
-    [_py enable:[ud objectForKey:@"scanTagTitle"] scanForTag:@"title"];
-    [_py enable:[ud objectForKey:@"scanTagGenre"] scanForTag:@"genre"];
-    [_py enable:[ud objectForKey:@"scanTagYear"] scanForTag:@"year"];
-    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
-    [_py setWordWeighting:[ud objectForKey:@"wordWeighting"]];
-    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
-    [_py setMatchSimilarWords:[ud objectForKey:@"matchSimilarWords"]];
-    NSInteger r = n2i([py doScan]);
-    if (r == 1)
-        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
-    if (r == 3)
-    {
-        [Dialogs showMessage:@"The selected directories contain no scannable file."];
-        [app toggleDirectories:nil];
-    }
-}
-
-/* Public */
-- (void)initResultColumns
-{
-    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
-    _resultColumns = [[NSMutableArray alloc] init];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (MB)" width:63 refCol:refCol];
-    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:sizeCol];
-    NSTableColumn *timeCol = [self getColumnForIdentifier:3 title:@"Time" width:50 refCol:refCol];
-    [[timeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:timeCol];
-    NSTableColumn *brCol = [self getColumnForIdentifier:4 title:@"Bitrate" width:50 refCol:refCol];
-    [[brCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:brCol];
-    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Sample Rate" width:60 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Kind" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Creation" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:9 title:@"Title" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:10 title:@"Artist" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:11 title:@"Album" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:12 title:@"Genre" width:80 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:13 title:@"Year" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:14 title:@"Track Number" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:15 title:@"Comment" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:16 title:@"Match %" width:57 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:17 title:@"Words Used" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:18 title:@"Dupe Count" width:80 refCol:refCol]];
-}
-
-/* Notifications */
-- (void)jobCompleted:(NSNotification *)aNotification
-{
-    [super jobCompleted:aNotification];
-    id lastAction = [[ProgressController mainProgressController] jobId];
-    if ([lastAction isEqualTo:jobScanDeadTracks])
-    {
-        NSInteger deadTrackCount = [(PyDupeGuru *)py deadTrackCount];
-        if (deadTrackCount > 0)
-        {
-            NSString *msg = @"Your iTunes Library contains %d dead tracks ready to be removed. Continue?";
-            if ([Dialogs askYesNo:[NSString stringWithFormat:msg,deadTrackCount]] == NSAlertFirstButtonReturn)
-                [(PyDupeGuru *)py removeDeadTracks];
-        }
-        else
-        {
-            [Dialogs showMessage:@"You have no dead tracks in your iTunes Library"];
-        }
-    }
+    [model scanDeadTracks];
 }
 @end

cocoa/me/dg_cocoa.py

@@ -1,69 +1,20 @@
-# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
 
-from hsutil.cocoa import signature
+from hscommon.trans import install_gettext_trans_under_cocoa
+install_gettext_trans_under_cocoa()
 
-from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
-from core_me.app_cocoa import DupeGuruME
-from core.scanner import (SCAN_TYPE_FILENAME, SCAN_TYPE_FIELDS, SCAN_TYPE_FIELDS_NO_ORDER,
-    SCAN_TYPE_TAG, SCAN_TYPE_CONTENT, SCAN_TYPE_CONTENT_AUDIO)
-
-# Fix py2app imports which chokes on relative imports and other stuff
-from core_me import app_cocoa, data, fs, scanner
-from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
-from lxml import etree, _elementpath
-import gzip
-
-class PyDupeGuru(PyDupeGuruBase):
-    def init(self):
-        self = super(PyDupeGuru,self).init()
-        self.py = DupeGuruME()
-        return self
-    
-    def removeDeadTracks(self):
-        self.py.remove_dead_tracks()
-    
-    def scanDeadTracks(self):
-        self.py.scan_dead_tracks()
-    
-    #---Information
-    @signature('i@:')
-    def deadTrackCount(self):
-        return len(self.py.dead_tracks)
-    
-    #---Properties
-    def setMinMatchPercentage_(self, percentage):
-        self.py.scanner.min_match_percentage = int(percentage)
-    
-    def setScanType_(self, scan_type):
-        try:
-            self.py.scanner.scan_type = [
-                SCAN_TYPE_FILENAME,
-                SCAN_TYPE_FIELDS,
-                SCAN_TYPE_FIELDS_NO_ORDER,
-                SCAN_TYPE_TAG,
-                SCAN_TYPE_CONTENT,
-                SCAN_TYPE_CONTENT_AUDIO
-            ][scan_type]
-        except IndexError:
-            pass
-    
-    def setWordWeighting_(self, words_are_weighted):
-        self.py.scanner.word_weighting = words_are_weighted
-    
-    def setMatchSimilarWords_(self, match_similar_words):
-        self.py.scanner.match_similar_words = match_similar_words
-    
-    def enable_scanForTag_(self, enable, scan_tag):
-        if enable:
-            self.py.scanner.scanned_tags.add(scan_tag)
-        else:
-            self.py.scanner.scanned_tags.discard(scan_tag)
-    
-    #---Registration
-    def appName(self):
-        return "dupeGuru Music Edition"
+from cocoa.inter import PySelectableList, PyColumns, PyTable
 
+from inter.details_panel import PyDetailsPanel
+from inter.directory_outline import PyDirectoryOutline
+from inter.prioritize_dialog import PyPrioritizeDialog
+from inter.prioritize_list import PyPrioritizeList
+from inter.problem_dialog import PyProblemDialog
+from inter.ignore_list_dialog import PyIgnoreListDialog
+from inter.result_table import PyResultTable
+from inter.stats_label import PyStatsLabel
+from inter.app_me import PyDupeGuru

cocoa/me/dupeguru.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:dupeguru.xcodeproj">
+   </FileRef>
+</Workspace>

cocoa/me/en.lproj/Preferences.strings

@@ -0,0 +1,105 @@
+
+/* Class = "NSWindow"; title = "dupeGuru ME Preferences"; ObjectID = "2"; */
+"2.title" = "dupeGuru ME Preferences";
+
+/* Class = "NSTextFieldCell"; title = "More results"; ObjectID = "29"; */
+"29.title" = "More results";
+
+/* Class = "NSTextFieldCell"; title = "Fewer results"; ObjectID = "30"; */
+"30.title" = "Fewer results";
+
+/* Class = "NSTextFieldCell"; title = "Filter hardness:"; ObjectID = "31"; */
+"31.title" = "Filter hardness:";
+
+/* Class = "NSTextFieldCell"; title = "Scan type:"; ObjectID = "32"; */
+"32.title" = "Scan type:";
+
+/* Class = "NSMenuItem"; title = "Content"; ObjectID = "35"; */
+"35.title" = "Content";
+
+/* Class = "NSMenuItem"; title = "Filename"; ObjectID = "36"; */
+"36.title" = "Filename";
+
+/* Class = "NSMenuItem"; title = "Filename - Fields"; ObjectID = "37"; */
+"37.title" = "Filename - Fields";
+
+/* Class = "NSMenuItem"; title = "Tags"; ObjectID = "38"; */
+"38.title" = "Tags";
+
+/* Class = "NSMenuItem"; title = "Audio Content"; ObjectID = "39"; */
+"39.title" = "Audio Content";
+
+/* Class = "NSMenuItem"; title = "Filename - Fields (No Order)"; ObjectID = "40"; */
+"40.title" = "Filename - Fields (No Order)";
+
+/* Class = "NSButtonCell"; title = "Word weighting"; ObjectID = "41"; */
+"41.title" = "Word weighting";
+
+/* Class = "NSButtonCell"; title = "Can mix file kind"; ObjectID = "42"; */
+"42.title" = "Can mix file kind";
+
+/* Class = "NSButtonCell"; title = "Reset to Defaults"; ObjectID = "45"; */
+"45.title" = "Reset to Defaults";
+
+/* Class = "NSButtonCell"; title = "Match similar words"; ObjectID = "46"; */
+"46.title" = "Match similar words";
+
+/* Class = "NSTextFieldCell"; title = "Copy and Move:"; ObjectID = "54"; */
+"54.title" = "Copy and Move:";
+
+/* Class = "NSMenuItem"; title = "Recreate relative path"; ObjectID = "57"; */
+"57.title" = "Recreate relative path";
+
+/* Class = "NSMenuItem"; title = "Recreate absolute path"; ObjectID = "58"; */
+"58.title" = "Recreate absolute path";
+
+/* Class = "NSMenuItem"; title = "Right in destination"; ObjectID = "59"; */
+"59.title" = "Right in destination";
+
+/* Class = "NSButtonCell"; title = "Automatically check for updates"; ObjectID = "60"; */
+"60.title" = "Automatically check for updates";
+
+/* Class = "NSButtonCell"; title = "Use regular expressions when filtering"; ObjectID = "61"; */
+"61.title" = "Use regular expressions when filtering";
+
+/* Class = "NSButtonCell"; title = "Remove empty folders after delete and move"; ObjectID = "62"; */
+"62.title" = "Remove empty folders after delete and move";
+
+/* Class = "NSTextFieldCell"; title = "Tags to scan:"; ObjectID = "63"; */
+"63.title" = "Tags to scan:";
+
+/* Class = "NSButtonCell"; title = "Track"; ObjectID = "64"; */
+"64.title" = "Track";
+
+/* Class = "NSButtonCell"; title = "Artist"; ObjectID = "65"; */
+"65.title" = "Artist";
+
+/* Class = "NSButtonCell"; title = "Album"; ObjectID = "66"; */
+"66.title" = "Album";
+
+/* Class = "NSButtonCell"; title = "Title"; ObjectID = "67"; */
+"67.title" = "Title";
+
+/* Class = "NSButtonCell"; title = "Genre"; ObjectID = "68"; */
+"68.title" = "Genre";
+
+/* Class = "NSButtonCell"; title = "Year"; ObjectID = "69"; */
+"69.title" = "Year";
+
+/* Class = "NSTabViewItem"; label = "Basic"; ObjectID = "116"; */
+"116.label" = "Basic";
+
+/* Class = "NSTabViewItem"; label = "Advanced"; ObjectID = "117"; */
+"117.label" = "Advanced";
+
+/* Class = "NSTextFieldCell"; title = "Custom Command (arguments: %d for dupe, %r for ref):"; ObjectID = "121"; */
+"121.title" = "Custom Command (arguments: %d for dupe, %r for ref):";
+
+/* Class = "NSButtonCell"; title = "Ignore duplicates hardlinking to the same file"; ObjectID = "126"; */
+"126.title" = "Ignore duplicates hardlinking to the same file";
+
+/* Class = "NSButtonCell"; title = "Debug mode (restart required)"; ObjectID = "130"; */
+"130.title" = "Debug mode (restart required)";
+
+/* Class = "NSTextFieldCell"; title = "Font size:"; ObjectID = "136"; */
+"136.title" = "Font size:";

cocoa/me/main.m

@@ -1,23 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "Utils.h"
-
-int main(int argc, char *argv[])
-{
-    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-    [Utils setPluginName:@"dg_cocoa"];
-    NSString *pluginPath = [[NSBundle mainBundle]
-                                pathForResource:@"dg_cocoa"
-                                         ofType:@"plugin"];
-    NSBundle *pluginBundle = [NSBundle bundleWithPath:pluginPath];
-    [pluginBundle load];
-    [pool release];
-    return NSApplicationMain(argc,  (const char **) argv);
-}

cocoa/pe/AppDelegate.h

@@ -1,18 +1,13 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 #import "../base/AppDelegate.h"
-#import "PyDupeGuru.h"
 
 @interface AppDelegate : AppDelegateBase {}
-- (IBAction)openWebsite:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
-
-- (PyDupeGuru *)py;
 @end

cocoa/pe/AppDelegate.m

@@ -1,32 +1,36 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "AppDelegate.h"
 #import "ProgressController.h"
-#import "RegistrationInterface.h"
 #import "Utils.h"
 #import "ValueTransformers.h"
 #import "Consts.h"
 #import "DetailsPanel.h"
 #import "DirectoryPanel.h"
+#import "ResultWindow.h"
 
 @implementation AppDelegate
 + (void)initialize
 {
+    [super initialize];
     NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
     NSMutableDictionary *d = [NSMutableDictionary dictionaryWithCapacity:10];
-    [d setObject:[NSNumber numberWithInt:95] forKey:@"minMatchPercentage"];
-    [d setObject:[NSNumber numberWithInt:1] forKey:@"recreatePathType"];
-    [d setObject:[NSNumber numberWithBool:NO] forKey:@"matchScaled"];
-    [d setObject:[NSNumber numberWithBool:YES] forKey:@"mixFileKind"];
-    [d setObject:[NSNumber numberWithBool:NO] forKey:@"useRegexpFilter"];
-    [d setObject:[NSNumber numberWithBool:NO] forKey:@"removeEmptyFolders"];
-    [d setObject:[NSNumber numberWithBool:NO] forKey:@"debug"];
+    [d setObject:i2n(0) forKey:@"scanType"];
+    [d setObject:i2n(95) forKey:@"minMatchPercentage"];
+    [d setObject:i2n(1) forKey:@"recreatePathType"];
+    [d setObject:i2n(11) forKey:TableFontSize];
+    [d setObject:b2n(NO) forKey:@"matchScaled"];
+    [d setObject:b2n(YES) forKey:@"mixFileKind"];
+    [d setObject:b2n(NO) forKey:@"useRegexpFilter"];
+    [d setObject:b2n(NO) forKey:@"ignoreHardlinkMatches"];
+    [d setObject:b2n(NO) forKey:@"removeEmptyFolders"];
+    [d setObject:b2n(NO) forKey:@"debug"];
     [d setObject:[NSArray array] forKey:@"recentDirectories"];
     [d setObject:[NSArray array] forKey:@"columnsOrder"];
     [d setObject:[NSDictionary dictionary] forKey:@"columnsWidth"];
@@ -37,42 +41,39 @@ http://www.hardcoded.net/licenses/hs_license
 - (id)init
 {
     self = [super init];
-    _directoryPanel = nil;
+    NSMutableIndexSet *i = [NSMutableIndexSet indexSetWithIndex:0];
+    VTIsIntIn *vtScanTypeIsFuzzy = [[[VTIsIntIn alloc] initWithValues:i reverse:NO] autorelease];
+    [NSValueTransformer setValueTransformer:vtScanTypeIsFuzzy forName:@"vtScanTypeIsFuzzy"];
     return self;
 }
 
-- (DetailsPanel *)detailsPanel
+- (NSString *)homepageURL
 {
-    if (!_detailsPanel)
-        _detailsPanel = [[DetailsPanelPE alloc] initWithPy:py];
-    return _detailsPanel;
+    return @"http://www.hardcoded.net/dupeguru_pe/";
 }
 
-- (IBAction)openWebsite:(id)sender
+- (ResultWindowBase *)createResultWindow
 {
-    [[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:@"http://www.hardcoded.net/dupeguru_pe"]];
+    return [[ResultWindow alloc] initWithParentApp:self];
 }
 
-- (IBAction)toggleDirectories:(id)sender
+- (DirectoryPanel *)createDirectoryPanel
 {
-    [[self directoryPanel] toggleVisible:sender];
+    return [[DirectoryPanelPE alloc] initWithParentApp:self];
 }
 
-- (DirectoryPanel *)directoryPanel
+- (DetailsPanel *)createDetailsPanel
 {
-    if (!_directoryPanel)
-        _directoryPanel = [[DirectoryPanelPE alloc] initWithParentApp:self];
-    return _directoryPanel;
+    return [[DetailsPanelPE alloc] initWithApp:model];
 }
-- (PyDupeGuru *)py { return (PyDupeGuru *)py; }
 
 //Delegate
 - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
 {
-    NSMenu *actionsMenu = [[[NSApp mainMenu] itemWithTitle:@"Actions"] submenu];
     // index 2 is just after "Clear Ingore List"
-    NSMenuItem *mi = [actionsMenu insertItemWithTitle:@"Clear Picture Cache" action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
-    [mi setTarget:result];
+    NSMenuItem *mi = [actionsMenu insertItemWithTitle:TR(@"Clear Picture Cache")
+        action:@selector(clearPictureCache:) keyEquivalent:@"P" atIndex:2];
+    [mi setTarget:[self resultWindow]];
     [mi setKeyEquivalentModifierMask:NSCommandKeyMask|NSShiftKeyMask];
     [super applicationDidFinishLaunching:aNotification];
 }

cocoa/pe/Consts.h

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "../base/Consts.h"

cocoa/pe/DetailsPanel.h

@@ -1,13 +1,14 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
 #import "../base/DetailsPanel.h"
+#import "PyDupeGuru.h"
 
 @interface DetailsPanelPE : DetailsPanel
 {
@@ -16,9 +17,11 @@ http://www.hardcoded.net/licenses/hs_license
     IBOutlet NSImageView *refImage;
     IBOutlet NSProgressIndicator *refProgressIndicator;
     
-    PyApp *pyApp;
+    PyDupeGuru *pyApp;
     BOOL _needsRefresh;
     NSString *_dupePath;
     NSString *_refPath;
 }
+
+- (id)initWithApp:(PyDupeGuru *)aApp;
 @end

cocoa/pe/DetailsPanel.m

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "Utils.h"
@@ -14,10 +14,10 @@ http://www.hardcoded.net/licenses/hs_license
 #import "Consts.h"
 
 @implementation DetailsPanelPE
-- (id)initWithPy:(PyApp *)aPy
+- (id)initWithApp:(PyDupeGuru *)aApp
 {
-    self = [super initWithPy:aPy];
-    pyApp = aPy;
+    self = [super initWithPyRef:[aApp detailsPanel]];
+    pyApp = aApp;
     _needsRefresh = YES;
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(imageLoaded:) name:ImageLoadedNotification object:self];
     return self;
@@ -42,12 +42,12 @@ http://www.hardcoded.net/licenses/hs_license
         return;
     [detailsTable reloadData];
     
-    NSString *refPath = [(PyDupeGuru *)pyApp getSelectedDupeRefPath];
+    NSString *refPath = [pyApp getSelectedDupeRefPath];
     if (_refPath != nil)
         [_refPath autorelease];
     _refPath = [refPath retain];
     [NSThread detachNewThreadSelector:@selector(loadImageAsync:) toTarget:self withObject:refPath];
-    NSString *dupePath = [(PyDupeGuru *)pyApp getSelectedDupePath];
+    NSString *dupePath = [pyApp getSelectedDupePath];
     if (_dupePath != nil)
         [_dupePath autorelease];
     _dupePath = [dupePath retain];

cocoa/pe/DirectoryPanel.h

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>

cocoa/pe/DirectoryPanel.m

@@ -1,51 +1,33 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "DirectoryPanel.h"
-#import "ProgressController.h"
-
-static NSString* jobAddIPhoto = @"jobAddIPhoto";
+#import "Consts.h"
 
 @implementation DirectoryPanelPE
 - (id)initWithParentApp:(id)aParentApp
 {
     self = [super initWithParentApp:aParentApp];
-    [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(jobCompleted:) name:JobCompletedNotification object:nil];
+    _alwaysShowPopUp = YES;
     return self;
 }
 
+- (void)fillPopUpMenu
+{
+    [super fillPopUpMenu];
+    NSMenu *m = [addButtonPopUp menu];
+    NSMenuItem *mi = [m insertItemWithTitle:TR(@"Add iPhoto Library") action:@selector(addiPhoto:)
+        keyEquivalent:@"" atIndex:1];
+    [mi setTarget:self];
+}
+
 - (IBAction)addiPhoto:(id)sender
 {
-    [[ProgressController mainProgressController] setJobDesc:@"Adding iPhoto Library..."];
-    [[ProgressController mainProgressController] setJobId:jobAddIPhoto];
-    [[ProgressController mainProgressController] showSheetForParent:[self window]];
     [self addDirectory:@"iPhoto Library"];
 }
-
-- (IBAction)popupAddDirectoryMenu:(id)sender
-{
-    NSMenu *m = [addButtonPopUp menu];
-    while ([m numberOfItems] > 0)
-        [m removeItemAtIndex:0];
-    NSMenuItem *mi = [m addItemWithTitle:@"Add New Directory..." action:@selector(askForDirectory:) keyEquivalent:@""];
-    [mi setTarget:self];
-    mi = [m addItemWithTitle:@"Add iPhoto Directory" action:@selector(addiPhoto:) keyEquivalent:@""];
-    [mi setTarget:self];
-    [m addItem:[NSMenuItem separatorItem]];
-    [_recentDirectories fillMenu:m];
-    [addButtonPopUp selectItem:nil];
-    [[addButtonPopUp cell] performClickWithFrame:[sender frame] inView:[sender superview]];
-}
-
-- (void)jobCompleted:(NSNotification *)aNotification
-{
-    if ([[ProgressController mainProgressController] jobId] == jobAddIPhoto) {
-        [outlineView reloadData];
-    }
-}
 @end

cocoa/pe/InfoTemplate.plist

@@ -13,7 +13,7 @@
 	<key>CFBundleIconFile</key>
 	<string>dupeguru</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.hardcoded_software.dupeguru_pe</string>
+	<string>com.hardcoded-software.dupeguru-pe</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -22,14 +22,16 @@
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
+    <key>CFBundleShortVersionString</key>
+    <string>{version}</string>
 	<key>CFBundleVersion</key>
-	<string>1.8.6</string>
+	<string>{version}</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>© Hardcoded Software, 2010</string>
+	<string>© Hardcoded Software, 2012</string>
 	<key>SUFeedURL</key>
 	<string>http://www.hardcoded.net/updates/dupeguru_pe.appcast</string>
 	<key>SUPublicDSAKeyFile</key>

cocoa/pe/PyDupeGuru.h

@@ -1,17 +0,0 @@
-/* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
-
-This software is licensed under the "HS" 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/hs_license
-*/
-
-#import <Cocoa/Cocoa.h>
-#import "../base/PyDupeGuru.h"
-
-@interface PyDupeGuru : PyDupeGuruBase
-- (void)clearPictureCache;
-- (NSString *)getSelectedDupePath;
-- (NSString *)getSelectedDupeRefPath;
-- (void)setMatchScaled:(NSNumber *)match_scaled;
-@end

cocoa/pe/ResultWindow.h

@@ -1,9 +1,9 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import <Cocoa/Cocoa.h>
@@ -11,6 +11,4 @@ http://www.hardcoded.net/licenses/hs_license
 
 @interface ResultWindow : ResultWindowBase {}
 - (IBAction)clearPictureCache:(id)sender;
-- (IBAction)startDuplicateScan:(id)sender;
-- (IBAction)toggleDirectories:(id)sender;
 @end

cocoa/pe/ResultWindow.m

@@ -1,100 +1,58 @@
 /* 
-Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 
-This software is licensed under the "HS" License as described in the "LICENSE" file, 
+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/hs_license
+http://www.hardcoded.net/licenses/bsd_license
 */
 
 #import "ResultWindow.h"
 #import "Dialogs.h"
-#import "ProgressController.h"
-#import "RegistrationInterface.h"
 #import "Utils.h"
-#import "AppDelegate.h"
 #import "Consts.h"
+#import "PyDupeGuru.h"
 
 @implementation ResultWindow
 /* Override */
-- (void)awakeFromNib
+- (void)initResultColumns
 {
-    [super awakeFromNib];
-    [[self window] setTitle:@"dupeGuru Picture Edition"];
-    NSMutableIndexSet *deltaColumns = [NSMutableIndexSet indexSetWithIndexesInRange:NSMakeRange(2,5)];
-    [deltaColumns removeIndex:3];
-    [deltaColumns removeIndex:4];
-    [outline setDeltaColumns:deltaColumns];
+    HSColumnDef defs[] = {
+        {@"marked", 26, 26, 26, YES, [NSButtonCell class]},
+        {@"name", 162, 16, 0, YES, nil},
+        {@"folder_path", 142, 16, 0, YES, nil},
+        {@"size", 63, 16, 0, YES, nil},
+        {@"extension", 40, 16, 0, YES, nil},
+        {@"dimensions", 73, 16, 0, YES, nil},
+        {@"mtime", 120, 16, 0, YES, nil},
+        {@"percentage", 58, 16, 0, YES, nil},
+        {@"dupe_count", 80, 16, 0, YES, nil},
+        nil
+    };
+    [[table columns] initializeColumns:defs];
+    NSTableColumn *c = [matches tableColumnWithIdentifier:@"marked"];
+    [[c dataCell] setButtonType:NSSwitchButton];
+    [[c dataCell] setControlSize:NSSmallControlSize];
+    c = [matches tableColumnWithIdentifier:@"size"];
+    [[c dataCell] setAlignment:NSRightTextAlignment];
+    [[table columns] restoreColumns];
+}
+
+- (void)setScanOptions
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [model setScanType:n2i([ud objectForKey:@"scanType"])];
+    [model setMinMatchPercentage:n2i([ud objectForKey:@"minMatchPercentage"])];
+    [model setMixFileKind:n2b([ud objectForKey:@"mixFileKind"])];
+    [model setIgnoreHardlinkMatches:n2b([ud objectForKey:@"ignoreHardlinkMatches"])];
+    [model setMatchScaled:n2b([ud objectForKey:@"matchScaled"])];
 }
 
 /* Actions */
 - (IBAction)clearPictureCache:(id)sender
 {
-    if ([Dialogs askYesNo:@"Do you really want to remove all your cached picture analysis?"] == NSAlertSecondButtonReturn) // NO
+    NSString *msg = TR(@"Do you really want to remove all your cached picture analysis?");
+    if ([Dialogs askYesNo:msg] == NSAlertSecondButtonReturn) // NO
         return;
-    [(PyDupeGuru *)py clearPictureCache];
-}
-
-- (IBAction)resetColumnsToDefault:(id)sender
-{
-    NSMutableArray *columnsOrder = [NSMutableArray array];
-    [columnsOrder addObject:@"0"];
-    [columnsOrder addObject:@"1"];
-    [columnsOrder addObject:@"2"];
-    [columnsOrder addObject:@"4"];
-    [columnsOrder addObject:@"7"];
-    NSMutableDictionary *columnsWidth = [NSMutableDictionary dictionary];
-    [columnsWidth setObject:i2n(121) forKey:@"0"];
-    [columnsWidth setObject:i2n(120) forKey:@"1"];
-    [columnsWidth setObject:i2n(63) forKey:@"2"];
-    [columnsWidth setObject:i2n(73) forKey:@"4"];
-    [columnsWidth setObject:i2n(58) forKey:@"7"];
-    [self restoreColumnsPosition:columnsOrder widths:columnsWidth];
-}
-
-- (IBAction)startDuplicateScan:(id)sender
-{
-    if ([matches numberOfRows] > 0)
-    {
-        if ([Dialogs askYesNo:@"Are you sure you want to start a new duplicate scan?"] == NSAlertSecondButtonReturn) // NO
-            return;
-    }
-    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
-    PyDupeGuru *_py = (PyDupeGuru *)py;
-    [_py setMinMatchPercentage:[ud objectForKey:@"minMatchPercentage"]];
-    [_py setMixFileKind:[ud objectForKey:@"mixFileKind"]];
-    [_py setMatchScaled:[ud objectForKey:@"matchScaled"]];
-    int r = n2i([py doScan]);
-    if (r != 0)
-        [[ProgressController mainProgressController] hide];
-    if (r == 1)
-        [Dialogs showMessage:@"You cannot make a duplicate scan with only reference directories."];
-    if (r == 3)
-    {
-        [Dialogs showMessage:@"The selected directories contain no scannable file."];
-        [app toggleDirectories:nil];
-    }
-}
-
-- (IBAction)toggleDirectories:(id)sender
-{
-    [(AppDelegate *)app toggleDirectories:sender];
-}
-
-/* Public */
-- (void)initResultColumns
-{
-    NSTableColumn *refCol = [matches tableColumnWithIdentifier:@"0"];
-    _resultColumns = [[NSMutableArray alloc] init];
-    [_resultColumns addObject:[matches tableColumnWithIdentifier:@"0"]]; // File Name
-    [_resultColumns addObject:[self getColumnForIdentifier:1 title:@"Directory" width:120 refCol:refCol]];
-    NSTableColumn *sizeCol = [self getColumnForIdentifier:2 title:@"Size (KB)" width:63 refCol:refCol];
-    [[sizeCol dataCell] setAlignment:NSRightTextAlignment];
-    [_resultColumns addObject:sizeCol];
-    [_resultColumns addObject:[self getColumnForIdentifier:3 title:@"Kind" width:40 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:4 title:@"Dimensions" width:80 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:5 title:@"Creation" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:6 title:@"Modification" width:120 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:7 title:@"Match %" width:58 refCol:refCol]];
-    [_resultColumns addObject:[self getColumnForIdentifier:8 title:@"Dupe Count" width:80 refCol:refCol]];
+    [model clearPictureCache];
 }
 @end

cocoa/pe/dg_cocoa.py

@@ -1,41 +1,21 @@
-# Copyright 2010 Hardcoded Software (http://www.hardcoded.net)
+# Copyright 2012 Hardcoded Software (http://www.hardcoded.net)
 # 
-# This software is licensed under the "HS" License as described in the "LICENSE" file, 
+# 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/hs_license
+# http://www.hardcoded.net/licenses/bsd_license
 
-from core.app_cocoa_inter import PyDupeGuruBase, PyDetailsPanel
-from core_pe import app_cocoa as app_pe_cocoa
+from hscommon.trans import install_gettext_trans_under_cocoa
+install_gettext_trans_under_cocoa()
 
-# Fix py2app imports which chokes on relative imports and other stuff
-from core_pe import block, cache, matchbase, data, _block_osx
-from lxml import etree, _elementpath
-import gzip
+from cocoa.inter import PySelectableList, PyColumns, PyTable
 
-class PyDupeGuru(PyDupeGuruBase):
-    def init(self):
-        self = super(PyDupeGuru, self).init()
-        self.py = app_pe_cocoa.DupeGuruPE()
-        return self
-    
-    def clearPictureCache(self):
-        self.py.scanner.clear_picture_cache()
-    
-    #---Information    
-    def getSelectedDupePath(self):
-        return unicode(self.py.selected_dupe_path())
-    
-    def getSelectedDupeRefPath(self):
-        return unicode(self.py.selected_dupe_ref_path())
-    
-    #---Properties
-    def setMatchScaled_(self,match_scaled):
-        self.py.scanner.match_scaled = match_scaled
-    
-    def setMinMatchPercentage_(self,percentage):
-        self.py.scanner.threshold = int(percentage)
-    
-    #---Registration
-    def appName(self):
-        return "dupeGuru Picture Edition"
+from inter.details_panel import PyDetailsPanel
+from inter.directory_outline import PyDirectoryOutline
+from inter.prioritize_dialog import PyPrioritizeDialog
+from inter.prioritize_list import PyPrioritizeList
+from inter.problem_dialog import PyProblemDialog
+from inter.ignore_list_dialog import PyIgnoreListDialog
+from inter.result_table import PyResultTable
+from inter.stats_label import PyStatsLabel
+from inter.app_pe import PyDupeGuru
     

cocoa/pe/dupeguru.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:dupeguru.xcodeproj">
+   </FileRef>
+</Workspace>

cocoa/pe/en.lproj/DetailsPanel.strings

@@ -0,0 +1,18 @@
+
+/* Class = "NSPanel"; title = "Details of Selected File"; ObjectID = "5"; */
+"5.title" = "Details of Selected File";
+
+/* Class = "NSTableColumn"; headerCell.title = "Selected"; ObjectID = "9"; */
+"9.headerCell.title" = "Selected";
+
+/* Class = "NSTableColumn"; headerCell.title = "Reference"; ObjectID = "10"; */
+"10.headerCell.title" = "Reference";
+
+/* Class = "NSTableColumn"; headerCell.title = "Attribute"; ObjectID = "11"; */
+"11.headerCell.title" = "Attribute";
+
+/* Class = "NSTextFieldCell"; title = "Selected"; ObjectID = "33"; */
+"33.title" = "Selected";
+
+/* Class = "NSTextFieldCell"; title = "Reference"; ObjectID = "35"; */
+"35.title" = "Reference";

cocoa/pe/en.lproj/DetailsPanel.xib

@@ -0,0 +1,846 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1060</int>
+		<string key="IBDocument.SystemVersion">11B26</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1617</string>
+		<string key="IBDocument.AppKitVersion">1138</string>
+		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			<string key="NS.object.0">1617</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>NSScroller</string>
+			<string>NSSplitView</string>
+			<string>NSTableHeaderView</string>
+			<string>NSScrollView</string>
+			<string>NSImageView</string>
+			<string>NSTextFieldCell</string>
+			<string>NSProgressIndicator</string>
+			<string>NSTableView</string>
+			<string>NSImageCell</string>
+			<string>NSCustomObject</string>
+			<string>NSCustomView</string>
+			<string>NSView</string>
+			<string>NSWindowTemplate</string>
+			<string>NSTextField</string>
+			<string>NSTableColumn</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</array>
+		<dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="433298071">
+			<object class="NSCustomObject" id="449950342">
+				<string key="NSClassName">DetailsPanelPE</string>
+			</object>
+			<object class="NSCustomObject" id="175405098">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="757309215">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="1023276826">
+				<int key="NSWindowStyleMask">155</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{634, 317}, {593, 398}}</string>
+				<int key="NSWTFlags">-260571136</int>
+				<string key="NSWindowTitle">Details of Selected File</string>
+				<object class="NSMutableString" key="NSWindowClass">
+					<characters key="NS.bytes">NSPanel</characters>
+				</object>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<nil key="NSUserInterfaceItemIdentifier"/>
+				<string key="NSWindowContentMinSize">{451, 161}</string>
+				<object class="NSView" key="NSWindowView" id="1024886486">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<array class="NSMutableArray" key="NSSubviews">
+						<object class="NSScrollView" id="842494181">
+							<reference key="NSNextResponder" ref="1024886486"/>
+							<int key="NSvFlags">266</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSClipView" id="47651407">
+									<reference key="NSNextResponder" ref="842494181"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTableView" id="1061505056">
+											<reference key="NSNextResponder" ref="47651407"/>
+											<int key="NSvFlags">256</int>
+											<string key="NSFrameSize">{591, 147}</string>
+											<reference key="NSSuperview" ref="47651407"/>
+											<reference key="NSWindow"/>
+											<int key="NSTag">2</int>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTableHeaderView" key="NSHeaderView" id="449183719">
+												<reference key="NSNextResponder" ref="205382409"/>
+												<int key="NSvFlags">256</int>
+												<string key="NSFrameSize">{591, 17}</string>
+												<reference key="NSSuperview" ref="205382409"/>
+												<reference key="NSWindow"/>
+												<reference key="NSTableView" ref="1061505056"/>
+											</object>
+											<object class="_NSCornerView" key="NSCornerView" id="429654016">
+												<reference key="NSNextResponder" ref="842494181"/>
+												<int key="NSvFlags">-2147483392</int>
+												<string key="NSFrame">{{-26, 0}, {16, 17}}</string>
+												<reference key="NSSuperview" ref="842494181"/>
+												<reference key="NSWindow"/>
+											</object>
+											<array class="NSMutableArray" key="NSTableColumns">
+												<object class="NSTableColumn" id="761242770">
+													<string key="NSIdentifier">0</string>
+													<double key="NSWidth">74</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Attribute</string>
+														<object class="NSFont" key="NSSupport" id="26">
+															<string key="NSName">LucidaGrande</string>
+															<double key="NSSize">11</double>
+															<int key="NSfFlags">3100</int>
+														</object>
+														<object class="NSColor" key="NSBackgroundColor" id="77031760">
+															<int key="NSColorSpace">3</int>
+															<bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="578432702">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerTextColor</string>
+															<object class="NSColor" key="NSColor" id="585838671">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MAA</bytes>
+															</object>
+														</object>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="1001899861">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="1061505056"/>
+														<object class="NSColor" key="NSBackgroundColor" id="240658091">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlBackgroundColor</string>
+															<object class="NSColor" key="NSColor" id="823392961">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
+															</object>
+														</object>
+														<object class="NSColor" key="NSTextColor" id="194446219">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">controlTextColor</string>
+															<reference key="NSColor" ref="585838671"/>
+														</object>
+													</object>
+													<int key="NSResizingMask">2</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="1061505056"/>
+												</object>
+												<object class="NSTableColumn" id="245708436">
+													<string key="NSIdentifier">1</string>
+													<double key="NSWidth">260</double>
+													<double key="NSMinWidth">40</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Selected</string>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSBackgroundColor" ref="77031760"/>
+														<reference key="NSTextColor" ref="578432702"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="322739197">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="1061505056"/>
+														<reference key="NSBackgroundColor" ref="240658091"/>
+														<reference key="NSTextColor" ref="194446219"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="1061505056"/>
+												</object>
+												<object class="NSTableColumn" id="421059304">
+													<string key="NSIdentifier">2</string>
+													<double key="NSWidth">248</double>
+													<double key="NSMinWidth">56.4755859375</double>
+													<double key="NSMaxWidth">1000</double>
+													<object class="NSTableHeaderCell" key="NSHeaderCell">
+														<int key="NSCellFlags">75628096</int>
+														<int key="NSCellFlags2">2048</int>
+														<string key="NSContents">Reference</string>
+														<reference key="NSSupport" ref="26"/>
+														<object class="NSColor" key="NSBackgroundColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">headerColor</string>
+															<object class="NSColor" key="NSColor" id="401909016">
+																<int key="NSColorSpace">3</int>
+																<bytes key="NSWhite">MQA</bytes>
+															</object>
+														</object>
+														<reference key="NSTextColor" ref="578432702"/>
+													</object>
+													<object class="NSTextFieldCell" key="NSDataCell" id="999491006">
+														<int key="NSCellFlags">337772096</int>
+														<int key="NSCellFlags2">2048</int>
+														<reference key="NSSupport" ref="26"/>
+														<reference key="NSControlView" ref="1061505056"/>
+														<reference key="NSBackgroundColor" ref="240658091"/>
+														<reference key="NSTextColor" ref="194446219"/>
+													</object>
+													<int key="NSResizingMask">3</int>
+													<bool key="NSIsResizeable">YES</bool>
+													<reference key="NSTableView" ref="1061505056"/>
+												</object>
+											</array>
+											<double key="NSIntercellSpacingWidth">3</double>
+											<double key="NSIntercellSpacingHeight">2</double>
+											<reference key="NSBackgroundColor" ref="401909016"/>
+											<object class="NSColor" key="NSGridColor">
+												<int key="NSColorSpace">6</int>
+												<string key="NSCatalogName">System</string>
+												<string key="NSColorName">gridColor</string>
+												<object class="NSColor" key="NSColor">
+													<int key="NSColorSpace">3</int>
+													<bytes key="NSWhite">MC41AA</bytes>
+												</object>
+											</object>
+											<double key="NSRowHeight">14</double>
+											<int key="NSTvFlags">1111523328</int>
+											<reference key="NSDelegate"/>
+											<reference key="NSDataSource"/>
+											<int key="NSColumnAutoresizingStyle">1</int>
+											<int key="NSDraggingSourceMaskForLocal">15</int>
+											<int key="NSDraggingSourceMaskForNonLocal">0</int>
+											<bool key="NSAllowsTypeSelect">YES</bool>
+											<int key="NSTableViewDraggingDestinationStyle">0</int>
+											<int key="NSTableViewGroupRowStyle">1</int>
+										</object>
+									</array>
+									<string key="NSFrame">{{1, 17}, {591, 147}}</string>
+									<reference key="NSSuperview" ref="842494181"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="1061505056"/>
+									<reference key="NSDocView" ref="1061505056"/>
+									<reference key="NSBGColor" ref="240658091"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="90145020">
+									<reference key="NSNextResponder" ref="842494181"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{-30, 17}, {15, 147}}</string>
+									<reference key="NSSuperview" ref="842494181"/>
+									<reference key="NSWindow"/>
+									<reference key="NSTarget" ref="842494181"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.91874998807907104</double>
+								</object>
+								<object class="NSScroller" id="23980189">
+									<reference key="NSNextResponder" ref="842494181"/>
+									<int key="NSvFlags">-2147483392</int>
+									<string key="NSFrame">{{-100, -100}, {394, 15}}</string>
+									<reference key="NSSuperview" ref="842494181"/>
+									<reference key="NSWindow"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="842494181"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">0.96332520246505737</double>
+								</object>
+								<object class="NSClipView" id="205382409">
+									<reference key="NSNextResponder" ref="842494181"/>
+									<int key="NSvFlags">2304</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<reference ref="449183719"/>
+									</array>
+									<string key="NSFrame">{{1, 0}, {591, 17}}</string>
+									<reference key="NSSuperview" ref="842494181"/>
+									<reference key="NSWindow"/>
+									<reference key="NSNextKeyView" ref="449183719"/>
+									<reference key="NSDocView" ref="449183719"/>
+									<reference key="NSBGColor" ref="240658091"/>
+									<int key="NScvFlags">4</int>
+								</object>
+								<reference ref="429654016"/>
+							</array>
+							<string key="NSFrame">{{0, 233}, {593, 165}}</string>
+							<reference key="NSSuperview" ref="1024886486"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="47651407"/>
+							<int key="NSsFlags">133650</int>
+							<reference key="NSVScroller" ref="90145020"/>
+							<reference key="NSHScroller" ref="23980189"/>
+							<reference key="NSContentView" ref="47651407"/>
+							<reference key="NSHeaderClipView" ref="205382409"/>
+							<reference key="NSCornerView" ref="429654016"/>
+							<bytes key="NSScrollAmts">QSAAAEEgAABBgAAAQYAAAA</bytes>
+						</object>
+						<object class="NSSplitView" id="1006675149">
+							<reference key="NSNextResponder" ref="1024886486"/>
+							<int key="NSvFlags">274</int>
+							<array class="NSMutableArray" key="NSSubviews">
+								<object class="NSCustomView" id="101939068">
+									<reference key="NSNextResponder" ref="1006675149"/>
+									<int key="NSvFlags">256</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="723437775">
+											<reference key="NSNextResponder" ref="101939068"/>
+											<int key="NSvFlags">266</int>
+											<string key="NSFrame">{{-3, 201}, {294, 17}}</string>
+											<reference key="NSSuperview" ref="101939068"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="517184416">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">138412032</int>
+												<string key="NSContents">Selected</string>
+												<object class="NSFont" key="NSSupport" id="872545298">
+													<string key="NSName">LucidaGrande</string>
+													<double key="NSSize">13</double>
+													<int key="NSfFlags">1044</int>
+												</object>
+												<reference key="NSControlView" ref="723437775"/>
+												<object class="NSColor" key="NSBackgroundColor" id="125808400">
+													<int key="NSColorSpace">6</int>
+													<string key="NSCatalogName">System</string>
+													<string key="NSColorName">controlColor</string>
+													<reference key="NSColor" ref="823392961"/>
+												</object>
+												<reference key="NSTextColor" ref="194446219"/>
+											</object>
+										</object>
+										<object class="NSImageView" id="664547713">
+											<reference key="NSNextResponder" ref="101939068"/>
+											<int key="NSvFlags">274</int>
+											<set class="NSMutableSet" key="NSDragTypes">
+												<string>Apple PDF pasteboard type</string>
+												<string>Apple PICT pasteboard type</string>
+												<string>Apple PNG pasteboard type</string>
+												<string>NSFilenamesPboardType</string>
+												<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+												<string>NeXT TIFF v4.0 pasteboard type</string>
+											</set>
+											<string key="NSFrameSize">{288, 193}</string>
+											<reference key="NSSuperview" ref="101939068"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSImageCell" key="NSCell" id="327656199">
+												<int key="NSCellFlags">130560</int>
+												<int key="NSCellFlags2">33554432</int>
+												<object class="NSCustomResource" key="NSContents" id="548486768">
+													<string key="NSClassName">NSImage</string>
+													<string key="NSResourceName">NSApplicationIcon</string>
+												</object>
+												<int key="NSAlign">0</int>
+												<int key="NSScale">0</int>
+												<int key="NSStyle">0</int>
+												<bool key="NSAnimates">NO</bool>
+											</object>
+											<bool key="NSEditable">YES</bool>
+										</object>
+										<object class="NSProgressIndicator" id="127754691">
+											<reference key="NSNextResponder" ref="101939068"/>
+											<int key="NSvFlags">1289</int>
+											<object class="NSPSMatrix" key="NSDrawMatrix"/>
+											<string key="NSFrame">{{255, 201}, {16, 16}}</string>
+											<reference key="NSSuperview" ref="101939068"/>
+											<reference key="NSWindow"/>
+											<int key="NSpiFlags">28938</int>
+											<double key="NSMaxValue">100</double>
+										</object>
+									</array>
+									<string key="NSFrameSize">{291, 225}</string>
+									<reference key="NSSuperview" ref="1006675149"/>
+									<reference key="NSWindow"/>
+									<string key="NSClassName">NSView</string>
+								</object>
+								<object class="NSCustomView" id="971244171">
+									<reference key="NSNextResponder" ref="1006675149"/>
+									<int key="NSvFlags">256</int>
+									<array class="NSMutableArray" key="NSSubviews">
+										<object class="NSTextField" id="905396720">
+											<reference key="NSNextResponder" ref="971244171"/>
+											<int key="NSvFlags">266</int>
+											<string key="NSFrame">{{-3, 203}, {295, 17}}</string>
+											<reference key="NSSuperview" ref="971244171"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSTextFieldCell" key="NSCell" id="334112854">
+												<int key="NSCellFlags">67239424</int>
+												<int key="NSCellFlags2">138412032</int>
+												<string key="NSContents">Reference</string>
+												<reference key="NSSupport" ref="872545298"/>
+												<reference key="NSControlView" ref="905396720"/>
+												<reference key="NSBackgroundColor" ref="125808400"/>
+												<reference key="NSTextColor" ref="194446219"/>
+											</object>
+										</object>
+										<object class="NSImageView" id="89184363">
+											<reference key="NSNextResponder" ref="971244171"/>
+											<int key="NSvFlags">274</int>
+											<set class="NSMutableSet" key="NSDragTypes">
+												<string>Apple PDF pasteboard type</string>
+												<string>Apple PICT pasteboard type</string>
+												<string>Apple PNG pasteboard type</string>
+												<string>NSFilenamesPboardType</string>
+												<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+												<string>NeXT TIFF v4.0 pasteboard type</string>
+											</set>
+											<string key="NSFrameSize">{289, 195}</string>
+											<reference key="NSSuperview" ref="971244171"/>
+											<reference key="NSWindow"/>
+											<bool key="NSEnabled">YES</bool>
+											<object class="NSImageCell" key="NSCell" id="966367135">
+												<int key="NSCellFlags">130560</int>
+												<int key="NSCellFlags2">33554432</int>
+												<reference key="NSContents" ref="548486768"/>
+												<int key="NSAlign">0</int>
+												<int key="NSScale">0</int>
+												<int key="NSStyle">0</int>
+												<bool key="NSAnimates">NO</bool>
+											</object>
+											<bool key="NSEditable">YES</bool>
+										</object>
+										<object class="NSProgressIndicator" id="40327027">
+											<reference key="NSNextResponder" ref="971244171"/>
+											<int key="NSvFlags">1289</int>
+											<object class="NSPSMatrix" key="NSDrawMatrix"/>
+											<string key="NSFrame">{{257, 203}, {16, 16}}</string>
+											<reference key="NSSuperview" ref="971244171"/>
+											<reference key="NSWindow"/>
+											<int key="NSpiFlags">28938</int>
+											<double key="NSMaxValue">100</double>
+										</object>
+									</array>
+									<string key="NSFrame">{{300, 0}, {293, 225}}</string>
+									<reference key="NSSuperview" ref="1006675149"/>
+									<reference key="NSWindow"/>
+									<string key="NSClassName">NSView</string>
+								</object>
+							</array>
+							<string key="NSFrameSize">{593, 225}</string>
+							<reference key="NSSuperview" ref="1024886486"/>
+							<reference key="NSWindow"/>
+							<bool key="NSIsVertical">YES</bool>
+						</object>
+					</array>
+					<string key="NSFrameSize">{593, 398}</string>
+					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
+				<string key="NSMinSize">{451, 177}</string>
+				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<string key="NSFrameAutosaveName">DetailsPanel</string>
+				<bool key="NSWindowIsRestorable">YES</bool>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="449950342"/>
+						<reference key="destination" ref="1023276826"/>
+					</object>
+					<int key="connectionID">12</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">detailsTable</string>
+						<reference key="source" ref="449950342"/>
+						<reference key="destination" ref="1061505056"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">refImage</string>
+						<reference key="source" ref="449950342"/>
+						<reference key="destination" ref="89184363"/>
+					</object>
+					<int key="connectionID">25</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dupeImage</string>
+						<reference key="source" ref="449950342"/>
+						<reference key="destination" ref="664547713"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dupeProgressIndicator</string>
+						<reference key="source" ref="449950342"/>
+						<reference key="destination" ref="127754691"/>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">refProgressIndicator</string>
+						<reference key="source" ref="449950342"/>
+						<reference key="destination" ref="40327027"/>
+					</object>
+					<int key="connectionID">31</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">dataSource</string>
+						<reference key="source" ref="1061505056"/>
+						<reference key="destination" ref="449950342"/>
+					</object>
+					<int key="connectionID">43</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="433298071"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="449950342"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="175405098"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="1023276826"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1024886486"/>
+						</array>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">details</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="1024886486"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="842494181"/>
+							<reference ref="1006675149"/>
+						</array>
+						<reference key="parent" ref="1023276826"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="842494181"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1061505056"/>
+							<reference ref="90145020"/>
+							<reference ref="23980189"/>
+							<reference ref="449183719"/>
+						</array>
+						<reference key="parent" ref="1024886486"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="1061505056"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="245708436"/>
+							<reference ref="421059304"/>
+							<reference ref="761242770"/>
+						</array>
+						<reference key="parent" ref="842494181"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="245708436"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="322739197"/>
+						</array>
+						<reference key="parent" ref="1061505056"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="421059304"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="999491006"/>
+						</array>
+						<reference key="parent" ref="1061505056"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="761242770"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="1001899861"/>
+						</array>
+						<reference key="parent" ref="1061505056"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="1006675149"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="101939068"/>
+							<reference ref="971244171"/>
+						</array>
+						<reference key="parent" ref="1024886486"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="101939068"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="723437775"/>
+							<reference ref="664547713"/>
+							<reference ref="127754691"/>
+						</array>
+						<reference key="parent" ref="1006675149"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="723437775"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="517184416"/>
+						</array>
+						<reference key="parent" ref="101939068"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="664547713"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="327656199"/>
+						</array>
+						<reference key="parent" ref="101939068"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">27</int>
+						<reference key="object" ref="127754691"/>
+						<reference key="parent" ref="101939068"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="971244171"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="905396720"/>
+							<reference ref="89184363"/>
+							<reference ref="40327027"/>
+						</array>
+						<reference key="parent" ref="1006675149"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="905396720"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="334112854"/>
+						</array>
+						<reference key="parent" ref="971244171"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="89184363"/>
+						<array class="NSMutableArray" key="children">
+							<reference ref="966367135"/>
+						</array>
+						<reference key="parent" ref="971244171"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">29</int>
+						<reference key="object" ref="40327027"/>
+						<reference key="parent" ref="971244171"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">33</int>
+						<reference key="object" ref="517184416"/>
+						<reference key="parent" ref="723437775"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">34</int>
+						<reference key="object" ref="327656199"/>
+						<reference key="parent" ref="664547713"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">35</int>
+						<reference key="object" ref="334112854"/>
+						<reference key="parent" ref="905396720"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">36</int>
+						<reference key="object" ref="966367135"/>
+						<reference key="parent" ref="89184363"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">37</int>
+						<reference key="object" ref="322739197"/>
+						<reference key="parent" ref="245708436"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">38</int>
+						<reference key="object" ref="999491006"/>
+						<reference key="parent" ref="421059304"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">39</int>
+						<reference key="object" ref="1001899861"/>
+						<reference key="parent" ref="761242770"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">40</int>
+						<reference key="object" ref="90145020"/>
+						<reference key="parent" ref="842494181"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">41</int>
+						<reference key="object" ref="23980189"/>
+						<reference key="parent" ref="842494181"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">42</int>
+						<reference key="object" ref="449183719"/>
+						<reference key="parent" ref="842494181"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="757309215"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Application</string>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="10.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="11.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="27.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="29.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="33.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="37.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="37.IBShouldRemoveOnLegacySave"/>
+				<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="38.IBShouldRemoveOnLegacySave"/>
+				<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="39.IBShouldRemoveOnLegacySave"/>
+				<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="40.IBShouldRemoveOnLegacySave"/>
+				<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="41.IBShouldRemoveOnLegacySave"/>
+				<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="42.IBShouldRemoveOnLegacySave"/>
+				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="5.IBWindowTemplateEditedContentRect">{{88, 453}, {593, 398}}</string>
+				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">43</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">DetailsPanel</string>
+					<string key="superclassName">HSWindowController</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">detailsTable</string>
+						<string key="NS.object.0">NSTableView</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">detailsTable</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">detailsTable</string>
+							<string key="candidateClassName">NSTableView</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DetailsPanel.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">DetailsPanelPE</string>
+					<string key="superclassName">DetailsPanel</string>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="dupeImage">NSImageView</string>
+						<string key="dupeProgressIndicator">NSProgressIndicator</string>
+						<string key="refImage">NSImageView</string>
+						<string key="refProgressIndicator">NSProgressIndicator</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="dupeImage">
+							<string key="name">dupeImage</string>
+							<string key="candidateClassName">NSImageView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="dupeProgressIndicator">
+							<string key="name">dupeProgressIndicator</string>
+							<string key="candidateClassName">NSProgressIndicator</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="refImage">
+							<string key="name">refImage</string>
+							<string key="candidateClassName">NSImageView</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="refProgressIndicator">
+							<string key="name">refProgressIndicator</string>
+							<string key="candidateClassName">NSProgressIndicator</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/DetailsPanelPE.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">HSWindowController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/HSWindowController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<real value="1060" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
+			<integer value="1050" key="NS.object.0"/>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
+			<real value="4100" key="NS.object.0"/>
+		</object>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+			<string key="NS.key.0">NSApplicationIcon</string>
+			<string key="NS.object.0">{128, 128}</string>
+		</object>
+	</data>
+</archive>