Changeset 6023
- Timestamp:
- Jun 4, 2008, 3:50:10 AM (14 years ago)
- Location:
- trunk/macosx
- Files:
-
- 6 edited
-
Controller.m (modified) (1 diff)
-
Defaults.plist (modified) (2 diffs)
-
English.lproj/MainMenu.xib (modified) (2 diffs)
-
English.lproj/PrefsWindow.xib (modified) (21 diffs)
-
PrefsController.h (modified) (2 diffs)
-
PrefsController.m (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.m
r6021 r6023 220 220 [fDefaults boolForKey: @"RPC"], 221 221 [fDefaults integerForKey: @"RPCPort"], 222 TR_DEFAULT_RPC_ACL);222 /*TR_DEFAULT_RPC_ACL*/""); 223 223 224 224 [NSApp setDelegate: self]; -
trunk/macosx/Defaults.plist
r6000 r6023 85 85 <key>NatTraversal</key> 86 86 <true/> 87 <key>RPC</key>88 <false/>89 <key>RPCPort</key>90 <integer>9091</integer>91 87 <key>PEXGlobal</key> 92 88 <true/> … … 115 111 <key>RatioLimit</key> 116 112 <integer>2</integer> 113 <key>RPC</key> 114 <false/> 115 <key>RPCPort</key> 116 <integer>9091</integer> 117 117 <key>SeedingSound</key> 118 118 <string>Submarine</string> -
trunk/macosx/English.lproj/MainMenu.xib
r6021 r6023 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 11 <integer value="2"/> 12 <integer value="81"/> 12 13 </object> 13 14 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 2215 2216 <reference key="NSOnImage" ref="322614661"/> 2216 2217 <reference key="NSMixedImage" ref="3851078"/> 2218 <int key="NSTag">501</int> 2217 2219 </object> 2218 2220 <object class="NSMenuItem" id="439865608"> -
trunk/macosx/English.lproj/PrefsWindow.xib
r6021 r6023 9 9 <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> 10 10 <bool key="EncodedWithXMLCoder">YES</bool> 11 <integer value="66"/>12 11 <integer value="1481"/> 13 <integer value="153"/>14 12 </object> 15 13 <object class="NSArray" key="IBDocument.PluginDependencies"> … … 930 928 <string key="NSCatalogName">System</string> 931 929 <string key="NSColorName">textBackgroundColor</string> 932 <object class="NSColor" key="NSColor" >930 <object class="NSColor" key="NSColor" id="381671284"> 933 931 <int key="NSColorSpace">3</int> 934 932 <bytes key="NSWhite">MQA</bytes> … … 1520 1518 </object> 1521 1519 <object class="NSCustomView" id="352903881"> 1522 < referencekey="NSNextResponder"/>1520 <nil key="NSNextResponder"/> 1523 1521 <int key="NSvFlags">256</int> 1524 1522 <object class="NSMutableArray" key="NSSubviews"> … … 2115 2113 </object> 2116 2114 <string key="NSFrameSize">{535, 226}</string> 2117 <reference key="NSSuperview"/>2118 2115 <string key="NSClassName">NSView</string> 2119 2116 <string key="NSExtension">NSResponder</string> … … 2537 2534 </object> 2538 2535 <object class="NSCustomView" id="204700639"> 2539 < referencekey="NSNextResponder"/>2536 <nil key="NSNextResponder"/> 2540 2537 <int key="NSvFlags">256</int> 2541 2538 <object class="NSMutableArray" key="NSSubviews"> … … 2797 2794 </object> 2798 2795 <string key="NSFrameSize">{535, 153}</string> 2799 <reference key="NSSuperview"/>2800 2796 <string key="NSClassName">NSView</string> 2801 2797 <string key="NSExtension">NSResponder</string> … … 2809 2805 <reference key="NSNextResponder" ref="810116101"/> 2810 2806 <int key="NSvFlags">256</int> 2811 <string key="NSFrame">{{10 3, 48}, {96, 17}}</string>2807 <string key="NSFrame">{{102, 210}, {96, 17}}</string> 2812 2808 <reference key="NSSuperview" ref="810116101"/> 2813 2809 <bool key="NSEnabled">YES</bool> … … 2825 2821 <reference key="NSNextResponder" ref="810116101"/> 2826 2822 <int key="NSvFlags">256</int> 2827 <string key="NSFrame">{{204, 46}, {50, 22}}</string>2823 <string key="NSFrame">{{204, 208}, {50, 22}}</string> 2828 2824 <reference key="NSSuperview" ref="810116101"/> 2829 2825 <bool key="NSEnabled">YES</bool> … … 2891 2887 <reference key="NSNextResponder" ref="810116101"/> 2892 2888 <int key="NSvFlags">256</int> 2893 <string key="NSFrame">{{84, 72}, {367, 18}}</string>2889 <string key="NSFrame">{{84, 234}, {367, 18}}</string> 2894 2890 <reference key="NSSuperview" ref="810116101"/> 2895 2891 <bool key="NSEnabled">YES</bool> … … 2913 2909 <reference key="NSNextResponder" ref="810116101"/> 2914 2910 <int key="NSvFlags">256</int> 2915 <string key="NSFrame">{{10 4, 21}, {139, 18}}</string>2911 <string key="NSFrame">{{103, 183}, {139, 18}}</string> 2916 2912 <reference key="NSSuperview" ref="810116101"/> 2917 2913 <bool key="NSEnabled">YES</bool> … … 2935 2931 <reference key="NSNextResponder" ref="810116101"/> 2936 2932 <int key="NSvFlags">256</int> 2937 <string key="NSFrame">{{24 9, 20}, {152, 22}}</string>2933 <string key="NSFrame">{{248, 182}, {152, 22}}</string> 2938 2934 <reference key="NSSuperview" ref="810116101"/> 2939 2935 <bool key="NSEnabled">YES</bool> … … 2953 2949 </object> 2954 2950 </object> 2955 </object> 2956 <string key="NSFrameSize">{535, 108}</string> 2951 <object class="NSTextField" id="764256678"> 2952 <reference key="NSNextResponder" ref="810116101"/> 2953 <int key="NSvFlags">256</int> 2954 <string key="NSFrame">{{102, 161}, {123, 17}}</string> 2955 <reference key="NSSuperview" ref="810116101"/> 2956 <bool key="NSEnabled">YES</bool> 2957 <object class="NSTextFieldCell" key="NSCell" id="1067941383"> 2958 <int key="NSCellFlags">67239424</int> 2959 <int key="NSCellFlags2">71303168</int> 2960 <string key="NSContents">Access control list:</string> 2961 <reference key="NSSupport" ref="86725571"/> 2962 <reference key="NSControlView" ref="764256678"/> 2963 <reference key="NSBackgroundColor" ref="977951849"/> 2964 <reference key="NSTextColor" ref="400627124"/> 2965 </object> 2966 </object> 2967 <object class="NSScrollView" id="122119447"> 2968 <reference key="NSNextResponder" ref="810116101"/> 2969 <int key="NSvFlags">268</int> 2970 <object class="NSMutableArray" key="NSSubviews"> 2971 <bool key="EncodedWithXMLCoder">YES</bool> 2972 <object class="NSClipView" id="206862330"> 2973 <reference key="NSNextResponder" ref="122119447"/> 2974 <int key="NSvFlags">2304</int> 2975 <object class="NSMutableArray" key="NSSubviews"> 2976 <bool key="EncodedWithXMLCoder">YES</bool> 2977 <object class="NSTableView" id="173651346"> 2978 <reference key="NSNextResponder" ref="206862330"/> 2979 <int key="NSvFlags">256</int> 2980 <string key="NSFrameSize">{327, 117}</string> 2981 <reference key="NSSuperview" ref="206862330"/> 2982 <bool key="NSEnabled">YES</bool> 2983 <object class="NSTableHeaderView" key="NSHeaderView" id="520862816"> 2984 <reference key="NSNextResponder" ref="852520526"/> 2985 <int key="NSvFlags">256</int> 2986 <string key="NSFrameSize">{327, 17}</string> 2987 <reference key="NSSuperview" ref="852520526"/> 2988 <reference key="NSTableView" ref="173651346"/> 2989 </object> 2990 <object class="_NSCornerView" key="NSCornerView" id="1018053122"> 2991 <reference key="NSNextResponder" ref="122119447"/> 2992 <int key="NSvFlags">256</int> 2993 <string key="NSFrame">{{328, 0}, {16, 17}}</string> 2994 <reference key="NSSuperview" ref="122119447"/> 2995 </object> 2996 <object class="NSMutableArray" key="NSTableColumns"> 2997 <bool key="EncodedWithXMLCoder">YES</bool> 2998 <object class="NSTableColumn" id="419711322"> 2999 <string key="NSIdentifier">IP</string> 3000 <double key="NSWidth">2.570000e+02</double> 3001 <double key="NSMinWidth">4.000000e+01</double> 3002 <double key="NSMaxWidth">1.000000e+03</double> 3003 <object class="NSTableHeaderCell" key="NSHeaderCell"> 3004 <int key="NSCellFlags">75628032</int> 3005 <int key="NSCellFlags2">0</int> 3006 <string key="NSContents">IP Address</string> 3007 <reference key="NSSupport" ref="26"/> 3008 <object class="NSColor" key="NSBackgroundColor" id="245857249"> 3009 <int key="NSColorSpace">3</int> 3010 <bytes key="NSWhite">MC4zMzMzMzI5OQA</bytes> 3011 </object> 3012 <object class="NSColor" key="NSTextColor" id="1020040622"> 3013 <int key="NSColorSpace">6</int> 3014 <string key="NSCatalogName">System</string> 3015 <string key="NSColorName">headerTextColor</string> 3016 <reference key="NSColor" ref="341432566"/> 3017 </object> 3018 </object> 3019 <object class="NSTextFieldCell" key="NSDataCell" id="927132215"> 3020 <int key="NSCellFlags">337772096</int> 3021 <int key="NSCellFlags2">2048</int> 3022 <string key="NSContents">Text Cell</string> 3023 <reference key="NSSupport" ref="86725571"/> 3024 <reference key="NSControlView" ref="173651346"/> 3025 <reference key="NSBackgroundColor" ref="729660797"/> 3026 <reference key="NSTextColor" ref="400627124"/> 3027 </object> 3028 <int key="NSResizingMask">3</int> 3029 <bool key="NSIsResizeable">YES</bool> 3030 <bool key="NSIsEditable">YES</bool> 3031 <reference key="NSTableView" ref="173651346"/> 3032 </object> 3033 <object class="NSTableColumn" id="618951019"> 3034 <string key="NSIdentifier">Permission</string> 3035 <double key="NSWidth">6.400000e+01</double> 3036 <double key="NSMinWidth">4.000000e+01</double> 3037 <double key="NSMaxWidth">1.000000e+03</double> 3038 <object class="NSTableHeaderCell" key="NSHeaderCell"> 3039 <int key="NSCellFlags">75628032</int> 3040 <int key="NSCellFlags2">0</int> 3041 <string key="NSContents">Permission</string> 3042 <reference key="NSSupport" ref="26"/> 3043 <reference key="NSBackgroundColor" ref="245857249"/> 3044 <reference key="NSTextColor" ref="1020040622"/> 3045 </object> 3046 <object class="NSPopUpButtonCell" key="NSDataCell" id="946327133"> 3047 <int key="NSCellFlags">-2076049856</int> 3048 <int key="NSCellFlags2">133120</int> 3049 <reference key="NSSupport" ref="26"/> 3050 <reference key="NSControlView" ref="173651346"/> 3051 <int key="NSButtonFlags">100679935</int> 3052 <int key="NSButtonFlags2">129</int> 3053 <string key="NSAlternateContents"/> 3054 <string key="NSKeyEquivalent"/> 3055 <int key="NSPeriodicDelay">400</int> 3056 <int key="NSPeriodicInterval">75</int> 3057 <object class="NSMenuItem" key="NSMenuItem" id="879941939"> 3058 <reference key="NSMenu" ref="23202450"/> 3059 <string key="NSTitle">Allow</string> 3060 <string key="NSKeyEquiv"/> 3061 <int key="NSKeyEquivModMask">1048576</int> 3062 <int key="NSMnemonicLoc">2147483647</int> 3063 <int key="NSState">1</int> 3064 <reference key="NSOnImage" ref="550412468"/> 3065 <reference key="NSMixedImage" ref="32510707"/> 3066 <string key="NSAction">_popUpItemAction:</string> 3067 <reference key="NSTarget" ref="946327133"/> 3068 </object> 3069 <bool key="NSMenuItemRespectAlignment">YES</bool> 3070 <object class="NSMenu" key="NSMenu" id="23202450"> 3071 <string key="NSTitle">OtherViews</string> 3072 <object class="NSMutableArray" key="NSMenuItems"> 3073 <bool key="EncodedWithXMLCoder">YES</bool> 3074 <reference ref="879941939"/> 3075 <object class="NSMenuItem" id="790371608"> 3076 <reference key="NSMenu" ref="23202450"/> 3077 <string key="NSTitle">Block</string> 3078 <string key="NSKeyEquiv"/> 3079 <int key="NSMnemonicLoc">2147483647</int> 3080 <reference key="NSOnImage" ref="550412468"/> 3081 <reference key="NSMixedImage" ref="32510707"/> 3082 <string key="NSAction">_popUpItemAction:</string> 3083 <reference key="NSTarget" ref="946327133"/> 3084 </object> 3085 </object> 3086 </object> 3087 <int key="NSPreferredEdge">3</int> 3088 <bool key="NSUsesItemFromMenu">YES</bool> 3089 <bool key="NSAltersState">YES</bool> 3090 <int key="NSArrowPosition">1</int> 3091 </object> 3092 <int key="NSResizingMask">3</int> 3093 <bool key="NSIsResizeable">YES</bool> 3094 <bool key="NSIsEditable">YES</bool> 3095 <reference key="NSTableView" ref="173651346"/> 3096 </object> 3097 </object> 3098 <double key="NSIntercellSpacingWidth">3.000000e+00</double> 3099 <double key="NSIntercellSpacingHeight">2.000000e+00</double> 3100 <reference key="NSBackgroundColor" ref="381671284"/> 3101 <object class="NSColor" key="NSGridColor"> 3102 <int key="NSColorSpace">6</int> 3103 <string key="NSCatalogName">System</string> 3104 <string key="NSColorName">gridColor</string> 3105 <object class="NSColor" key="NSColor"> 3106 <int key="NSColorSpace">3</int> 3107 <bytes key="NSWhite">MC41AA</bytes> 3108 </object> 3109 </object> 3110 <double key="NSRowHeight">1.700000e+01</double> 3111 <int key="NSTvFlags">-557842432</int> 3112 <int key="NSColumnAutoresizingStyle">4</int> 3113 <int key="NSDraggingSourceMaskForLocal">15</int> 3114 <int key="NSDraggingSourceMaskForNonLocal">0</int> 3115 <bool key="NSAllowsTypeSelect">YES</bool> 3116 </object> 3117 </object> 3118 <string key="NSFrame">{{1, 17}, {327, 117}}</string> 3119 <reference key="NSSuperview" ref="122119447"/> 3120 <reference key="NSNextKeyView" ref="173651346"/> 3121 <reference key="NSDocView" ref="173651346"/> 3122 <reference key="NSBGColor" ref="729660797"/> 3123 <int key="NScvFlags">4</int> 3124 </object> 3125 <object class="NSScroller" id="220703981"> 3126 <reference key="NSNextResponder" ref="122119447"/> 3127 <int key="NSvFlags">256</int> 3128 <string key="NSFrame">{{328, 17}, {15, 117}}</string> 3129 <reference key="NSSuperview" ref="122119447"/> 3130 <reference key="NSTarget" ref="122119447"/> 3131 <string key="NSAction">_doScroller:</string> 3132 <double key="NSCurValue">3.700000e+01</double> 3133 <double key="NSPercent">1.947368e-01</double> 3134 </object> 3135 <object class="NSScroller" id="383062716"> 3136 <reference key="NSNextResponder" ref="122119447"/> 3137 <int key="NSvFlags">256</int> 3138 <string key="NSFrame">{{-100, -100}, {327, 15}}</string> 3139 <reference key="NSSuperview" ref="122119447"/> 3140 <int key="NSsFlags">1</int> 3141 <reference key="NSTarget" ref="122119447"/> 3142 <string key="NSAction">_doScroller:</string> 3143 <double key="NSPercent">9.971265e-01</double> 3144 </object> 3145 <object class="NSClipView" id="852520526"> 3146 <reference key="NSNextResponder" ref="122119447"/> 3147 <int key="NSvFlags">2304</int> 3148 <object class="NSMutableArray" key="NSSubviews"> 3149 <bool key="EncodedWithXMLCoder">YES</bool> 3150 <reference ref="520862816"/> 3151 </object> 3152 <string key="NSFrame">{{1, 0}, {327, 17}}</string> 3153 <reference key="NSSuperview" ref="122119447"/> 3154 <reference key="NSNextKeyView" ref="520862816"/> 3155 <reference key="NSDocView" ref="520862816"/> 3156 <reference key="NSBGColor" ref="729660797"/> 3157 <int key="NScvFlags">4</int> 3158 </object> 3159 <reference ref="1018053122"/> 3160 </object> 3161 <string key="NSFrame">{{105, 18}, {344, 135}}</string> 3162 <reference key="NSSuperview" ref="810116101"/> 3163 <reference key="NSNextKeyView" ref="206862330"/> 3164 <int key="NSsFlags">18</int> 3165 <reference key="NSVScroller" ref="220703981"/> 3166 <reference key="NSHScroller" ref="383062716"/> 3167 <reference key="NSContentView" ref="206862330"/> 3168 <reference key="NSHeaderClipView" ref="852520526"/> 3169 <reference key="NSCornerView" ref="1018053122"/> 3170 <bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes> 3171 </object> 3172 </object> 3173 <string key="NSFrameSize">{535, 270}</string> 2957 3174 <reference key="NSSuperview"/> 2958 3175 <string key="NSClassName">NSView</string> … … 4689 4906 <int key="connectionID">1515</int> 4690 4907 </object> 4908 <object class="IBConnectionRecord"> 4909 <object class="IBOutletConnection" key="connection"> 4910 <string key="label">dataSource</string> 4911 <reference key="source" ref="173651346"/> 4912 <reference key="destination" ref="511492310"/> 4913 </object> 4914 <int key="connectionID">1532</int> 4915 </object> 4916 <object class="IBConnectionRecord"> 4917 <object class="IBOutletConnection" key="connection"> 4918 <string key="label">fRPCAccessTable</string> 4919 <reference key="source" ref="511492310"/> 4920 <reference key="destination" ref="173651346"/> 4921 </object> 4922 <int key="connectionID">1533</int> 4923 </object> 4691 4924 </object> 4692 4925 <object class="IBMutableOrderedSet" key="objectRecords"> … … 6488 6721 <object class="NSMutableArray" key="children"> 6489 6722 <bool key="EncodedWithXMLCoder">YES</bool> 6490 <reference ref="898169443"/>6491 6723 <reference ref="712370553"/> 6492 6724 <reference ref="485614707"/> 6725 <reference ref="898169443"/> 6493 6726 <reference ref="151618662"/> 6494 6727 <reference ref="894846458"/> 6728 <reference ref="764256678"/> 6729 <reference ref="122119447"/> 6495 6730 </object> 6496 6731 <reference key="parent" ref="37013934"/> … … 6575 6810 <reference key="object" ref="38151087"/> 6576 6811 <reference key="parent" ref="894846458"/> 6812 </object> 6813 <object class="IBObjectRecord"> 6814 <int key="objectID">1516</int> 6815 <reference key="object" ref="764256678"/> 6816 <object class="NSMutableArray" key="children"> 6817 <bool key="EncodedWithXMLCoder">YES</bool> 6818 <reference ref="1067941383"/> 6819 </object> 6820 <reference key="parent" ref="810116101"/> 6821 </object> 6822 <object class="IBObjectRecord"> 6823 <int key="objectID">1517</int> 6824 <reference key="object" ref="1067941383"/> 6825 <reference key="parent" ref="764256678"/> 6826 </object> 6827 <object class="IBObjectRecord"> 6828 <int key="objectID">1518</int> 6829 <reference key="object" ref="122119447"/> 6830 <object class="NSMutableArray" key="children"> 6831 <bool key="EncodedWithXMLCoder">YES</bool> 6832 <reference ref="220703981"/> 6833 <reference ref="383062716"/> 6834 <reference ref="173651346"/> 6835 <reference ref="520862816"/> 6836 </object> 6837 <reference key="parent" ref="810116101"/> 6838 </object> 6839 <object class="IBObjectRecord"> 6840 <int key="objectID">1519</int> 6841 <reference key="object" ref="220703981"/> 6842 <reference key="parent" ref="122119447"/> 6843 </object> 6844 <object class="IBObjectRecord"> 6845 <int key="objectID">1520</int> 6846 <reference key="object" ref="383062716"/> 6847 <reference key="parent" ref="122119447"/> 6848 </object> 6849 <object class="IBObjectRecord"> 6850 <int key="objectID">1521</int> 6851 <reference key="object" ref="173651346"/> 6852 <object class="NSMutableArray" key="children"> 6853 <bool key="EncodedWithXMLCoder">YES</bool> 6854 <reference ref="419711322"/> 6855 <reference ref="618951019"/> 6856 </object> 6857 <reference key="parent" ref="122119447"/> 6858 </object> 6859 <object class="IBObjectRecord"> 6860 <int key="objectID">1522</int> 6861 <reference key="object" ref="520862816"/> 6862 <reference key="parent" ref="122119447"/> 6863 </object> 6864 <object class="IBObjectRecord"> 6865 <int key="objectID">1523</int> 6866 <reference key="object" ref="419711322"/> 6867 <object class="NSMutableArray" key="children"> 6868 <bool key="EncodedWithXMLCoder">YES</bool> 6869 <reference ref="927132215"/> 6870 </object> 6871 <reference key="parent" ref="173651346"/> 6872 </object> 6873 <object class="IBObjectRecord"> 6874 <int key="objectID">1524</int> 6875 <reference key="object" ref="618951019"/> 6876 <object class="NSMutableArray" key="children"> 6877 <bool key="EncodedWithXMLCoder">YES</bool> 6878 <reference ref="946327133"/> 6879 </object> 6880 <reference key="parent" ref="173651346"/> 6881 </object> 6882 <object class="IBObjectRecord"> 6883 <int key="objectID">1526</int> 6884 <reference key="object" ref="927132215"/> 6885 <reference key="parent" ref="419711322"/> 6886 </object> 6887 <object class="IBObjectRecord"> 6888 <int key="objectID">1528</int> 6889 <reference key="object" ref="946327133"/> 6890 <object class="NSMutableArray" key="children"> 6891 <bool key="EncodedWithXMLCoder">YES</bool> 6892 <reference ref="23202450"/> 6893 </object> 6894 <reference key="parent" ref="618951019"/> 6895 </object> 6896 <object class="IBObjectRecord"> 6897 <int key="objectID">1529</int> 6898 <reference key="object" ref="23202450"/> 6899 <object class="NSMutableArray" key="children"> 6900 <bool key="EncodedWithXMLCoder">YES</bool> 6901 <reference ref="879941939"/> 6902 <reference ref="790371608"/> 6903 </object> 6904 <reference key="parent" ref="946327133"/> 6905 </object> 6906 <object class="IBObjectRecord"> 6907 <int key="objectID">1530</int> 6908 <reference key="object" ref="879941939"/> 6909 <reference key="parent" ref="23202450"/> 6910 </object> 6911 <object class="IBObjectRecord"> 6912 <int key="objectID">1531</int> 6913 <reference key="object" ref="790371608"/> 6914 <reference key="parent" ref="23202450"/> 6577 6915 </object> 6578 6916 </object> … … 6680 7018 <string>1509.IBPluginDependency</string> 6681 7019 <string>1510.IBPluginDependency</string> 7020 <string>1516.IBPluginDependency</string> 7021 <string>1516.ImportedFromIB2</string> 7022 <string>1518.IBPluginDependency</string> 7023 <string>1519.IBPluginDependency</string> 7024 <string>1520.IBPluginDependency</string> 7025 <string>1521.IBPluginDependency</string> 7026 <string>1522.IBPluginDependency</string> 7027 <string>1523.IBPluginDependency</string> 7028 <string>1524.IBPluginDependency</string> 7029 <string>1526.IBPluginDependency</string> 7030 <string>1528.IBPluginDependency</string> 7031 <string>1529.IBEditorWindowLastContentRect</string> 7032 <string>1529.IBPluginDependency</string> 6682 7033 <string>153.IBEditorWindowLastContentRect</string> 6683 7034 <string>153.IBPluginDependency</string> 6684 7035 <string>153.ImportedFromIB2</string> 6685 7036 <string>153.editorWindowContentRectSynchronizationRect</string> 7037 <string>1530.IBPluginDependency</string> 7038 <string>1531.IBPluginDependency</string> 6686 7039 <string>154.IBPluginDependency</string> 6687 7040 <string>154.ImportedFromIB2</string> … … 6979 7332 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6980 7333 <reference ref="1361"/> 6981 <string>{{4 72, 699}, {535, 108}}</string>7334 <string>{{404, 377}, {535, 270}}</string> 6982 7335 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6983 7336 <reference ref="1361"/> … … 6995 7348 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6996 7349 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7350 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7351 <reference ref="1361"/> 7352 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7353 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7354 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7355 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7356 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7357 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7358 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7359 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7360 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7361 <string>{{499, 476}, {327, 37}}</string> 7362 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6997 7363 <string>{{289, 658}, {535, 226}}</string> 6998 7364 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 6999 7365 <reference ref="1361"/> 7000 7366 <string>{{149, 524}, {539, 226}}</string> 7367 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7368 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7001 7369 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 7002 7370 <reference ref="1361"/> … … 7238 7606 </object> 7239 7607 <nil key="sourceID"/> 7240 <int key="maxID">15 15</int>7608 <int key="maxID">1533</int> 7241 7609 </object> 7242 7610 <object class="IBClassDescriber" key="IBDocument.Classes"> … … 7416 7784 <string>fQueueDownloadField</string> 7417 7785 <string>fQueueSeedField</string> 7786 <string>fRPCAccessTable</string> 7418 7787 <string>fRPCPortField</string> 7419 7788 <string>fRatioStopField</string> … … 7446 7815 <string>NSTextField</string> 7447 7816 <string>NSTextField</string> 7817 <string>NSTableView</string> 7448 7818 <string>NSTextField</string> 7449 7819 <string>NSTextField</string> -
trunk/macosx/PrefsController.h
r6015 r6023 59 59 60 60 IBOutlet NSTextField * fRPCPortField; 61 IBOutlet NSTableView * fRPCAccessTable; 62 NSMutableArray * fRPCAccessArray; 61 63 } 62 64 … … 121 123 - (void) setRPCEnabled: (id) sender; 122 124 - (void) setRPCPort: (id) sender; 125 - (void) updateRPCAccessList; 123 126 124 127 - (void) rpcUpdatePrefs; -
trunk/macosx/PrefsController.m
r6015 r6023 32 32 #define DOWNLOAD_TORRENT 2 33 33 34 #define RPC_ACCESS_ALLOW 0 35 #define RPC_ACCESS_BLOCK 1 36 34 37 #define UPDATE_SECONDS 86400 35 38 … … 95 98 //actually set bandwidth limits 96 99 [self applySpeedSettings: nil]; 100 101 //update rpc access list 102 fRPCAccessArray = [[fDefaults arrayForKey: @"RPCAccessList"] mutableCopy]; 103 if (!fRPCAccessArray) 104 fRPCAccessArray = [[NSMutableArray arrayWithObject: [NSDictionary dictionaryWithObjectsAndKeys: @"127.0.0.1", @"IP", 105 [NSNumber numberWithBool: YES], @"Allow", nil]] retain]; 106 [self updateRPCAccessList]; 97 107 } 98 108 … … 114 124 [fPortChecker release]; 115 125 } 126 127 [fRPCAccessArray release]; 116 128 117 129 [super dealloc]; … … 638 650 } 639 651 652 - (void) updateRPCAccessList 653 { 654 NSMutableString * string = [NSMutableString stringWithCapacity: 17 * [fRPCAccessArray count]]; 655 656 NSEnumerator * enumerator = [fRPCAccessArray objectEnumerator]; 657 NSDictionary * dict; 658 while ((dict = [enumerator nextObject])) 659 { 660 [string appendFormat: @"%c%@,", [[dict objectForKey: @"Allow"] boolValue] ? '+' : '-', [dict objectForKey: @"IP"]]; 661 } 662 663 //remove last comma 664 NSUInteger length = [string length]; 665 if (length > 0) 666 [string deleteCharactersInRange: NSMakeRange(length-1, 1)]; 667 668 #warning check for an error! 669 tr_sessionSetRPCACL(fHandle, [string UTF8String], NULL); 670 } 671 672 - (NSInteger) numberOfRowsInTableView: (NSTableView *) tableView 673 { 674 return [fRPCAccessArray count]; 675 } 676 677 - (id) tableView: (NSTableView *) tableView objectValueForTableColumn: (NSTableColumn *) tableColumn row: (NSInteger) row 678 { 679 NSDictionary * dict = [fRPCAccessArray objectAtIndex: row]; 680 681 NSString * ident = [tableColumn identifier]; 682 if ([ident isEqualToString: @"Permission"]) 683 { 684 int allow = [[dict objectForKey: @"Allow"] boolValue] ? RPC_ACCESS_ALLOW : RPC_ACCESS_BLOCK; 685 return [NSNumber numberWithInt: allow]; 686 } 687 else 688 return [dict objectForKey: @"IP"]; 689 } 690 691 - (void) tableView: (NSTableView *) tableView setObjectValue: (id) object forTableColumn: (NSTableColumn *) tableColumn 692 row: (NSInteger) row 693 { 694 NSDictionary * oldDict = [fRPCAccessArray objectAtIndex: row], * newDict; 695 696 NSString * ident = [tableColumn identifier]; 697 if ([ident isEqualToString: @"Permission"]) 698 { 699 NSNumber * allow = [NSNumber numberWithBool: [object intValue] == RPC_ACCESS_ALLOW]; 700 newDict = [NSDictionary dictionaryWithObjectsAndKeys: [oldDict objectForKey: @"IP"], @"IP", allow, @"Allow", nil]; 701 } 702 else 703 { 704 //verify ip 705 NSArray * components = [object componentsSeparatedByString: @"."]; 706 if ([components count] != 4) 707 { 708 NSBeep(); 709 return; 710 } 711 712 NSMutableArray * newComponents = [NSMutableArray arrayWithCapacity: 4]; 713 714 NSEnumerator * enumerator = [components objectEnumerator]; 715 NSString * component; 716 while ((component = [enumerator nextObject])) 717 { 718 if ([component isEqualToString: @"*"]) 719 [newComponents addObject: component]; 720 else 721 { 722 int value = [component intValue]; 723 if (value >= 0 && value < 256) 724 [newComponents addObject: [[NSNumber numberWithInt: value] stringValue]]; 725 else 726 { 727 NSBeep(); 728 return; 729 } 730 } 731 } 732 733 newDict = [NSDictionary dictionaryWithObjectsAndKeys: [newComponents componentsJoinedByString: @"."], @"IP", 734 [oldDict objectForKey: @"Allow"], @"Allow", nil];NSLog([newDict description]); 735 } 736 737 [fRPCAccessArray replaceObjectAtIndex: row withObject: newDict]; 738 739 [fDefaults setObject: fRPCAccessArray forKey: @"RPCAccessList"]; 740 [self updateRPCAccessList]; 741 } 742 640 743 - (void) helpForPeers: (id) sender 641 744 {
Note: See TracChangeset
for help on using the changeset viewer.
