#4393 Remove "Open Recent" menu item and list of recent torrent files

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 67d6c9501593d7352867b6a596e4d77004d000fb..d3a399014540a5a6646419120c662a949a5dfc96 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -248,6 +248,9 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
             [fDefaults setBool: NO forKey: @"CheckDownload"];
         }
         
+        //upgrading from versions < 2.40: clear recent items
+        [[NSDocumentController sharedDocumentController] clearRecentDocuments: nil];
+        
         tr_benc settings;
         tr_bencInitDict(&settings, 41);
         tr_sessionGetDefaultSettings(&settings);
@@ -867,9 +870,6 @@ static void sleepCallback(void * controller, io_service_t y, natural_t messageTy
         if (type == ADD_CREATED)
             [torrent resetCache];
         
-        //add it to the "File -> Open Recent" menu
-        [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL: [NSURL fileURLWithPath: torrentPath]];
-        
         //show the add window or add directly
         if (showWindow || !location)
         {

diff --git a/macosx/en.lproj/MainMenu.xib b/macosx/en.lproj/MainMenu.xib
index 699ae38860b2c20bb33e428d510d124c6766cd30..aa9314ce90bdc23d987872b370b50154295b88a0 100644 (file)
--- a/macosx/en.lproj/MainMenu.xib
+++ b/macosx/en.lproj/MainMenu.xib
@@ -891,33 +891,6 @@ AAAAAAAAAAA</bytes>
                                                                        <reference key="NSOnImage" ref="246127200"/>
                                                                        <reference key="NSMixedImage" ref="330170270"/>
                                                                </object>
-                                                               <object class="NSMenuItem" id="25242686">
-                                                                       <reference key="NSMenu" ref="455126894"/>
-                                                                       <string key="NSTitle">Open Recent</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSKeyEquivModMask">1048576</int>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="246127200"/>
-                                                                       <reference key="NSMixedImage" ref="330170270"/>
-                                                                       <string key="NSAction">submenuAction:</string>
-                                                                       <object class="NSMenu" key="NSSubmenu" id="297907060">
-                                                                               <object class="NSMutableString" key="NSTitle">
-                                                                                       <characters key="NS.bytes">Open Recent</characters>
-                                                                               </object>
-                                                                               <array class="NSMutableArray" key="NSMenuItems">
-                                                                                       <object class="NSMenuItem" id="484250807">
-                                                                                               <reference key="NSMenu" ref="297907060"/>
-                                                                                               <string key="NSTitle">Clear Menu</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="246127200"/>
-                                                                                               <reference key="NSMixedImage" ref="330170270"/>
-                                                                                       </object>
-                                                                               </array>
-                                                                               <string key="NSName">_NSRecentDocumentsMenu</string>
-                                                                       </object>
-                                                               </object>
                                                                <object class="NSMenuItem" id="1043081358">
                                                                        <reference key="NSMenu" ref="455126894"/>
                                                                        <bool key="NSIsDisabled">YES</bool>
@@ -2672,14 +2645,6 @@ AAAAAAAAAAA</bytes>
                </array>
                <object class="IBObjectContainer" key="IBDocument.Objects">
                        <array class="NSMutableArray" key="connectionRecords">
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">clearRecentDocuments:</string>
-                                               <reference key="source" ref="221169782"/>
-                                               <reference key="destination" ref="484250807"/>
-                                       </object>
-                                       <int key="connectionID">127</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">hideOtherApplications:</string>
@@ -4209,7 +4174,6 @@ AAAAAAAAAAA</bytes>
                                                        <reference ref="785760832"/>
                                                        <reference ref="849725873"/>
                                                        <reference ref="839303335"/>
-                                                       <reference ref="25242686"/>
                                                        <reference ref="521960375"/>
                                                        <reference ref="711840500"/>
                                                        <reference ref="439865608"/>
@@ -4238,27 +4202,6 @@ AAAAAAAAAAA</bytes>
                                                <reference key="object" ref="839303335"/>
                                                <reference key="parent" ref="455126894"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">124</int>
-                                               <reference key="object" ref="25242686"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="297907060"/>
-                                               </array>
-                                               <reference key="parent" ref="455126894"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">125</int>
-                                               <reference key="object" ref="297907060"/>
-                                               <array class="NSMutableArray" key="children">
-                                                       <reference ref="484250807"/>
-                                               </array>
-                                               <reference key="parent" ref="25242686"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">126</int>
-                                               <reference key="object" ref="484250807"/>
-                                               <reference key="parent" ref="297907060"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">1533</int>
                                                <reference key="object" ref="521960375"/>
@@ -5634,9 +5577,6 @@ AAAAAAAAAAA</bytes>
                                <string key="1068.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="1070.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="1222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                               <string key="126.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="1282.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="129.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
                                <string key="1293.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>