Changeset 745

Timestamp:

Aug 8, 2006, 10:23:33 PM (17 years ago)

Author:

livings124

Message:

show prefs window in Window menu / dock menu

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (2 diffs)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• InfoWindowController.m (modified) (1 diff)
• PrefsWindow.m (modified) (1 diff)

trunk/macosx/Controller.m

@@ -124 +124 @@
     
     [fWindow makeFirstResponder: fTableView];
+    [fWindow setExcludedFromWindowsMenu: YES];
     
     //set table size
@@ -1224 +1225 @@
     
     NSCalendarDate * currentDate = [NSCalendarDate calendarDate];
-    //do nothing if not within first few seconds of hour
-    if ([currentDate minuteOfHour] > 0 || [currentDate secondOfMinute] >= AUTO_SPEED_LIMIT_SECONDS)
-        return;
-    
-    if ([currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
+    //toggle if within first few seconds of hour
+    if ([currentDate minuteOfHour] == 0 && [currentDate secondOfMinute] < AUTO_SPEED_LIMIT_SECONDS
+            && [currentDate hourOfDay] == (fSpeedLimitEnabled ? offHour : onHour))
     {
         [self toggleSpeedLimit: nil];

trunk/macosx/English.lproj/MainMenu.nib/info.nib

@@ -14 +14 @@
                 <string>337 545 477 67 0 0 1152 842 </string>
                 <key>29</key>
-                <string>227 675 451 44 0 0 1152 842 </string>
+                <string>104 684 520 44 0 0 1152 842 </string>
                 <key>456</key>
                 <string>396 374 216 206 0 0 1152 842 </string>
@@ -32 +32 @@
         <key>IBOpenObjects</key>
         <array>
+                <integer>21</integer>
                 <integer>29</integer>
-                <integer>21</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/InfoWindowController.m

@@ -183 +183 @@
         [fDateStartedField setObjectValue: [torrent date]];
         
-        //don't allow empty strings to be selected
+        //allow these strings to be selected
         [fTrackerField setSelectable: YES];
         [fAnnounceField setSelectable: YES];

trunk/macosx/PrefsWindow.m

@@ -36 +36 @@
 - (void) close
 {
-    [self makeFirstResponder: nil]; //essentially saves changes on window close
+    [self makeFirstResponder: nil]; //essentially saves pref changes on window close
     [super close];
 }