Changeset 9303 for trunk/macosx/Controller.m

Timestamp:

Oct 12, 2009, 1:59:52 AM (13 years ago)

Author:

livings124

Message:

when Quick Look is visible, make the toolbar icon blue and append "Close" to the menu item

File:

• trunk/macosx/Controller.m (modified) (4 diffs)

trunk/macosx/Controller.m

@@ -3386 +3386 @@
     {
         ButtonToolbarItem * item = [self standardToolbarButtonWithIdentifier: ident];
+        [[(NSButton *)[item view] cell] setShowsStateBy: NSContentsCellMask]; //blue when enabled
         
         [item setLabel: NSLocalizedString(@"Quick Look", "QuickLook toolbar item -> label")];
@@ -3393 +3394 @@
         [item setTarget: self];
         [item setAction: @selector(toggleQuickLook:)];
-        [item setAutovalidates: NO];
-        [item setEnabled: [NSApp isOnSnowLeopardOrBetter]];
         
         return item;
@@ -3508 +3507 @@
         [(NSButton *)[toolbarItem view] setState: ![fFilterBar isHidden]];
         return YES;
+    }
+    
+    //set quick look image
+    if ([ident isEqualToString: TOOLBAR_QUICKLOOK])
+    {
+        [(NSButton *)[toolbarItem view] setState: [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]
+                                                    && [[QLPreviewPanelSL sharedPreviewPanel] isVisible]];
+        return [NSApp isOnSnowLeopardOrBetter];
     }
 
@@ -3865 +3872 @@
     }
     
-    //quick look only works on 10.6
     if (action == @selector(toggleQuickLook:))
+    {
+        const BOOL visible = [NSApp isOnSnowLeopardOrBetter] && [QLPreviewPanelSL sharedPreviewPanelExists]
+                                && [[QLPreviewPanelSL sharedPreviewPanel] isVisible];
+        //text consistent with Finder
+        NSString * title = !visible ? NSLocalizedString(@"Quick Look", "View menu -> Quick Look")
+                                    : NSLocalizedString(@"Close Quick Look", "View menu -> Quick Look");
+        [menuItem setTitle: title];
+        
         return [NSApp isOnSnowLeopardOrBetter];
+    }
     
     return YES;