diff --git a/macosx/InfoActivityViewController.h b/macosx/InfoActivityViewController.h index 7f47ce61c..ae12b1a70 100644 --- a/macosx/InfoActivityViewController.h +++ b/macosx/InfoActivityViewController.h @@ -39,11 +39,18 @@ * fHaveField, * fDownloadedTotalField, * fUploadedTotalField, * fFailedHashField, * fRatioField, * fDownloadTimeField, * fSeedTimeField; - IBOutlet NSTextView * fErrorMessageView; IBOutlet PiecesView * fPiecesView; IBOutlet NSSegmentedControl * fPiecesControl; + + //remove when we switch to auto layout on 10.7 + IBOutlet NSTextField * fTransferSectionLabel, * fDatesSectionLabel, * fTimeSectionLabel; + IBOutlet NSTextField * fStateLabel, * fProgressLabel, * fHaveLabel, * fDownloadedLabel, * fUploadedLabel, + * fFailedDLLabel, * fRatioLabel, * fErrorLabel, + * fDateAddedLabel, * fDateCompletedLabel, * fDateActivityLabel, + * fDownloadTimeLabel, * fSeedTimeLabel; + IBOutlet NSScrollView * fErrorScrollView; } - (void) setInfoForTorrents: (NSArray *) torrents; diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m index 8342912d4..03a47ee84 100644 --- a/macosx/InfoActivityViewController.m +++ b/macosx/InfoActivityViewController.m @@ -56,6 +56,46 @@ - (void) awakeFromNib { [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updatePiecesView) name: @"UpdatePiecesView" object: nil]; + + #warning remove when 10.7-only with auto layout + [fTransferSectionLabel sizeToFit]; + [fDatesSectionLabel sizeToFit]; + [fTimeSectionLabel sizeToFit]; + + NSArray * labels = @[ fStateLabel, fProgressLabel, fHaveLabel, fDownloadedLabel, fUploadedLabel, fFailedDLLabel, fRatioLabel, fErrorLabel, fDateAddedLabel, fDateCompletedLabel, fDateActivityLabel, fDownloadTimeLabel, fSeedTimeLabel ]; + + CGFloat oldMaxWidth = 0.0, originX, newMaxWidth = 0.0; + for (NSTextField * label in labels) + { + const CGRect oldFrame = [label frame]; + if (oldFrame.size.width > oldMaxWidth) + { + oldMaxWidth = oldFrame.size.width; + originX = oldFrame.origin.x; + } + + [label sizeToFit]; + const CGFloat newWidth = [label bounds].size.width; + if (newWidth > newMaxWidth) + newMaxWidth = newWidth; + } + + for (NSTextField * label in labels) + { + NSRect frame = [label frame]; + frame.origin.x = originX + (newMaxWidth - frame.size.width); + [label setFrame: frame]; + } + + NSArray * fields = @[ fDateAddedField, fDateCompletedField, fDateActivityField, fStateField, fProgressField, fHaveField, fDownloadedTotalField, fUploadedTotalField, fFailedHashField, fRatioField, fDownloadTimeField, fSeedTimeField, fErrorScrollView ]; + + for (NSView * field in fields) { + const CGFloat widthIncrease = newMaxWidth - oldMaxWidth; + NSRect frame = [field frame]; + frame.origin.x += widthIncrease; + frame.size.width -= widthIncrease; + [field setFrame: frame]; + } } - (void) dealloc diff --git a/macosx/en.lproj/InfoActivityView.xib b/macosx/en.lproj/InfoActivityView.xib index 51bf70ee3..d1e23dbca 100644 --- a/macosx/en.lproj/InfoActivityView.xib +++ b/macosx/en.lproj/InfoActivityView.xib @@ -2,28 +2,28 @@ 1060 - 11D50 - 2177 - 1138.32 - 568.00 + 12C54 + 2840 + 1187.34 + 625.00 com.apple.InterfaceBuilder.CocoaPlugin - 2177 + 2840 - NSSegmentedControl - NSScroller - NSScrollView - NSTextFieldCell - NSDateFormatter - NSImageView - NSImageCell NSBox NSCustomObject - NSSegmentedCell NSCustomView - NSTextView + NSDateFormatter + NSImageCell + NSImageView + NSScrollView + NSScroller + NSSegmentedCell + NSSegmentedControl NSTextField + NSTextFieldCell + NSTextView com.apple.InterfaceBuilder.CocoaPlugin @@ -55,7 +55,7 @@ YES - 67239424 + 67108864 71303168 Downloaded: @@ -83,6 +83,7 @@ + NO @@ -93,7 +94,7 @@ YES - 67239488 + 67108928 272631808 @@ -102,6 +103,7 @@ + NO @@ -112,7 +114,7 @@ YES - 67239424 + 67108864 71303168 Uploaded: @@ -120,6 +122,7 @@ + NO @@ -130,7 +133,7 @@ YES - 67239488 + 67108928 272631808 @@ -139,6 +142,7 @@ + NO @@ -149,7 +153,7 @@ YES - 67239424 + 67108864 71303168 Ratio: @@ -157,6 +161,7 @@ + NO @@ -167,7 +172,7 @@ YES - 67239488 + 67108928 272631808 @@ -176,6 +181,7 @@ + NO @@ -186,7 +192,7 @@ YES - 67239424 + 67108864 71303168 Have: @@ -194,6 +200,7 @@ + NO @@ -204,7 +211,7 @@ YES - 67239488 + 67108928 272631808 @@ -213,6 +220,7 @@ + NO @@ -223,7 +231,7 @@ YES - 67239424 + 67108864 71303168 State: @@ -231,6 +239,7 @@ + NO @@ -241,7 +250,7 @@ YES - 67239488 + 67108928 272631808 @@ -250,6 +259,7 @@ + NO @@ -268,13 +278,14 @@ YES - 130560 + 134217728 33554432 0 1 0 YES + NO YES @@ -288,7 +299,7 @@ 2322 - {248, 14} + {248, 56} @@ -303,7 +314,7 @@ - 6 + 38 @@ -346,7 +357,6 @@ 6 {517, 10000000} - {87, 0} @@ -385,10 +395,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 256 - {{249, 1}, {11, 56}} + {{246, 1}, {14, 56}} + NO 256 _doScroller: @@ -401,6 +412,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO 257 _doScroller: @@ -416,6 +428,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + 0.25 + 4 + 1 @@ -426,7 +441,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Error: @@ -434,6 +449,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -444,7 +460,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 272629760 Time Elapsed @@ -456,6 +472,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -466,7 +483,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Downloading: @@ -474,6 +491,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -484,7 +502,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 N/A @@ -492,6 +510,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -502,7 +521,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Seeding: @@ -510,6 +529,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -520,7 +540,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 N/A @@ -528,6 +548,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -538,7 +559,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {0, 0} - 67239424 + 67108864 0 Box @@ -571,7 +592,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 272629760 Dates @@ -579,6 +600,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -589,7 +611,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Added: @@ -597,6 +619,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -607,7 +630,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 @@ -625,6 +648,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -635,7 +659,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Completed: @@ -643,6 +667,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -653,7 +678,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 @@ -671,6 +696,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -681,7 +707,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {0, 0} - 67239424 + 67108864 0 Box @@ -705,7 +731,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 272629760 Transfer @@ -713,6 +739,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -723,7 +750,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Last Activity: @@ -731,6 +758,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -741,7 +769,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 @@ -759,6 +787,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -769,7 +798,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 262144 LucidaGrande @@ -793,6 +822,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA -1 1 + NO @@ -803,7 +833,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Progress: @@ -811,6 +841,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -821,7 +852,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 @@ -830,6 +861,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -840,7 +872,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239424 + 67108864 71303168 Failed DL: @@ -848,6 +880,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO @@ -858,7 +891,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA YES - 67239488 + 67108928 272631808 @@ -867,6 +900,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA + NO {360, 335} @@ -1017,6 +1051,142 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 99 + + + fStateLabel + + + + 100 + + + + fProgressLabel + + + + 101 + + + + fHaveLabel + + + + 102 + + + + fDownloadedLabel + + + + 103 + + + + fUploadedLabel + + + + 104 + + + + fFailedDLLabel + + + + 105 + + + + fRatioLabel + + + + 106 + + + + fErrorLabel + + + + 107 + + + + fDateAddedLabel + + + + 108 + + + + fDateCompletedLabel + + + + 109 + + + + fDateActivityLabel + + + + 110 + + + + fSeedTimeLabel + + + + 111 + + + + fDownloadTimeLabel + + + + 112 + + + + fTransferSectionLabel + + + + 113 + + + + fDatesSectionLabel + + + + 114 + + + + fTimeSectionLabel + + + + 116 + + + + fErrorScrollView + + + + 118 + @@ -1603,6 +1773,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -1637,7 +1808,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA - 99 + 118 @@ -1646,19 +1817,36 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA NSViewController NSTextField + NSTextField NSTextField + NSTextField NSTextField + NSTextField + NSTextField NSTextField + NSTextField + NSTextField NSTextField + NSTextField NSTextView + NSScrollView + NSTextField NSTextField NSTextField + NSTextField NSSegmentedControl PiecesView NSTextField + NSTextField NSTextField + NSTextField NSTextField + NSTextField NSTextField + NSTextField + NSTextField + NSTextField + NSTextField NSTextField @@ -1666,26 +1854,62 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA fDateActivityField NSTextField + + fDateActivityLabel + NSTextField + fDateAddedField NSTextField + + fDateAddedLabel + NSTextField + fDateCompletedField NSTextField + + fDateCompletedLabel + NSTextField + + + fDatesSectionLabel + NSTextField + fDownloadTimeField NSTextField + + fDownloadTimeLabel + NSTextField + + + fDownloadedLabel + NSTextField + fDownloadedTotalField NSTextField + + fErrorLabel + NSTextField + fErrorMessageView NSTextView + + fErrorScrollView + NSScrollView + + + fFailedDLLabel + NSTextField + fFailedHashField NSTextField @@ -1694,6 +1918,10 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA fHaveField NSTextField + + fHaveLabel + NSTextField + fPiecesControl NSSegmentedControl @@ -1706,18 +1934,46 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA fProgressField NSTextField + + fProgressLabel + NSTextField + fRatioField NSTextField + + fRatioLabel + NSTextField + fSeedTimeField NSTextField + + fSeedTimeLabel + NSTextField + fStateField NSTextField + + fStateLabel + NSTextField + + + fTimeSectionLabel + NSTextField + + + fTransferSectionLabel + NSTextField + + + fUploadedLabel + NSTextField + fUploadedTotalField NSTextField @@ -1754,7 +2010,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA com.apple.InterfaceBuilder.CocoaPlugin.macosx - + YES 3