Revision: 6579
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6579&view=rev
Author:   hofman
Date:     2010-06-09 11:29:36 +0000 (Wed, 09 Jun 2010)

Log Message:
-----------
use main menu items for display mode display for all four settings rather than 
separate items for one/two and continuous toggle

Modified Paths:
--------------
    trunk/Dutch.lproj/MainMenu.strings
    trunk/French.lproj/MainMenu.strings
    trunk/German.lproj/MainMenu.strings
    trunk/Italian.lproj/MainMenu.strings
    trunk/MainMenu.xib
    trunk/SKMainWindowController_Actions.h
    trunk/SKMainWindowController_Actions.m
    trunk/SKMainWindowController_UI.m
    trunk/Spanish.lproj/MainMenu.strings
    trunk/pl.lproj/MainMenu.strings
    trunk/ru.lproj/MainMenu.strings
    trunk/zh_TW.lproj/MainMenu.strings

Modified: trunk/Dutch.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/French.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/German.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/Italian.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/MainMenu.xib
===================================================================
--- trunk/MainMenu.xib  2010-06-09 09:23:33 UTC (rev 6578)
+++ trunk/MainMenu.xib  2010-06-09 11:29:36 UTC (rev 6579)
@@ -2,13 +2,13 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
        <data>
                <int key="IBDocument.SystemTarget">1040</int>
-               <string key="IBDocument.SystemVersion">10C540</string>
-               <string key="IBDocument.InterfaceBuilderVersion">740</string>
-               <string key="IBDocument.AppKitVersion">1038.25</string>
-               <string key="IBDocument.HIToolboxVersion">458.00</string>
+               <string key="IBDocument.SystemVersion">10D573</string>
+               <string key="IBDocument.InterfaceBuilderVersion">762</string>
+               <string key="IBDocument.AppKitVersion">1038.29</string>
+               <string key="IBDocument.HIToolboxVersion">460.00</string>
                <object class="NSMutableDictionary" 
key="IBDocument.PluginVersions">
                        <string 
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
-                       <string key="NS.object.0">740</string>
+                       <string key="NS.object.0">762</string>
                </object>
                <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1419,42 +1419,54 @@
                                                                                
        <bool key="EncodedWithXMLCoder">YES</bool>
                                                                                
        <object class="NSMenuItem" id="905422809">
                                                                                
                <reference key="NSMenu" ref="548272754"/>
-                                                                               
                <string key="NSTitle">Single Pages</string>
+                                                                               
                <string key="NSTitle">Single Page</string>
                                                                                
                <string key="NSKeyEquiv"/>
                                                                                
                <int key="NSKeyEquivModMask">1048576</int>
                                                                                
                <int key="NSMnemonicLoc">2147483647</int>
                                                                                
                <reference key="NSOnImage" ref="1022008517"/>
                                                                                
                <reference key="NSMixedImage" ref="290280874"/>
                                                                                
        </object>
-                                                                               
        <object class="NSMenuItem" id="795065684">
+                                                                               
        <object class="NSMenuItem" id="737309585">
                                                                                
                <reference key="NSMenu" ref="548272754"/>
-                                                                               
                <string key="NSTitle">Facing Pages</string>
+                                                                               
                <string key="NSTitle">Single Page Continuous</string>
                                                                                
                <string key="NSKeyEquiv"/>
                                                                                
                <int key="NSKeyEquivModMask">1048576</int>
                                                                                
                <int key="NSMnemonicLoc">2147483647</int>
                                                                                
                <reference key="NSOnImage" ref="1022008517"/>
                                                                                
                <reference key="NSMixedImage" ref="290280874"/>
+                                                                               
                <int key="NSTag">1</int>
                                                                                
        </object>
-                                                                               
        <object class="NSMenuItem" id="1016602768">
+                                                                               
        <object class="NSMenuItem" id="201242086">
                                                                                
                <reference key="NSMenu" ref="548272754"/>
-                                                                               
                <bool key="NSIsDisabled">YES</bool>
-                                                                               
                <bool key="NSIsSeparator">YES</bool>
-                                                                               
                <string key="NSTitle"/>
+                                                                               
                <string key="NSTitle">Two Pages</string>
                                                                                
                <string key="NSKeyEquiv"/>
                                                                                
                <int key="NSKeyEquivModMask">1048576</int>
                                                                                
                <int key="NSMnemonicLoc">2147483647</int>
                                                                                
                <reference key="NSOnImage" ref="1022008517"/>
                                                                                
                <reference key="NSMixedImage" ref="290280874"/>
+                                                                               
                <int key="NSTag">2</int>
                                                                                
        </object>
-                                                                               
        <object class="NSMenuItem" id="762985941">
+                                                                               
        <object class="NSMenuItem" id="618195290">
                                                                                
                <reference key="NSMenu" ref="548272754"/>
-                                                                               
                <string key="NSTitle">Continuous</string>
+                                                                               
                <string key="NSTitle">Two Pages Continuous</string>
                                                                                
                <string key="NSKeyEquiv"/>
                                                                                
                <int key="NSKeyEquivModMask">1048576</int>
                                                                                
                <int key="NSMnemonicLoc">2147483647</int>
                                                                                
                <reference key="NSOnImage" ref="1022008517"/>
                                                                                
                <reference key="NSMixedImage" ref="290280874"/>
+                                                                               
                <int key="NSTag">3</int>
                                                                                
        </object>
+                                                                               
        <object class="NSMenuItem" id="1016602768">
+                                                                               
                <reference key="NSMenu" ref="548272754"/>
