From: Mitchell Livingston Date: Sat, 12 Feb 2011 03:53:23 +0000 (+0000) Subject: center the "No Torrents Selected" in the inspector X-Git-Tag: 2.30b1~378 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c97f6b3d59402aa3f33602b116ac7824da7aca7d;p=transmission center the "No Torrents Selected" in the inspector --- diff --git a/macosx/InfoWindow.xib b/macosx/InfoWindow.xib index 75c4263c2..157d48e01 100644 --- a/macosx/InfoWindow.xib +++ b/macosx/InfoWindow.xib @@ -59,8 +59,8 @@ 67239488 4196864 - No Torrent Selected - + title + LucidaGrande-Bold 13 2072 @@ -86,6 +86,22 @@ + + + 266 + {{47, 42}, {349, 17}} + + YES + + 67239488 + 4196352 + No Torrents Selected + + + + + + 268 @@ -476,6 +492,14 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 1479 + + + fNoneSelectedField + + + + 1834 + @@ -522,10 +546,11 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA YES - - + + + @@ -538,24 +563,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - - 28 - - - YES - - - - - - 29 - - - YES - - - - 927 @@ -601,16 +608,6 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - - 1482 - - - - - 1483 - - - 1562 @@ -626,6 +623,48 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA + + 29 + + + YES + + + + + + 1483 + + + + + 28 + + + YES + + + + + + 1482 + + + + + 1832 + + + YES + + + + + + 1833 + + + @@ -639,16 +678,23 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA 1483.IBPluginDependency 15.CustomClassName 15.IBPluginDependency + 15.IBViewBoundsToFrameTransform 15.ImportedFromIB2 1562.IBPluginDependency 1726.CustomClassName 1726.IBPluginDependency 1830.IBPluginDependency 1830.IBViewBoundsToFrameTransform + 1832.CustomClassName + 1832.IBPluginDependency + 1832.IBViewBoundsToFrameTransform + 1832.ImportedFromIB2 + 1833.IBPluginDependency 28.IBPluginDependency 28.ImportedFromIB2 29.CustomClassName 29.IBPluginDependency + 29.IBViewBoundsToFrameTransform 29.ImportedFromIB2 5.IBEditorWindowLastContentRect 5.IBPluginDependency @@ -688,6 +734,9 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA com.apple.InterfaceBuilder.CocoaPlugin InfoTextField com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCPAAAwngAAA + com.apple.InterfaceBuilder.CocoaPlugin InfoTabButtonCell @@ -696,10 +745,20 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA AUOLAAAAAAAAA + InfoTextField + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABA4AAAwmgAAA + + + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin InfoTextField com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCPAAAwjQAAA + {{500, 881}, {403, 75}} com.apple.InterfaceBuilder.CocoaPlugin @@ -747,7 +806,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA - 1830 + 1834 @@ -813,6 +872,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA fBasicInfoField fImageView fNameField + fNoneSelectedField fTabMatrix @@ -820,6 +880,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA NSTextField NSImageView NSTextField + NSTextField NSMatrix @@ -830,6 +891,7 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA fBasicInfoField fImageView fNameField + fNoneSelectedField fTabMatrix @@ -846,6 +908,10 @@ AAB0ZXh0AAAAAENvcHlyaWdodCBBcHBsZSBDb21wdXRlciwgSW5jLiwgMjAwNQAAAAA fNameField NSTextField + + fNoneSelectedField + NSTextField + fTabMatrix NSMatrix diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h index 54e8ac10d..517194374 100644 --- a/macosx/InfoWindowController.h +++ b/macosx/InfoWindowController.h @@ -48,7 +48,7 @@ InfoOptionsViewController * fOptionsViewController; IBOutlet NSImageView * fImageView; - IBOutlet NSTextField * fNameField, * fBasicInfoField; + IBOutlet NSTextField * fNameField, * fBasicInfoField, * fNoneSelectedField; } - (void) setInfoForTorrents: (NSArray *) torrents; diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m index 30e212307..b17c166c9 100644 --- a/macosx/InfoWindowController.m +++ b/macosx/InfoWindowController.m @@ -73,6 +73,8 @@ typedef enum - (void) awakeFromNib { + [fNoneSelectedField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> selected torrents")]; + //window location and size NSPanel * window = (NSPanel *)[self window]; @@ -393,6 +395,7 @@ typedef enum [fNameField setStringValue: [NSString stringWithFormat: NSLocalizedString(@"%@ Torrents Selected", "Inspector -> selected torrents"), [NSString formattedUInteger: numberSelected]]]; + [fNameField setHidden: NO]; uint64_t size = 0; NSUInteger fileCount = 0, magnetCount = 0; @@ -441,14 +444,17 @@ typedef enum [fBasicInfoField setStringValue: fileString]; [fBasicInfoField setToolTip: nil]; } + [fBasicInfoField setHidden: NO]; + + [fNoneSelectedField setHidden: YES]; } else { [fImageView setImage: [NSImage imageNamed: @"NSApplicationIcon"]]; + [fNoneSelectedField setHidden: NO]; - [fNameField setStringValue: NSLocalizedString(@"No Torrents Selected", "Inspector -> selected torrents")]; - [fBasicInfoField setStringValue: @""]; - [fBasicInfoField setToolTip: @""]; + [fNameField setHidden: YES]; + [fBasicInfoField setHidden: YES]; } [fNameField setToolTip: nil]; @@ -470,6 +476,7 @@ typedef enum NSString * name = [torrent name]; [fNameField setStringValue: name]; [fNameField setToolTip: name]; + [fNameField setHidden: NO]; if (![torrent isMagnet]) { @@ -494,6 +501,9 @@ typedef enum [fBasicInfoField setStringValue: NSLocalizedString(@"Magnetized transfer", "Inspector -> selected torrents")]; [fBasicInfoField setToolTip: nil]; } + [fBasicInfoField setHidden: NO]; + + [fNoneSelectedField setHidden: YES]; } [fGeneralViewController setInfoForTorrents: fTorrents];