Changeset 807 for trunk

Timestamp:

Aug 21, 2006, 10:07:08 PM (16 years ago)

Author:

livings124

Message:

Message Log window, accessible from the Transmission menu.

Location:

trunk

Files:

• MessageWindowController.h (added)
• MessageWindowController.m (added)
• Transmission.xcodeproj/project.pbxproj (modified) (10 diffs)
• macosx/Controller.h (modified) (3 diffs)
• macosx/Controller.m (modified) (3 diffs)
• macosx/Defaults.plist (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/classes.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• macosx/English.lproj/MainMenu.nib/keyedobjects.nib (modified) (previous)
• macosx/English.lproj/MessageWindow.nib (added)
• macosx/English.lproj/MessageWindow.nib/classes.nib (added)
• macosx/English.lproj/MessageWindow.nib/info.nib (added)
• macosx/English.lproj/MessageWindow.nib/keyedobjects.nib (added)
• macosx/InfoWindowController.m (modified) (2 diffs)
• macosx/PrefsController.m (modified) (1 diff)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -79 +79 @@
                 A200B9B60A22893D007BBB1E /* InfoWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A200B9620A227FD0007BBB1E /* InfoWindow.nib */; };
                 A20AB97B0A5C622A004F81FA /* SmallTurtle.png in Resources */ = {isa = PBXBuildFile; fileRef = A20AB97A0A5C622A004F81FA /* SmallTurtle.png */; };
+                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = A21567EB0A9A5034004DECD6 /* MessageWindow.nib */; };
                 A21610FC0A050B1700E8E4C1 /* MenuButton.m in Sources */ = {isa = PBXBuildFile; fileRef = A21610FB0A050B1700E8E4C1 /* MenuButton.m */; };
                 A2173E1C0A33C1B300B0D8AB /* ActionButtonPressed.png in Resources */ = {isa = PBXBuildFile; fileRef = A2173E1B0A33C1B300B0D8AB /* ActionButtonPressed.png */; };
@@ -130 +131 @@
                 A2D4F0830A915F6600890C32 /* RedDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0820A915F6600890C32 /* RedDot.tiff */; };
                 A2D4F0850A915F7200890C32 /* GreenDot.tiff in Resources */ = {isa = PBXBuildFile; fileRef = A2D4F0840A915F7200890C32 /* GreenDot.tiff */; };
+                A2E78FC10A9967FE005B28CE /* MessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */; };
                 A2F40AE40A361C00006B8288 /* Transmission.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4D2784360905709500687951 /* Transmission.icns */; };
                 A2F6DB090A55F31C0058D1E5 /* SpeedLimitButton.png in Resources */ = {isa = PBXBuildFile; fileRef = A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */; };
@@ -258 +260 @@
                 4DCCBB3C09C3D71100D3CABF /* TorrentCell.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = TorrentCell.m; path = macosx/TorrentCell.m; sourceTree = "<group>"; };
                 4DCCBB3D09C3D71100D3CABF /* TorrentCell.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = TorrentCell.h; path = macosx/TorrentCell.h; sourceTree = "<group>"; };
-                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
+                4DDBB71909E16BAE00284745 /* transmissioncli */ = {isa = PBXFileReference; includeInIndex = 0; lastKnownFileType = "compiled.mach-o.executable"; path = transmissioncli; sourceTree = BUILT_PRODUCTS_DIR; };
                 4DDBB71B09E16BF100284745 /* transmissioncli.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = transmissioncli.c; path = cli/transmissioncli.c; sourceTree = "<group>"; };
                 4DDFDD20099A5D8E00189D81 /* DownloadBadge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = DownloadBadge.png; path = macosx/Images/DownloadBadge.png; sourceTree = "<group>"; };
@@ -283 +285 @@
                 A200B9630A227FD0007BBB1E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/InfoWindow.nib; sourceTree = "<group>"; };
                 A20AB97A0A5C622A004F81FA /* SmallTurtle.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SmallTurtle.png; path = macosx/Images/SmallTurtle.png; sourceTree = "<group>"; };
+                A21567EC0A9A5034004DECD6 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = macosx/English.lproj/MessageWindow.nib; sourceTree = "<group>"; };
                 A21610FA0A050B1700E8E4C1 /* MenuButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MenuButton.h; path = macosx/MenuButton.h; sourceTree = "<group>"; };
                 A21610FB0A050B1700E8E4C1 /* MenuButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = MenuButton.m; path = macosx/MenuButton.m; sourceTree = "<group>"; };
@@ -335 +338 @@
                 A2D4F0820A915F6600890C32 /* RedDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = RedDot.tiff; path = macosx/Images/RedDot.tiff; sourceTree = "<group>"; };
                 A2D4F0840A915F7200890C32 /* GreenDot.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = GreenDot.tiff; path = macosx/Images/GreenDot.tiff; sourceTree = "<group>"; };
+                A2E78FBE0A9967FE005B28CE /* MessageWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageWindowController.h; sourceTree = "<group>"; };
+                A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageWindowController.m; sourceTree = "<group>"; };
                 A2F6DB070A55F31C0058D1E5 /* SpeedLimitButton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = SpeedLimitButton.png; path = macosx/Images/SpeedLimitButton.png; sourceTree = "<group>"; };
                 A2F8951E0A2D4BA500ED2127 /* Credits.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; name = Credits.rtf; path = macosx/Credits.rtf; sourceTree = "<group>"; };
@@ -375 +380 @@
                         isa = PBXGroup;
                         children = (
+                                A2E78FBE0A9967FE005B28CE /* MessageWindowController.h */,
+                                A2E78FBF0A9967FE005B28CE /* MessageWindowController.m */,
                                 A200B8390A2263BA007BBB1E /* InfoWindowController.h */,
                                 A200B83A0A2263BA007BBB1E /* InfoWindowController.m */,
