fixed scroll and single/double preferences dialog

readium · Jul 30, 2014 · 88b9ddd · 88b9ddd
1 parent bce2ac8
commit 88b9ddd
Show file tree

Hide file tree

Showing 7 changed files with 90 additions and 37 deletions.
diff --git a/LauncherOSX/LOXPreferences.h b/LauncherOSX/LOXPreferences.h
@@ -13,7 +13,6 @@
 
 
 
-@property (nonatomic, strong) NSNumber *isSyntheticSpread;
 @property (nonatomic, strong) NSNumber *fontSize;
 @property (nonatomic, strong) NSNumber *columnGap;
 @property (nonatomic, strong) NSNumber *mediaOverlaysSkipSkippables;
@@ -23,8 +22,10 @@
 @property (nonatomic, strong) NSNumber *mediaOverlaysEnableClick;
 @property (nonatomic, strong) NSNumber *mediaOverlaysRate;
 @property (nonatomic, strong) NSNumber *mediaOverlaysVolume;
-@property (nonatomic, strong) NSNumber *isScrollDoc;
-@property (nonatomic, strong) NSNumber *isScrollContinuous;
+
+@property (nonatomic, strong) NSString *displayScroll;
+@property (nonatomic, strong) NSString *displaySyntheticSpread;
+
 
 - (void)updateMediaOverlaysSkippables:(NSString *)str;
 - (void)updateMediaOverlaysEscapables:(NSString *)str;

diff --git a/LauncherOSX/LOXPreferences.mm b/LauncherOSX/LOXPreferences.mm
@@ -37,7 +37,6 @@ - (id)init
     if(self) {
 
         self.fontSize = [NSNumber numberWithInt:100];
-        self.isSyntheticSpread = [NSNumber numberWithBool:YES];
         self.mediaOverlaysSkipSkippables = [NSNumber numberWithBool:NO];
         self.mediaOverlaysEscapeEscapables = [NSNumber numberWithBool:YES];
         self.mediaOverlaysSkippables = [NSString stringWithUTF8String:""];
@@ -46,14 +45,14 @@ - (id)init
         self.columnGap = [NSNumber numberWithInt:20];
         self.mediaOverlaysRate = [NSNumber numberWithInt:1];
         self.mediaOverlaysVolume = [NSNumber numberWithInt:100];
-        self.isScrollDoc = [NSNumber numberWithBool:NO];
-        self.isScrollContinuous = [NSNumber numberWithBool:NO];
+
+        self.displaySyntheticSpread = @"auto";
+        self.displayScroll = @"auto";
 
         _doNotUpdateView = NO;
 
         _observableProperties = [NSArray arrayWithObjects:
                 NSStringFromSelector(@selector(fontSize)),
-                        NSStringFromSelector(@selector(isSyntheticSpread)),
                         NSStringFromSelector(@selector(columnGap)),
                         NSStringFromSelector(@selector(mediaOverlaysSkipSkippables)),
                         NSStringFromSelector(@selector(mediaOverlaysEscapeEscapables)),
@@ -62,8 +61,9 @@ - (id)init
                         NSStringFromSelector(@selector(mediaOverlaysEnableClick)),
                         NSStringFromSelector(@selector(mediaOverlaysRate)),
                         NSStringFromSelector(@selector(mediaOverlaysVolume)),
-                        NSStringFromSelector(@selector(isScrollDoc)),
-                        NSStringFromSelector(@selector(isScrollContinuous)),
+
+                        NSStringFromSelector(@selector(displayScroll)),
+                        NSStringFromSelector(@selector(displaySyntheticSpread)),
                         nil];
     }
 
@@ -109,7 +109,6 @@ -(NSDictionary *) toDictionary
 {
     return @{
             NSStringFromSelector(@selector(fontSize)): self.fontSize,
-            NSStringFromSelector(@selector(isSyntheticSpread)): self.isSyntheticSpread,
             NSStringFromSelector(@selector(mediaOverlaysSkipSkippables)): self.mediaOverlaysSkipSkippables,
             NSStringFromSelector(@selector(mediaOverlaysEscapeEscapables)): self.mediaOverlaysEscapeEscapables,
             NSStringFromSelector(@selector(mediaOverlaysSkippables)): self.mediaOverlaysSkippables,
@@ -118,8 +117,11 @@ -(NSDictionary *) toDictionary
             NSStringFromSelector(@selector(mediaOverlaysRate)): self.mediaOverlaysRate,
             NSStringFromSelector(@selector(mediaOverlaysVolume)): self.mediaOverlaysVolume,
             NSStringFromSelector(@selector(columnGap)): self.columnGap,
-            NSStringFromSelector(@selector(isScrollDoc)): self.isScrollDoc,
-            NSStringFromSelector(@selector(isScrollContinuous)): self.isScrollContinuous,
+
+            NSStringFromSelector(@selector(syntheticSpread)): self.displaySyntheticSpread,
+            NSStringFromSelector(@selector(scroll)): self.displayScroll,
+
+
             NSStringFromSelector(@selector(doNotUpdateView)): [NSNumber numberWithBool:_doNotUpdateView]
     };
 }

