Revision: 24099
          http://sourceforge.net/p/bibdesk/svn/24099
Author:   hofman
Date:     2019-08-01 14:18:58 +0000 (Thu, 01 Aug 2019)
Log Message:
-----------
Add progress indicator and warning for tex preview as subview rather than in an 
overlay window now that we can use overlapping views

Modified Paths:
--------------
    trunk/bibdesk/BDSKPreviewer.h
    trunk/bibdesk/BDSKPreviewer.m
    trunk/bibdesk/BibDocument_UI.m
    trunk/bibdesk/English.lproj/Previewer.xib
    trunk/bibdesk/French.lproj/Previewer.xib
    trunk/bibdesk/German.lproj/Previewer.xib

Modified: trunk/bibdesk/BDSKPreviewer.h
===================================================================
--- trunk/bibdesk/BDSKPreviewer.h       2019-08-01 09:30:31 UTC (rev 24098)
+++ trunk/bibdesk/BDSKPreviewer.h       2019-08-01 14:18:58 UTC (rev 24099)
@@ -41,7 +41,7 @@
 #import <Cocoa/Cocoa.h>
 #import "BDSKTeXTask.h"
 
-@class PDFView, BDSKZoomablePDFView, BDSKTeXTask, BDSKOverlayPanel;
+@class PDFView, BDSKZoomablePDFView, BDSKTeXTask, BDSKCollapsibleView;
 
 typedef NS_ENUM(NSInteger, BDSKPreviewState) {
        BDSKPreviewStateUnknown = -1,
@@ -60,9 +60,9 @@
     NSTextView *logView;
     NSTabView *tabView;
     NSProgressIndicator *progressIndicator;
-    BDSKOverlayPanel *progressOverlay;
     NSImageView *warningImageView;
     NSView *warningView;
+    BDSKCollapsibleView *indicatorView;
     
     BDSKPreviewState previewState;
     BDSKTeXTask *texTask;
@@ -79,9 +79,9 @@
 @property (nonatomic, assign) IBOutlet NSTextView *logView;
 @property (nonatomic, assign) IBOutlet NSTabView *tabView;
 @property (nonatomic, assign) IBOutlet NSProgressIndicator *progressIndicator;
-@property (nonatomic, assign) IBOutlet BDSKOverlayPanel *progressOverlay;
 @property (nonatomic, assign) IBOutlet NSImageView *warningImageView;
 @property (nonatomic, assign) IBOutlet NSView *warningView;
+@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *indicatorView;
 
 @property (nonatomic, readonly) NSView *pdfContentView;
 

Modified: trunk/bibdesk/BDSKPreviewer.m
===================================================================
--- trunk/bibdesk/BDSKPreviewer.m       2019-08-01 09:30:31 UTC (rev 24098)
+++ trunk/bibdesk/BDSKPreviewer.m       2019-08-01 14:18:58 UTC (rev 24099)
@@ -37,7 +37,6 @@
 #import "BDSKPreviewer.h"
 #import "BDSKStringConstants.h"
 #import "BDSKTeXTask.h"
-#import "BDSKOverlayWindow.h"
 #import "BDSKAppController.h"
 #import "BDSKZoomableTextView.h"
 #import "BDSKZoomablePDFView.h"
@@ -78,7 +77,7 @@
 
 @implementation BDSKPreviewer
 
-@synthesize pdfView, logView, tabView, progressIndicator, progressOverlay, 
warningImageView, warningView;
+@synthesize pdfView, logView, tabView, progressIndicator, warningImageView, 
warningView, indicatorView;
 @dynamic pdfContentView, PDFScaleFactor, visible;
 
 static BDSKPreviewer *sharedPreviewer = nil;
@@ -113,7 +112,6 @@
 
 - (void)windowDidLoad{
     CGFloat pdfScaleFactor = 0.0;
-    BDSKCollapsibleView *collapsibleView = (BDSKCollapsibleView 
*)[[[progressOverlay contentView] subviews] firstObject];
     NSSize minSize = [progressIndicator frame].size;
     NSRect rect = [warningImageView bounds];
     NSImage *image = [[NSImage alloc] initBitmapWithSize:rect.size 
drawingHandler:^(NSRect targetRect){
@@ -130,8 +128,8 @@
     BDSKSetHasLightAppearance(progressIndicator);
     
     minSize.height += NSMinY([[progressIndicator superview] frame]);
-    [collapsibleView setMinSize:minSize];
-    [collapsibleView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMaxYEdgeMask];
+    [indicatorView setMinSize:minSize];
+    [indicatorView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMaxYEdgeMask];
     
     if([self isSharedPreviewer]){
         
@@ -152,9 +150,6 @@
         rect.origin.x += 22.0;
         [warningView setFrame:rect];
         
-        // overlay the progressIndicator over the contentView
-        [progressOverlay overlayView:contentView];
-        
         pdfScaleFactor = [[NSUserDefaults standardUserDefaults] 
doubleForKey:BDSKPreviewPDFScaleFactorKey];
         
         // register to observe when the preview needs to be updated (handle 
this here rather than on a per document basis as the preview is currently 
global for the application)
@@ -225,12 +220,6 @@
     return [[[[tabView tabViewItemAtIndex:BDSKPreviewerTabIndexPDF] view] 
subviews] firstObject];
 }
 
-- (BDSKOverlayPanel *)progressOverlay;
-{
-    [self window];
-    return progressOverlay;
-}
-
 - (CGFloat)PDFScaleFactor;
 {
     [self window];
@@ -251,9 +240,11 @@
 
 - (IBAction)showWindow:(id)sender{
     BDSKASSERT([self isSharedPreviewer]);
+    
        [super showWindow:self];
-       [progressOverlay orderFront:sender];
-       [(BibDocument *)[[NSDocumentController sharedDocumentController] 
currentDocument] updatePreviewer:self];
+       
+    [(BibDocument *)[[NSDocumentController sharedDocumentController] 
currentDocument] updatePreviewer:self];
+    
     if(![[NSUserDefaults standardUserDefaults] boolForKey:BDSKUsesTeXKey]){
         NSAlert *alert = [[[NSAlert alloc] init] autorelease];
         [alert setMessageText:NSLocalizedString(@"Previewing is Disabled.", 
@"Message in alert dialog when showing preview with TeX preview disabled")];
@@ -302,9 +293,17 @@
     if(NO == [self isVisible] && state != BDSKPreviewStateEmpty){
         return;
     }
-       
+    
     [warningView setHidden:success];
     
+    if (success && state != BDSKPreviewStateWaiting) {
+        if ([indicatorView superview])
+            [indicatorView removeFromSuperview];
+    } else if ([indicatorView superview] == nil) {
+        [indicatorView setFrame:[pdfView bounds]];
+        [pdfView addSubview:indicatorView positioned:NSWindowAbove 
relativeTo:nil];
+    }
+    
     NSString *logString = @"";
     NSData *pdfData = nil;
        

Modified: trunk/bibdesk/BibDocument_UI.m
===================================================================
--- trunk/bibdesk/BibDocument_UI.m      2019-08-01 09:30:31 UTC (rev 24098)
+++ trunk/bibdesk/BibDocument_UI.m      2019-08-01 14:18:58 UTC (rev 24099)
@@ -213,12 +213,9 @@
         [previewer setPDFScaleFactor:[xatrrDefaults 
doubleForKey:BDSKPreviewPDFScaleFactorKey defaultValue:0.0]];
         [[bottomPreviewTabView tabViewItemAtIndex:BDSKPreviewDisplayTeX] 
setView:[previewer pdfContentView]];
     }
-    
-    [[previewer progressOverlay] overlayView:bottomPreviewTabView];
 }
 
 - (void)cleanupAfterTeXPreview {
-    [[previewer progressOverlay] remove];
     [previewer updateWithoutBibTeXString];
 }
 

Modified: trunk/bibdesk/English.lproj/Previewer.xib
===================================================================
--- trunk/bibdesk/English.lproj/Previewer.xib   2019-08-01 09:30:31 UTC (rev 
24098)
+++ trunk/bibdesk/English.lproj/Previewer.xib   2019-08-01 14:18:58 UTC (rev 
24099)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
     <dependencies>
+        <deployment identifier="macosx"/>
         <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="14460.31"/>
-        <plugIn identifier="com.apple.pdfkit.ibplugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="14490.70"/>
+        <plugIn identifier="com.apple.pdfkit.ibplugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" 
minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" 
customClass="BDSKPreviewer">
             <connections>
+                <outlet property="indicatorView" destination="93" 
id="nTo-bh-Q3n"/>
                 <outlet property="logView" destination="103" id="104"/>
                 <outlet property="pdfView" destination="90" id="91"/>
                 <outlet property="progressIndicator" destination="87" id="88"/>
-                <outlet property="progressOverlay" destination="85" id="89"/>
                 <outlet property="tabView" destination="64" id="75"/>
                 <outlet property="warningImageView" destination="95" 
id="100111"/>
                 <outlet property="warningView" destination="105" id="107"/>
@@ -94,55 +95,42 @@
                 <outlet property="delegate" destination="-2" id="77"/>
             </connections>
         </window>
-        <window allowsToolTipsWhenApplicationIsInactive="NO" 
autorecalculatesKeyViewLoop="NO" hasShadow="NO" hidesOnDeactivate="YES" 
releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" 
id="85" userLabel="ProgressOverlay" customClass="BDSKOverlayPanel">
-            <windowStyleMask key="styleMask" titled="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" 
rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="236" y="497" width="213" height="107"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
-            <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="86">
-                <rect key="frame" x="0.0" y="0.0" width="213" height="107"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <customView id="93" customClass="BDSKCollapsibleView">
-                        <rect key="frame" x="0.0" y="0.0" width="213" 
height="107"/>
-                        <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <customView id="94">
-                                <rect key="frame" x="0.0" y="15" width="213" 
height="92"/>
-                                <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <customView hidden="YES" id="105">
-                                        <rect key="frame" x="0.0" y="72" 
width="181" height="20"/>
-                                        <autoresizingMask 
key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <subviews>
-                                            <imageView toolTip="TeX had 
errors" id="95">
-                                                <rect key="frame" x="4" 
y="0.0" width="16" height="16"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
-                                                <imageCell key="cell" 
refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" 
image="BDSKCautionIcon" id="200114"/>
-                                            </imageView>
-                                            <textField 
verticalHuggingPriority="750" id="106">
-                                                <rect key="frame" x="21" y="1" 
width="163" height="14"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
-                                                <textFieldCell key="cell" 
sendsActionOnEndEditing="YES" title="TeX preview generation failed" id="200115">
-                                                    <font key="font" 
metaFont="smallSystem"/>
-                                                    <color key="textColor" 
red="1" green="0.0" blue="0.0" alpha="0.69999998809999997" 
colorSpace="calibratedRGB"/>
-                                                    <color 
key="backgroundColor" name="controlColor" catalog="System" 
colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                    </customView>
-                                    <progressIndicator wantsLayer="YES" 
horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" 
displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" 
id="87">
-                                        <rect key="frame" x="90" y="30" 
width="32" height="32"/>
-                                        <autoresizingMask 
key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" 
flexibleMaxY="YES"/>
-                                    </progressIndicator>
-                                </subviews>
-                            </customView>
-                        </subviews>
-                    </customView>
-                </subviews>
-            </view>
-        </window>
+        <customView id="93" customClass="BDSKCollapsibleView">
+            <rect key="frame" x="0.0" y="0.0" width="213" height="107"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" 
heightSizable="YES"/>
+            <subviews>
+                <customView id="94">
+                    <rect key="frame" x="0.0" y="15" width="213" height="92"/>
+                    <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
+                    <subviews>
+                        <customView hidden="YES" id="105">
+                            <rect key="frame" x="0.0" y="72" width="181" 
height="20"/>
+                            <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <subviews>
+                                <imageView toolTip="TeX had errors" id="95">
+                                    <rect key="frame" x="4" y="0.0" width="16" 
height="16"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <imageCell key="cell" 
refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" 
image="BDSKCautionIcon" id="200114"/>
+                                </imageView>
+                                <textField verticalHuggingPriority="750" 
id="106">
+                                    <rect key="frame" x="21" y="1" width="163" 
height="14"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <textFieldCell key="cell" 
sendsActionOnEndEditing="YES" title="TeX preview generation failed" id="200115">
+                                        <font key="font" 
metaFont="smallSystem"/>
+                                        <color key="textColor" red="1" 
green="0.0" blue="0.0" alpha="0.69999998809999997" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" 
name="controlColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                        </customView>
+                        <progressIndicator wantsLayer="YES" 
horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" 
displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" 
id="87">
+                            <rect key="frame" x="90" y="30" width="32" 
height="32"/>
+                            <autoresizingMask key="autoresizingMask" 
flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                        </progressIndicator>
+                    </subviews>
+                </customView>
+            </subviews>
+        </customView>
     </objects>
     <resources>
         <image name="BDSKCautionIcon" width="128" height="128"/>

Modified: trunk/bibdesk/French.lproj/Previewer.xib
===================================================================
--- trunk/bibdesk/French.lproj/Previewer.xib    2019-08-01 09:30:31 UTC (rev 
24098)
+++ trunk/bibdesk/French.lproj/Previewer.xib    2019-08-01 14:18:58 UTC (rev 
24099)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
     <dependencies>
+        <deployment identifier="macosx"/>
         <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="14460.31"/>
-        <plugIn identifier="com.apple.pdfkit.ibplugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="14490.70"/>
+        <plugIn identifier="com.apple.pdfkit.ibplugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" 
minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" 
customClass="BDSKPreviewer">
             <connections>
+                <outlet property="indicatorView" destination="93" 
id="sWa-8W-WAj"/>
                 <outlet property="logView" destination="103" id="104"/>
                 <outlet property="pdfView" destination="90" id="91"/>
                 <outlet property="progressIndicator" destination="87" id="88"/>
-                <outlet property="progressOverlay" destination="85" id="89"/>
                 <outlet property="tabView" destination="64" id="75"/>
                 <outlet property="warningImageView" destination="95" 
id="100111"/>
                 <outlet property="warningView" destination="105" id="107"/>
@@ -58,7 +59,7 @@
                                             <autoresizingMask 
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" 
id="odU-NN-yl0">
                                                 <rect key="frame" x="0.0" 
y="0.0" width="530" height="123"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
+                                                <autoresizingMask 
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView editable="NO" 
importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" 
findStyle="panel" continuousSpellChecking="YES" usesRuler="YES" 
spellingCorrection="YES" smartInsertDelete="YES" id="103" 
customClass="BDSKZoomableTextView">
                                                         <rect key="frame" 
x="0.0" y="0.0" width="530" height="123"/>
@@ -94,55 +95,42 @@
                 <outlet property="delegate" destination="-2" id="77"/>
             </connections>
         </window>
-        <window allowsToolTipsWhenApplicationIsInactive="NO" 
autorecalculatesKeyViewLoop="NO" hasShadow="NO" hidesOnDeactivate="YES" 
releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" 
id="85" userLabel="ProgressOverlay" customClass="BDSKOverlayPanel">
-            <windowStyleMask key="styleMask" titled="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" 
rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="236" y="497" width="213" height="107"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
-            <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="86">
-                <rect key="frame" x="0.0" y="0.0" width="213" height="107"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <customView id="93" customClass="BDSKCollapsibleView">
-                        <rect key="frame" x="0.0" y="0.0" width="213" 
height="107"/>
-                        <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <customView id="94">
-                                <rect key="frame" x="0.0" y="15" width="213" 
height="92"/>
-                                <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <customView hidden="YES" id="105">
-                                        <rect key="frame" x="0.0" y="72" 
width="181" height="20"/>
-                                        <autoresizingMask 
key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <subviews>
-                                            <imageView toolTip="Il y a des 
erreurs de TeX" id="95">
-                                                <rect key="frame" x="4" 
y="0.0" width="16" height="16"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
-                                                <imageCell key="cell" 
refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" 
image="BDSKCautionIcon" id="200114"/>
-                                            </imageView>
-                                            <textField 
verticalHuggingPriority="750" id="106">
-                                                <rect key="frame" x="21" y="1" 
width="163" height="14"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
-                                                <textFieldCell key="cell" 
sendsActionOnEndEditing="YES" title="Échec de création de l'aperçu TeX" 
id="200115">
-                                                    <font key="font" 
metaFont="smallSystem"/>
-                                                    <color key="textColor" 
red="1" green="0.0" blue="0.0" alpha="0.69999998809999997" 
colorSpace="calibratedRGB"/>
-                                                    <color 
key="backgroundColor" name="controlColor" catalog="System" 
colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                    </customView>
-                                    <progressIndicator wantsLayer="YES" 
horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" 
displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" 
id="87">
-                                        <rect key="frame" x="90" y="30" 
width="32" height="32"/>
-                                        <autoresizingMask 
key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" 
flexibleMaxY="YES"/>
-                                    </progressIndicator>
-                                </subviews>
-                            </customView>
-                        </subviews>
-                    </customView>
-                </subviews>
-            </view>
-        </window>
+        <customView id="93" customClass="BDSKCollapsibleView">
+            <rect key="frame" x="0.0" y="0.0" width="213" height="107"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" 
heightSizable="YES"/>
+            <subviews>
+                <customView id="94">
+                    <rect key="frame" x="0.0" y="15" width="213" height="92"/>
+                    <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
+                    <subviews>
+                        <customView hidden="YES" id="105">
+                            <rect key="frame" x="0.0" y="72" width="181" 
height="20"/>
+                            <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <subviews>
+                                <imageView toolTip="Il y a des erreurs de TeX" 
id="95">
+                                    <rect key="frame" x="4" y="0.0" width="16" 
height="16"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <imageCell key="cell" 
refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" 
image="BDSKCautionIcon" id="200114"/>
+                                </imageView>
+                                <textField verticalHuggingPriority="750" 
id="106">
+                                    <rect key="frame" x="21" y="1" width="163" 
height="14"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <textFieldCell key="cell" 
sendsActionOnEndEditing="YES" title="Échec de création de l'aperçu TeX" 
id="200115">
+                                        <font key="font" 
metaFont="smallSystem"/>
+                                        <color key="textColor" red="1" 
green="0.0" blue="0.0" alpha="0.69999998809999997" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" 
name="controlColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                        </customView>
+                        <progressIndicator wantsLayer="YES" 
horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" 
displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" 
id="87">
+                            <rect key="frame" x="90" y="30" width="32" 
height="32"/>
+                            <autoresizingMask key="autoresizingMask" 
flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                        </progressIndicator>
+                    </subviews>
+                </customView>
+            </subviews>
+        </customView>
     </objects>
     <resources>
         <image name="BDSKCautionIcon" width="128" height="128"/>

Modified: trunk/bibdesk/German.lproj/Previewer.xib
===================================================================
--- trunk/bibdesk/German.lproj/Previewer.xib    2019-08-01 09:30:31 UTC (rev 
24098)
+++ trunk/bibdesk/German.lproj/Previewer.xib    2019-08-01 14:18:58 UTC (rev 
24099)
@@ -1,18 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" 
toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" 
propertyAccessControl="none">
     <dependencies>
+        <deployment identifier="macosx"/>
         <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="14460.31"/>
-        <plugIn identifier="com.apple.pdfkit.ibplugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" 
version="14490.70"/>
+        <plugIn identifier="com.apple.pdfkit.ibplugin" version="14490.70"/>
         <capability name="documents saved in the Xcode 8 format" 
minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" 
customClass="BDSKPreviewer">
             <connections>
+                <outlet property="indicatorView" destination="93" 
id="LFK-g8-wZ4"/>
                 <outlet property="logView" destination="103" id="104"/>
                 <outlet property="pdfView" destination="90" id="91"/>
                 <outlet property="progressIndicator" destination="87" id="88"/>
-                <outlet property="progressOverlay" destination="85" id="89"/>
                 <outlet property="tabView" destination="64" id="75"/>
                 <outlet property="warningImageView" destination="95" 
id="100111"/>
                 <outlet property="warningView" destination="105" id="107"/>
@@ -58,7 +59,7 @@
                                             <autoresizingMask 
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <clipView key="contentView" 
id="66o-3T-9TC">
                                                 <rect key="frame" x="0.0" 
y="0.0" width="530" height="123"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
+                                                <autoresizingMask 
key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textView editable="NO" 
importsGraphics="NO" verticallyResizable="YES" usesFontPanel="YES" 
findStyle="panel" continuousSpellChecking="YES" usesRuler="YES" 
spellingCorrection="YES" smartInsertDelete="YES" id="103" 
customClass="BDSKZoomableTextView">
                                                         <rect key="frame" 
x="0.0" y="0.0" width="530" height="123"/>
@@ -94,55 +95,42 @@
                 <outlet property="delegate" destination="-2" id="77"/>
             </connections>
         </window>
-        <window allowsToolTipsWhenApplicationIsInactive="NO" 
autorecalculatesKeyViewLoop="NO" hasShadow="NO" hidesOnDeactivate="YES" 
releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" 
id="85" userLabel="ProgressOverlay" customClass="BDSKOverlayPanel">
-            <windowStyleMask key="styleMask" titled="YES"/>
-            <windowPositionMask key="initialPositionMask" leftStrut="YES" 
rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="236" y="497" width="233" height="107"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
-            <value key="minSize" type="size" width="213" height="107"/>
-            <view key="contentView" id="86">
-                <rect key="frame" x="0.0" y="0.0" width="233" height="107"/>
-                <autoresizingMask key="autoresizingMask"/>
-                <subviews>
-                    <customView id="93" customClass="BDSKCollapsibleView">
-                        <rect key="frame" x="0.0" y="0.0" width="233" 
height="107"/>
-                        <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <customView id="94">
-                                <rect key="frame" x="0.0" y="15" width="233" 
height="92"/>
-                                <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
-                                <subviews>
-                                    <customView hidden="YES" id="105">
-                                        <rect key="frame" x="0.0" y="72" 
width="232" height="20"/>
-                                        <autoresizingMask 
key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                        <subviews>
-                                            <imageView toolTip="Es sind Fehler 
in TeX aufgetreten" id="95">
-                                                <rect key="frame" x="4" 
y="0.0" width="16" height="16"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
-                                                <imageCell key="cell" 
refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" 
image="BDSKCautionIcon" id="200114"/>
-                                            </imageView>
-                                            <textField 
verticalHuggingPriority="750" id="106">
-                                                <rect key="frame" x="21" y="1" 
width="214" height="14"/>
-                                                <autoresizingMask 
key="autoresizingMask"/>
-                                                <textFieldCell key="cell" 
sendsActionOnEndEditing="YES" title="Fehler beim Erstellen der TeX Vorschau" 
id="200115">
-                                                    <font key="font" 
metaFont="smallSystem"/>
-                                                    <color key="textColor" 
red="1" green="0.0" blue="0.0" alpha="0.69999998809999997" 
colorSpace="calibratedRGB"/>
-                                                    <color 
key="backgroundColor" name="controlColor" catalog="System" 
colorSpace="catalog"/>
-                                                </textFieldCell>
-                                            </textField>
-                                        </subviews>
-                                    </customView>
-                                    <progressIndicator wantsLayer="YES" 
horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" 
displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" 
id="87">
-                                        <rect key="frame" x="100" y="30" 
width="32" height="32"/>
-                                        <autoresizingMask 
key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" 
flexibleMaxY="YES"/>
-                                    </progressIndicator>
-                                </subviews>
-                            </customView>
-                        </subviews>
-                    </customView>
-                </subviews>
-            </view>
-        </window>
+        <customView id="93" customClass="BDSKCollapsibleView">
+            <rect key="frame" x="0.0" y="0.0" width="233" height="107"/>
+            <autoresizingMask key="autoresizingMask" widthSizable="YES" 
heightSizable="YES"/>
+            <subviews>
+                <customView id="94">
+                    <rect key="frame" x="0.0" y="15" width="233" height="92"/>
+                    <autoresizingMask key="autoresizingMask" 
widthSizable="YES" heightSizable="YES"/>
+                    <subviews>
+                        <customView hidden="YES" id="105">
+                            <rect key="frame" x="0.0" y="72" width="232" 
height="20"/>
+                            <autoresizingMask key="autoresizingMask" 
flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <subviews>
+                                <imageView toolTip="Es sind Fehler in TeX 
aufgetreten" id="95">
+                                    <rect key="frame" x="4" y="0.0" width="16" 
height="16"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <imageCell key="cell" 
refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" 
image="BDSKCautionIcon" id="200114"/>
+                                </imageView>
+                                <textField verticalHuggingPriority="750" 
id="106">
+                                    <rect key="frame" x="21" y="1" width="214" 
height="14"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <textFieldCell key="cell" 
sendsActionOnEndEditing="YES" title="Fehler beim Erstellen der TeX Vorschau" 
id="200115">
+                                        <font key="font" 
metaFont="smallSystem"/>
+                                        <color key="textColor" red="1" 
green="0.0" blue="0.0" alpha="0.69999998809999997" colorSpace="calibratedRGB"/>
+                                        <color key="backgroundColor" 
name="controlColor" catalog="System" colorSpace="catalog"/>
+                                    </textFieldCell>
+                                </textField>
+                            </subviews>
+                        </customView>
+                        <progressIndicator wantsLayer="YES" 
horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" 
displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" style="spinning" 
id="87">
+                            <rect key="frame" x="100" y="30" width="32" 
height="32"/>
+                            <autoresizingMask key="autoresizingMask" 
flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                        </progressIndicator>
+                    </subviews>
+                </customView>
+            </subviews>
+        </customView>
     </objects>
     <resources>
         <image name="BDSKCautionIcon" width="128" height="128"/>

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



_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to