Changeset 5875

Timestamp:

May 21, 2008, 4:02:38 PM (14 years ago)

Author:

livings124

Message:

add a QuickLook? button to the toolbar

Location:

trunk/macosx

Files:

• Controller.h (modified) (1 diff)
• Controller.m (modified) (4 diffs)

trunk/macosx/Controller.h

@@ -258 +258 @@
 - (NSArray *) quickLookURLs;
 - (NSRect) quickLookFrameWithURL: (NSURL*) url;
+- (void) toggleQuickLook;
 
 - (void) linkHomepage: (id) sender;

trunk/macosx/Controller.m

@@ -61 +61 @@
 #define TOOLBAR_PAUSE_RESUME_SELECTED   @"Toolbar Pause / Resume Selected"
 #define TOOLBAR_FILTER                  @"Toolbar Toggle Filter"
+#define TOOLBAR_QUICKLOOK               @"Toolbar QuickLook"
 
 typedef enum
@@ -3267 +3268 @@
         return item;
     }
+    else if ([ident isEqualToString: TOOLBAR_QUICKLOOK])
+    {
+        ButtonToolbarItem * item = [self standardToolbarButtonWithIdentifier: ident];
+        
+        [item setLabel: NSLocalizedString(@"QuickLook", "QuickLook toolbar item -> label")];
+        [item setPaletteLabel: NSLocalizedString(@"Quick Look", "QuickLook toolbar item -> palette label")];
+        [item setToolTip: NSLocalizedString(@"Quick Look", "QuickLook toolbar item -> tooltip")];
+        [item setImage: [NSImage imageNamed: NSImageNameQuickLookTemplate]];
+        [item setTarget: self];
+        [item setAction: @selector(toggleQuickLook)];
+        
+        return item;
+    }
     else
         return nil;
@@ -3303 +3317 @@
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [NSArray arrayWithObjects:
-            TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_OPEN_WEB,
-            TOOLBAR_REMOVE, TOOLBAR_PAUSE_RESUME_SELECTED, TOOLBAR_PAUSE_RESUME_ALL,
-            TOOLBAR_FILTER, TOOLBAR_INFO,
-            NSToolbarSeparatorItemIdentifier,
-            NSToolbarSpaceItemIdentifier,
-            NSToolbarFlexibleSpaceItemIdentifier,
-            NSToolbarCustomizeToolbarItemIdentifier, nil];
+    NSMutableArray * idents = [NSMutableArray arrayWithObjects:
+                                TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_OPEN_WEB,
+                                TOOLBAR_REMOVE, TOOLBAR_PAUSE_RESUME_SELECTED, TOOLBAR_PAUSE_RESUME_ALL,
+                                TOOLBAR_FILTER, TOOLBAR_INFO,
+                                NSToolbarSeparatorItemIdentifier,
+                                NSToolbarSpaceItemIdentifier,
+                                NSToolbarFlexibleSpaceItemIdentifier,
+                                NSToolbarCustomizeToolbarItemIdentifier, nil];
+    
+    //allow quicklook on leopard
+    if ([NSApp isOnLeopardOrBetter])
+        [idents insertObject: TOOLBAR_QUICKLOOK atIndex: 6];
+    
+    return idents;
 }
 
 - (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [NSArray arrayWithObjects:
-            TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE,
-            NSToolbarSeparatorItemIdentifier,
-            TOOLBAR_PAUSE_RESUME_ALL,
-            NSToolbarFlexibleSpaceItemIdentifier,
-            TOOLBAR_FILTER, TOOLBAR_INFO, nil];
+    //has quicklook on leopard
+    if ([NSApp isOnLeopardOrBetter])
+    {
+        return [NSArray arrayWithObjects:
+                TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE,
+                NSToolbarSeparatorItemIdentifier,
+                TOOLBAR_PAUSE_RESUME_ALL,
+                NSToolbarFlexibleSpaceItemIdentifier,
+                TOOLBAR_QUICKLOOK, TOOLBAR_FILTER, TOOLBAR_INFO, nil];
+    }
+    else
+    {
+        return [NSArray arrayWithObjects:
+                TOOLBAR_CREATE, TOOLBAR_OPEN_FILE, TOOLBAR_REMOVE,
+                NSToolbarSeparatorItemIdentifier,
+                TOOLBAR_PAUSE_RESUME_ALL,
+                NSToolbarFlexibleSpaceItemIdentifier,
+                TOOLBAR_FILTER, TOOLBAR_INFO, nil];
+    }
 }
 
@@ -4058 +4091 @@
 }
 
+#warning move to QuickLookController?
+- (void) toggleQuickLook
+{
+    [[QuickLookController quickLook] toggleQuickLook];
+}
+
 - (void) linkHomepage: (id) sender
 {