diff --git a/LauncherOSX/LOXPreferencesController.h b/LauncherOSX/LOXPreferencesController.h
@@ -22,6 +22,7 @@
 - (IBAction)applySkippables:(id)sender;
 - (IBAction)applyEscapables:(id)sender;
 - (IBAction)onViewModeChanged: (id)sender;
+- (IBAction)onViewSynthChanged: (id)sender;
 
 @property (assign) IBOutlet NSButton *thiteticSpread;
 @property (assign) IBOutlet NSWindow *sheet;
@@ -32,6 +33,7 @@
 @property (assign) IBOutlet NSTextView *moEscapablesCtrl;
 
 @property (assign) IBOutlet NSMatrix *displayModeCtrl;
+@property (assign) IBOutlet NSMatrix *displaySynthCtrl;
 
 @property(nonatomic, strong) LOXPreferences *preferences;
 @property(nonatomic, strong) LOXWebViewController *webViewController;

diff --git a/LauncherOSX/LOXPreferencesController.m b/LauncherOSX/LOXPreferencesController.m
@@ -62,25 +62,44 @@ - (IBAction)applyEscapables:(id)sender
 }
 
 - (IBAction)onViewModeChanged:(id)sender {
-
+    
     _postponeSettingsUpdate = YES;
     NSButtonCell *selCell = [sender selectedCell];
     switch([selCell tag])
     {
         case 1:
-            self.preferences.isScrollDoc = [NSNumber numberWithBool:YES];
-            self.preferences.isScrollContinuous = [NSNumber numberWithBool:NO];
+            self.preferences.displayScroll = @"scroll-doc";
             break;
         case 2:
-            self.preferences.isScrollDoc = [NSNumber numberWithBool:NO];
-            self.preferences.isScrollContinuous = [NSNumber numberWithBool:YES];
+            self.preferences.displayScroll = @"scroll-continuous";
             break;
         default:
-            self.preferences.isScrollDoc = [NSNumber numberWithBool:NO];
-            self.preferences.isScrollContinuous = [NSNumber numberWithBool:NO];
+            self.preferences.displayScroll = @"auto";
     }
     _postponeSettingsUpdate = NO;
+
+    [self.preferences setDoNotUpdateView:NO];
+    [self.webViewController updateSettings: self.preferences];
+}
+
 
+- (IBAction)onViewSynthChanged:(id)sender {
+
+    _postponeSettingsUpdate = YES;
+    NSButtonCell *selCell = [sender selectedCell];
+    switch([selCell tag])
+    {
+        case 1:
+            self.preferences.displaySyntheticSpread = @"single";
+            break;
+        case 2:
+            self.preferences.displaySyntheticSpread = @"double";
+            break;
+        default:
+            self.preferences.displaySyntheticSpread = @"auto";
+    }
+    _postponeSettingsUpdate = NO;
+
     [self.preferences setDoNotUpdateView:NO];
     [self.webViewController updateSettings: self.preferences];
 }
@@ -161,16 +180,26 @@ - (void)showPreferences:(LOXPreferences *)preferences
     //Make sure that in nib file "Visible at launch" property set to false
     //otherwise sheet il not be attached to the window
     [NSBundle loadNibNamed:@"PreferencesDlg" owner:self];
