Changeset 655

Timestamp:

Jul 22, 2006, 4:38:05 PM (17 years ago)

Author:

livings124

Message:

New prefs setting to keep the window sized perfectly for the current number of transfers.

Location:

trunk

Files:

• Transmission.xcodeproj/project.pbxproj (modified) (1 diff)
• macosx/BarButton.m (modified) (2 diffs)
• macosx/Controller.h (modified) (1 diff)
• macosx/Controller.m (modified) (8 diffs)
• macosx/Defaults.plist (modified) (1 diff)
• macosx/English.lproj/PrefsWindow.nib/classes.nib (modified) (2 diffs)
• macosx/English.lproj/PrefsWindow.nib/info.nib (modified) (2 diffs)
• macosx/English.lproj/PrefsWindow.nib/keyedobjects.nib (modified) (previous)
• macosx/PrefsController.h (modified) (2 diffs)
• macosx/PrefsController.m (modified) (2 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -936 +936 @@
                                 GCC_VERSION_ppc = 3.3;
                                 MACOSX_DEPLOYMENT_TARGET_i386 = 10.4;
-                                MACOSX_DEPLOYMENT_TARGET_ppc = 10.2;
+                                MACOSX_DEPLOYMENT_TARGET_ppc = 10.3;
                                 SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
                         };

trunk/macosx/BarButton.m

@@ -51 +51 @@
                 mainSize = NSMakeSize(buttonSize.width - endSize.width * 2.0, endSize.height);
         NSPoint leftPoint = NSMakePoint(0, 0),
-                mainPoint = NSMakePoint(endSize.width, 0),
-                rightPoint = NSMakePoint(buttonSize.width - endSize.width, 0);
+                rightPoint = NSMakePoint(buttonSize.width - endSize.width, 0),
+                mainPoint = NSMakePoint(endSize.width, 0);
 
         [mainOver setScalesWhenResized: YES];
@@ -199 +199 @@
     [highlightedAttributes release];
     [highlightedDimAttributes release];
-    
-    //NSLog(@"%@ %f", text, textRect.width);
 }
 

trunk/macosx/Controller.h

@@ -179 +179 @@
 - (void) toggleAdvancedBar: (id) sender;
 
+- (void) setWindowSizeToFit;
+
 - (void) showMainWindow:    (id) sender;
 - (void) linkHomepage:      (id) sender;

trunk/macosx/Controller.m

@@ -307 +307 @@
                     name: @"RatioGlobalChange" object: nil];
     
+    [nc addObserver: self selector: @selector(autoImportChange:)
+                    name: @"AutoImportSettingChange" object: nil];
+    
+    [nc addObserver: self selector: @selector(setWindowSizeToFit)
+                    name: @"AutoSizeSettingChange" object: nil];
+    
     //check to start another because of stopped torrent
     [nc addObserver: self selector: @selector(checkWaitingForStopped:)
@@ -326 +332 @@
     [nc addObserver: self selector: @selector(reloadInspectorSettings:)
                     name: @"TorrentSettingChange" object: nil];
-    
-    //reset auto import
-    [nc addObserver: self selector: @selector(autoImportChange:)
-                    name: @"AutoImportSettingChange" object: nil];
 
     //timer to update the interface every second
@@ -348 +350 @@
     
     [self applyFilter: nil];
+    [self setWindowSizeToFit];
     
     [fWindow makeKeyAndOrderFront: nil];
@@ -508 +511 @@
     [self updateUI: nil];
     [self applyFilter: nil];
+    [self setWindowSizeToFit];
+    
     [self updateTorrentHistory];
 }
@@ -733 +738 @@
     [self torrentNumberChanged];
     [fTableView deselectAll: nil];
+    
     [self updateUI: nil];
+    [self setWindowSizeToFit];
+    
     [self updateTorrentHistory];
 }
@@ -1589 +1597 @@
     [fWindow setContentMinSize: contentMinSize];
     
+    [self setWindowSizeToFit];
+    
     //resize for larger min height
     if (!makeSmall && contentSize.height < contentMinSize.height)
@@ -2125 +2135 @@
 }
 