+                                                                               
                <bool key="NSIsDisabled">YES</bool>
+                                                                               
                <bool key="NSIsSeparator">YES</bool>
+                                                                               
                <string key="NSTitle"/>
+                                                                               
                <string key="NSKeyEquiv"/>
+                                                                               
                <int key="NSKeyEquivModMask">1048576</int>
+                                                                               
                <int key="NSMnemonicLoc">2147483647</int>
+                                                                               
                <reference key="NSOnImage" ref="1022008517"/>
+                                                                               
                <reference key="NSMixedImage" ref="290280874"/>
+                                                                               
        </object>
                                                                                
        <object class="NSMenuItem" id="868291721">
                                                                                
                <reference key="NSMenu" ref="548272754"/>
                                                                                
                <string key="NSTitle">Book Mode</string>
@@ -3191,14 +3203,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" 
key="connection">
-                                               <string 
key="label">displayFacingPages:</string>
-                                               <reference key="source" 
ref="660174102"/>
-                                               <reference key="destination" 
ref="795065684"/>
-                                       </object>
-                                       <int key="connectionID">898</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" 
key="connection">
                                                <string 
key="label">changeDisplayBox:</string>
                                                <reference key="source" 
ref="660174102"/>
                                                <reference key="destination" 
ref="520337417"/>
@@ -3247,14 +3251,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" 
key="connection">
-                                               <string 
key="label">displaySinglePages:</string>
-                                               <reference key="source" 
ref="660174102"/>
-                                               <reference key="destination" 
ref="905422809"/>
-                                       </object>
-                                       <int key="connectionID">905</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" 
key="connection">
                                                <string 
key="label">toggleDisplayPageBreaks:</string>
                                                <reference key="source" 
ref="660174102"/>
                                                <reference key="destination" 
ref="181204401"/>
@@ -3263,14 +3259,6 @@
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" 
key="connection">
-                                               <string 
key="label">toggleDisplayContinuous:</string>
-                                               <reference key="source" 
ref="660174102"/>
-                                               <reference key="destination" 
ref="762985941"/>
-                                       </object>
-                                       <int key="connectionID">907</int>
-                               </object>
-                               <object class="IBConnectionRecord">
-                                       <object class="IBActionConnection" 
key="connection">
                                                <string 
key="label">toggleAutoScale:</string>
                                                <reference key="source" 
ref="660174102"/>
                                                <reference key="destination" 
ref="1018941691"/>
@@ -3565,6 +3553,38 @@
                                        </object>
                                        <int key="connectionID">1023</int>
                                </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" 
key="connection">
+                                               <string 
key="label">changeDisplayMode:</string>
+                                               <reference key="source" 
ref="660174102"/>
+                                               <reference key="destination" 
ref="905422809"/>
+                                       </object>
+                                       <int key="connectionID">1036</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" 
key="connection">
+                                               <string 
key="label">changeDisplayMode:</string>
+                                               <reference key="source" 
ref="660174102"/>
+                                               <reference key="destination" 
ref="737309585"/>
+                                       </object>
+                                       <int key="connectionID">1038</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" 
key="connection">
+                                               <string 
key="label">changeDisplayMode:</string>
+                                               <reference key="source" 
ref="660174102"/>
+                                               <reference key="destination" 
ref="201242086"/>
+                                       </object>
+                                       <int key="connectionID">1040</int>
+                               </object>
+                               <object class="IBConnectionRecord">
+                                       <object class="IBActionConnection" 
key="connection">
+                                               <string 
key="label">changeDisplayMode:</string>
+                                               <reference key="source" 
ref="660174102"/>
+                                               <reference key="destination" 
ref="618195290"/>
+                                       </object>
+                                       <int key="connectionID">1044</int>
+                               </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
                                <object class="NSArray" key="orderedObjects">
@@ -4854,12 +4874,13 @@
                                                        <reference 
ref="181204401"/>
                                                        <reference 
ref="292927709"/>
                                                        <reference 
ref="1016602768"/>
-                                                       <reference 
ref="762985941"/>
                                                        <reference 
ref="630044631"/>
                                                        <reference 
ref="868291721"/>
                                                        <reference 
ref="520337417"/>
                                                        <reference 
ref="905422809"/>
-                                                       <reference 
ref="795065684"/>
+                                                       <reference 
ref="737309585"/>
+                                                       <reference 
ref="201242086"/>
+                                                       <reference 
ref="618195290"/>
                                                </object>
                                                <reference key="parent" 
ref="759805106"/>
                                        </object>
@@ -4879,11 +4900,6 @@
                                                <reference key="parent" 
ref="548272754"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">880</int>
-                                               <reference key="object" 
ref="762985941"/>
-                                               <reference key="parent" 
ref="548272754"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">881</int>
                                                <reference key="object" 
ref="630044631"/>
                                                <reference key="parent" 
ref="548272754"/>
@@ -4904,11 +4920,6 @@
                                                <reference key="parent" 
ref="548272754"/>
                                        </object>
                                        <object class="IBObjectRecord">
-                                               <int key="objectID">885</int>
-                                               <reference key="object" 
ref="795065684"/>
-                                               <reference key="parent" 
ref="548272754"/>
-                                       </object>
-                                       <object class="IBObjectRecord">
                                                <int key="objectID">886</int>
                                                <reference key="object" 
ref="494942330"/>
                                                <reference key="parent" 
ref="952835084"/>
@@ -5201,6 +5212,21 @@
                                                <reference key="object" 
ref="787772946"/>
                                                <reference key="parent" 
ref="736262900"/>
                                        </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1037</int>
