some cleanup of inspector QuickLook

diff --git a/macosx/FileOutlineController.m b/macosx/FileOutlineController.m
index e58c417353739df2e37f3ed3bf79963e5c83b8df..7b47a36db3290aeb3f5b6b1e3df40216ac376505 100644 (file)
--- a/macosx/FileOutlineController.m
+++ b/macosx/FileOutlineController.m
@@ -133,7 +133,10 @@ typedef enum
 - (void) outlineViewSelectionDidChange: (NSNotification *) notification
 {
     if ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible])
+    {
         [[QLPreviewPanel sharedPreviewPanel] reloadData];
+        [[QLPreviewPanel sharedPreviewPanel] updateController];
+    }
 }
 
 - (NSInteger) outlineView: (NSOutlineView *) outlineView numberOfChildrenOfItem: (id) item

diff --git a/macosx/InfoWindowController.h b/macosx/InfoWindowController.h
index 52c0a2514feaab55b592b8591230a57a7f2d2e68..b1c0632391b34d9a3b9dbd0c04e2f4a72c3531c2 100644 (file)
--- a/macosx/InfoWindowController.h
+++ b/macosx/InfoWindowController.h
@@ -95,7 +95,6 @@
 
 - (NSArray *) quickLookURLs;
 - (BOOL) canQuickLook;
-- (NSRect) quickLookFrameWithURL: (NSURL*) url;
 
 - (void) setPiecesView: (id) sender;
 - (void) setPiecesViewForAvailable: (BOOL) available;

diff --git a/macosx/InfoWindowController.m b/macosx/InfoWindowController.m
index 9e2d93c0290b152af56b753b02bce8d84d8e5292..d3af1a2f4e95023ce90e34c6f23fd5dfd9973eb0 100644 (file)
--- a/macosx/InfoWindowController.m
+++ b/macosx/InfoWindowController.m
@@ -820,9 +820,9 @@ typedef enum
     [[window contentView] addSubview: view];
     [view setHidden: NO];
     
-    if (fCurrentTabTag == TAB_FILES_TAG || oldTabTag == TAB_FILES_TAG
+    if ((fCurrentTabTag == TAB_FILES_TAG || oldTabTag == TAB_FILES_TAG)
         && ([QLPreviewPanel sharedPreviewPanelExists] && [[QLPreviewPanel sharedPreviewPanel] isVisible]))
-        [[QLPreviewPanel sharedPreviewPanel] reloadData];
+        [[QLPreviewPanel sharedPreviewPanel] updateController];
 }
 
 - (void) setNextTab
@@ -1109,7 +1109,7 @@ typedef enum
 
 - (BOOL) acceptsPreviewPanelControl: (QLPreviewPanel *) panel
 {
-    return fCurrentTabTag == TAB_FILES_TAG && [[fFileController outlineView] numberOfSelectedRows] > 0;
+    return fCurrentTabTag == TAB_FILES_TAG && [self canQuickLook];
 }
 
 - (void) beginPreviewPanelControl: (QLPreviewPanel *) panel