+- (void) setWindowSizeToFit
+{
+    if (![fDefaults boolForKey: @"AutoSize"])
+        return;
+
+    NSRect frame = [fWindow frame];
+    float newHeight = frame.size.height - [fScrollView frame].size.height
+        + [fTorrents count] * ([fTableView rowHeight] + [fTableView intercellSpacing].height);
+
+    float minHeight = [fWindow minSize].height;
+    if (newHeight < minHeight)
+        newHeight = minHeight;
+
+    frame.origin.y -= (newHeight - frame.size.height);
+    frame.size.height = newHeight;
+    
+    [fWindow setFrame: frame display: YES animate: YES]; 
+}
+
 - (void) showMainWindow: (id) sender
 {
@@ -2155 +2184 @@
 }
 
+- (NSSize) windowWillResize: (NSWindow *) sender toSize: (NSSize) proposedFrameSize
+{
+    if ([fDefaults boolForKey: @"AutoSize"])
+        proposedFrameSize.height = [fWindow frame].size.height;
+    return proposedFrameSize;
+}
+
 - (void) windowDidResize: (NSNotification *) notification
 {

trunk/macosx/Defaults.plist

@@ -7 +7 @@
         <key>AutoImportDirectory</key>
         <string>~/Desktop</string>
+        <key>AutoSize</key>
+        <false/>
         <key>BadgeDownloadRate</key>
         <false/>

trunk/macosx/English.lproj/PrefsWindow.nib/classes.nib

@@ -8 +8 @@
                 importFolderSheetShow = id; 
                 setAutoImport = id; 
+                setAutoSize = id; 
                 setBadge = id; 
                 setDownloadLocation = id; 
@@ -26 +27 @@
             OUTLETS = {
                 fAutoImportCheck = NSButton; 
+                fAutoSizeCheck = NSButton; 
                 fBadgeDownloadRateCheck = NSButton; 
                 fBadgeUploadRateCheck = NSButton; 

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

@@ -4 +4 @@
 <dict>
         <key>IBDocumentLocation</key>
-        <string>69 61 356 240 0 0 1152 842 </string>
+        <string>49 70 356 240 0 0 1152 842 </string>
         <key>IBEditorPositions</key>
         <dict>
                 <key>153</key>
                 <string>299 469 554 217 0 0 1152 842 </string>
+                <key>28</key>
+                <string>85 426 553 285 0 0 1152 842 </string>
                 <key>41</key>
                 <string>299 417 554 321 0 0 1152 842 </string>
@@ -16 +18 @@
         <key>IBOpenObjects</key>
         <array>
-                <integer>41</integer>
+                <integer>28</integer>
         </array>
         <key>IBSystem Version</key>

trunk/macosx/PrefsController.h

@@ -39 +39 @@
                             * fBadgeDownloadRateCheck, * fBadgeUploadRateCheck,
                             * fCopyTorrentCheck, * fDeleteOriginalTorrentCheck,
-                            * fAutoImportCheck;
+                            * fAutoImportCheck, * fAutoSizeCheck;
                             
     IBOutlet NSPopUpButton  * fUpdatePopUp;
@@ -88 +88 @@
 - (void) importFolderSheetShow: (id) sender;
 
+- (void) setAutoSize: (id) sender;
+
 - (void) setRatio:          (id) sender;
 - (void) setRatioCheck:     (id) sender;

trunk/macosx/PrefsController.m

@@ -112 +112 @@
     [fImportFolderPopUp setEnabled: autoImport];
     
+    //set auto size
+    [fAutoSizeCheck setState: [fDefaults boolForKey: @"AutoSize"]];
+    
     //set bind port
     int bindPort = [fDefaults integerForKey: @"BindPort"];
@@ -632 +635 @@
         modalForWindow: [self window] modalDelegate: self didEndSelector:
         @selector(importFolderSheetClosed:returnCode:contextInfo:) contextInfo: nil];
+}
+
+- (void) setAutoSize: (id) sender
+{
+    [fDefaults setBool: [sender state] forKey: @"AutoSize"];
+    
+    [[NSNotificationCenter defaultCenter] postNotificationName: @"AutoSizeSettingChange" object: self];
 }