Permalink
Browse files

Merge branch 'release'

  • Loading branch information...
2 parents 3968a7e + 10264db commit 2f00a5a3a10ee3c354e2c69cd8de700dc25ee61f @skurfer skurfer committed Mar 25, 2013
@@ -614,7 +614,7 @@ - (NSDictionary *)infoRecord {
return nil;
}
- NSString *uti = QSUTIForExtensionOrType((NSString *)record.extension, record.filetype);
+ NSString *uti = QSUTIWithLSInfoRec(path, &record);
NSString *extension = [(NSString *)record.extension copy];
/* local or network volume? does it support Trash? */
@@ -68,9 +68,11 @@
return itemUTI;
}
+
+// WARNING: This does not necessarily return the correct UTI. QSUTIWithLSInfoRec() is more reliable
NSString *QSUTIForExtensionOrType(NSString *extension, OSType filetype) {
NSString *itemUTI = nil;
-// NSLog(@"type %@ %@", extension, NSFileTypeForHFSTypeCode(filetype));
+
if (extension != nil) {
itemUTI = (NSString *)UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (CFStringRef)extension, NULL);
} else {
@@ -1,7 +1,7 @@
// This file contains developer-specific information. You can provide temporary overrides to build settings here.
// The bundle version displayed in the Finder's Get Info dialog and About Box
-QS_INFO_VERSION = ß72
+QS_INFO_VERSION = 1.0.0
// The current development version shown in About Box
-QS_BUNDLE_VERSION = 3947
+QS_BUNDLE_VERSION = 4000
@@ -4513,7 +4513,7 @@
);
runOnlyForDeploymentPostprocessing = 1;
shellPath = /bin/sh;
- shellScript = "#echo \"rsync -auzEv $BUILT_PRODUCTS_DIR/Quicksilver.app /Applications/Quicksilver.app\"\n#rsync -auzEv \"$BUILT_PRODUCTS_DIR/Quicksilver.app/\" /Applications/Quicksilver.app/\n\n#exit\n\nif [ $BUILD_STYLE != \"Release\" ]; then\n exit\nfi\n\necho $SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"\n\n$SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"";
+ shellScript = "#echo \"rsync -auzEv $BUILT_PRODUCTS_DIR/Quicksilver.app /Applications/Quicksilver.app\"\n#rsync -auzEv \"$BUILT_PRODUCTS_DIR/Quicksilver.app/\" /Applications/Quicksilver.app/\n\n#exit\n\nif [ $CONFIGURATION != \"Release\" ]; then\n exit\nfi\n\necho $SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"\n\n$SRCROOT/Tools/buildDMG.pl -dmgName $PRODUCT_NAME \\\n -volName Quicksilver \\\n -volIcon \"$SRCROOT/Resources/Images/QuicksilverDMG.icns\" \\\n -dmgName \"Quicksilver $QS_INFO_VERSION.0\" \\\n -compressionLevel 9 \\\n -debug \"$BUILT_PRODUCTS_DIR/Quicksilver.app\"";
};
7FA4EF1E0913AE44007DB407 /* Release Notes */ = {
isa = PBXShellScriptBuildPhase;
@@ -1,9 +1,12 @@
-## Changes - ß72 (3947) ##
+## Changes - 1.0.0 (4000) ##
This will be the last release to support Mac OS X 10.6 and 32-bit mode.
### New ###
+ * Preliminary support for retina displays (#1044, #1378)
+ * Many internal images have been upscaled
+ * Icons and images are no longer downscaled in the interface
* Assign the same trigger to different actions in different applications (#1201)
* Add files and folders to the catalog using the Add To Catalog action (#1276)
* AppleScript Action enhancements - http://qsapp.com/wiki/AppleScript_Actions (#1023, #1048)
@@ -39,11 +42,13 @@ This will be the last release to support Mac OS X 10.6 and 32-bit mode.
* Set a default string ranker to prevent meaningless notifications (#1380)
* Prevent a crash when changing row height immediately after choosing a new interface (#1383)
* Fixed an exception when right-arrowing into applications with iCloud documents (#1396, #1398)
- * Internal optimizations, stability improvements, and fixes (#1335, #1346, #1385, #1390, #1401, #1371, #1403)
+ * Changed the process for displaying the Dock icon (#1152, #1414)
+ * More reliable file type detection (#1427, #1428, #1430)
+ * Internal optimizations, stability improvements, and fixes (#1335, #1346, #1385, #1390, #1401, #1371, #1403, #1388, #1410)
### Changed ###
- * Simplify Services and set the "Command Window with Selection" trigger to use ⌘⎋ by default (#409, #1295)
+ * Simplify Services and set the "Command Window with Selection" trigger to use ⌘⎋ by default (#409, #1295, #1416, #1418)
* The Current Selection proxy object appears quicker (#1295)
* Better auto-detection of URLs in text entry mode (#1312, #1346, #1376)
* If files are omitted from the catalog, they will still be available when browsing the filesystem (#1195, #1322)

0 comments on commit 2f00a5a

Please sign in to comment.