@@ -477 +484 @@
                                 29B97318FDCFA39411CA2CEA /* MainMenu.nib */,
                                 A200B9620A227FD0007BBB1E /* InfoWindow.nib */,
+                                A21567EB0A9A5034004DECD6 /* MessageWindow.nib */,
                                 A2C655640A04FEDC00E9FD82 /* BottomBorder.png */,
                                 A289EB0B0A33C56D00B082A3 /* ButtonBorder.png */,
@@ -767 +775 @@
                                 A2D4F0830A915F6600890C32 /* RedDot.tiff in Resources */,
                                 A2D4F0850A915F7200890C32 /* GreenDot.tiff in Resources */,
+                                A21567ED0A9A5034004DECD6 /* MessageWindow.nib in Resources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -821 +830 @@
                                 A27ABC240A6ADE410020EC71 /* ImageBackgroundView.m in Sources */,
                                 A2710E770A86796000CE4F7D /* PrefsWindow.m in Sources */,
+                                A2E78FC10A9967FE005B28CE /* MessageWindowController.m in Sources */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -862 +872 @@
                         );
                         name = InfoWindow.nib;
+                        sourceTree = "<group>";
+                };
+                A21567EB0A9A5034004DECD6 /* MessageWindow.nib */ = {
+                        isa = PBXVariantGroup;
+                        children = (
+                                A21567EC0A9A5034004DECD6 /* English */,
+                        );
+                        name = MessageWindow.nib;
                         sourceTree = "<group>";
                 };

trunk/macosx/Controller.h

@@ -30 +30 @@
 #import "PrefsController.h"
 #import "InfoWindowController.h"
+#import "MessageWindowController.h"
 #import "Badger.h"
 #import "ImageBackgroundView.h"
@@ -48 +49 @@
     NSUserDefaults                  * fDefaults;
     InfoWindowController            * fInfoController;
+    MessageWindowController         * fMessageController;
 
     IBOutlet NSWindow               * fWindow;
@@ -136 +138 @@
 - (void) setInfoTab: (id) sender;
 
+- (void) showMessageWindow: (id) sender;
+
 - (void) updateControlTint: (NSNotification *) notification;
 

trunk/macosx/Controller.m

@@ -68 +68 @@
 @implementation Controller
 
++ (void) initialize
+{
+    [[NSUserDefaults standardUserDefaults] registerDefaults: [NSDictionary dictionaryWithContentsOfFile:
+        [[NSBundle mainBundle] pathForResource: @"Defaults" ofType: @"plist"]]];
+}
+
 - (id) init
 {
@@ -78 +84 @@
         
         fDefaults = [NSUserDefaults standardUserDefaults];
+        
+        fMessageController = [[MessageWindowController alloc] initWithWindowNibName: @"MessageWindow"];
         fInfoController = [[InfoWindowController alloc] initWithWindowNibName: @"InfoWindow"];
         fPrefsController = [[PrefsController alloc] initWithWindowNibName: @"PrefsWindow" handle: fLib];
+        
         fBadger = [[Badger alloc] init];
         
@@ -909 +918 @@
     else
         [fInfoController setPreviousTab];
+}
+
+- (void) showMessageWindow: (id) sender
+{
+    [fMessageController showWindow: nil];
 }
 

trunk/macosx/Defaults.plist

@@ -47 +47 @@
         <key>InfoVisible</key>
         <false/>
+        <key>MessageLevel</key>
+        <integer>1</integer>
         <key>MoveChoice</key>
         <string>Constant</string>

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

@@ -27 +27 @@
                 showInfo = id; 
                 showMainWindow = id; 
+                showMessageWindow = id; 
                 showPreferenceWindow = id; 
                 stopAllTorrents = id; 

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

@@ -14 +14 @@
                 <string>337 545 477 67 0 0 1152 842 </string>
                 <key>29</key>
-                <string>104 684 520 44 0 0 1152 842 </string>
+                <string>104 684 451 44 0 0 1152 842 </string>
                 <key>456</key>
                 <string>396 374 216 206 0 0 1152 842 </string>

trunk/macosx/InfoWindowController.m

@@ -83 +83 @@
     [self setWindowForTab: identifier animate: NO];
     
+    //initially sort peer table by IP
     if ([[fPeerTable sortDescriptors] count] == 0)
         [fPeerTable setSortDescriptors: [NSArray arrayWithObject: [[fPeerTable tableColumnWithIdentifier: @"IP"]
@@ -424 +425 @@
         [window setFrame: frame display: YES];
     
-    [window setMinSize: NSMakeSize(MIN_WINDOW_WIDTH, frame.size.height)];
-    [window setMaxSize: NSMakeSize(MAX_WINDOW_WIDTH, frame.size.height)];
+    NSSize windowSize = NSMakeSize(MIN_WINDOW_WIDTH, frame.size.height);
+    [window setMinSize: windowSize];
+    [window setMaxSize: windowSize];
 }
 

trunk/macosx/PrefsController.m

@@ -65 +65 @@
 @implementation PrefsController
 
-+ (void) initialize
-{
-    [[NSUserDefaults standardUserDefaults] registerDefaults: [NSDictionary dictionaryWithContentsOfFile:
-        [[NSBundle mainBundle] pathForResource: @"Defaults" ofType: @"plist"]]];
-}
-
 - (id) initWithWindowNibName: (NSString *) name handle: (tr_handle_t *) handle
 {