+                                               <reference key="object" 
ref="737309585"/>
+                                               <reference key="parent" 
ref="548272754"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1039</int>
+                                               <reference key="object" 
ref="201242086"/>
+                                               <reference key="parent" 
ref="548272754"/>
+                                       </object>
+                                       <object class="IBObjectRecord">
+                                               <int key="objectID">1043</int>
+                                               <reference key="object" 
ref="618195290"/>
+                                               <reference key="parent" 
ref="548272754"/>
+                                       </object>
                                </object>
                        </object>
                        <object class="NSMutableDictionary" 
key="flattenedProperties">
@@ -5214,6 +5240,12 @@
                                        <string>1002.IBPluginDependency</string>
                                        <string>103.IBPluginDependency</string>
                                        <string>103.ImportedFromIB2</string>
+                                       <string>1037.IBPluginDependency</string>
+                                       <string>1037.ImportedFromIB2</string>
+                                       <string>1039.IBPluginDependency</string>
+                                       <string>1039.ImportedFromIB2</string>
+                                       <string>1043.IBPluginDependency</string>
+                                       <string>1043.ImportedFromIB2</string>
                                        <string>106.IBPluginDependency</string>
                                        <string>106.ImportedFromIB2</string>
                                        <string>111.IBPluginDependency</string>
@@ -5567,10 +5599,12 @@
                                        <string>870.ImportedFromIB2</string>
                                        <string>872.IBPluginDependency</string>
                                        <string>872.ImportedFromIB2</string>
+                                       
<string>873.IBEditorWindowLastContentRect</string>
                                        <string>873.IBPluginDependency</string>
                                        <string>873.ImportedFromIB2</string>
                                        <string>875.IBPluginDependency</string>
                                        <string>875.ImportedFromIB2</string>
+                                       
<string>876.IBEditorWindowLastContentRect</string>
                                        <string>876.IBPluginDependency</string>
                                        <string>876.ImportedFromIB2</string>
                                        <string>877.IBPluginDependency</string>
@@ -5579,8 +5613,6 @@
                                        <string>878.ImportedFromIB2</string>
                                        <string>879.IBPluginDependency</string>
                                        <string>879.ImportedFromIB2</string>
-                                       <string>880.IBPluginDependency</string>
-                                       <string>880.ImportedFromIB2</string>
                                        <string>881.IBPluginDependency</string>
                                        <string>881.ImportedFromIB2</string>
                                        <string>882.IBPluginDependency</string>
@@ -5589,8 +5621,6 @@
                                        <string>883.ImportedFromIB2</string>
                                        <string>884.IBPluginDependency</string>
                                        <string>884.ImportedFromIB2</string>
-                                       <string>885.IBPluginDependency</string>
-                                       <string>885.ImportedFromIB2</string>
                                        <string>886.IBPluginDependency</string>
                                        <string>886.ImportedFromIB2</string>
                                        <string>887.IBPluginDependency</string>
