adium 5074:f196058dfb81: Removed all file transfer preferences t...
commits at adium.im
commits at adium.im
Thu Sep 13 21:36:52 UTC 2012
details: http://hg.adium.im/adium/rev/f196058dfb81
revision: 5074:f196058dfb81
branch: Sandboxing
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Thu Sep 13 23:36:40 2012 +0200
Removed all file transfer preferences that are not necessary anymore:
* Open safe files. Impossible from the sandbox.
* Download location. Either the user auto-accepts and it goes to ~/Dowloads, or they get a "Save As" panel.
Renamed "Automatically accept files and images" to "Automatically save files to Downloads".
diffs (truncated from 1013 to 1000 lines):
diff -r ef1d48be3644 -r f196058dfb81 Frameworks/Adium Framework/Source/AIFileTransferControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIFileTransferControllerProtocol.h Thu Sep 13 23:15:56 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIFileTransferControllerProtocol.h Thu Sep 13 23:36:40 2012 +0200
@@ -21,7 +21,6 @@
#define PREF_GROUP_FILE_TRANSFER @"FileTransfer"
#define KEY_FT_AUTO_ACCEPT @"FT AutoAccept"
-#define KEY_FT_AUTO_OPEN_SAFE @"FT AutoOpenSafe"
#define KEY_FT_AUTO_CLEAR_COMPLETED @"FT AutoClearCompleted"
#define KEY_FT_SHOW_PROGRESS_WINDOW @"FT ShowProgressWindow"
diff -r ef1d48be3644 -r f196058dfb81 Frameworks/Adium Framework/Source/AIPreferenceControllerProtocol.h
--- a/Frameworks/Adium Framework/Source/AIPreferenceControllerProtocol.h Thu Sep 13 23:15:56 2012 +0200
+++ b/Frameworks/Adium Framework/Source/AIPreferenceControllerProtocol.h Thu Sep 13 23:36:40 2012 +0200
@@ -65,10 +65,6 @@
//Defaults
- (void)registerDefaults:(NSDictionary *)defaultDict forGroup:(NSString *)group;
- (void)registerDefaults:(NSDictionary *)defaultDict forGroup:(NSString *)group object:(AIListObject *)object;
-
-//Default download location
-- (NSString *)userPreferredDownloadFolder;
-- (void)setUserPreferredDownloadFolder:(NSString *)path;
@end
@interface NSObject (AIPreferenceObserver)
diff -r ef1d48be3644 -r f196058dfb81 Resources/FileTransferPrefs.xib
--- a/Resources/FileTransferPrefs.xib Thu Sep 13 23:15:56 2012 +0200
+++ b/Resources/FileTransferPrefs.xib Thu Sep 13 23:36:40 2012 +0200
@@ -2,24 +2,20 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1060</int>
- <string key="IBDocument.SystemVersion">11D50b</string>
- <string key="IBDocument.InterfaceBuilderVersion">2182</string>
- <string key="IBDocument.AppKitVersion">1138.32</string>
- <string key="IBDocument.HIToolboxVersion">568.00</string>
+ <string key="IBDocument.SystemVersion">12B19</string>
+ <string key="IBDocument.InterfaceBuilderVersion">2549</string>
+ <string key="IBDocument.AppKitVersion">1187</string>
+ <string key="IBDocument.HIToolboxVersion">624.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>
+ <string key="NS.object.0">2549</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
+ <string>NSButton</string>
+ <string>NSButtonCell</string>
+ <string>NSCustomObject</string>
+ <string>NSCustomView</string>
<string>NSTextField</string>
- <string>NSCustomObject</string>
- <string>NSMenu</string>
- <string>NSMenuItem</string>
- <string>NSPopUpButton</string>
- <string>NSCustomView</string>
- <string>NSButtonCell</string>
- <string>NSPopUpButtonCell</string>
- <string>NSButton</string>
<string>NSTextFieldCell</string>
</array>
<array key="IBDocument.PluginDependencies">
@@ -40,18 +36,19 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="572325108">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">258</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSTextField" id="751715316">
<reference key="NSNextResponder" ref="572325108"/>
<int key="NSvFlags">257</int>
- <string key="NSFrame">{{72, 164}, {99, 17}}</string>
+ <string key="NSFrame">{{72, 59}, {99, 17}}</string>
<reference key="NSSuperview" ref="572325108"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="178078209"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="781553746">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
<string key="NSContents">Receiving files:</string>
<object class="NSFont" key="NSSupport" id="11131930">
@@ -79,21 +76,23 @@
</object>
</object>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="178078209">
<reference key="NSNextResponder" ref="572325108"/>
<int key="NSvFlags">257</int>
- <string key="NSFrame">{{174, 163}, {196, 18}}</string>
+ <string key="NSFrame">{{174, 58}, {273, 18}}</string>
<reference key="NSSuperview" ref="572325108"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="50595239"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="533897617">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
- <string key="NSContents">Automatically accept files...</string>
+ <string key="NSContents">Automatically save files to Downloads...</string>
<reference key="NSSupport" ref="11131930"/>
<reference key="NSControlView" ref="178078209"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<object class="NSCustomResource" key="NSNormalImage" id="106102765">
<string key="NSClassName">NSImage</string>
@@ -107,21 +106,23 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="50595239">
<reference key="NSNextResponder" ref="572325108"/>
<int key="NSvFlags">257</int>
- <string key="NSFrame">{{192, 143}, {263, 18}}</string>
+ <string key="NSFrame">{{192, 38}, {263, 18}}</string>
<reference key="NSSuperview" ref="572325108"/>
- <reference key="NSNextKeyView" ref="960959268"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="316596620"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="763038629">
- <int key="NSCellFlags">67239424</int>
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">only from contacts on my Contact List</string>
<reference key="NSSupport" ref="11131930"/>
<reference key="NSControlView" ref="50595239"/>
- <int key="NSButtonFlags">1211912703</int>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="106102765"/>
<reference key="NSAlternateImage" ref="314558961"/>
@@ -130,119 +131,42 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSTextField" id="960959268">
+ <object class="NSTextField" id="316596620">
<reference key="NSNextResponder" ref="572325108"/>
<int key="NSvFlags">257</int>
- <string key="NSFrame">{{87, 114}, {84, 17}}</string>
+ <string key="NSFrame">{{108, 19}, {63, 17}}</string>
<reference key="NSSuperview" ref="572325108"/>
- <reference key="NSNextKeyView" ref="916883540"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="485928105"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="265353561">
- <int key="NSCellFlags">67239424</int>
+ <object class="NSTextFieldCell" key="NSCell" id="180424392">
+ <int key="NSCellFlags">67108864</int>
<int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Save files to:</string>
+ <string key="NSContents">Progress:</string>
<reference key="NSSupport" ref="11131930"/>
- <reference key="NSControlView" ref="960959268"/>
+ <reference key="NSControlView" ref="316596620"/>
<reference key="NSBackgroundColor" ref="203676018"/>
<reference key="NSTextColor" ref="799636984"/>
</object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
- <object class="NSPopUpButton" id="916883540">
+ <object class="NSButton" id="485928105">
<reference key="NSNextResponder" ref="572325108"/>
<int key="NSvFlags">257</int>
- <string key="NSFrame">{{174, 108}, {221, 26}}</string>
+ <string key="NSFrame">{{174, 18}, {282, 18}}</string>
<reference key="NSSuperview" ref="572325108"/>
- <reference key="NSNextKeyView" ref="849400280"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<bool key="NSEnabled">YES</bool>
- <object class="NSPopUpButtonCell" key="NSCell" id="606980636">
- <int key="NSCellFlags">-2076049856</int>
- <int key="NSCellFlags2">1024</int>
+ <object class="NSButtonCell" key="NSCell" id="632923143">
+ <int key="NSCellFlags">67108864</int>
+ <int key="NSCellFlags2">0</int>
+ <string key="NSContents">Show the progress window automatically</string>
<reference key="NSSupport" ref="11131930"/>
- <reference key="NSControlView" ref="916883540"/>
- <int key="NSButtonFlags">109199615</int>
- <int key="NSButtonFlags2">1</int>
- <object class="NSFont" key="NSAlternateImage">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
- </object>
- <string key="NSAlternateContents"/>
- <object class="NSMutableString" key="NSKeyEquivalent">
- <characters key="NS.bytes"/>
- </object>
- <int key="NSPeriodicDelay">400</int>
- <int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="485110629">
- <reference key="NSMenu" ref="722486096"/>
- <string key="NSTitle">Item1</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="814129108">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuCheckmark</string>
- </object>
- <object class="NSCustomResource" key="NSMixedImage" id="864876289">
- <string key="NSClassName">NSImage</string>
- <string key="NSResourceName">NSMenuMixedState</string>
- </object>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="606980636"/>
- </object>
- <bool key="NSMenuItemRespectAlignment">YES</bool>
- <object class="NSMenu" key="NSMenu" id="722486096">
- <object class="NSMutableString" key="NSTitle">
- <characters key="NS.bytes">OtherViews</characters>
- </object>
- <array class="NSMutableArray" key="NSMenuItems">
- <reference ref="485110629"/>
- <object class="NSMenuItem" id="752746502">
- <reference key="NSMenu" ref="722486096"/>
- <string key="NSTitle">Item2</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="814129108"/>
- <reference key="NSMixedImage" ref="864876289"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="606980636"/>
- </object>
- <object class="NSMenuItem" id="310894636">
- <reference key="NSMenu" ref="722486096"/>
- <string key="NSTitle">Item3</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="814129108"/>
- <reference key="NSMixedImage" ref="864876289"/>
- <string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="606980636"/>
- </object>
- </array>
- </object>
- <int key="NSSelectedIndex">-1</int>
- <int key="NSPreferredEdge">3</int>
- <bool key="NSUsesItemFromMenu">YES</bool>
- <bool key="NSAltersState">YES</bool>
- <int key="NSArrowPosition">1</int>
- </object>
- </object>
- <object class="NSButton" id="849400280">
- <reference key="NSNextResponder" ref="572325108"/>
- <int key="NSvFlags">257</int>
- <string key="NSFrame">{{174, 82}, {219, 18}}</string>
- <reference key="NSSuperview" ref="572325108"/>
- <reference key="NSNextKeyView" ref="507643543"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="228030005">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Open "safe" files after receiving</string>
- <reference key="NSSupport" ref="11131930"/>
- <reference key="NSControlView" ref="849400280"/>
- <int key="NSButtonFlags">1211912703</int>
+ <reference key="NSControlView" ref="485928105"/>
+ <int key="NSButtonFlags">1211912448</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="106102765"/>
<reference key="NSAlternateImage" ref="314558961"/>
@@ -251,73 +175,12 @@
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
- </object>
- <object class="NSTextField" id="507643543">
- <reference key="NSNextResponder" ref="572325108"/>
- <int key="NSvFlags">257</int>
- <string key="NSFrame">{{192, 48}, {308, 28}}</string>
- <reference key="NSSuperview" ref="572325108"/>
- <reference key="NSNextKeyView" ref="316596620"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="484297007">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">4194304</int>
- <string type="base64-UTF8" key="NSContents">IlNhZmUiIGZpbGVzIGluY2x1ZGUgbW92aWVzLCBwaWN0dXJlcywKc291bmRzLCB0ZXh0IGRvY3VtZW50
-cywgYW5kIGFyY2hpdmVzLg</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
- </object>
- <reference key="NSControlView" ref="507643543"/>
- <reference key="NSBackgroundColor" ref="203676018"/>
- <object class="NSColor" key="NSTextColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC4yNDU5Njc3NQA</bytes>
- </object>
- </object>
- </object>
- <object class="NSTextField" id="316596620">
- <reference key="NSNextResponder" ref="572325108"/>
- <int key="NSvFlags">257</int>
- <string key="NSFrame">{{108, 21}, {63, 17}}</string>
- <reference key="NSSuperview" ref="572325108"/>
- <reference key="NSNextKeyView" ref="485928105"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="180424392">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">71303168</int>
- <string key="NSContents">Progress:</string>
- <reference key="NSSupport" ref="11131930"/>
- <reference key="NSControlView" ref="316596620"/>
- <reference key="NSBackgroundColor" ref="203676018"/>
- <reference key="NSTextColor" ref="799636984"/>
- </object>
- </object>
- <object class="NSButton" id="485928105">
- <reference key="NSNextResponder" ref="572325108"/>
- <int key="NSvFlags">257</int>
- <string key="NSFrame">{{174, 20}, {282, 18}}</string>
- <reference key="NSSuperview" ref="572325108"/>
- <bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="632923143">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">0</int>
- <string key="NSContents">Show the progress window automatically</string>
- <reference key="NSSupport" ref="11131930"/>
- <reference key="NSControlView" ref="485928105"/>
- <int key="NSButtonFlags">1211912703</int>
- <int key="NSButtonFlags2">2</int>
- <reference key="NSNormalImage" ref="106102765"/>
- <reference key="NSAlternateImage" ref="314558961"/>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
- </object>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
- <string key="NSFrameSize">{600, 199}</string>
+ <string key="NSFrameSize">{600, 94}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="751715316"/>
<string key="NSClassName">NSView</string>
<string key="NSExtension">NSResponder</string>
@@ -334,14 +197,6 @@
<int key="connectionID">9</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">popUp_downloadLocation</string>
- <reference key="source" ref="712709828"/>
- <reference key="destination" ref="916883540"/>
- </object>
- <int key="connectionID">53</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">changePreference:</string>
<reference key="source" ref="712709828"/>
@@ -367,22 +222,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">label_defaultReceivingFolder</string>
- <reference key="source" ref="712709828"/>
- <reference key="destination" ref="960959268"/>
- </object>
- <int key="connectionID">70</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">label_safeFilesDescription</string>
- <reference key="source" ref="712709828"/>
- <reference key="destination" ref="507643543"/>
- </object>
- <int key="connectionID">71</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">label_whenReceivingFiles</string>
<reference key="source" ref="712709828"/>
<reference key="destination" ref="751715316"/>
@@ -399,14 +238,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">checkBox_autoOpenFiles</string>
- <reference key="source" ref="712709828"/>
- <reference key="destination" ref="849400280"/>
- </object>
- <int key="connectionID">75</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">checkBox_autoAcceptFiles</string>
<reference key="source" ref="712709828"/>
<reference key="destination" ref="178078209"/>
@@ -454,14 +285,6 @@
<int key="connectionID">80</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="50595239"/>
- <reference key="destination" ref="916883540"/>
- </object>
- <int key="connectionID">62</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">enabled: adium.preferenceController.FileTransfer.FT AutoAccept</string>
<reference key="source" ref="50595239"/>
@@ -479,38 +302,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="916883540"/>
- <reference key="destination" ref="849400280"/>
- </object>
- <int key="connectionID">63</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">nextKeyView</string>
- <reference key="source" ref="849400280"/>
- <reference key="destination" ref="485928105"/>
- </object>
- <int key="connectionID">64</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBBindingConnection" key="connection">
- <string key="label">value: adium.preferenceController.FileTransfer.FT AutoOpenSafe</string>
- <reference key="source" ref="849400280"/>
- <reference key="destination" ref="712709828"/>
- <object class="NSNibBindingConnector" key="connector">
- <reference key="NSSource" ref="849400280"/>
- <reference key="NSDestination" ref="712709828"/>
- <string key="NSLabel">value: adium.preferenceController.FileTransfer.FT AutoOpenSafe</string>
- <string key="NSBinding">value</string>
- <string key="NSKeyPath">adium.preferenceController.FileTransfer.FT AutoOpenSafe</string>
- <int key="NSNibBindingConnectorVersion">2</int>
- </object>
- </object>
- <int key="connectionID">89</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
<string key="label">view_anchorToRightSide</string>
<reference key="source" ref="316596620"/>
<reference key="destination" ref="485928105"/>
@@ -577,12 +368,8 @@
<reference ref="751715316"/>
<reference ref="178078209"/>
<reference ref="50595239"/>
- <reference ref="960959268"/>
- <reference ref="916883540"/>
- <reference ref="849400280"/>
- <reference ref="507643543"/>
+ <reference ref="485928105"/>
<reference ref="316596620"/>
- <reference ref="485928105"/>
</array>
<reference key="parent" ref="0"/>
<string key="objectName">View</string>
@@ -612,38 +399,6 @@
<reference key="parent" ref="572325108"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">41</int>
- <reference key="object" ref="960959268"/>
- <array class="NSMutableArray" key="children">
- <reference ref="265353561"/>
- </array>
- <reference key="parent" ref="572325108"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">45</int>
- <reference key="object" ref="916883540"/>
- <array class="NSMutableArray" key="children">
- <reference ref="606980636"/>
- </array>
- <reference key="parent" ref="572325108"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">47</int>
- <reference key="object" ref="849400280"/>
- <array class="NSMutableArray" key="children">
- <reference ref="228030005"/>
- </array>
- <reference key="parent" ref="572325108"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">48</int>
- <reference key="object" ref="507643543"/>
- <array class="NSMutableArray" key="children">
- <reference ref="484297007"/>
- </array>
- <reference key="parent" ref="572325108"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">49</int>
<reference key="object" ref="316596620"/>
<array class="NSMutableArray" key="children">
@@ -675,29 +430,6 @@
<reference key="parent" ref="50595239"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">100</int>
- <reference key="object" ref="265353561"/>
- <reference key="parent" ref="960959268"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">101</int>
- <reference key="object" ref="606980636"/>
- <array class="NSMutableArray" key="children">
- <reference ref="722486096"/>
- </array>
- <reference key="parent" ref="916883540"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">102</int>
- <reference key="object" ref="228030005"/>
- <reference key="parent" ref="849400280"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">103</int>
- <reference key="object" ref="484297007"/>
- <reference key="parent" ref="507643543"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">104</int>
<reference key="object" ref="180424392"/>
<reference key="parent" ref="316596620"/>
@@ -708,31 +440,6 @@
<reference key="parent" ref="485928105"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">43</int>
- <reference key="object" ref="722486096"/>
- <array class="NSMutableArray" key="children">
- <reference ref="485110629"/>
- <reference ref="752746502"/>
- <reference ref="310894636"/>
- </array>
- <reference key="parent" ref="606980636"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">46</int>
- <reference key="object" ref="485110629"/>
- <reference key="parent" ref="722486096"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">44</int>
- <reference key="object" ref="752746502"/>
- <reference key="parent" ref="722486096"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">42</int>
- <reference key="object" ref="310894636"/>
- <reference key="parent" ref="722486096"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="496241559"/>
<reference key="parent" ref="0"/>
@@ -744,10 +451,6 @@
<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="100.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="101.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="102.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="103.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="104.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="105.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="32.CustomClassName">AILocalizationTextField</string>
@@ -756,17 +459,6 @@
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="40.CustomClassName">AILocalizationButton</string>
<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="41.CustomClassName">AILocalizationTextField</string>
- <string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="42.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="45.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="46.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="47.CustomClassName">AILocalizationButton</string>
- <string key="47.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="48.CustomClassName">AILocalizationTextField</string>
- <string key="48.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="49.CustomClassName">AILocalizationTextField</string>
<string key="49.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="50.CustomClassName">AILocalizationButton</string>
@@ -889,17 +581,23 @@
<object class="IBPartialClassDescription">
<string key="className">ESFileTransferPreferences</string>
<string key="superclassName">AIPreferencePane</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">changePreference:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">changePreference:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">changePreference:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="checkBox_autoAcceptFiles">AILocalizationButton</string>
<string key="checkBox_autoAcceptOnlyFromCLList">AILocalizationButton</string>
- <string key="checkBox_autoClearCompleted">AILocalizationButton</string>
- <string key="checkBox_autoOpenFiles">AILocalizationButton</string>
<string key="checkBox_showProgress">AILocalizationButton</string>
- <string key="label_defaultReceivingFolder">AILocalizationTextField</string>
- <string key="label_safeFilesDescription">AILocalizationTextField</string>
<string key="label_transferProgress">AILocalizationTextField</string>
<string key="label_whenReceivingFiles">AILocalizationTextField</string>
- <string key="popUp_downloadLocation">NSPopUpButton</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="checkBox_autoAcceptFiles">
@@ -910,26 +608,10 @@
<string key="name">checkBox_autoAcceptOnlyFromCLList</string>
<string key="candidateClassName">AILocalizationButton</string>
</object>
- <object class="IBToOneOutletInfo" key="checkBox_autoClearCompleted">
- <string key="name">checkBox_autoClearCompleted</string>
- <string key="candidateClassName">AILocalizationButton</string>
- </object>
- <object class="IBToOneOutletInfo" key="checkBox_autoOpenFiles">
- <string key="name">checkBox_autoOpenFiles</string>
- <string key="candidateClassName">AILocalizationButton</string>
- </object>
<object class="IBToOneOutletInfo" key="checkBox_showProgress">
<string key="name">checkBox_showProgress</string>
<string key="candidateClassName">AILocalizationButton</string>
</object>
- <object class="IBToOneOutletInfo" key="label_defaultReceivingFolder">
- <string key="name">label_defaultReceivingFolder</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
- <object class="IBToOneOutletInfo" key="label_safeFilesDescription">
- <string key="name">label_safeFilesDescription</string>
- <string key="candidateClassName">AILocalizationTextField</string>
- </object>
<object class="IBToOneOutletInfo" key="label_transferProgress">
<string key="name">label_transferProgress</string>
<string key="candidateClassName">AILocalizationTextField</string>
@@ -938,16 +620,30 @@
<string key="name">label_whenReceivingFiles</string>
<string key="candidateClassName">AILocalizationTextField</string>
</object>
- <object class="IBToOneOutletInfo" key="popUp_downloadLocation">
- <string key="name">popUp_downloadLocation</string>
- <string key="candidateClassName">NSPopUpButton</string>
- </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/ESFileTransferPreferences.h</string>
</object>
</object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">selectServiceType:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">selectServiceType:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">selectServiceType:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/NSObject.h</string>
+ </object>
+ </object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
@@ -958,7 +654,7 @@
</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"/>
+ <real value="1070" key="NS.object.0"/>
</object>
<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
@@ -966,10 +662,9 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
- <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
- <string key="NSMenuCheckmark">{11, 11}</string>
- <string key="NSMenuMixedState">{10, 3}</string>
- <string key="NSSwitch">{15, 15}</string>
- </dictionary>
+ <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="NS.key.0">NSSwitch</string>
+ <string key="NS.object.0">{15, 15}</string>
+ </object>
</data>
</archive>
diff -r ef1d48be3644 -r f196058dfb81 Source/AIPreferenceController.m
--- a/Source/AIPreferenceController.m Thu Sep 13 23:15:56 2012 +0200
+++ b/Source/AIPreferenceController.m Thu Sep 13 23:36:40 2012 +0200
@@ -491,57 +491,6 @@
return prefContainer;
}
-//Default download locaiton --------------------------------------------------------------------------------------------
-#pragma mark Default download location
-/*!
- * @brief Get the default download location
- *
- * This will use an Adium-specific preference if set, or the systemwide download location if not
- *
- * @result A full path to the download location
- */
-- (NSString *)userPreferredDownloadFolder
-{
- NSString *userPreferredDownloadFolder;
-
- userPreferredDownloadFolder = [[self preferenceForKey:@"UserPreferredDownloadFolder"
- group:PREF_GROUP_GENERAL] stringByExpandingTildeInPath];
-
- NSFileManager *fm = [NSFileManager defaultManager];
- if (!userPreferredDownloadFolder) {
- userPreferredDownloadFolder = [[fm URLForDirectory:NSDownloadsDirectory
- inDomain:NSUserDomainMask
- appropriateForURL:nil create:YES error:nil] path];
- }
-
- //If the existing folder doesn't exist anymore, try to create it falling back to the desktop if that fails
- BOOL isDir = NO, created = NO;
- if (userPreferredDownloadFolder && ![fm fileExistsAtPath:userPreferredDownloadFolder isDirectory:&isDir]) {
- //Try to create the saved folder
- created = [fm createDirectoryAtPath:userPreferredDownloadFolder withIntermediateDirectories:YES attributes:nil error:nil];
- }
- if (!isDir && !created) {
- //Try the desktop
- userPreferredDownloadFolder = [[fm URLForDirectory:NSDesktopDirectory
- inDomain:NSUserDomainMask
- appropriateForURL:nil create:YES error:nil] path];
- }
-
- return userPreferredDownloadFolder;
-}
-
-/*!
- * @brief Set the location Adium should use for saving files
- *
- * @param A path to an existing folder
- */
-- (void)setUserPreferredDownloadFolder:(NSString *)path
-{
- [self setPreference:[path stringByAbbreviatingWithTildeInPath]
- forKey:@"UserPreferredDownloadFolder"
- group:PREF_GROUP_GENERAL];
-}
-
#pragma mark KVC
static void parseKeypath(NSString *keyPath, NSString **outGroup, NSString **outKeyPath, NSString **outInternalObjectID)
diff -r ef1d48be3644 -r f196058dfb81 Source/ESFileTransferController.h
--- a/Source/ESFileTransferController.h Thu Sep 13 23:15:56 2012 +0200
+++ b/Source/ESFileTransferController.h Thu Sep 13 23:36:40 2012 +0200
@@ -29,8 +29,6 @@
NSSet *safeFileExtensions;
AIFileTransferAutoAcceptType autoAcceptType;
- BOOL autoChooseFolder;
- BOOL autoOpenSafe;
BOOL showProgressWindow;
}
diff -r ef1d48be3644 -r f196058dfb81 Source/ESFileTransferController.m
--- a/Source/ESFileTransferController.m Thu Sep 13 23:15:56 2012 +0200
+++ b/Source/ESFileTransferController.m Thu Sep 13 23:36:40 2012 +0200
@@ -58,7 +58,6 @@
- (void)showProgressWindow:(id)sender;
- (void)showProgressWindowIfNotOpen:(id)sender;
- (void)_finishReceiveRequestForFileTransfer:(ESFileTransfer *)fileTransfer localFilename:(NSString *)localFilename;
-- (BOOL)shouldOpenCompleteFileTransfer:(ESFileTransfer *)fileTransfer;
- (IBAction)contextualMenuSendFile:(id)sender;
- (IBAction)sendFileToSelectedContact:(id)sender;
@end
@@ -200,14 +199,18 @@
if ((autoAcceptType == AutoAccept_All) ||
((autoAcceptType == AutoAccept_FromContactList) && [listContact isIntentionallyNotAStranger])) {
- NSString *preferredDownloadFolder = [adium.preferenceController userPreferredDownloadFolder];
+ NSString *downloadFolder = [[[NSFileManager defaultManager] URLForDirectory:NSDownloadsDirectory
+ inDomain:NSUserDomainMask
+ appropriateForURL:nil
+ create:NO
+ error:NULL] path];
NSString *remoteFilename = [fileTransfer remoteFilename];
//If the incoming file would become hidden, prefix it with an underscore so it is visible.
if ([remoteFilename hasPrefix:@"."]) remoteFilename = [@"_" stringByAppendingString:remoteFilename ];
//If we should autoaccept, determine the local filename and proceed to accept the request.
- localFilename = [preferredDownloadFolder stringByAppendingPathComponent:remoteFilename];
+ localFilename = [downloadFolder stringByAppendingPathComponent:remoteFilename];
[self _finishReceiveRequestForFileTransfer:fileTransfer
localFilename:[[NSFileManager defaultManager] uniquePathForPath:localFilename]];
@@ -470,11 +473,6 @@
userInfo:fileTransfer
previouslyPerformedActionIDs:nil];
- //The file is complete; if we are supposed to automatically open safe files and this is one, open it
- if ([self shouldOpenCompleteFileTransfer:fileTransfer]) {
- [fileTransfer openFile];
- }
-
[[NSDistributedNotificationCenter defaultCenter] postNotificationName:@"com.apple.DownloadFileFinished"
object:fileTransfer.localFilename];
@@ -496,21 +494,6 @@
}
}
-- (BOOL)shouldOpenCompleteFileTransfer:(ESFileTransfer *)fileTransfer
-{
- BOOL shouldOpen = NO;
-
- if (autoOpenSafe &&
- ([fileTransfer fileTransferType] == Incoming_FileTransfer)) {
-
- if (!safeFileExtensions) safeFileExtensions = SAFE_FILE_EXTENSIONS_SET;
-
- shouldOpen = [safeFileExtensions containsObject:[[[fileTransfer localFilename] pathExtension] lowercaseString]];
- }
-
- return shouldOpen;
-}
-
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
{
AIListContact *listContact = nil;
@@ -582,12 +565,6 @@
object:(AIListObject *)object preferenceDict:(NSDictionary *)prefDict firstTime:(BOOL)firstTime
{
autoAcceptType = [[prefDict objectForKey:KEY_FT_AUTO_ACCEPT] intValue];
- autoOpenSafe = [[prefDict objectForKey:KEY_FT_AUTO_OPEN_SAFE] boolValue];
-
- //If we created a safe file extensions set and no longer need it, desroy it
- if (!autoOpenSafe && safeFileExtensions) {
- safeFileExtensions = nil;
- }
showProgressWindow = [[prefDict objectForKey:KEY_FT_SHOW_PROGRESS_WINDOW] boolValue];
}
diff -r ef1d48be3644 -r f196058dfb81 Source/ESFileTransferPreferences.h
--- a/Source/ESFileTransferPreferences.h Thu Sep 13 23:15:56 2012 +0200
+++ b/Source/ESFileTransferPreferences.h Thu Sep 13 23:36:40 2012 +0200
@@ -19,17 +19,12 @@
@class AILocalizationButton, AILocalizationTextField;
@interface ESFileTransferPreferences : AIPreferencePane {
- IBOutlet NSPopUpButton *popUp_downloadLocation;
IBOutlet AILocalizationButton *checkBox_autoAcceptFiles;
IBOutlet AILocalizationButton *checkBox_autoAcceptOnlyFromCLList;
- IBOutlet AILocalizationButton *checkBox_autoOpenFiles;
- IBOutlet AILocalizationButton *checkBox_autoClearCompleted;
IBOutlet AILocalizationButton *checkBox_showProgress;
IBOutlet AILocalizationTextField *label_whenReceivingFiles;
- IBOutlet AILocalizationTextField *label_defaultReceivingFolder;
- IBOutlet AILocalizationTextField *label_safeFilesDescription;
IBOutlet AILocalizationTextField *label_transferProgress;
}
diff -r ef1d48be3644 -r f196058dfb81 Source/ESFileTransferPreferences.m
--- a/Source/ESFileTransferPreferences.m Thu Sep 13 23:15:56 2012 +0200
+++ b/Source/ESFileTransferPreferences.m Thu Sep 13 23:36:40 2012 +0200
@@ -23,12 +23,6 @@
#import <AIUtilities/AIMenuAdditions.h>
#import <AIUtilities/AIStringAdditions.h>
- at interface ESFileTransferPreferences ()
-- (NSMenu *)downloadLocationMenu;
-- (void)buildDownloadLocationMenu;
-- (void)selectOtherDownloadFolder:(id)sender;
- at end
-
@implementation ESFileTransferPreferences
//Preference pane properties
- (AIPreferenceCategory)category{
@@ -78,7 +72,6 @@
AIFileTransferAutoAcceptType autoAcceptType = [[adium.preferenceController preferenceForKey:KEY_FT_AUTO_ACCEPT
group:PREF_GROUP_FILE_TRANSFER] intValue];
- [self buildDownloadLocationMenu];
switch (autoAcceptType) {
case AutoAccept_None:
@@ -101,70 +94,11 @@
- (void)localizePane
{
[label_whenReceivingFiles setLocalizedString:AILocalizedString(@"Receiving files:","File Transfer preferences label")];
- [label_defaultReceivingFolder setLocalizedString:AILocalizedString(@"Save files to:","File Transfer preferences label")];
- [label_safeFilesDescription setLocalizedString:AILocalizedString(@"\"Safe\" files include movies, pictures,\nsounds, text documents, and archives.","Description of safe files (files which Adium can open automatically without danger to the user). This description should be on two lines; the lines are separated by \n.")];
[label_transferProgress setLocalizedString:AILocalizedString(@"Progress:","File Transfer preferences label")];
- [checkBox_autoAcceptFiles setLocalizedString:[AILocalizedString(@"Automatically accept files and images","File Transfer preferences") stringByAppendingEllipsis]];
+ [checkBox_autoAcceptFiles setLocalizedString:[AILocalizedString(@"Automatically save files to Downloads","File Transfer preferences") stringByAppendingEllipsis]];
[checkBox_autoAcceptOnlyFromCLList setLocalizedString:AILocalizedString(@"only from contacts on my Contact List","File Transfer preferences")];
- [checkBox_autoOpenFiles setLocalizedString:AILocalizedString(@"Open \"Safe\" files after receiving","File Transfer preferences")];
[checkBox_showProgress setLocalizedString:AILocalizedString(@"Show the File Transfers window automatically","File Transfer preferences")];
- [checkBox_autoClearCompleted setLocalizedString:AILocalizedString(@"Clear completed transfers automatically","File Transfer preferences")];
-}
-
-- (void)buildDownloadLocationMenu
-{
- [popUp_downloadLocation setMenu:[self downloadLocationMenu]];
- [popUp_downloadLocation selectItem:[popUp_downloadLocation itemAtIndex:0]];
-}
-
-- (NSMenu *)downloadLocationMenu
-{
- NSMenu *menu;
- NSMenuItem *menuItem;
- NSString *userPreferredDownloadFolder;
-
- menu = [[NSMenu alloc] init];
- [menu setAutoenablesItems:NO];
-
- //Create the menu item for the current download folder
- userPreferredDownloadFolder = [adium.preferenceController userPreferredDownloadFolder];
- menuItem = [[NSMenuItem alloc] initWithTitle:[[NSFileManager defaultManager] displayNameAtPath:userPreferredDownloadFolder]
- target:nil
- action:nil
- keyEquivalent:@""];
- [menuItem setRepresentedObject:userPreferredDownloadFolder];
- [menuItem setImage:[[[NSWorkspace sharedWorkspace] iconForFile:userPreferredDownloadFolder] imageByScalingForMenuItem]];
- [menu addItem:menuItem];
-
- [menu addItem:[NSMenuItem separatorItem]];
-
- //Create the menu item for changing the current download folder
- menuItem = [[NSMenuItem alloc] initWithTitle:[AILocalizedString(@"Other",nil) stringByAppendingEllipsis]
- target:self
- action:@selector(selectOtherDownloadFolder:)
- keyEquivalent:@""];
- [menuItem setRepresentedObject:userPreferredDownloadFolder];
- [menu addItem:menuItem];
-
- return menu;
-}
-
-- (void)selectOtherDownloadFolder:(id)sender
-{
- NSOpenPanel *openPanel = [NSOpenPanel openPanel];
- NSString *userPreferredDownloadFolder = [sender representedObject];
-
- [openPanel setCanChooseFiles:NO];
- [openPanel setCanChooseDirectories:YES];
- openPanel.directoryURL = [NSURL fileURLWithPath:userPreferredDownloadFolder];
- [openPanel beginSheetModalForWindow:[[self view] window] completionHandler:^(NSInteger result) {
- if (result == NSFileHandlingPanelOKButton) {
- [adium.preferenceController setUserPreferredDownloadFolder:openPanel.URL. path];
- }
-
- [self buildDownloadLocationMenu];
- }];
}
@end
diff -r ef1d48be3644 -r f196058dfb81 Source/ESFileTransferRequestPromptController.m
--- a/Source/ESFileTransferRequestPromptController.m Thu Sep 13 23:15:56 2012 +0200
+++ b/Source/ESFileTransferRequestPromptController.m Thu Sep 13 23:36:40 2012 +0200
@@ -71,8 +71,13 @@
*/
- (void)handleFileTransferAction:(AIFileTransferAction)action
More information about the commits
mailing list