Revision: 13127
          http://bibdesk.svn.sourceforge.net/bibdesk/?rev=13127&view=rev
Author:   hofman
Date:     2008-04-08 07:53:37 -0700 (Tue, 08 Apr 2008)

Log Message:
-----------
Don't allow editing macros when searching.

Modified Paths:
--------------
    trunk/bibdesk/BDSKMacroWindowController.m

Modified: trunk/bibdesk/BDSKMacroWindowController.m
===================================================================
--- trunk/bibdesk/BDSKMacroWindowController.m   2008-04-08 05:45:23 UTC (rev 
13126)
+++ trunk/bibdesk/BDSKMacroWindowController.m   2008-04-08 14:53:37 UTC (rev 
13127)
@@ -316,13 +316,18 @@
     NSPredicate *predicate = nil;
     if ([NSString isEmptyString:string] == NO)
         predicate = [NSPredicate predicateWithFormat:@"(name CONTAINS[cd] %@) 
OR (value CONTAINS[cd] %@)", string, string];
+    
+    isEditable = showAll == NO && predicate == nil && (macroResolver == 
[BDSKMacroResolver defaultMacroResolver] || [[macroResolver owner] isDocument]);
+    
+    [self updateButtons];
+    
     [arrayController setFilterPredicate:predicate];
     [tableView reloadData];
 }
 
 - (IBAction)changeShowAll:(id)sender{
     showAll = [sender state] == NSOnState;
-    isEditable = showAll == NO && (macroResolver == [BDSKMacroResolver 
defaultMacroResolver] || [[macroResolver owner] isDocument]);
+    isEditable = showAll == NO && [arrayController filterPredicate] == nil && 
(macroResolver == [BDSKMacroResolver defaultMacroResolver] || [[macroResolver 
owner] isDocument]);
     
     [self updateButtons];
     [self reloadMacros];


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

-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference 
Register now and save $200. Hurry, offer ends at 11:59 p.m., 
Monday, April 7! Use priority code J8TLD2. 
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit

Reply via email to