@@ -5721,6 +5751,12 @@
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
+                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <boolean value="YES"/>
+                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <boolean value="YES"/>
+                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+                                       <boolean value="YES"/>
                                        <string>{{541, 359}, {238, 
133}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
@@ -5802,7 +5838,7 @@
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
-                                       <string>{{184, 712}, {622, 20}}</string>
+                                       <string>{{38, 775}, {622, 20}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6040,10 +6076,12 @@
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
+                                       <string>{{297, 542}, {340, 
233}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
+                                       <string>{{637, 592}, {226, 
183}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6115,10 +6153,6 @@
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <boolean value="YES"/>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <boolean value="YES"/>
-                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       <boolean value="YES"/>
-                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{541, 219}, {169, 
253}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -6168,43 +6202,15 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">1023</int>
+                       <int key="maxID">1044</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" 
key="referencedPartialClassDescriptions">
                                <bool key="EncodedWithXMLCoder">YES</bool>
                                <object class="IBPartialClassDescription">
-                                       <string 
key="className">BDSKCollapsibleView</string>
-                                       <string 
key="superclassName">BDSKContainerView</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBProjectSource</string>
-                                               <string 
key="minorKey">BDSKCollapsibleView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string 
key="className">BDSKCollapsibleView</string>
-                                       <string 
key="superclassName">BDSKContainerView</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
                                        <string 
key="className">BDSKContainerView</string>
                                        <string 
key="superclassName">NSView</string>
-                                       <object class="NSMutableDictionary" 
key="outlets">
-                                               <string 
key="NS.key.0">contentView</string>
-                                               <string 
key="NS.object.0">id</string>
-                                       </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBProjectSource</string>
-                                               <string 
key="minorKey">BDSKContainerView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string 
key="className">BDSKContainerView</string>
-                                       <string 
key="superclassName">NSView</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
                                        </object>
@@ -6213,14 +6219,6 @@
                                        <string 
key="className">BDSKEdgeView</string>
                                        <string 
key="superclassName">BDSKContainerView</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBProjectSource</string>
-                                               <string 
key="minorKey">BDSKEdgeView.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string 
key="className">BDSKEdgeView</string>
-                                       <string 
key="superclassName">BDSKContainerView</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBUserSource</string>
                                                <string key="minorKey"/>
                                        </object>
@@ -6399,6 +6397,13 @@
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSApplication</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKScriptMenu.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string 
key="className">NSApplication</string>
                                        <string 
key="superclassName">NSResponder</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBUserSource</string>
@@ -6406,6 +6411,13 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">NSArray_SKExtensions.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">NSDocument</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
@@ -6637,7 +6649,7 @@
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSWindowController</string>
                                        <object class="NSMutableDictionary" 
key="actions">
-                                               <string 
key="NS.key.0">dismiss:</string>
+                                               <string 
key="NS.key.0">dismissSheet:</string>
                                                <string 
key="NS.object.0">id</string>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -6830,21 +6842,19 @@
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>buttons</string>
                                                        
<string>findField</string>
                                                        
<string>ignoreCaseCheckbox</string>
                                                        
<string>labelField</string>
-                                                       
<string>nextButton</string>
                                                        
<string>ownerController</string>
-                                                       
<string>previousButton</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSArray</string>
                                                        
<string>NSTextField</string>
                                                        
<string>NSButton</string>
                                                        
<string>NSTextField</string>
-                                                       
<string>NSButton</string>
                                                        
<string>NSObjectController</string>
-                                                       
<string>NSButton</string>
                                                </object>
                                        </object>
                                        <reference key="sourceIdentifier" 
ref="354948943"/>
@@ -6860,12 +6870,47 @@
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">SKGradientView</string>
                                        <string 
key="superclassName">NSView</string>
+                                       <object class="NSMutableDictionary" 
key="outlets">
+                                               <string 
key="NS.key.0">contentView</string>
+                                               <string 
key="NS.object.0">id</string>
+                                       </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
                                                <string 
key="minorKey">SKGradientView.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">SKLeftSideViewController</string>
+                                       <string 
key="superclassName">SKSideViewController</string>
+                                       <object class="NSMutableDictionary" 
key="outlets">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>findArrayController</string>
+                                                       
<string>findTableView</string>
+                                                       
<string>groupedFindArrayController</string>
+                                                       
<string>groupedFindTableView</string>
+                                                       
<string>thumbnailArrayController</string>
+                                                       
<string>thumbnailTableView</string>
+                                                       
<string>tocOutlineView</string>
+                                               </object>
+                                               <object class="NSMutableArray" 
key="dict.values">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>NSArrayController</string>
+                                                       
<string>NSTableView</string>
+                                                       
<string>NSArrayController</string>
+                                                       
<string>NSTableView</string>
+                                                       
<string>NSArrayController</string>
+                                                       
<string>SKThumbnailTableView</string>
+                                                       
<string>SKTocOutlineView</string>
+                                               </object>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKLeftSideViewController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">SKMainDocument</string>
                                        <string 
key="superclassName">NSDocument</string>
                                        <object class="NSMutableDictionary" 
key="actions">
@@ -6892,105 +6937,35 @@
                                        <reference key="sourceIdentifier" 
ref="460517255"/>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string 
key="className">SKMainWindowController</string>
-                                       <string 
key="superclassName">NSWindowController</string>
+                                       <string 
key="className">SKMainToolbarController</string>
+                                       <string 
key="superclassName">NSViewController</string>
                                        <object class="NSMutableDictionary" 
key="actions">
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>addBookmark:</string>
-                                                       
<string>addSessionBookmark:</string>
-                                                       
<string>addSetupBookmark:</string>
-                                                       
<string>allGoToFirstPage:</string>
-                                                       
<string>allGoToLastPage:</string>
-                                                       
<string>allGoToNextPage:</string>
-                                                       
<string>allGoToPreviousPage:</string>
-                                                       
<string>alternatePaste:</string>
-                                                       
<string>alternateZoomToFit:</string>
-                                                       
<string>autoCropAll:</string>
-                                                       
<string>autoSelectContent:</string>
-                                                       
<string>changeAnnotationMode:</string>
-                                                       
<string>changeColor:</string>
                                                        
<string>changeDisplayBox:</string>
                                                        
<string>changeDisplayContinuous:</string>
                                                        
<string>changeDisplayMode:</string>
                                                        
<string>changeDisplaySinglePages:</string>
-                                                       
<string>changeFindPaneState:</string>
-                                                       
<string>changeFont:</string>
-                                                       
<string>changeLeftSidePaneState:</string>
-                                                       
<string>changeRightSidePaneState:</string>
                                                        
<string>changeScaleFactor:</string>
                                                        
<string>changeToolMode:</string>
                                                        
<string>chooseScale:</string>
-                                                       
<string>chooseTransition:</string>
-                                                       <string>copy:</string>
                                                        
<string>createNewCircleNote:</string>
-                                                       
<string>createNewLineNote:</string>
                                                        
<string>createNewMarkupNote:</string>
                                                        
<string>createNewNote:</string>
                                                        
<string>createNewTextNote:</string>
-                                                       <string>crop:</string>
                                                        
<string>cropAll:</string>
-                                                       <string>cut:</string>
-                                                       <string>delete:</string>
-                                                       
<string>deselectAll:</string>
-                                                       
<string>displayFacingPages:</string>
-                                                       
<string>displaySinglePages:</string>
-                                                       
<string>doAutoScale:</string>
-                                                       
<string>doGoBack:</string>
-                                                       
<string>doGoForward:</string>
-                                                       
<string>doGoToFirstPage:</string>
-                                                       
<string>doGoToLastPage:</string>
-                                                       
<string>doGoToNextPage:</string>
-                                                       
<string>doGoToPage:</string>
-                                                       
<string>doGoToPreviousPage:</string>
-                                                       
<string>doZoomIn:</string>
-                                                       
<string>doZoomOut:</string>
-                                                       
<string>doZoomToActualSize:</string>
-                                                       
<string>doZoomToFit:</string>
-                                                       
<string>doZoomToPhysicalSize:</string>
-                                                       
<string>doZoomToSelection:</string>
-                                                       
<string>editNote:</string>
                                                        
<string>enterFullScreen:</string>
                                                        
<string>enterPresentation:</string>
-                                                       
<string>exitFullScreen:</string>
-                                                       
<string>getInfo:</string>
                                                        
<string>goBackOrForward:</string>
-                                                       
<string>goToMarkedPage:</string>
                                                        
<string>goToPreviousNextFirstLastPage:</string>
-                                                       
<string>markPage:</string>
-                                                       
<string>password:</string>
-                                                       <string>paste:</string>
-                                                       
<string>pasteAsPlainText:</string>
-                                                       
<string>performFit:</string>
-                                                       
<string>rotateAllLeft:</string>
                                                        
<string>rotateAllLeftRight:</string>
-                                                       
<string>rotateAllRight:</string>
-                                                       
<string>rotateLeft:</string>
-                                                       
<string>rotateRight:</string>
-                                                       
<string>savePDFSettingToDefaults:</string>
-                                                       <string>search:</string>
-                                                       
<string>searchNotes:</string>
-                                                       
<string>searchPDF:</string>
                                                        
<string>selectColor:</string>
-                                                       
<string>smartAutoCropAll:</string>
-                                                       
<string>takeSnapshot:</string>
-                                                       
<string>toggleAutoScale:</string>
-                                                       
<string>toggleCaseInsensitiveNoteSearch:</string>
-                                                       
<string>toggleCaseInsensitiveSearch:</string>
-                                                       
<string>toggleDisplayAsBook:</string>
-                                                       
<string>toggleDisplayContinuous:</string>
-                                                       
<string>toggleDisplayPageBreaks:</string>
-                                                       
<string>toggleFullScreen:</string>
-                                                       
<string>toggleHideNotes:</string>
                                                        
<string>toggleLeftSidePane:</string>
-                                                       
<string>togglePresentation:</string>
-                                                       
<string>toggleReadingBar:</string>
                                                        
<string>toggleRightSidePane:</string>
-                                                       
<string>toggleSplitPDF:</string>
-                                                       
<string>toggleStatusBar:</string>
-                                                       
<string>toggleWholeWordSearch:</string>
                                                        
<string>zoomInActualOut:</string>
+                                                       
<string>zoomToFit:</string>
+                                                       
<string>zoomToSelection:</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -7017,76 +6992,6 @@
                                                        <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>
-                                                       <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>
-                                                       <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>
-                                                       <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>
-                                                       <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>
-                                                       <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>
-                                                       <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>
-                                                       <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>
-                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" 
key="outlets">
@@ -7094,76 +6999,37 @@
                                                <object class="NSArray" 
key="dict.sortedKeys">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                        
<string>backForwardButton</string>
-                                                       
<string>centerContentView</string>
                                                        
<string>circleNoteButton</string>
                                                        
<string>colorSwatch</string>
                                                        
<string>colorsButton</string>
                                                        
<string>continuousButton</string>
                                                        
<string>cropButton</string>
-                                                       
<string>currentLeftSideView</string>
-                                                       
<string>currentRightSideView</string>
                                                        
<string>customizeButton</string>
                                                        
<string>displayBoxButton</string>
                                                        
<string>displayModeButton</string>
-                                                       
<string>findArrayController</string>
-                                                       
<string>findButton</string>
-                                                       
<string>findTableView</string>
-                                                       
<string>findView</string>
                                                        
<string>fontsButton</string>
                                                        
<string>fullScreenButton</string>
-                                                       
<string>groupedFindArrayController</string>
-                                                       
<string>groupedFindTableView</string>
-                                                       
<string>groupedFindView</string>
                                                        
<string>infoButton</string>
                                                        
<string>leftPaneButton</string>
-                                                       
<string>leftSideButton</string>
-                                                       
<string>leftSideCollapsibleView</string>
-                                                       
<string>leftSideContentView</string>
-                                                       
<string>leftSideEdgeView</string>
-                                                       
<string>leftSideGradientView</string>
-                                                       
<string>leftSideView</string>
                                                        
<string>lineNoteButton</string>
                                                        
<string>linesButton</string>
+                                                       
<string>mainController</string>
                                                        
<string>markupNoteButton</string>
                                                        
<string>nextPageButton</string>
-                                                       
<string>noteArrayController</string>
                                                        
<string>noteButton</string>
-                                                       
<string>noteOutlineView</string>
-                                                       
<string>noteSearchField</string>
-                                                       
<string>noteView</string>
-                                                       
<string>outlineView</string>
-                                                       
<string>ownerController</string>
                                                        
<string>pageNumberField</string>
-                                                       
<string>pdfContentView</string>
-                                                       
<string>pdfSplitView</string>
-                                                       <string>pdfView</string>
                                                        
<string>presentationButton</string>
                                                        
<string>previousNextFirstLastPageButton</string>
                                                        
<string>previousNextPageButton</string>
                                                        
<string>previousPageButton</string>
                                                        
<string>printButton</string>
                                                        
<string>rightPaneButton</string>
-                                                       
<string>rightSideButton</string>
-                                                       
<string>rightSideCollapsibleView</string>
-                                                       
<string>rightSideContentView</string>
-                                                       
<string>rightSideEdgeView</string>
-                                                       
<string>rightSideGradientView</string>
-                                                       
<string>rightSideView</string>
                                                        
<string>rotateLeftButton</string>
                                                        
<string>rotateLeftRightButton</string>
                                                        
<string>rotateRightButton</string>
                                                        
<string>scaleField</string>
-                                                       
<string>searchField</string>
                                                        
<string>singleTwoUpButton</string>
-                                                       
<string>snapshotArrayController</string>
-                                                       
<string>snapshotTableView</string>
-                                                       
<string>snapshotView</string>
-                                                       
<string>splitView</string>
                                                        
<string>textNoteButton</string>
-                                                       
<string>thumbnailArrayController</string>
-                                                       
<string>thumbnailTableView</string>
-                                                       
<string>thumbnailView</string>
-                                                       <string>tocView</string>
                                                        
<string>toolModeButton</string>
                                                        
<string>zoomActualButton</string>
                                                        
<string>zoomFitButton</string>
@@ -7174,49 +7040,25 @@
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                        
<string>NSSegmentedControl</string>
-                                                       <string>NSView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>SKColorSwatch</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       <string>NSView</string>
-                                                       <string>NSView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSArrayController</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSTableView</string>
-                                                       <string>NSView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSArrayController</string>
-                                                       
<string>NSTableView</string>
-                                                       <string>NSView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>BDSKCollapsibleView</string>
-                                                       <string>NSView</string>
-                                                       
<string>BDSKEdgeView</string>
-                                                       
<string>SKGradientView</string>
-                                                       <string>NSView</string>
+                                                       
<string>SKMainWindowController</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSSegmentedControl</string>
-                                                       
<string>NSArrayController</string>
-                                                       
<string>NSSegmentedControl</string>
-                                                       
<string>SKNoteOutlineView</string>
-                                                       
<string>NSSearchField</string>
-                                                       <string>NSView</string>
-                                                       
<string>SKTocOutlineView</string>
-                                                       
<string>NSObjectController</string>
                                                        
<string>NSTextField</string>
-                                                       <string>NSView</string>
-                                                       
<string>SKSplitView</string>
-                                                       
<string>SKPDFView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
@@ -7224,26 +7066,11 @@
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>BDSKCollapsibleView</string>
-                                                       <string>NSView</string>
-                                                       
<string>BDSKEdgeView</string>
-                                                       
<string>SKGradientView</string>
-                                                       <string>NSView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSSegmentedControl</string>
                                                        
<string>NSTextField</string>
-                                                       
<string>NSSearchField</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSArrayController</string>
-                                                       
<string>SKThumbnailTableView</string>
-                                                       <string>NSView</string>
-                                                       
<string>SKSplitView</string>
                                                        
<string>NSSegmentedControl</string>
-                                                       
<string>NSArrayController</string>
-                                                       
<string>SKThumbnailTableView</string>
-                                                       <string>NSView</string>
-                                                       <string>NSView</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
                                                        
<string>NSSegmentedControl</string>
@@ -7254,6 +7081,62 @@
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKMainToolbarController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string 
key="className">SKMainWindowController</string>
+                                       <string 
key="superclassName">NSWindowController</string>
+                                       <object class="NSMutableDictionary" 
key="actions">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>enterFullScreen:</string>
+                                                       
<string>enterPresentation:</string>
+                                                       
<string>exitFullScreen:</string>
+                                                       <string>search:</string>
+                                                       
<string>searchNotes:</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>
+                                               </object>
+                                       </object>
+                                       <object class="NSMutableDictionary" 
key="outlets">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>centerContentView</string>
+                                                       
<string>leftSideContentView</string>
+                                                       
<string>leftSideController</string>
+                                                       
<string>mainWindow</string>
+                                                       
<string>pdfContentView</string>
+                                                       
<string>pdfSplitView</string>
+                                                       
<string>rightSideContentView</string>
+                                                       
<string>rightSideController</string>
+                                                       
<string>splitView</string>
+                                                       
<string>toolbarController</string>
+                                               </object>
+                                               <object class="NSMutableArray" 
key="dict.values">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       <string>NSView</string>
+                                                       <string>NSView</string>
+                                                       
<string>SKLeftSideViewController</string>
+                                                       
<string>NSWindow</string>
+                                                       <string>NSView</string>
+                                                       
<string>SKSplitView</string>
+                                                       <string>NSView</string>
+                                                       
<string>SKRightSideViewController</string>
+                                                       
<string>SKSplitView</string>
+                                                       
<string>SKMainToolbarController</string>
+                                               </object>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
                                                <string 
key="minorKey">SKMainWindowController.h</string>
                                        </object>
                                </object>
@@ -7284,16 +7167,10 @@
                                                        
<string>changeFont:</string>
                                                        
<string>changeLeftSidePaneState:</string>
                                                        
<string>changeRightSidePaneState:</string>
-                                                       
<string>changeScaleFactor:</string>
                                                        
<string>changeToolMode:</string>
-                                                       
<string>chooseScale:</string>
                                                        
<string>chooseTransition:</string>
                                                        <string>copy:</string>
-                                                       
<string>createNewCircleNote:</string>
-                                                       
<string>createNewLineNote:</string>
-                                                       
<string>createNewMarkupNote:</string>
                                                        
<string>createNewNote:</string>
-                                                       
<string>createNewTextNote:</string>
                                                        <string>crop:</string>
                                                        
<string>cropAll:</string>
                                                        <string>cut:</string>
@@ -7317,22 +7194,18 @@
                                                        
<string>doZoomToSelection:</string>
                                                        
<string>editNote:</string>
                                                        
<string>getInfo:</string>
-                                                       
<string>goBackOrForward:</string>
                                                        
<string>goToMarkedPage:</string>
-                                                       
<string>goToPreviousNextFirstLastPage:</string>
                                                        
<string>markPage:</string>
                                                        
<string>password:</string>
                                                        <string>paste:</string>
                                                        
<string>pasteAsPlainText:</string>
                                                        
<string>performFit:</string>
                                                        
<string>rotateAllLeft:</string>
-                                                       
<string>rotateAllLeftRight:</string>
                                                        
<string>rotateAllRight:</string>
                                                        
<string>rotateLeft:</string>
                                                        
<string>rotateRight:</string>
                                                        
<string>savePDFSettingToDefaults:</string>
                                                        
<string>searchPDF:</string>
-                                                       
<string>selectColor:</string>
                                                        
<string>smartAutoCropAll:</string>
                                                        
<string>takeSnapshot:</string>
                                                        
<string>toggleAutoScale:</string>
@@ -7350,7 +7223,6 @@
                                                        
<string>toggleSplitPDF:</string>
                                                        
<string>toggleStatusBar:</string>
                                                        
<string>toggleWholeWordSearch:</string>
-                                                       
<string>zoomInActualOut:</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -7431,17 +7303,6 @@
                                                        <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>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -7453,13 +7314,6 @@
                                        <string 
key="className">SKMainWindowController</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
-                                               <string 
key="minorKey">SKMainWindowController_Toolbar.h</string>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string 
key="className">SKMainWindowController</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBProjectSource</string>
                                                <string 
key="minorKey">SKMainWindowController_UI.h</string>
                                        </object>
                                </object>
@@ -7493,42 +7347,6 @@
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">SKNoteOutlineView</string>
                                        <string 
key="superclassName">SKOutlineView</string>
-                                       <object class="NSMutableDictionary" 
key="actions">
-                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" 
key="dict.sortedKeys">
-                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>dismissNoteTypeSheet:</string>
-                                                       
<string>displayAllNoteTypes:</string>
-                                                       
<string>selectNoteTypes:</string>
-                                                       
<string>toggleDisplayNoteType:</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>
-                                               </object>
-                                       </object>
-                                       <object class="NSMutableDictionary" 
key="outlets">
-                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" 
key="dict.sortedKeys">
-                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>noteTypeCancelButton</string>
-                                                       
<string>noteTypeMatrix</string>
-                                                       
<string>noteTypeMessageField</string>
-                                                       
<string>noteTypeOkButton</string>
-                                                       
<string>noteTypeSheet</string>
-                                               </object>
-                                               <object class="NSMutableArray" 
key="dict.values">
-                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>NSButton</string>
-                                                       
<string>NSMatrix</string>
-                                                       
<string>NSTextField</string>
-                                                       
<string>NSButton</string>
-                                                       
<string>NSWindow</string>
-                                               </object>
-                                       </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
                                                <string 
key="minorKey">SKNoteOutlineView.h</string>
@@ -7549,6 +7367,9 @@
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>addBookmark:</string>
+                                                       
<string>addSessionBookmark:</string>
+                                                       
<string>addSetupBookmark:</string>
                                                        
<string>openPDF:</string>
                                                        
<string>searchNotes:</string>
                                                        
<string>toggleCaseInsensitiveSearch:</string>
@@ -7560,6 +7381,9 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" 
key="outlets">
@@ -7569,14 +7393,12 @@
                                                        
<string>arrayController</string>
                                                        
<string>outlineView</string>
                                                        
<string>searchField</string>
-                                                       
<string>statusBar</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                        
<string>NSArrayController</string>
                                                        
<string>SKNoteOutlineView</string>
                                                        
<string>NSSearchField</string>
-                                                       
<string>SKStatusBar</string>
                                                </object>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -7741,6 +7563,60 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">SKRightSideViewController</string>
+                                       <string 
key="superclassName">SKSideViewController</string>
+                                       <object class="NSMutableDictionary" 
key="outlets">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>noteArrayController</string>
+                                                       
<string>noteOutlineView</string>
+                                                       
<string>snapshotArrayController</string>
+                                                       
<string>snapshotTableView</string>
+                                               </object>
+                                               <object class="NSMutableArray" 
key="dict.values">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>NSArrayController</string>
+                                                       
<string>SKNoteOutlineView</string>
+                                                       
<string>NSArrayController</string>
+                                                       
<string>SKThumbnailTableView</string>
+                                               </object>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKRightSideViewController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string 
key="className">SKSideViewController</string>
+                                       <string 
key="superclassName">NSViewController</string>
+                                       <object class="NSMutableDictionary" 
key="outlets">
+                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                               <object class="NSArray" 
key="dict.sortedKeys">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>alternateButton</string>
+                                                       <string>button</string>
+                                                       
<string>currentView</string>
+                                                       
<string>gradientView</string>
+                                                       
<string>mainController</string>
+                                                       
<string>searchField</string>
+                                               </object>
+                                               <object class="NSMutableArray" 
key="dict.values">
+                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
+                                                       
<string>NSSegmentedControl</string>
+                                                       
<string>NSSegmentedControl</string>
+                                                       <string>NSView</string>
+                                                       
<string>SKGradientView</string>
+                                                       
<string>SKMainWindowController</string>
+                                                       
<string>NSSearchField</string>
+                                               </object>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">SKSideViewController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">SKSplitView</string>
                                        <string 
key="superclassName">NSSplitView</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -7992,6 +7868,49 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <string 
key="superclassName">NSObject</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSArray.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier" id="948538922">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier" id="939796674">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSPathUtilities.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSPredicate.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
+                                       <string key="className">NSArray</string>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">Foundation.framework/Headers/NSSortDescriptor.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">NSArrayController</string>
                                        <string 
key="superclassName">NSObjectController</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -8278,17 +8197,11 @@
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSObject</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBFrameworkSource</string>
-                                               <string 
key="minorKey">Foundation.framework/Headers/NSKeyValueCoding.h</string>
-                                       </object>
+                                       <reference key="sourceIdentifier" 
ref="948538922"/>
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSObject</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBFrameworkSource</string>
-                                               <string 
key="minorKey">Foundation.framework/Headers/NSKeyValueObserving.h</string>
-                                       </object>
+                                       <reference key="sourceIdentifier" 
ref="939796674"/>
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSObject</string>
@@ -8563,6 +8476,18 @@
                                        <reference key="sourceIdentifier" 
ref="1003691166"/>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">NSViewController</string>
+                                       <string 
key="superclassName">NSResponder</string>
+                                       <object class="NSMutableDictionary" 
key="outlets">
+                                               <string 
key="NS.key.0">view</string>
+                                               <string 
key="NS.object.0">NSView</string>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">AppKit.framework/Headers/NSViewController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">NSWindow</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBFrameworkSource</string>
@@ -8681,6 +8606,7 @@
                        </object>
                </object>
                <int key="IBDocument.localizationMode">0</int>
+               <string 
key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
                <object class="NSMutableDictionary" 
key="IBDocument.PluginDeclaredDependencies">
                        <string 
key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string>
                        <integer value="1040" key="NS.object.0"/>
@@ -8696,5 +8622,18 @@
                <bool 
key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
                <string 
key="IBDocument.LastKnownRelativeProjectPath">Skim.xcodeproj</string>
                <int key="IBDocument.defaultPropertyAccessControl">3</int>
+               <object class="NSMutableDictionary" 
key="IBDocument.LastKnownImageSizes">
+                       <bool key="EncodedWithXMLCoder">YES</bool>
+                       <object class="NSArray" key="dict.sortedKeys">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <string>NSMenuCheckmark</string>
+                               <string>NSMenuMixedState</string>
+                       </object>
+                       <object class="NSMutableArray" key="dict.values">
+                               <bool key="EncodedWithXMLCoder">YES</bool>
+                               <string>{9, 8}</string>
+                               <string>{7, 2}</string>
+                       </object>
+               </object>
        </data>
 </archive>

Modified: trunk/SKMainWindowController_Actions.h
===================================================================
--- trunk/SKMainWindowController_Actions.h      2010-06-09 09:23:33 UTC (rev 
6578)
+++ trunk/SKMainWindowController_Actions.h      2010-06-09 11:29:36 UTC (rev 
6579)
@@ -51,7 +51,6 @@
 - (IBAction)displaySinglePages:(id)sender;
 - (IBAction)displayFacingPages:(id)sender;
 - (IBAction)changeDisplaySinglePages:(id)sender;
-- (IBAction)toggleDisplayContinuous:(id)sender;
 - (IBAction)changeDisplayContinuous:(id)sender;
 - (IBAction)changeDisplayMode:(id)sender;
 - (IBAction)toggleDisplayAsBook:(id)sender;

Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m      2010-06-09 09:23:33 UTC (rev 
6578)
+++ trunk/SKMainWindowController_Actions.m      2010-06-09 11:29:36 UTC (rev 
6579)
@@ -219,19 +219,6 @@
         [pdfView setDisplayMode:kPDFDisplaySinglePageContinuous];
 }
 
-- (IBAction)toggleDisplayContinuous:(id)sender {
-    PDFDisplayMode displayMode = [pdfView displayMode];
-    if (displayMode == kPDFDisplaySinglePage) 
-        displayMode = kPDFDisplaySinglePageContinuous;
-    else if (displayMode == kPDFDisplaySinglePageContinuous)
-        displayMode = kPDFDisplaySinglePage;
-    else if (displayMode == kPDFDisplayTwoUp)
-        displayMode = kPDFDisplayTwoUpContinuous;
-    else if (displayMode == kPDFDisplayTwoUpContinuous)
-        displayMode = kPDFDisplayTwoUp;
-    [pdfView setDisplayMode:displayMode];
-}
-
 - (IBAction)changeDisplayContinuous:(id)sender {
     PDFDisplayMode tag = [sender tag];
     PDFDisplayMode displayMode = [pdfView displayMode];

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-06-09 09:23:33 UTC (rev 6578)
+++ trunk/SKMainWindowController_UI.m   2010-06-09 11:29:36 UTC (rev 6579)
@@ -1345,10 +1345,6 @@
     } else if (action == @selector(changeDisplayMode:)) {
         [menuItem setState:[pdfView displayMode] == (PDFDisplayMode)[menuItem 
tag] ? NSOnState : NSOffState];
         return [self isPresentation] == NO;
-    } else if (action == @selector(toggleDisplayContinuous:)) {
-        BOOL displayContinuous = [pdfView displayMode] == 
kPDFDisplaySinglePageContinuous || [pdfView displayMode] == 
kPDFDisplayTwoUpContinuous;
-        [menuItem setState:displayContinuous ? NSOnState : NSOffState];
-        return [self isPresentation] == NO;
     } else if (action == @selector(toggleDisplayAsBook:)) {
         [menuItem setState:[pdfView displaysAsBook] ? NSOnState : NSOffState];
         return [self isPresentation] == NO && ([pdfView displayMode] == 
kPDFDisplayTwoUp || [pdfView displayMode] == kPDFDisplayTwoUpContinuous);

Modified: trunk/Spanish.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/pl.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/ru.lproj/MainMenu.strings
===================================================================
(Binary files differ)

Modified: trunk/zh_TW.lproj/MainMenu.strings
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to