dgme cocoa: v5.7.0

--HG--
extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40271

me/cocoa/Info.plist

@@ -23,7 +23,7 @@
 	<key>CFBundleSignature</key>
 	<string>hsft</string>
 	<key>CFBundleVersion</key>
-	<string>5.6.6</string>
+	<string>5.7.0</string>
 	<key>NSMainNibFile</key>
 	<string>MainMenu</string>
 	<key>NSPrincipalClass</key>

me/cocoa/gen.py

@@ -5,13 +5,15 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
+import sys
+sys.path.insert(0, 'py') # for hsutil and hsdocgen
 import os
 
+from help import gen
+
 print "Generating help"
-os.chdir('help')
+gen.generate()
-os.system('python -u gen.py')
+os.system('/Developer/Applications/Utilities/Help\\ Indexer.app/Contents/MacOS/Help\\ Indexer help/dupeguru_me_help')
-os.system('/Developer/Applications/Utilities/Help\\ Indexer.app/Contents/MacOS/Help\\ Indexer dupeguru_me_help')
-os.chdir('..')
 
 print "Generating py plugin"
 os.chdir('py')

me/help/changelog.yaml

@@ -1,3 +1,12 @@
+- date: 2009-12-18
+  version: 5.7.0
+  description: |
+    * Added drag & drop support in the Directories panel. (#9)
+    * Fixed a bug causing dupeGuru to be confused if a scanned file was moved during the scan. (#72)
+    * Clarified how directories' state are set by painting a combo box in the state cells. [Windows]
+      (#76)
+    * Fixed some crashes. (#78 and #79)
+    * Dropped Mac OS X Tiger support.
 - date: 2009-10-14
   version: 5.6.6
   description: |

me/help/gen.py

@@ -5,10 +5,10 @@
 # which should be included with this package. The terms are also available at 
 # http://www.hardcoded.net/licenses/hs_license
 
-import os
+import os.path as op
-
 from hsdocgen import generate_help, filters
 
+def generate(windows=False):
     tix = filters.tixgen("https://hardcoded.lighthouseapp.com/projects/31699-dupeguru/tickets/{0}")
-
+    basepath = op.dirname(__file__)
-generate_help.main('.', 'dupeguru_me_help', force_render=True, tix=tix)
+    generate_help.main(basepath, op.join(basepath, 'dupeguru_me_help'), force_render=True, tix=tix, windows=windows)

me/help/templates/faq.mako

@@ -64,4 +64,12 @@ If your comparison threshold is low enough, you will probably end up with live a
 * **Mac OS X**: Type "[*]" in the "Filter" field in the toolbar.
 * Click on **Mark --> Mark All**.
 * Click on **Actions --> Remove Selected from Results**.
+
+### I tried to send my duplicates to Trash, but dupeGuru is telling me it can't do it. Why? What can I do?
+
+Most of the time, the reason why dupeGuru can't send files to Trash is because of file permissions. You need *write* permissions on files you want to send to Trash. If you're not familiar with the command line, you can use utilities such as [BatChmod](http://macchampion.com/arbysoft/BatchMod) to fix your permissions.
+
+If dupeGuru still gives you troubles after fixing your permissions, there have been some cases where using "Move Marked to..." as a workaround did the trick. So instead of sending your files to Trash, you send them to a temporary folder with the "Move Marked to..." action, and then you delete that temporary folder manually.
+
+If all of this fail, [contact HS support](http://www.hardcoded.net/support), we'll figure it out.
 </%text>

me/qt/app.py

@@ -17,7 +17,7 @@ from preferences_dialog import PreferencesDialog
 class DupeGuru(DupeGuruBase):
     LOGO_NAME = 'logo_me'
     NAME = 'dupeGuru Music Edition'
-    VERSION = '5.6.6'
+    VERSION = '5.7.0'
     DELTA_COLUMNS = frozenset([2, 3, 4, 5, 7, 8])
     
     def __init__(self):

me/qt/gen.py

@@ -13,10 +13,13 @@ import os.path as op
 
 from hsutil.build import print_and_do, build_all_qt_ui
 
+from help import gen
+
 build_all_qt_ui(op.join('qtlib', 'ui'))
 build_all_qt_ui('base')
 build_all_qt_ui('.')
-
+os.chdir('base')
-os.chdir('help')
+print_and_do("pyrcc4 dg.qrc > dg_rc.py")
-print_and_do('python gen.py')
 os.chdir('..')
+
+gen.generate(windows=True)