-
-    if([_preferences.isScrollDoc boolValue]) {
+    
+    if([_preferences.displayScroll  isEqual: @"scroll-doc"]) {
         [self.displayModeCtrl selectCellWithTag: 1];
     }
-    else if([_preferences.isScrollContinuous boolValue]) {
+    else if([_preferences.displayScroll isEqual: @"scroll-continuous"]) {
         [self.displayModeCtrl selectCellWithTag: 2];
     }
     else {
         [self.displayModeCtrl selectCellWithTag: 0];
     }
+
+    if([_preferences.displaySyntheticSpread  isEqual: @"single"]) {
+        [self.displaySynthCtrl selectCellWithTag: 1];
+    }
+    else if([_preferences.displaySyntheticSpread isEqual: @"double"]) {
+        [self.displaySynthCtrl selectCellWithTag: 2];
+    }
+    else {
+        [self.displaySynthCtrl selectCellWithTag: 0];
+    }
 
     [NSApp beginSheet:self.sheet
        modalForWindow:[[NSApp delegate] window]

diff --git a/LauncherOSX/PreferencesDlg.xib b/LauncherOSX/PreferencesDlg.xib
@@ -1,19 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5053" systemVersion="13C64" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="5056" systemVersion="13E28" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment defaultVersion="1070" identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5053"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="5056"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="LOXPreferencesController">
             <connections>
                 <outlet property="displayModeCtrl" destination="Ui7-Ke-pjm" id="OAm-iW-gq4"/>
+                <outlet property="displaySynthCtrl" destination="pmZ-sh-78a" id="1qo-HI-GTk"/>
                 <outlet property="moEscapablesCtrl" destination="329" id="345"/>
                 <outlet property="moSkippablesCtrl" destination="313" id="344"/>
                 <outlet property="selectorsCtrl" destination="219" id="230"/>
                 <outlet property="sheet" destination="1" id="58"/>
                 <outlet property="styleCtrl" destination="286" id="293"/>
-                <outlet property="thiteticSpread" destination="Is4-0o-VJx" id="0Hi-UX-8oI"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
@@ -121,26 +121,26 @@
                                             </connections>
                                         </stepper>
                                         <matrix verticalHuggingPriority="750" tag="1" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="Ui7-Ke-pjm">
-                                            <rect key="frame" x="4" y="252" width="171" height="64"/>
+                                            <rect key="frame" x="316" y="252" width="171" height="64"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                            <size key="cellSize" width="171" height="18"/>
+                                            <size key="cellSize" width="98" height="18"/>
                                             <size key="intercellSpacing" width="4" height="2"/>
                                             <buttonCell key="prototype" type="radio" title="Use Book Defaults:" imagePosition="right" alignment="left" inset="2" id="dF3-gx-Neh" userLabel="Button Cell - Empty:">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
                                             <cells>
                                                 <column>
-                                                    <buttonCell type="radio" title="Use Book Defaults:" imagePosition="right" alignment="left" state="on" inset="2" id="QSc-lb-utl">
+                                                    <buttonCell type="radio" title="Scroll Auto" imagePosition="right" alignment="left" state="on" inset="2" id="QSc-lb-utl">
                                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                         <font key="font" metaFont="system"/>
                                                     </buttonCell>
-                                                    <buttonCell type="radio" title="Scroll View Document:" imagePosition="right" alignment="left" tag="1" inset="2" id="BfS-Ei-zxe">
+                                                    <buttonCell type="radio" title="Document:" imagePosition="right" alignment="left" tag="1" inset="2" id="BfS-Ei-zxe">
                                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                         <font key="font" metaFont="system"/>
                                                     </buttonCell>
-                                                    <buttonCell type="radio" title="Scroll View Continuous:" imagePosition="right" alignment="left" tag="2" inset="2" id="hKb-9H-0SW">
+                                                    <buttonCell type="radio" title="Continuous:" imagePosition="right" alignment="left" tag="2" inset="2" id="hKb-9H-0SW">
                                                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                         <font key="font" metaFont="system"/>
                                                     </buttonCell>
@@ -150,17 +150,36 @@
                                                 <action selector="onViewModeChanged:" target="-2" id="wdl-qC-q8I"/>
                                             </connections>
                                         </matrix>
-                                        <button id="Is4-0o-VJx">
-                                            <rect key="frame" x="238" y="300" width="148" height="18"/>
+                                        <matrix verticalHuggingPriority="750" tag="1" allowsEmptySelection="NO" autorecalculatesCellSize="YES" id="pmZ-sh-78a">
+                                            <rect key="frame" x="17" y="252" width="171" height="64"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="check" title="Synthetic Spread:" bezelStyle="regularSquare" imagePosition="right" state="on" inset="2" id="PqZ-Aj-8na">
+                                            <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                            <size key="cellSize" width="161" height="18"/>
+                                            <size key="intercellSpacing" width="4" height="2"/>
+                                            <buttonCell key="prototype" type="radio" title="Use Book Defaults:" imagePosition="right" alignment="left" inset="2" id="gSz-Dv-R6g" userLabel="Button Cell - Empty:">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                                                 <font key="font" metaFont="system"/>
                                             </buttonCell>
+                                            <cells>
+                                                <column>
+                                                    <buttonCell type="radio" title="Synthetic Spread Auto" imagePosition="right" alignment="left" state="on" inset="2" id="tue-5Q-LXk">
+                                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                        <font key="font" metaFont="system"/>
+                                                    </buttonCell>
+                                                    <buttonCell type="radio" title="Single" imagePosition="right" alignment="left" tag="1" inset="2" id="4Te-Wi-bTv">
+                                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                        <font key="font" metaFont="system"/>
+                                                    </buttonCell>
+                                                    <buttonCell type="radio" title="Double" imagePosition="right" alignment="left" tag="2" inset="2" id="eDP-Xo-Lg6">
+                                                        <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                                        <font key="font" metaFont="system"/>
+                                                    </buttonCell>
+                                                </column>
+                                            </cells>
                                             <connections>
-                                                <binding destination="-2" name="value" keyPath="preferences.isSyntheticSpread" id="u5P-ZN-QJ2"/>
+                                                <action selector="onViewSynthChanged:" target="-2" id="1VU-DJ-Drf"/>
                                             </connections>
-                                        </button>
+                                        </matrix>
                                     </subviews>
                                 </view>
                             </tabViewItem>

diff --git a/readium-sdk b/readium-sdk
diff --git a/readium-shared-js b/readium-shared-js
+30 −13		js/helpers.js
+1 −1		js/models/fixed_page_spread.js
+4 −0		js/models/viewer_settings.js
+5 −5		js/views/fixed_view.js
+24 −7		js/views/media_overlay_player.js
+3 −0		js/views/one_page_view.js
+6 −4		js/views/reader_view.js
+130 −33		js/views/reflowable_view.js
+40 −2		js/views/scroll_view.js
+0 −8		readium-module.json