Add zoom support to WebKit2 API
authorweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Sep 2010 06:45:41 +0000 (06:45 +0000)
committerweinig@apple.com <weinig@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 11 Sep 2010 06:45:41 +0000 (06:45 +0000)
<rdar://problem/7660657>
https://bugs.webkit.org/show_bug.cgi?id=45585

Reviewed by Dan Bernstein.

WebKit2:

- Add UIProcess API for setting zoom factors.
- Change bundle zoom API to be in terms of doubles
  for consistency.

* Shared/CoreIPCSupport/WebPageMessageKinds.h:
* UIProcess/API/C/WKPage.cpp:
(WKPageGetTextZoomFactor):
(WKPageSetTextZoomFactor):
(WKPageGetPageZoomFactor):
(WKPageSetPageZoomFactor):
(WKPageSetPageAndTextZoomFactors):
* UIProcess/API/C/WKPage.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setTextZoomFactor):
(WebKit::WebPageProxy::setPageZoomFactor):
(WebKit::WebPageProxy::setPageAndTextZoomFactors):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::textZoomFactor):
(WebKit::WebPageProxy::pageZoomFactor):
* WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
(WKBundlePageGetTextZoomFactor):
(WKBundlePageSetTextZoomFactor):
(WKBundlePageGetPageZoomFactor):
(WKBundlePageSetPageZoomFactor):
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::textZoomFactor):
(WebKit::WebPage::setTextZoomFactor):
(WebKit::WebPage::pageZoomFactor):
(WebKit::WebPage::setPageZoomFactor):
(WebKit::WebPage::setPageAndTextZoomFactors):
(WebKit::WebPage::didReceiveMessage):
* WebProcess/WebPage/WebPage.h:

WebKitTools:

- Add zoom options to MiniBrowser that mimic Safari's options using
  the new WebKit2 zoom APIs.
- Switch uses of float for the zoom APIs to use double.

* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController initWithPageNamespace:]):
(-[BrowserWindowController validateMenuItem:]):
(-[BrowserWindowController validateUserInterfaceItem:]):
(-[BrowserWindowController currentZoomFactor]):
(-[BrowserWindowController setCurrentZoomFactor:]):
(-[BrowserWindowController canZoomIn]):
(-[BrowserWindowController zoomIn:]):
(-[BrowserWindowController canZoomOut]):
(-[BrowserWindowController zoomOut:]):
(-[BrowserWindowController canResetZoom]):
(-[BrowserWindowController resetZoom:]):
(-[BrowserWindowController toggleZoomMode:]):
* MiniBrowser/mac/MainMenu.xib:
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
(WTR::EventSendingController::textZoomIn):
(WTR::EventSendingController::textZoomOut):
(WTR::EventSendingController::zoomPageIn):
(WTR::EventSendingController::zoomPageOut):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67287 268f45cc-cd09-0410-ab3c-d52691b4dbfc

15 files changed:
WebKit2/ChangeLog
WebKit2/Shared/CoreIPCSupport/WebPageMessageKinds.h
WebKit2/UIProcess/API/C/WKPage.cpp
WebKit2/UIProcess/API/C/WKPage.h
WebKit2/UIProcess/WebPageProxy.cpp
WebKit2/UIProcess/WebPageProxy.h
WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp
WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h
WebKit2/WebProcess/WebPage/WebPage.cpp
WebKit2/WebProcess/WebPage/WebPage.h
WebKitTools/ChangeLog
WebKitTools/MiniBrowser/mac/BrowserWindowController.h
WebKitTools/MiniBrowser/mac/BrowserWindowController.m
WebKitTools/MiniBrowser/mac/MainMenu.xib
WebKitTools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp

index b7f068f47f000dc83cb9aeb6659fb4916ec3123d..d08eec9c02c7873d15b1511b1c41a6536860b499 100644 (file)
@@ -1,3 +1,46 @@
+2010-09-10  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Add zoom support to WebKit2 API
+        <rdar://problem/7660657>
+        https://bugs.webkit.org/show_bug.cgi?id=45585
+
+        - Add UIProcess API for setting zoom factors.
+        - Change bundle zoom API to be in terms of doubles
+          for consistency.
+
+        * Shared/CoreIPCSupport/WebPageMessageKinds.h:
+        * UIProcess/API/C/WKPage.cpp:
+        (WKPageGetTextZoomFactor):
+        (WKPageSetTextZoomFactor):
+        (WKPageGetPageZoomFactor):
+        (WKPageSetPageZoomFactor):
+        (WKPageSetPageAndTextZoomFactors):
+        * UIProcess/API/C/WKPage.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::WebPageProxy):
+        (WebKit::WebPageProxy::setTextZoomFactor):
+        (WebKit::WebPageProxy::setPageZoomFactor):
+        (WebKit::WebPageProxy::setPageAndTextZoomFactors):
+        * UIProcess/WebPageProxy.h:
+        (WebKit::WebPageProxy::textZoomFactor):
+        (WebKit::WebPageProxy::pageZoomFactor):
+        * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+        (WKBundlePageGetTextZoomFactor):
+        (WKBundlePageSetTextZoomFactor):
+        (WKBundlePageGetPageZoomFactor):
+        (WKBundlePageSetPageZoomFactor):
+        * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h:
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::textZoomFactor):
+        (WebKit::WebPage::setTextZoomFactor):
+        (WebKit::WebPage::pageZoomFactor):
+        (WebKit::WebPage::setPageZoomFactor):
+        (WebKit::WebPage::setPageAndTextZoomFactors):
+        (WebKit::WebPage::didReceiveMessage):
+        * WebProcess/WebPage/WebPage.h:
+
 2010-09-10  Balazs Kelemen  <kb@inf.u-szeged.hu>
 
         Reviewed by Andreas Kling.
