the "Cancel" button in the blocklist download sheet resizes to fit the localized...

diff --git a/macosx/BlocklistDownloader.m b/macosx/BlocklistDownloader.m
index 8d6a6f30bfe8a2a5f8bffb264e32e64183c07465..65b14feee03cf73e3423846ae07275f4c245e2a2 100644 (file)
--- a/macosx/BlocklistDownloader.m
+++ b/macosx/BlocklistDownloader.m
@@ -51,6 +51,13 @@
 - (void) awakeFromNib
 {
     [fButton setTitle: NSLocalizedString(@"Cancel", "Blocklist -> cancel button")];
+    
+    float oldWidth = [fButton frame].size.width;
+    [fButton sizeToFit];
+    NSRect buttonFrame = [fButton frame];
+    buttonFrame.origin.x -= buttonFrame.size.width - oldWidth;
+    [fButton setFrame: buttonFrame];
+    
     [fTextField setStringValue: [NSLocalizedString(@"Connecting to site", "Blocklist -> message") stringByAppendingEllipsis]];
     
     [fProgressBar setUsesThreadedAnimation: YES];

diff --git a/macosx/BlocklistStatusWindow.xib b/macosx/BlocklistStatusWindow.xib
index d027f954dfdf02e810f4ec6bd29d8aa4662adbf2..68789b286f5409a7f0ffa86900979a167baaa47a 100644 (file)
--- a/macosx/BlocklistStatusWindow.xib
+++ b/macosx/BlocklistStatusWindow.xib
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
        <data>
                <int key="IBDocument.SystemTarget">1050</int>
-               <string key="IBDocument.SystemVersion">9C7010</string>
-               <string key="IBDocument.InterfaceBuilderVersion">648</string>
-               <string key="IBDocument.AppKitVersion">949.26</string>
+               <string key="IBDocument.SystemVersion">9E17</string>
+               <string key="IBDocument.InterfaceBuilderVersion">670</string>
+               <string key="IBDocument.AppKitVersion">949.33</string>
                <string key="IBDocument.HIToolboxVersion">352.00</string>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="1"/>
+                       <integer value="2"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -34,6 +34,7 @@
                                <string key="NSWindowTitle">Window</string>
                                <string key="NSWindowClass">NSWindow</string>
                                <nil key="NSViewClass"/>
+                               <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
                                <object class="NSView" key="NSWindowView" id="1006">
                                        <reference key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
@@ -77,7 +78,7 @@
                                                </object>
                                                <object class="NSProgressIndicator" id="365018519">
                                                        <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">1292</int>
+                                                       <int key="NSvFlags">1290</int>
                                                        <object class="NSPSMatrix" key="NSDrawMatrix"/>
                                                        <string key="NSFrame">{{18, 56}, {369, 20}}</string>
                                                        <reference key="NSSuperview" ref="1006"/>
@@ -86,7 +87,7 @@
                                                </object>
                                                <object class="NSButton" id="700889541">
                                                        <reference key="NSNextResponder" ref="1006"/>
-                                                       <int key="NSvFlags">268</int>
+                                                       <int key="NSvFlags">257</int>
                                                        <string key="NSFrame">{{309, 12}, {82, 32}}</string>
                                                        <reference key="NSSuperview" ref="1006"/>
                                                        <bool key="NSEnabled">YES</bool>
@@ -253,6 +254,7 @@
                                        <string>1.NSWindowTemplate.visibleAtLaunch</string>
                                        <string>1.WindowOrigin</string>
                                        <string>1.editorWindowContentRectSynchronizationRect</string>
+                                       <string>1.windowTemplate.maxSize</string>
                                        <string>2.IBPluginDependency</string>
                                        <string>4.IBPluginDependency</string>
                                        <string>5.IBPluginDependency</string>
@@ -271,6 +273,7 @@
                                        <integer value="0"/>
                                        <string>{196, 240}</string>
                                        <string>{{202, 428}, {480, 270}}</string>
+                                       <string>{3.40282e+38, 3.40282e+38}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -347,13 +350,6 @@
                                                <string key="minorKey">macosx/NSMenuAdditions.h</string>
                                        </object>
                                </object>
-                               <object class="IBPartialClassDescription">
-                                       <string key="className">NSObject</string>
-                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string key="majorKey">IBProjectSource</string>
-                                               <string key="minorKey">macosx/IPCController.h</string>
-                                       </object>
-                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">