From b2b1aeb2824604770173e70fa11dcdd910d20dea Mon Sep 17 00:00:00 2001
From: Mitchell Livingston <livings124@transmissionbt.com>
Date: Fri, 19 Oct 2012 03:52:59 +0000
Subject: [PATCH] don't do layout in code until localizations are updated in
 2.8

---
 macosx/AddMagnetWindowController.m  | 3 +++
 macosx/InfoActivityViewController.m | 4 ++--
 macosx/InfoGeneralViewController.m  | 4 +++-
 macosx/InfoOptionsViewController.m  | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/macosx/AddMagnetWindowController.m b/macosx/AddMagnetWindowController.m
index 474421785..8ab7fbe02 100644
--- a/macosx/AddMagnetWindowController.m
+++ b/macosx/AddMagnetWindowController.m
@@ -95,6 +95,8 @@
         [fLocationImageView setImage: nil];
     }
     
+    #warning enable after 2.7 
+    /*
     #warning when 10.7-only, switch to auto layout
     [fMagnetLinkLabel sizeToFit];
     
@@ -152,6 +154,7 @@
     [fCancelButton setFrame: cancelButtonFrame];
     
     [fStartCheck sizeToFit];
+     */
 }
 
 - (void) windowDidLoad
diff --git a/macosx/InfoActivityViewController.m b/macosx/InfoActivityViewController.m
index 2ec9f29b2..5fdba6ebf 100644
--- a/macosx/InfoActivityViewController.m
+++ b/macosx/InfoActivityViewController.m
@@ -58,7 +58,7 @@
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updatePiecesView) name: @"UpdatePiecesView" object: nil];
     
     #warning remove when 10.7-only with auto layout
-    [fTransferSectionLabel sizeToFit];
+    /*[fTransferSectionLabel sizeToFit];
     [fDatesSectionLabel sizeToFit];
     [fTimeSectionLabel sizeToFit];
     
@@ -95,7 +95,7 @@
         frame.origin.x += widthIncrease;
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
-    }
+    }*/
 }
 
 - (void) dealloc
diff --git a/macosx/InfoGeneralViewController.m b/macosx/InfoGeneralViewController.m
index cc24ba6fb..9c97b2aca 100644
--- a/macosx/InfoGeneralViewController.m
+++ b/macosx/InfoGeneralViewController.m
@@ -51,6 +51,8 @@
     [super dealloc];
 }
 
+#warning enable after 2.7
+/*
 - (void) awakeFromNib
 {
     #warning remove when 10.7-only with auto layout
@@ -91,7 +93,7 @@
         frame.size.width -= widthIncrease;
         [field setFrame: frame];
     }
-}
+}*/
 
 - (void) setInfoForTorrents: (NSArray *) torrents
 {
diff --git a/macosx/InfoOptionsViewController.m b/macosx/InfoOptionsViewController.m
index e752e269e..220115084 100644
--- a/macosx/InfoOptionsViewController.m
+++ b/macosx/InfoOptionsViewController.m
@@ -63,6 +63,8 @@
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(setGlobalLabels) name: @"UpdateGlobalOptions" object: nil];
     [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(updateOptionsNotification:) name: @"UpdateOptionsNotification" object: nil];
     
+    #warning enable after 2.7
+    /*
     #warning remove when 10.7-only with auto layout
     const CGFloat padding = 6.0; //this shows as 8 in IB
     [fPrioritySectionLabel sizeToFit];
@@ -128,7 +130,7 @@
     [fPeersConnectLabel sizeToFit];
     NSRect peersConnectLabelFrame = [fPeersConnectLabel frame];
     peersConnectLabelFrame.origin.x = NSMaxX(peersConnectFrame) + padding;
-    [fPeersConnectLabel setFrame: peersConnectLabelFrame];
+    [fPeersConnectLabel setFrame: peersConnectLabelFrame];*/
 }
 
 - (void) dealloc
-- 
2.40.0