index 1fa72040c259afaf6d6a5f065584db9ac3efdd45..b4eb9623ca2cc37d27291f259208c17f31d6b241 100644 (file)
@@ -52,6 +52,9 @@ enum Kind {
     SetCustomUserAgent,
     SetFocused,
     SetIsInWindow,
+    SetPageAndTextZoomFactors,
+    SetPageZoomFactor,
+    SetTextZoomFactor,
     StopLoading,
     TryClose,
     UnapplyEditCommand,
index 910075c303dae8de1b7b83f6a685e568d2df37c0..7d5709905f517d903790539ffc3a40781c4b9a3f 100644 (file)
@@ -153,6 +153,31 @@ void WKPageRestoreFromSessionState(WKPageRef pageRef, WKDataRef sessionStateData
     toWK(pageRef)->restoreFromSessionState(toWK(sessionStateData));
 }
 
+double WKPageGetTextZoomFactor(WKPageRef pageRef)
+{
+    return toWK(pageRef)->textZoomFactor();
+}
+
+void WKPageSetTextZoomFactor(WKPageRef pageRef, double zoomFactor)
+{
+    toWK(pageRef)->setTextZoomFactor(zoomFactor);
+}
+
+double WKPageGetPageZoomFactor(WKPageRef pageRef)
+{
+    return toWK(pageRef)->pageZoomFactor();
+}
+
+void WKPageSetPageZoomFactor(WKPageRef pageRef, double zoomFactor)
+{
+    toWK(pageRef)->setPageZoomFactor(zoomFactor);
+}
+
+void WKPageSetPageAndTextZoomFactors(WKPageRef pageRef, double pageZoomFactor, double textZoomFactor)
+{
+    toWK(pageRef)->setPageAndTextZoomFactors(pageZoomFactor, textZoomFactor);
+}
+
 void WKPageSetPageLoaderClient(WKPageRef pageRef, const WKPageLoaderClient* wkClient)
 {
     if (wkClient && wkClient->version)
index f58c9f348dd3702d4086d7654debeeadd2879e5e..fab4eac46efba1711247b0055fe0afe482468dbd 100644 (file)
@@ -189,6 +189,12 @@ WK_EXPORT void WKPageTerminate(WKPageRef page);
 WK_EXPORT WKDataRef WKPageCopySessionState(WKPageRef page);
 WK_EXPORT void WKPageRestoreFromSessionState(WKPageRef page, WKDataRef sessionStateData);
 
+WK_EXPORT double WKPageGetTextZoomFactor(WKPageRef page);
+WK_EXPORT void WKPageSetTextZoomFactor(WKPageRef page, double zoomFactor);
+WK_EXPORT double WKPageGetPageZoomFactor(WKPageRef page);
+WK_EXPORT void WKPageSetPageZoomFactor(WKPageRef page, double zoomFactor);
+WK_EXPORT void WKPageSetPageAndTextZoomFactors(WKPageRef page, double pageZoomFactor, double textZoomFactor);
+
 WK_EXPORT void WKPageSetPageLoaderClient(WKPageRef page, const WKPageLoaderClient* client);
 WK_EXPORT void WKPageSetPagePolicyClient(WKPageRef page, const WKPagePolicyClient* client);
 WK_EXPORT void WKPageSetPageFormClient(WKPageRef page, const WKPageFormClient* client);
index b712dc3f8f3d0ebec95cb23f9d601289bf7b2bcd..ec37f413de44106a36545cf725a30cfbd57c1386 100644 (file)
@@ -74,6 +74,8 @@ WebPageProxy::WebPageProxy(WebPageNamespace* pageNamespace, uint64_t pageID)
     , m_estimatedProgress(0.0)
     , m_isInWindow(false)
     , m_backForwardList(WebBackForwardList::create(this))
+    , m_textZoomFactor(1)
+    , m_pageZoomFactor(1)
     , m_valid(true)
     , m_closed(false)
     , m_pageID(pageID)
@@ -392,6 +394,43 @@ void WebPageProxy::restoreFromSessionState(WebData*)
     // FIXME: Restore the Page from the passed in session state data.
 }
 
+void WebPageProxy::setTextZoomFactor(double zoomFactor)
+{
+    if (!isValid())
+        return;
+
+    if (m_textZoomFactor == zoomFactor)
+        return;
+
+    m_textZoomFactor = zoomFactor;
+    process()->send(WebPageMessage::SetTextZoomFactor, m_pageID, CoreIPC::In(m_textZoomFactor)); 
+}
+
+void WebPageProxy::setPageZoomFactor(double zoomFactor)
+{
+    if (!isValid())
+        return;
+
+    if (m_pageZoomFactor == zoomFactor)
+        return;
+
+    m_pageZoomFactor = zoomFactor;
+    process()->send(WebPageMessage::SetPageZoomFactor, m_pageID, CoreIPC::In(m_pageZoomFactor)); 
+}
+
+void WebPageProxy::setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor)
+{
+    if (!isValid())
+        return;
+
+    if (m_pageZoomFactor == pageZoomFactor && m_textZoomFactor == textZoomFactor)
+        return;
+
+    m_pageZoomFactor = pageZoomFactor;
+    m_textZoomFactor = textZoomFactor;
+    process()->send(WebPageMessage::SetPageAndTextZoomFactors, m_pageID, CoreIPC::In(m_pageZoomFactor, m_textZoomFactor)); 
+}
+
 void WebPageProxy::runJavaScriptInMainFrame(const String& script, PassRefPtr<ScriptReturnValueCallback> prpCallback)
 {
     RefPtr<ScriptReturnValueCallback> callback = prpCallback;
index c66ef8794688c9de4dac9987a00021b53bfa7f29..0b7056a5a6f2509accf625fbfa3ec4dfe9a1f31c 100644 (file)
@@ -147,6 +147,12 @@ public:
     PassRefPtr<WebData> sessionState() const;
     void restoreFromSessionState(WebData*);
 
+    double textZoomFactor() const { return m_textZoomFactor; }
+    void setTextZoomFactor(double);
+    double pageZoomFactor() const { return m_pageZoomFactor; }
+    void setPageZoomFactor(double);
+    void setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor);
+
     void runJavaScriptInMainFrame(const WTF::String&, PassRefPtr<ScriptReturnValueCallback>);
     void getRenderTreeExternalRepresentation(PassRefPtr<RenderTreeExternalRepresentationCallback>);
 
@@ -267,6 +273,9 @@ private:
 
     // REMOVE: For demo purposes only.
     WTF::String m_urlAtProcessExit;
+
+    double m_textZoomFactor;
+    double m_pageZoomFactor;
     
     bool m_valid;
     bool m_closed;
index acc785ed6932c1571270e51fac2a524516befd97..bfa1feba561ed3a98c6e85ab58fe13fc2d881fec 100644 (file)
@@ -100,22 +100,22 @@ void WKBundlePageClose(WKBundlePageRef pageRef)
     toWK(pageRef)->sendClose();
 }
 
-float WKBundlePageGetTextZoomFactor(WKBundlePageRef pageRef)
+double WKBundlePageGetTextZoomFactor(WKBundlePageRef pageRef)
 {
     return toWK(pageRef)->textZoomFactor();
 }
 
-void WKBundlePageSetTextZoomFactor(WKBundlePageRef pageRef, float zoomFactor)
+void WKBundlePageSetTextZoomFactor(WKBundlePageRef pageRef, double zoomFactor)
 {
     toWK(pageRef)->setTextZoomFactor(zoomFactor);
 }
 
-float WKBundlePageGetPageZoomFactor(WKBundlePageRef pageRef)
+double WKBundlePageGetPageZoomFactor(WKBundlePageRef pageRef)
 {
     return toWK(pageRef)->pageZoomFactor();
 }
 
-void WKBundlePageSetPageZoomFactor(WKBundlePageRef pageRef, float zoomFactor)
+void WKBundlePageSetPageZoomFactor(WKBundlePageRef pageRef, double zoomFactor)
 {
     toWK(pageRef)->setPageZoomFactor(zoomFactor);
 }
index a2f308624b89c46231c520813aa3c784f14a49fa..5c99bd84af574fb7af769bf657676ff594faa9b1 100644 (file)
@@ -40,11 +40,10 @@ WK_EXPORT void WKBundlePageClose(WKBundlePageRef page);
 WK_EXPORT WKStringRef WKBundlePageCopyRenderTreeExternalRepresentation(WKBundlePageRef page);
 WK_EXPORT void WKBundlePageExecuteEditingCommand(WKBundlePageRef page, WKStringRef commandName, WKStringRef argument);
 
-WK_EXPORT float WKBundlePageGetTextZoomFactor(WKBundlePageRef page);
-WK_EXPORT void WKBundlePageSetTextZoomFactor(WKBundlePageRef page, float zoomFactor);
-WK_EXPORT float WKBundlePageGetPageZoomFactor(WKBundlePageRef page);
-WK_EXPORT void WKBundlePageSetPageZoomFactor(WKBundlePageRef page, float zoomFactor);
-
+WK_EXPORT double WKBundlePageGetTextZoomFactor(WKBundlePageRef page);
+WK_EXPORT void WKBundlePageSetTextZoomFactor(WKBundlePageRef page, double zoomFactor);
+WK_EXPORT double WKBundlePageGetPageZoomFactor(WKBundlePageRef page);
+WK_EXPORT void WKBundlePageSetPageZoomFactor(WKBundlePageRef page, double zoomFactor);
 
 #ifdef __cplusplus
 }
index 2248b2edeb8dcf5daa40d607f9fcfe96e2cc6b38..bdfef9a9eb27b84b7552d0f2d0162beb98e497be 100644 (file)
@@ -302,39 +302,47 @@ void WebPage::drawRect(GraphicsContext& graphicsContext, const IntRect& rect)
     graphicsContext.restore();
 }
 
-float WebPage::textZoomFactor() const
+double WebPage::textZoomFactor() const
 {
     if (Frame* coreFrame = m_mainFrame->coreFrame()) {
         if (FrameView* view = coreFrame->view())
             return view->textZoomFactor();
     }
     
-    return 1.0f;
+    return 1;
 }
 
-void WebPage::setTextZoomFactor(float zoomFactor)
+void WebPage::setTextZoomFactor(double zoomFactor)
 {
     if (Frame* coreFrame = m_mainFrame->coreFrame()) {
         if (FrameView* view = coreFrame->view())
-            return view->setTextZoomFactor(zoomFactor);
+            return view->setTextZoomFactor(static_cast<float>(zoomFactor));
     }
 }
 
-float WebPage::pageZoomFactor() const
+double WebPage::pageZoomFactor() const
 {
     if (Frame* coreFrame = m_mainFrame->coreFrame()) {
         if (FrameView* view = coreFrame->view())
             return view->pageZoomFactor();
     }
     
-    return 1.0f;
+    return 1;
 }
 
-void WebPage::setPageZoomFactor(float zoomFactor)
+void WebPage::setPageZoomFactor(double zoomFactor)
 {
     if (Frame* coreFrame = m_mainFrame->coreFrame()) {
         if (FrameView* view = coreFrame->view())
-            return view->setPageZoomFactor(zoomFactor);
+            return view->setPageZoomFactor(static_cast<float>(zoomFactor));
+    }
+}
+
+void WebPage::setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor)
+{
+    if (Frame* coreFrame = m_mainFrame->coreFrame()) {
+        if (FrameView* view = coreFrame->view())
+            return view->setPageAndTextZoomFactors(static_cast<float>(pageZoomFactor), static_cast<float>(textZoomFactor));
     }
 }
 