diff --git a/macosx/QuickLook.h b/macosx/QuickLook.h
deleted file mode 100644 (file)
index df1de9c..0000000
--- a/macosx/QuickLook.h
+++ /dev/null
@@ -1,85 +0,0 @@
-@interface QLPreviewPanel : NSPanel
-+ (id)sharedPreviewPanel;
-+ (id)_previewPanel;
-+ (BOOL)isSharedPreviewPanelLoaded;
-- (id)initWithContentRect:(struct _NSRect)fp8 styleMask:(unsigned int)fp24 backing:(unsigned int)fp28 defer:(BOOL)fp32;
-- (id)initWithCoder:(id)fp8;
-- (void)dealloc;
-- (BOOL)isOpaque;
-- (BOOL)canBecomeKeyWindow;
-- (BOOL)canBecomeMainWindow;
-- (BOOL)shouldIgnorePanelFrameChanges;
-- (BOOL)isOpen;
-- (void)setFrame:(struct _NSRect)fp8 display:(BOOL)fp24 animate:(BOOL)fp28;
-- (id)_subEffectsForWindow:(id)fp8 itemFrame:(struct _NSRect)fp12 transitionWindow:(id *)fp28;
-- (id)_scaleEffectForItemFrame:(struct _NSRect)fp8 transitionWindow:(id *)fp24;
-- (void)_invertCurrentEffect;
-- (struct _NSRect)_currentItemFrame;
-- (void)setAutosizesAndCenters:(BOOL)fp8;
-- (BOOL)autosizesAndCenters;
-- (void)makeKeyAndOrderFront:(id)fp8;
-- (void)makeKeyAndOrderFrontWithEffect:(int)fp8;
-- (void)makeKeyAndGoFullscreenWithEffect:(int)fp8;
-- (void)makeKeyAndOrderFrontWithEffect:(int)fp8 canClose:(BOOL)fp12;
-- (void)_makeKeyAndOrderFrontWithEffect:(int)fp8 canClose:(BOOL)fp12 willOpen:(BOOL)fp16 toFullscreen:(BOOL)fp20;
-- (int)openingEffect;
-- (void)closePanel;
-- (void)close;
-- (void)closeWithEffect:(int)fp8;
-- (void)closeWithEffect:(int)fp8 canReopen:(BOOL)fp12;
-- (void)_closeWithEffect:(int)fp8 canReopen:(BOOL)fp12;
-- (void)windowEffectDidTerminate:(id)fp8;
-- (void)_close:(id)fp8;
-- (void)sendEvent:(id)fp8;
-- (void)selectNextItem;
-- (void)selectPreviousItem;
-- (void)setURLs:(id)fp8 currentIndex:(unsigned int)fp12 preservingDisplayState:(BOOL)fp16;
-- (void)setURLs:(id)fp8 preservingDisplayState:(BOOL)fp12;
-- (void)setURLs:(id)fp8;
-- (id)URLs;
-- (unsigned int)indexOfCurrentURL;
-- (void)setIndexOfCurrentURL:(unsigned int)fp8;
-- (void)setDelegate:(id)fp8;
-- (id)sharedPreviewView;
-- (void)setSharedPreviewView:(id)fp8;
-- (void)setCyclesSelection:(BOOL)fp8;
-- (BOOL)cyclesSelection;
-- (void)setShowsAddToiPhotoButton:(BOOL)fp8;
-- (BOOL)showsAddToiPhotoButton;
-- (void)setShowsiChatTheaterButton:(BOOL)fp8;
-- (BOOL)showsiChatTheaterButton;
-- (void)setShowsFullscreenButton:(BOOL)fp8;
-- (BOOL)showsFullscreenButton;
-- (void)setShowsIndexSheetButton:(BOOL)fp8;
-- (BOOL)showsIndexSheetButton;
-- (void)setAutostarts:(BOOL)fp8;
-- (BOOL)autostarts;
-- (void)setPlaysDuringPanelAnimation:(BOOL)fp8;
-- (BOOL)playsDuringPanelAnimation;
-- (void)setDeferredLoading:(BOOL)fp8;
-- (BOOL)deferredLoading;
-- (void)setEnableDragNDrop:(BOOL)fp8;
-- (BOOL)enableDragNDrop;
-- (void)start:(id)fp8;
-- (void)stop:(id)fp8;
-- (void)setShowsIndexSheet:(BOOL)fp8;
-- (BOOL)showsIndexSheet;
-- (void)setShareWithiChat:(BOOL)fp8;
-- (BOOL)shareWithiChat;
-- (void)setPlaysSlideShow:(BOOL)fp8;
-- (BOOL)playsSlideShow;
-- (void)setIsFullscreen:(BOOL)fp8;
-- (BOOL)isFullscreen;
-- (void)setMandatoryClient:(id)fp8;
-- (id)mandatoryClient;
-- (void)setForcedContentTypeUTI:(id)fp8;
-- (id)forcedContentTypeUTI;
-- (void)setDocumentURLs:(id)fp8;
-- (void)setDocumentURLs:(id)fp8 preservingDisplayState:(BOOL)fp12;
-- (void)setDocumentURLs:(id)fp8 itemFrame:(struct _NSRect)fp12;
-- (void)setURLs:(id)fp8 itemFrame:(struct _NSRect)fp12;
-- (void)setAutoSizeAndCenterOnScreen:(BOOL)fp8;
-- (void)setShowsAddToiPhoto:(BOOL)fp8;
-- (void)setShowsiChatTheater:(BOOL)fp8;
-- (void)setShowsFullscreen:(BOOL)fp8;
-@end
\ No newline at end of file