@@ -766,6 +774,28 @@ void WebPage::didReceiveMessage(CoreIPC::Connection* connection, CoreIPC::Messag
             didRemoveEditCommand(commandID);
             return;
         }
+        case WebPageMessage::SetPageZoomFactor: {
+            double zoomFactor;
+            if (!arguments->decode(CoreIPC::Out(zoomFactor)))
+                return;
+            setPageZoomFactor(zoomFactor);
+            return;
+        }
+        case WebPageMessage::SetTextZoomFactor: {
+            double zoomFactor;
+            if (!arguments->decode(CoreIPC::Out(zoomFactor)))
+                return;
+            setTextZoomFactor(zoomFactor);
+            return;
+        }
+        case WebPageMessage::SetPageAndTextZoomFactors: {
+            double pageZoomFactor;
+            double textZoomFactor;
+            if (!arguments->decode(CoreIPC::Out(pageZoomFactor, textZoomFactor)))
+                return;
+            setPageAndTextZoomFactors(pageZoomFactor, textZoomFactor);
+            return;
+        }
     }
 
     ASSERT_NOT_REACHED();
index e6ab3efdf9458c911658bdc1f2ce78b1bd7092c4..a496e0b2e7a9c388a773f00677df65a8552c20ca 100644 (file)
@@ -125,10 +125,11 @@ public:
     void clearMainFrameName();
     void sendClose();
 
-    float textZoomFactor() const;
-    void setTextZoomFactor(float);
-    float pageZoomFactor() const;
-    void setPageZoomFactor(float);
+    double textZoomFactor() const;
+    void setTextZoomFactor(double);
+    double pageZoomFactor() const;
+    void setPageZoomFactor(double);
+    void setPageAndTextZoomFactors(double pageZoomFactor, double textZoomFactor);
 
     void stopLoading();
 
index 413901106dd276b8e3f62b4207683bd43488d243..bce5be9675600a0088c37ee71ca0e0f2d1564c20 100644 (file)
@@ -1,3 +1,36 @@
+2010-09-10  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Dan Bernstein.
+
+        Add zoom support to WebKit2 API
+        <rdar://problem/7660657>
+        https://bugs.webkit.org/show_bug.cgi?id=45585
+
+        - Add zoom options to MiniBrowser that mimic Safari's options using
+          the new WebKit2 zoom APIs.
+        - Switch uses of float for the zoom APIs to use double.
+
+        * MiniBrowser/mac/BrowserWindowController.h:
+        * MiniBrowser/mac/BrowserWindowController.m:
+        (-[BrowserWindowController initWithPageNamespace:]):
+        (-[BrowserWindowController validateMenuItem:]):
+        (-[BrowserWindowController validateUserInterfaceItem:]):
+        (-[BrowserWindowController currentZoomFactor]):
+        (-[BrowserWindowController setCurrentZoomFactor:]):
+        (-[BrowserWindowController canZoomIn]):
+        (-[BrowserWindowController zoomIn:]):
+        (-[BrowserWindowController canZoomOut]):
+        (-[BrowserWindowController zoomOut:]):
+        (-[BrowserWindowController canResetZoom]):
+        (-[BrowserWindowController resetZoom:]):
+        (-[BrowserWindowController toggleZoomMode:]):
+        * MiniBrowser/mac/MainMenu.xib:
+        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+        (WTR::EventSendingController::textZoomIn):
+        (WTR::EventSendingController::textZoomOut):
+        (WTR::EventSendingController::zoomPageIn):
+        (WTR::EventSendingController::zoomPageOut):
+
 2010-09-10  Robert Hogan  <robert@webkit.org>
 
         Reviewed by Andreas Kling.
index aad8240bd6cd8566a84ceda259d265b61dc8acb4..3b7419bba17a8fb12d2d8030027e9dd004addd60 100644 (file)
@@ -34,6 +34,7 @@
 
     WKPageNamespaceRef _pageNamespace;
     WKView *_webView;
+    BOOL _zoomTextOnly;
 }
 - (IBAction)fetch:(id)sender;
 - (IBAction)reload:(id)sender;
 - (void)loadURLString:(NSString *)urlString;
 - (void)applicationTerminating;
 
+- (IBAction)zoomIn:(id)sender;
+- (IBAction)zoomOut:(id)sender;
+- (IBAction)resetZoom:(id)sender;
+- (BOOL)canZoomIn;
+- (BOOL)canZoomOut;
+- (BOOL)canResetZoom;
+
+- (IBAction)toggleZoomMode:(id)sender;
+
 @end
index 0b4e17051f8d89ff50e25dc6c3bee08f5c95969c..2351a2686f560f550bf395b246bf6684fab40ac1 100644 (file)
 
 - (id)initWithPageNamespace:(WKPageNamespaceRef)pageNamespace
 {
-    if ((self = [super initWithWindowNibName:@"BrowserWindow"]))
+    if ((self = [super initWithWindowNibName:@"BrowserWindow"])) {
         _pageNamespace = WKRetain(pageNamespace);
+        _zoomTextOnly = NO;
+    }
     
     return self;
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem
 {
-    if ([menuItem action] == @selector(showHideWebView:))
+    SEL action = [menuItem action];
+
+    if (action == @selector(zoomIn:))
+        return [self canZoomIn];
+    if (action == @selector(zoomOut:))
+        return [self canZoomOut];
+    if (action == @selector(resetZoom:))
+        return [self canResetZoom];
+
+    if (action == @selector(showHideWebView:))
         [menuItem setTitle:[_webView isHidden] ? @"Show Web View" : @"Hide Web View"];
-    else if ([menuItem action] == @selector(removeReinsertWebView:))
+    else if (action == @selector(removeReinsertWebView:))
         [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
+    else if (action == @selector(toggleZoomMode:))
+        [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
     return YES;
 }
 
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
 {
     SEL action = [item action];
-    
+
     if (action == @selector(goBack:))
         return _webView && WKPageCanGoBack(_webView.pageRef);
     
     WKRelease(_webView.pageRef);
 }
 
+#define DefaultMinimumZoomFactor (.5)
+#define DefaultMaximumZoomFactor (3.0)
+#define DefaultZoomFactorRatio (1.2)
+
+- (double)currentZoomFactor
+{
+    return _zoomTextOnly ? WKPageGetTextZoomFactor(_webView.pageRef) : WKPageGetPageZoomFactor(_webView.pageRef);
+}
+
+- (void)setCurrentZoomFactor:(double)factor
+{
+    _zoomTextOnly ? WKPageSetTextZoomFactor(_webView.pageRef, factor) : WKPageSetPageZoomFactor(_webView.pageRef, factor);
+}
+
+- (BOOL)canZoomIn
+{
+    return [self currentZoomFactor] * DefaultZoomFactorRatio < DefaultMaximumZoomFactor;
+}
+
+- (void)zoomIn:(id)sender;
+{
+    if (![self canZoomIn])
+        return;
+
+    double factor = [self currentZoomFactor] * DefaultZoomFactorRatio;
+    [self setCurrentZoomFactor:factor];
+}
+
+- (BOOL)canZoomOut
+{
+    return [self currentZoomFactor] / DefaultZoomFactorRatio > DefaultMinimumZoomFactor;
+}
+
+- (void)zoomOut:(id)sender;
+{
+    if (![self canZoomIn])
+        return;
+
+    double factor = [self currentZoomFactor] / DefaultZoomFactorRatio;
+    [self setCurrentZoomFactor:factor];
+}
+
+- (BOOL)canResetZoom
+{
+    return _zoomTextOnly ? (WKPageGetTextZoomFactor(_webView.pageRef) != 1) : (WKPageGetPageZoomFactor(_webView.pageRef) != 1);
+}
+
+- (void)resetZoom:(id)sender;
+{
+    if (![self canResetZoom])
+        return;
+
+    if (_zoomTextOnly)
+        WKPageSetTextZoomFactor(_webView.pageRef, 1);
+    else
+        WKPageSetPageZoomFactor(_webView.pageRef, 1);
+}
+
+- (IBAction)toggleZoomMode:(id)sender
+{
+    if (_zoomTextOnly) {
+        _zoomTextOnly = NO;
+        double currentTextZoom = WKPageGetTextZoomFactor(_webView.pageRef);
+        WKPageSetPageAndTextZoomFactors(_webView.pageRef, currentTextZoom, 1);
+    } else {
+        _zoomTextOnly = YES;
+        double currentPageZoom = WKPageGetPageZoomFactor(_webView.pageRef);
+        WKPageSetPageAndTextZoomFactors(_webView.pageRef, 1, currentPageZoom);
+    }
+}
+
 #pragma mark Loader Client Callbacks
 
 static void didStartProvisionalLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
index 229611c7a6b9c480c9ed4996965418bbf4d03eb7..f444073197f58f442935dd664ba5d43757f61654 100644 (file)
@@ -2,17 +2,17 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>
                <int key="IBDocument.SystemTarget">1060</int>
-               <string key="IBDocument.SystemVersion">10D573</string>
-               <string key="IBDocument.InterfaceBuilderVersion">762</string>
+               <string key="IBDocument.SystemVersion">10F569</string>
+               <string key="IBDocument.InterfaceBuilderVersion">788</string>
                <string key="IBDocument.AppKitVersion">1038.29</string>
-               <string key="IBDocument.HIToolboxVersion">460.00</string>
+               <string key="IBDocument.HIToolboxVersion">461.00</string>
                <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">762</string>
+                       <string key="NS.object.0">788</string>
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
-                       <integer value="535"/>
+                       <integer value="296"/>
                </object>
                <object class="NSArray" key="IBDocument.PluginDependencies">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        </object>
                                                </object>
                                        </object>
-                                       <object class="NSMenuItem" id="302598603">
-                                               <reference key="NSMenu" ref="649796088"/>
-                                               <string key="NSTitle">Format</string>
-                                               <string key="NSKeyEquiv"/>
-                                               <int key="NSMnemonicLoc">2147483647</int>
-                                               <reference key="NSOnImage" ref="35465992"/>
-                                               <reference key="NSMixedImage" ref="502551668"/>
-                                               <string key="NSAction">submenuAction:</string>
-                                               <object class="NSMenu" key="NSSubmenu" id="941447902">
-                                                       <string key="NSTitle">Format</string>
-                                                       <object class="NSMutableArray" key="NSMenuItems">
-                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                               <object class="NSMenuItem" id="792887677">
-                                                                       <reference key="NSMenu" ref="941447902"/>
-                                                                       <string key="NSTitle">Font</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                       <string key="NSAction">submenuAction:</string>
-                                                                       <object class="NSMenu" key="NSSubmenu" id="786677654">
-                                                                               <string key="NSTitle">Font</string>
-                                                                               <object class="NSMutableArray" key="NSMenuItems">
-                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                       <object class="NSMenuItem" id="159677712">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Show Fonts</string>
-                                                                                               <string key="NSKeyEquiv">t</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="305399458">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Bold</string>
-                                                                                               <string key="NSKeyEquiv">b</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <int key="NSTag">2</int>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="814362025">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Italic</string>
-                                                                                               <string key="NSKeyEquiv">i</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <int key="NSTag">1</int>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="330926929">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Underline</string>
-                                                                                               <string key="NSKeyEquiv">u</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="533507878">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <bool key="NSIsDisabled">YES</bool>
-                                                                                               <bool key="NSIsSeparator">YES</bool>
-                                                                                               <string key="NSTitle"/>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="158063935">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Bigger</string>
-                                                                                               <string key="NSKeyEquiv">+</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <int key="NSTag">3</int>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="885547335">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Smaller</string>
-                                                                                               <string key="NSKeyEquiv">-</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <int key="NSTag">4</int>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="901062459">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <bool key="NSIsDisabled">YES</bool>
-                                                                                               <bool key="NSIsSeparator">YES</bool>
-                                                                                               <string key="NSTitle"/>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="767671776">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Kern</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <string key="NSAction">submenuAction:</string>
-                                                                                               <object class="NSMenu" key="NSSubmenu" id="175441468">
-                                                                                                       <string key="NSTitle">Kern</string>
-                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
-                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                               <object class="NSMenuItem" id="252969304">
-                                                                                                                       <reference key="NSMenu" ref="175441468"/>
-                                                                                                                       <string key="NSTitle">Use Default</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="766922938">
-                                                                                                                       <reference key="NSMenu" ref="175441468"/>
-                                                                                                                       <string key="NSTitle">Use None</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="677519740">
-                                                                                                                       <reference key="NSMenu" ref="175441468"/>
-                                                                                                                       <string key="NSTitle">Tighten</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="238351151">
-                                                                                                                       <reference key="NSMenu" ref="175441468"/>
-                                                                                                                       <string key="NSTitle">Loosen</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="691570813">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Ligature</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <string key="NSAction">submenuAction:</string>
-                                                                                               <object class="NSMenu" key="NSSubmenu" id="1058217995">
-                                                                                                       <string key="NSTitle">Ligature</string>
-                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
-                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                               <object class="NSMenuItem" id="706297211">
-                                                                                                                       <reference key="NSMenu" ref="1058217995"/>
-                                                                                                                       <string key="NSTitle">Use Default</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="568384683">
-                                                                                                                       <reference key="NSMenu" ref="1058217995"/>
-                                                                                                                       <string key="NSTitle">Use None</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="663508465">
-                                                                                                                       <reference key="NSMenu" ref="1058217995"/>
-                                                                                                                       <string key="NSTitle">Use All</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="769124883">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Baseline</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <string key="NSAction">submenuAction:</string>
-                                                                                               <object class="NSMenu" key="NSSubmenu" id="18263474">
-                                                                                                       <string key="NSTitle">Baseline</string>
-                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
-                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                               <object class="NSMenuItem" id="257962622">
-                                                                                                                       <reference key="NSMenu" ref="18263474"/>
-                                                                                                                       <string key="NSTitle">Use Default</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="644725453">
-                                                                                                                       <reference key="NSMenu" ref="18263474"/>
-                                                                                                                       <string key="NSTitle">Superscript</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="1037576581">
-                                                                                                                       <reference key="NSMenu" ref="18263474"/>
-                                                                                                                       <string key="NSTitle">Subscript</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="941806246">
-                                                                                                                       <reference key="NSMenu" ref="18263474"/>
-                                                                                                                       <string key="NSTitle">Raise</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="1045724900">
-                                                                                                                       <reference key="NSMenu" ref="18263474"/>
-                                                                                                                       <string key="NSTitle">Lower</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="739652853">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <bool key="NSIsDisabled">YES</bool>
-                                                                                               <bool key="NSIsSeparator">YES</bool>
-                                                                                               <string key="NSTitle"/>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="1012600125">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Show Colors</string>
-                                                                                               <string key="NSKeyEquiv">C</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="214559597">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <bool key="NSIsDisabled">YES</bool>
-                                                                                               <bool key="NSIsSeparator">YES</bool>
-                                                                                               <string key="NSTitle"/>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="596732606">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Copy Style</string>
-                                                                                               <string key="NSKeyEquiv">c</string>
-                                                                                               <int key="NSKeyEquivModMask">1572864</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="393423671">
-                                                                                               <reference key="NSMenu" ref="786677654"/>
-                                                                                               <string key="NSTitle">Paste Style</string>
-                                                                                               <string key="NSKeyEquiv">v</string>
-                                                                                               <int key="NSKeyEquivModMask">1572864</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                               </object>
-                                                                               <string key="NSName">_NSFontMenu</string>
-                                                                       </object>
-                                                               </object>
-                                                               <object class="NSMenuItem" id="215659978">
-                                                                       <reference key="NSMenu" ref="941447902"/>
-                                                                       <string key="NSTitle">Text</string>
-                                                                       <string key="NSKeyEquiv"/>
-                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                       <string key="NSAction">submenuAction:</string>
-                                                                       <object class="NSMenu" key="NSSubmenu" id="446991534">
-                                                                               <string key="NSTitle">Text</string>
-                                                                               <object class="NSMutableArray" key="NSMenuItems">
-                                                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                       <object class="NSMenuItem" id="875092757">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Align Left</string>
-                                                                                               <string key="NSKeyEquiv">{</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="630155264">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Center</string>
-                                                                                               <string key="NSKeyEquiv">|</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="945678886">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Justify</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="512868991">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Align Right</string>
-                                                                                               <string key="NSKeyEquiv">}</string>
-                                                                                               <int key="NSKeyEquivModMask">1048576</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="163117631">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <bool key="NSIsDisabled">YES</bool>
-                                                                                               <bool key="NSIsSeparator">YES</bool>
-                                                                                               <string key="NSTitle"/>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="31516759">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Writing Direction</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                               <string key="NSAction">submenuAction:</string>
-                                                                                               <object class="NSMenu" key="NSSubmenu" id="956096989">
-                                                                                                       <string key="NSTitle">Writing Direction</string>
-                                                                                                       <object class="NSMutableArray" key="NSMenuItems">
-                                                                                                               <bool key="EncodedWithXMLCoder">YES</bool>
-                                                                                                               <object class="NSMenuItem" id="257099033">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <bool key="NSIsDisabled">YES</bool>
-                                                                                                                       <string key="NSTitle">Paragraph</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="551969625">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <string type="base64-UTF8" key="NSTitle">CURlZmF1bHQ</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="249532473">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <string type="base64-UTF8" key="NSTitle">CUxlZnQgdG8gUmlnaHQ</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="607364498">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <string type="base64-UTF8" key="NSTitle">CVJpZ2h0IHRvIExlZnQ</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="508151438">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <bool key="NSIsDisabled">YES</bool>
-                                                                                                                       <bool key="NSIsSeparator">YES</bool>
-                                                                                                                       <string key="NSTitle"/>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="981751889">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <bool key="NSIsDisabled">YES</bool>
-                                                                                                                       <string key="NSTitle">Selection</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="380031999">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <string type="base64-UTF8" key="NSTitle">CURlZmF1bHQ</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="825984362">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <string type="base64-UTF8" key="NSTitle">CUxlZnQgdG8gUmlnaHQ</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                               <object class="NSMenuItem" id="560145579">
-                                                                                                                       <reference key="NSMenu" ref="956096989"/>
-                                                                                                                       <string type="base64-UTF8" key="NSTitle">CVJpZ2h0IHRvIExlZnQ</string>
-                                                                                                                       <string key="NSKeyEquiv"/>
-                                                                                                                       <int key="NSMnemonicLoc">2147483647</int>
-                                                                                                                       <reference key="NSOnImage" ref="35465992"/>
-                                                                                                                       <reference key="NSMixedImage" ref="502551668"/>
-                                                                                                               </object>
-                                                                                                       </object>
-                                                                                               </object>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="908105787">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <bool key="NSIsDisabled">YES</bool>
-                                                                                               <bool key="NSIsSeparator">YES</bool>
-                                                                                               <string key="NSTitle"/>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="644046920">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Show Ruler</string>
-                                                                                               <string key="NSKeyEquiv"/>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="231811626">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Copy Ruler</string>
-                                                                                               <string key="NSKeyEquiv">c</string>
-                                                                                               <int key="NSKeyEquivModMask">1310720</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                                       <object class="NSMenuItem" id="883618387">
-                                                                                               <reference key="NSMenu" ref="446991534"/>
-                                                                                               <string key="NSTitle">Paste Ruler</string>
-                                                                                               <string key="NSKeyEquiv">v</string>
-                                                                                               <int key="NSKeyEquivModMask">1310720</int>
-                                                                                               <int key="NSMnemonicLoc">2147483647</int>
-                                                                                               <reference key="NSOnImage" ref="35465992"/>
-                                                                                               <reference key="NSMixedImage" ref="502551668"/>
-                                                                                       </object>
-                                                                               </object>
-                                                                       </object>
-                                                               </object>
-                                                       </object>
-                                               </object>
-                                       </object>
                                        <object class="NSMenuItem" id="586577488">
                                                <reference key="NSMenu" ref="649796088"/>
                                                <string key="NSTitle">View</string>
                                                                        <reference key="NSOnImage" ref="35465992"/>
                                                                        <reference key="NSMixedImage" ref="502551668"/>
                                                                </object>
+                                                               <object class="NSMenuItem" id="1025359947">
+                                                                       <reference key="NSMenu" ref="466310130"/>
+                                                                       <bool key="NSIsDisabled">YES</bool>
+                                                                       <bool key="NSIsSeparator">YES</bool>
+                                                                       <string key="NSTitle"/>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="694544109">
+                                                                       <reference key="NSMenu" ref="466310130"/>
+                                                                       <string key="NSTitle">Zoom In</string>
+                                                                       <string key="NSKeyEquiv">+</string>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="943694335">
+                                                                       <reference key="NSMenu" ref="466310130"/>
+                                                                       <string key="NSTitle">Zoom Out</string>
+                                                                       <string key="NSKeyEquiv">-</string>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="863984465">
+                                                                       <reference key="NSMenu" ref="466310130"/>
+                                                                       <string key="NSTitle">Reset Zoom</string>
+                                                                       <string key="NSKeyEquiv">0</string>
+                                                                       <int key="NSKeyEquivModMask">1048576</int>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
+                                                               <object class="NSMenuItem" id="138443116">
+                                                                       <reference key="NSMenu" ref="466310130"/>
+                                                                       <string key="NSTitle">Zoom Text Only</string>
+                                                                       <string key="NSKeyEquiv"/>
+                                                                       <int key="NSMnemonicLoc">2147483647</int>
+                                                                       <reference key="NSOnImage" ref="35465992"/>
+                                                                       <reference key="NSMixedImage" ref="502551668"/>
+                                                               </object>
                                                        </object>
                                                </object>
                                        </object>
                                        </object>
                                        <int key="connectionID">374</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">addFontTrait:</string>
-                                               <reference key="source" ref="755631768"/>
-                                               <reference key="destination" ref="305399458"/>
-                                       </object>
-                                       <int key="connectionID">421</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">addFontTrait:</string>
-                                               <reference key="source" ref="755631768"/>
-                                               <reference key="destination" ref="814362025"/>
-                                       </object>
-                                       <int key="connectionID">422</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">modifyFont:</string>
-                                               <reference key="source" ref="755631768"/>
-                                               <reference key="destination" ref="885547335"/>
-                                       </object>
-                                       <int key="connectionID">423</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">orderFrontFontPanel:</string>
-                                               <reference key="source" ref="755631768"/>
-                                               <reference key="destination" ref="159677712"/>
-                                       </object>
-                                       <int key="connectionID">424</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">modifyFont:</string>
-                                               <reference key="source" ref="755631768"/>
-                                               <reference key="destination" ref="158063935"/>
-                                       </object>
-                                       <int key="connectionID">425</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">raiseBaseline:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="941806246"/>
-                                       </object>
-                                       <int key="connectionID">426</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">lowerBaseline:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="1045724900"/>
-                                       </object>
-                                       <int key="connectionID">427</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">copyFont:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="596732606"/>
-                                       </object>
-                                       <int key="connectionID">428</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">subscript:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="1037576581"/>
-                                       </object>
-                                       <int key="connectionID">429</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">superscript:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="644725453"/>
-                                       </object>
-                                       <int key="connectionID">430</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">tightenKerning:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="677519740"/>
-                                       </object>
-                                       <int key="connectionID">431</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">underline:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="330926929"/>
-                                       </object>
-                                       <int key="connectionID">432</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">orderFrontColorPanel:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="1012600125"/>
-                                       </object>
-                                       <int key="connectionID">433</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">useAllLigatures:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="663508465"/>
-                                       </object>
-                                       <int key="connectionID">434</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">loosenKerning:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="238351151"/>
-                                       </object>
-                                       <int key="connectionID">435</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">pasteFont:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="393423671"/>
-                                       </object>
-                                       <int key="connectionID">436</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">unscript:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="257962622"/>
-                                       </object>
-                                       <int key="connectionID">437</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">useStandardKerning:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="252969304"/>
-                                       </object>
-                                       <int key="connectionID">438</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">useStandardLigatures:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="706297211"/>
-                                       </object>
-                                       <int key="connectionID">439</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">turnOffLigatures:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="568384683"/>
-                                       </object>
-                                       <int key="connectionID">440</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">turnOffKerning:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="766922938"/>
-                                       </object>
-                                       <int key="connectionID">441</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">terminate:</string>
                                        </object>
                                        <int key="connectionID">495</int>
                                </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">alignCenter:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="630155264"/>
-                                       </object>
-                                       <int key="connectionID">518</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">pasteRuler:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="883618387"/>
-                                       </object>
-                                       <int key="connectionID">519</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">toggleRuler:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="644046920"/>
-                                       </object>
-                                       <int key="connectionID">520</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">alignRight:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="512868991"/>
-                                       </object>
-                                       <int key="connectionID">521</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">copyRuler:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="231811626"/>
-                                       </object>
-                                       <int key="connectionID">522</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">alignJustified:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="945678886"/>
-                                       </object>
-                                       <int key="connectionID">523</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">alignLeft:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="875092757"/>
-                                       </object>
-                                       <int key="connectionID">524</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">makeBaseWritingDirectionNatural:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="551969625"/>
-                                       </object>
-                                       <int key="connectionID">525</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">makeBaseWritingDirectionLeftToRight:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="249532473"/>
-                                       </object>
-                                       <int key="connectionID">526</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">makeBaseWritingDirectionRightToLeft:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="607364498"/>
-                                       </object>
-                                       <int key="connectionID">527</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">makeTextWritingDirectionNatural:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="380031999"/>
-                                       </object>
-                                       <int key="connectionID">528</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">makeTextWritingDirectionLeftToRight:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="825984362"/>
-                                       </object>
-                                       <int key="connectionID">529</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" key="connection">
-                                               <string key="label">makeTextWritingDirectionRightToLeft:</string>
-                                               <reference key="source" ref="1014"/>
-                                               <reference key="destination" ref="560145579"/>
-                                       </object>
-                                       <int key="connectionID">530</int>
-                               </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" key="connection">
                                                <string key="label">newWindow:</string>
                                        </object>
                                        <int key="connectionID">554</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">zoomIn:</string>
+                                               <reference key="source" ref="1014"/>
+                                               <reference key="destination" ref="694544109"/>
+                                       </object>
+                                       <int key="connectionID">559</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">zoomOut:</string>
+                                               <reference key="source" ref="1014"/>
+                                               <reference key="destination" ref="943694335"/>
+                                       </object>
+                                       <int key="connectionID">560</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">resetZoom:</string>
+                                               <reference key="source" ref="1014"/>
+                                               <reference key="destination" ref="863984465"/>
+                                       </object>
+                                       <int key="connectionID">561</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" key="connection">
+                                               <string key="label">toggleZoomMode:</string>
+                                               <reference key="source" ref="1014"/>
+                                               <reference key="destination" ref="138443116"/>
+                                       </object>
+                                       <int key="connectionID">564</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
                                                        <reference ref="952259628"/>
                                                        <reference ref="379814623"/>
                                                        <reference ref="586577488"/>
-                                                       <reference ref="302598603"/>
                                                        <reference ref="448692316"/>
                                                        <reference ref="816668511"/>
                                                </object>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <reference ref="102151532"/>
                                                        <reference ref="237841660"/>
+                                                       <reference ref="694544109"/>
+                                                       <reference ref="1025359947"/>
+                                                       <reference ref="943694335"/>
+                                                       <reference ref="863984465"/>
+                                                       <reference ref="138443116"/>
                                                </object>
                                                <reference key="parent" ref="586577488"/>
                                        </object>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">351</int>
-                                               <reference key="object" ref="197661976"/>
-                                               <reference key="parent" ref="698887838"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">354</int>
-                                               <reference key="object" ref="708854459"/>
-                                               <reference key="parent" ref="698887838"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">375</int>
-                                               <reference key="object" ref="302598603"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="941447902"/>
-                                               </object>
-                                               <reference key="parent" ref="649796088"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">376</int>
-                                               <reference key="object" ref="941447902"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="792887677"/>
-                                                       <reference ref="215659978"/>
-                                               </object>
-                                               <reference key="parent" ref="302598603"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">377</int>
-                                               <reference key="object" ref="792887677"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="786677654"/>
-                                               </object>
-                                               <reference key="parent" ref="941447902"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">388</int>
-                                               <reference key="object" ref="786677654"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="159677712"/>
-                                                       <reference ref="305399458"/>
-                                                       <reference ref="814362025"/>
-                                                       <reference ref="330926929"/>
-                                                       <reference ref="533507878"/>
-                                                       <reference ref="158063935"/>
-                                                       <reference ref="885547335"/>
-                                                       <reference ref="901062459"/>
-                                                       <reference ref="767671776"/>
-                                                       <reference ref="691570813"/>
-                                                       <reference ref="769124883"/>
-                                                       <reference ref="739652853"/>
-                                                       <reference ref="1012600125"/>
-                                                       <reference ref="214559597"/>
-                                                       <reference ref="596732606"/>
-                                                       <reference ref="393423671"/>
-                                               </object>
-                                               <reference key="parent" ref="792887677"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">389</int>
-                                               <reference key="object" ref="159677712"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">390</int>
-                                               <reference key="object" ref="305399458"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">391</int>
-                                               <reference key="object" ref="814362025"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">392</int>
-                                               <reference key="object" ref="330926929"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">393</int>
-                                               <reference key="object" ref="533507878"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">394</int>
-                                               <reference key="object" ref="158063935"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">395</int>
-                                               <reference key="object" ref="885547335"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">396</int>
-                                               <reference key="object" ref="901062459"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">397</int>
-                                               <reference key="object" ref="767671776"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="175441468"/>
-                                               </object>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">398</int>
-                                               <reference key="object" ref="691570813"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="1058217995"/>
-                                               </object>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">399</int>
-                                               <reference key="object" ref="769124883"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="18263474"/>
-                                               </object>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">400</int>
-                                               <reference key="object" ref="739652853"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">401</int>
-                                               <reference key="object" ref="1012600125"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">402</int>
-                                               <reference key="object" ref="214559597"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">403</int>
-                                               <reference key="object" ref="596732606"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">404</int>
-                                               <reference key="object" ref="393423671"/>
-                                               <reference key="parent" ref="786677654"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">405</int>
-                                               <reference key="object" ref="18263474"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="257962622"/>
-                                                       <reference ref="644725453"/>
-                                                       <reference ref="1037576581"/>
-                                                       <reference ref="941806246"/>
-                                                       <reference ref="1045724900"/>
-                                               </object>
-                                               <reference key="parent" ref="769124883"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">406</int>
-                                               <reference key="object" ref="257962622"/>
-                                               <reference key="parent" ref="18263474"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">407</int>
-                                               <reference key="object" ref="644725453"/>
-                                               <reference key="parent" ref="18263474"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">408</int>
-                                               <reference key="object" ref="1037576581"/>
-                                               <reference key="parent" ref="18263474"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">409</int>
-                                               <reference key="object" ref="941806246"/>
-                                               <reference key="parent" ref="18263474"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">410</int>
-                                               <reference key="object" ref="1045724900"/>
-                                               <reference key="parent" ref="18263474"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">411</int>
-                                               <reference key="object" ref="1058217995"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="706297211"/>
-                                                       <reference ref="568384683"/>
-                                                       <reference ref="663508465"/>
-                                               </object>
-                                               <reference key="parent" ref="691570813"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">412</int>
-                                               <reference key="object" ref="706297211"/>
-                                               <reference key="parent" ref="1058217995"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">413</int>
-                                               <reference key="object" ref="568384683"/>
-                                               <reference key="parent" ref="1058217995"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">414</int>
-                                               <reference key="object" ref="663508465"/>
-                                               <reference key="parent" ref="1058217995"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">415</int>
-                                               <reference key="object" ref="175441468"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="252969304"/>
-                                                       <reference ref="766922938"/>
-                                                       <reference ref="677519740"/>
-                                                       <reference ref="238351151"/>
-                                               </object>
-                                               <reference key="parent" ref="767671776"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">416</int>
-                                               <reference key="object" ref="252969304"/>
-                                               <reference key="parent" ref="175441468"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">417</int>
-                                               <reference key="object" ref="766922938"/>
-                                               <reference key="parent" ref="175441468"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">418</int>
-                                               <reference key="object" ref="677519740"/>
-                                               <reference key="parent" ref="175441468"/>
+                                               <reference key="object" ref="197661976"/>
+                                               <reference key="parent" ref="698887838"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">419</int>
-                                               <reference key="object" ref="238351151"/>
-                                               <reference key="parent" ref="175441468"/>
+                                               <int key="objectID">354</int>
+                                               <reference key="object" ref="708854459"/>
+                                               <reference key="parent" ref="698887838"/>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">420</int>
                                                <reference key="object" ref="976324537"/>
                                                <reference key="parent" ref="0"/>
                                        </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">496</int>
-                                               <reference key="object" ref="215659978"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="446991534"/>
-                                               </object>
-                                               <reference key="parent" ref="941447902"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">497</int>
-                                               <reference key="object" ref="446991534"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="875092757"/>
-                                                       <reference ref="630155264"/>
-                                                       <reference ref="945678886"/>
-                                                       <reference ref="512868991"/>
-                                                       <reference ref="163117631"/>
-                                                       <reference ref="31516759"/>
-                                                       <reference ref="908105787"/>
-                                                       <reference ref="644046920"/>
-                                                       <reference ref="231811626"/>
-                                                       <reference ref="883618387"/>
-                                               </object>
-                                               <reference key="parent" ref="215659978"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">498</int>
-                                               <reference key="object" ref="875092757"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">499</int>
-                                               <reference key="object" ref="630155264"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">500</int>
-                                               <reference key="object" ref="945678886"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">501</int>
-                                               <reference key="object" ref="512868991"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">502</int>
-                                               <reference key="object" ref="163117631"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">503</int>
-                                               <reference key="object" ref="31516759"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="956096989"/>
-                                               </object>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">504</int>
-                                               <reference key="object" ref="908105787"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">505</int>
-                                               <reference key="object" ref="644046920"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">506</int>
-                                               <reference key="object" ref="231811626"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">507</int>
-                                               <reference key="object" ref="883618387"/>
-                                               <reference key="parent" ref="446991534"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">508</int>
-                                               <reference key="object" ref="956096989"/>
-                                               <object class="NSMutableArray" key="children">
-                                                       <bool key="EncodedWithXMLCoder">YES</bool>
-                                                       <reference ref="257099033"/>
-                                                       <reference ref="551969625"/>
-                                                       <reference ref="249532473"/>
-                                                       <reference ref="607364498"/>
-                                                       <reference ref="508151438"/>
-                                                       <reference ref="981751889"/>
-                                                       <reference ref="380031999"/>
-                                                       <reference ref="825984362"/>
-                                                       <reference ref="560145579"/>
-                                               </object>
-                                               <reference key="parent" ref="31516759"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">509</int>
-                                               <reference key="object" ref="257099033"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">510</int>
-                                               <reference key="object" ref="551969625"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">511</int>
-                                               <reference key="object" ref="249532473"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">512</int>
-                                               <reference key="object" ref="607364498"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">513</int>
-                                               <reference key="object" ref="508151438"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">514</int>
-                                               <reference key="object" ref="981751889"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">515</int>
-                                               <reference key="object" ref="380031999"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">516</int>
-                                               <reference key="object" ref="825984362"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
-                                               <int key="objectID">517</int>
-                                               <reference key="object" ref="560145579"/>
-                                               <reference key="parent" ref="956096989"/>
-                                       </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">534</int>
                                                <reference key="object" ref="816668511"/>
                                                <reference key="object" ref="864702084"/>
                                                <reference key="parent" ref="865232259"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">555</int>
+                                               <reference key="object" ref="694544109"/>
+                                               <reference key="parent" ref="466310130"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">556</int>
+                                               <reference key="object" ref="1025359947"/>
+                                               <reference key="parent" ref="466310130"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">557</int>
+                                               <reference key="object" ref="943694335"/>
+                                               <reference key="parent" ref="466310130"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">558</int>
+                                               <reference key="object" ref="863984465"/>
+                                               <reference key="parent" ref="466310130"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">562</int>
+                                               <reference key="object" ref="138443116"/>
+                                               <reference key="parent" ref="466310130"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" key="flattenedProperties">
                                        <string>351.ImportedFromIB2</string>
                                        <string>354.IBPluginDependency</string>
                                        <string>354.ImportedFromIB2</string>
-                                       <string>375.IBPluginDependency</string>
-                                       <string>376.IBEditorWindowLastContentRect</string>
-                                       <string>376.IBPluginDependency</string>
-                                       <string>377.IBPluginDependency</string>
-                                       <string>388.IBEditorWindowLastContentRect</string>
-                                       <string>388.IBPluginDependency</string>
-                                       <string>389.IBPluginDependency</string>
-                                       <string>390.IBPluginDependency</string>
-                                       <string>391.IBPluginDependency</string>
-                                       <string>392.IBPluginDependency</string>
-                                       <string>393.IBPluginDependency</string>
-                                       <string>394.IBPluginDependency</string>
-                                       <string>395.IBPluginDependency</string>
-                                       <string>396.IBPluginDependency</string>
-                                       <string>397.IBPluginDependency</string>
-                                       <string>398.IBPluginDependency</string>
-                                       <string>399.IBPluginDependency</string>
-                                       <string>400.IBPluginDependency</string>
-                                       <string>401.IBPluginDependency</string>
-                                       <string>402.IBPluginDependency</string>
-                                       <string>403.IBPluginDependency</string>
-                                       <string>404.IBPluginDependency</string>
-                                       <string>405.IBPluginDependency</string>
-                                       <string>406.IBPluginDependency</string>
-                                       <string>407.IBPluginDependency</string>
-                                       <string>408.IBPluginDependency</string>
-                                       <string>409.IBPluginDependency</string>
-                                       <string>410.IBPluginDependency</string>
-                                       <string>411.IBPluginDependency</string>
-                                       <string>412.IBPluginDependency</string>
-                                       <string>413.IBPluginDependency</string>
-                                       <string>414.IBPluginDependency</string>
-                                       <string>415.IBPluginDependency</string>
-                                       <string>416.IBPluginDependency</string>
-                                       <string>417.IBPluginDependency</string>
-                                       <string>418.IBPluginDependency</string>
-                                       <string>419.IBPluginDependency</string>
                                        <string>450.IBPluginDependency</string>
                                        <string>451.IBEditorWindowLastContentRect</string>
                                        <string>451.IBPluginDependency</string>
                                        <string>491.IBEditorWindowLastContentRect</string>
                                        <string>491.IBPluginDependency</string>
                                        <string>492.IBPluginDependency</string>
-                                       <string>496.IBPluginDependency</string>
-                                       <string>497.IBEditorWindowLastContentRect</string>
-                                       <string>497.IBPluginDependency</string>
-                                       <string>498.IBPluginDependency</string>
-                                       <string>499.IBPluginDependency</string>
                                        <string>5.IBPluginDependency</string>
                                        <string>5.ImportedFromIB2</string>
-                                       <string>500.IBPluginDependency</string>
-                                       <string>501.IBPluginDependency</string>
-                                       <string>502.IBPluginDependency</string>
-                                       <string>503.IBPluginDependency</string>
-                                       <string>504.IBPluginDependency</string>
-                                       <string>505.IBPluginDependency</string>
-                                       <string>506.IBPluginDependency</string>
-                                       <string>507.IBPluginDependency</string>
-                                       <string>508.IBEditorWindowLastContentRect</string>
-                                       <string>508.IBPluginDependency</string>
-                                       <string>509.IBPluginDependency</string>
-                                       <string>510.IBPluginDependency</string>
-                                       <string>511.IBPluginDependency</string>
-                                       <string>512.IBPluginDependency</string>
-                                       <string>513.IBPluginDependency</string>
-                                       <string>514.IBPluginDependency</string>
-                                       <string>515.IBPluginDependency</string>
-                                       <string>516.IBPluginDependency</string>
-                                       <string>517.IBPluginDependency</string>
                                        <string>534.IBPluginDependency</string>
                                        <string>535.IBEditorWindowLastContentRect</string>
                                        <string>535.IBPluginDependency</string>
                                        <string>550.IBPluginDependency</string>
                                        <string>552.IBPluginDependency</string>
                                        <string>553.IBPluginDependency</string>
+                                       <string>555.IBPluginDependency</string>
+                                       <string>556.IBPluginDependency</string>
+                                       <string>557.IBPluginDependency</string>
+                                       <string>558.IBPluginDependency</string>
                                        <string>56.IBPluginDependency</string>
                                        <string>56.ImportedFromIB2</string>
+                                       <string>562.IBPluginDependency</string>
                                        <string>57.IBEditorWindowLastContentRect</string>
                                        <string>57.IBPluginDependency</string>
                                        <string>57.ImportedFromIB2</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
-                                       <string>{{546, 553}, {254, 283}}</string>
+                                       <string>{{650, 538}, {254, 283}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{187, 434}, {243, 243}}</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
-                                       <string>{{639, 872}, {194, 73}}</string>
+                                       <string>{{744, 748}, {194, 73}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{525, 802}, {197, 73}}</string>
-                                       <string>{{317, 836}, {517, 20}}</string>
+                                       <string>{{488, 821}, {451, 20}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{74, 862}</string>
                                        <string>{{6, 978}, {478, 20}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{656, 793}, {231, 43}}</string>
+                                       <string>{{694, 688}, {234, 133}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{475, 832}, {234, 43}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{527, 902}, {83, 43}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{523, 2}, {178, 283}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{753, 197}, {170, 63}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{714, 922}, {193, 23}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{674, 260}, {204, 183}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{881, 798}, {189, 23}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{864, 698}, {246, 123}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <string>{{1110, 678}, {154, 43}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{878, 180}, {164, 173}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{759, 713}, {246, 123}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <string>{{944, 872}, {154, 43}}</string>
-                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
+                                       <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{286, 129}, {275, 183}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <integer value="1"/>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
-                                       <string>{{504, 633}, {196, 203}}</string>
+                                       <string>{{608, 618}, {196, 203}}</string>
                                        <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <integer value="1"/>
                                        <string>{{145, 474}, {199, 203}}</string>
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">554</int>
+                       <int key="maxID">564</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" key="referencedPartialClassDescriptions">
                                                        <string>id</string>
                                                </object>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>setSharedProcessProcessModel:</string>
+                                                       <string>setSharedThreadProcessModel:</string>
+                                                       <string>showStatisticsWindow:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">setSharedProcessProcessModel:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">setSharedThreadProcessModel:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">showStatisticsWindow:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">mac/AppDelegate.h</string>
                                                <string key="NS.key.0">window</string>
                                                <string key="NS.object.0">NSWindow</string>
                                        </object>
+                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <string key="NS.key.0">window</string>
+                                               <object class="IBToOneOutletInfo" key="NS.object.0">
+                                                       <string key="name">window</string>
+                                                       <string key="candidateClassName">NSWindow</string>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>fetch:</string>
                                                        <string>forceRepaint:</string>
+                                                       <string>goBack:</string>
+                                                       <string>goForward:</string>
                                                        <string>reload:</string>
                                                        <string>removeReinsertWebView:</string>
+                                                       <string>resetZoom:</string>
                                                        <string>showHideWebView:</string>
+                                                       <string>toggleZoomMode:</string>
+                                                       <string>zoomIn:</string>
+                                                       <string>zoomOut:</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                               </object>
+                                       </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>fetch:</string>
+                                                       <string>forceRepaint:</string>
+                                                       <string>goBack:</string>
+                                                       <string>goForward:</string>
+                                                       <string>reload:</string>
+                                                       <string>removeReinsertWebView:</string>
+                                                       <string>resetZoom:</string>
+                                                       <string>showHideWebView:</string>
+                                                       <string>toggleZoomMode:</string>
+                                                       <string>zoomIn:</string>
+                                                       <string>zoomOut:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">fetch:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">forceRepaint:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">goBack:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">goForward:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">reload:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">removeReinsertWebView:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">resetZoom:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">showHideWebView:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">toggleZoomMode:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">zoomIn:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">zoomOut:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" key="outlets">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" key="dict.sortedKeys">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>backButton</string>
                                                        <string>containerView</string>
+                                                       <string>forwardButton</string>
                                                        <string>progressIndicator</string>
                                                        <string>reloadButton</string>
+                                                       <string>toolbar</string>
                                                        <string>urlText</string>
                                                </object>
                                                <object class="NSMutableArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSButton</string>
                                                        <string>NSView</string>
+                                                       <string>NSButton</string>
                                                        <string>NSProgressIndicator</string>
                                                        <string>NSButton</string>
+                                                       <string>NSToolbar</string>
                                                        <string>NSTextField</string>
                                                </object>
                                        </object>
+                                       <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>backButton</string>
+                                                       <string>containerView</string>
+                                                       <string>forwardButton</string>
+                                                       <string>progressIndicator</string>
+                                                       <string>reloadButton</string>
+                                                       <string>toolbar</string>
+                                                       <string>urlText</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">backButton</string>
+                                                               <string key="candidateClassName">NSButton</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">containerView</string>
+                                                               <string key="candidateClassName">NSView</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">forwardButton</string>
+                                                               <string key="candidateClassName">NSButton</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">progressIndicator</string>
+                                                               <string key="candidateClassName">NSProgressIndicator</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">reloadButton</string>
+                                                               <string key="candidateClassName">NSButton</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">toolbar</string>
+                                                               <string key="candidateClassName">NSToolbar</string>
+                                                       </object>
+                                                       <object class="IBToOneOutletInfo">
+                                                               <string key="name">urlText</string>
+                                                               <string key="candidateClassName">NSTextField</string>
+                                                       </object>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBProjectSource</string>
                                                <string key="minorKey">mac/BrowserWindowController.h</string>
                                                        <string>id</string>
                                                </object>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>forceRepaint:</string>
+                                                       <string>newWindow:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">forceRepaint:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">newWindow:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
                                                        <string>id</string>
                                                </object>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>printDocument:</string>
+                                                       <string>revertDocumentToSaved:</string>
+                                                       <string>runPageLayout:</string>
+                                                       <string>saveDocument:</string>
+                                                       <string>saveDocumentAs:</string>
+                                                       <string>saveDocumentTo:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">printDocument:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">revertDocumentToSaved:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">runPageLayout:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">saveDocument:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">saveDocumentAs:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">saveDocumentTo:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBFrameworkSource</string>
                                                <string key="minorKey">AppKit.framework/Headers/NSDocument.h</string>
                                                        <string>id</string>
                                                </object>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <bool key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" key="dict.sortedKeys">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>clearRecentDocuments:</string>
+                                                       <string>newDocument:</string>
+                                                       <string>openDocument:</string>
+                                                       <string>saveAllDocuments:</string>
+                                               </object>
+                                               <object class="NSMutableArray" key="dict.values">
+                                                       <bool key="EncodedWithXMLCoder">YES</bool>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">clearRecentDocuments:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">newDocument:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">openDocument:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                                       <object class="IBActionInfo">
+                                                               <string key="name">saveAllDocuments:</string>
+                                                               <string key="candidateClassName">id</string>
+                                                       </object>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBFrameworkSource</string>
                                                <string key="minorKey">AppKit.framework/Headers/NSDocumentController.h</string>
                                                <string key="minorKey">AppKit.framework/Headers/NSTextView.h</string>
                                        </object>
                                </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSToolbar</string>
+                                       <string key="superclassName">NSObject</string>
+                                       <object class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string key="majorKey">IBFrameworkSource</string>
+                                               <string key="minorKey">AppKit.framework/Headers/NSToolbar.h</string>
+                                       </object>
+                               </object>
                                <object class="IBPartialClassDescription">
                                        <string key="className">NSView</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="NS.key.0">showWindow:</string>
                                                <string key="NS.object.0">id</string>
                                        </object>
+                                       <object class="NSMutableDictionary" key="actionInfosByName">
+                                               <string key="NS.key.0">showWindow:</string>
+                                               <object class="IBActionInfo" key="NS.object.0">
+                                                       <string key="name">showWindow:</string>
+                                                       <string key="candidateClassName">id</string>
+                                               </object>
+                                       </object>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBFrameworkSource</string>
                                                <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
                </object>
                <int key="IBDocument.localizationMode">0</int>
                <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
-               <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults">
-                       <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
-                       <integer value="1060" key="NS.object.0"/>
-               </object>
                <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
                        <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string>
                        <integer value="3000" key="NS.object.0"/>
                </object>
                <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-               <string key="IBDocument.LastKnownRelativeProjectPath">../../MiniBrowser.xcodeproj</string>
+               <string key="IBDocument.LastKnownRelativeProjectPath">../MiniBrowser.xcodeproj</string>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
                <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
                        <bool key="EncodedWithXMLCoder">YES</bool>
index dc224cff1ddb04261776bc56113d01c494809bf6..9e8fc63a1a864a5e3f4546dcff1fef71695c8e9a 100644 (file)
@@ -95,7 +95,7 @@ void EventSendingController::textZoomIn()
     // Ensure page zoom is reset.
     WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), 1);
 
-    float zoomFactor = WKBundlePageGetTextZoomFactor(InjectedBundle::shared().page()->page());
+    double zoomFactor = WKBundlePageGetTextZoomFactor(InjectedBundle::shared().page()->page());
     WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor * ZoomMultiplierRatio);
 }
 
@@ -104,7 +104,7 @@ void EventSendingController::textZoomOut()
     // Ensure page zoom is reset.
     WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), 1);
 
-    float zoomFactor = WKBundlePageGetTextZoomFactor(InjectedBundle::shared().page()->page());
+    double zoomFactor = WKBundlePageGetTextZoomFactor(InjectedBundle::shared().page()->page());
     WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor / ZoomMultiplierRatio);
 }
 
@@ -113,7 +113,7 @@ void EventSendingController::zoomPageIn()
     // Ensure text zoom is reset.
     WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), 1);
 
-    float zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
+    double zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
     WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor / ZoomMultiplierRatio);
 }
 
@@ -122,7 +122,7 @@ void EventSendingController::zoomPageOut()
     // Ensure text zoom is reset.
     WKBundlePageSetTextZoomFactor(InjectedBundle::shared().page()->page(), 1);
 
-    float zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
+    double zoomFactor = WKBundlePageGetPageZoomFactor(InjectedBundle::shared().page()->page());
     WKBundlePageSetPageZoomFactor(InjectedBundle::shared().page()->page(), zoomFactor / ZoomMultiplierRatio);
 }