Reduced code duplication among editions in ResultsWindow.

2026-01-22 14:41:39 +00:00 · 2010-02-06 11:40:10 +01:00
parent d4db8faad8
commit 64c67e19d2
8 changed files with 137 additions and 418 deletions
--- a/cocoa/base/ResultWindow.h
+++ b/cocoa/base/ResultWindow.h
@@ -24,10 +24,12 @@ http://www.hardcoded.net/licenses/hs_license
 	IBOutlet NSSegmentedControl *pmSwitch;
 	IBOutlet NSTextField *stats;
 	IBOutlet NSMenu *columnsMenu;
+	IBOutlet NSSearchField *filterField;
    
    BOOL _powerMode;
    BOOL _displayDelta;
    NSMutableArray *_resultColumns;
+    NSMutableIndexSet *_deltaColumns;
    NSWindowController *preferencesPanel;
 }
 /* Helpers */
@@ -44,17 +46,30 @@ http://www.hardcoded.net/licenses/hs_license
 - (void)restoreColumnsPosition:(NSArray *)aColumnsOrder widths:(NSDictionary *)aColumnsWidth;

 /* Actions */
+- (IBAction)clearIgnoreList:(id)sender;
 - (IBAction)changeDelta:(id)sender;
 - (IBAction)changePowerMarker:(id)sender;
 - (IBAction)copyMarked:(id)sender;
 - (IBAction)deleteMarked:(id)sender;
 - (IBAction)expandAll:(id)sender;
 - (IBAction)exportToXHTML:(id)sender;
+- (IBAction)filter:(id)sender;
+- (IBAction)ignoreSelected:(id)sender;
+- (IBAction)markAll:(id)sender;
+- (IBAction)markInvert:(id)sender;
+- (IBAction)markNone:(id)sender;
+- (IBAction)markSelected:(id)sender;
+- (IBAction)markToggle:(id)sender;
 - (IBAction)moveMarked:(id)sender;
+- (IBAction)removeMarked:(id)sender;
+- (IBAction)removeSelected:(id)sender;
+- (IBAction)renameSelected:(id)sender;
 - (IBAction)resetColumnsToDefault:(id)sender;
+- (IBAction)revealSelected:(id)sender;
 - (IBAction)showPreferencesPanel:(id)sender;
 - (IBAction)switchSelected:(id)sender;
 - (IBAction)toggleColumn:(id)sender;
+- (IBAction)toggleDelta:(id)sender;
 - (IBAction)toggleDetailsPanel:(id)sender;
 - (IBAction)togglePowerMarker:(id)sender;

--- a/cocoa/base/ResultWindow.m
+++ b/cocoa/base/ResultWindow.m
@@ -216,6 +216,16 @@ http://www.hardcoded.net/licenses/hs_license
 }

 /* Actions */
+- (IBAction)clearIgnoreList:(id)sender
+{
+    NSInteger i = n2i([py getIgnoreListCount]);
+    if (!i)
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"Do you really want to remove all %d items from the ignore list?",i]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [py clearIgnoreList];
+}
+
 - (IBAction)changeDelta:(id)sender
 {
    _displayDelta = [deltaSwitch selectedSegment] == 1;
@@ -279,6 +289,60 @@ http://www.hardcoded.net/licenses/hs_license
    [[NSWorkspace sharedWorkspace] openFile:exported];
 }

+- (IBAction)filter:(id)sender
+{
+    NSUserDefaults *ud = [NSUserDefaults standardUserDefaults];
+    [py setEscapeFilterRegexp:b2n(!n2b([ud objectForKey:@"useRegexpFilter"]))];
+    [py applyFilter:[filterField stringValue]];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)ignoreSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"All selected %d matches are going to be ignored in all subsequent scans. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py addSelectedToIgnoreList];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)markAll:(id)sender
+{
+    [py markAll];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markInvert:(id)sender
+{
+    [py markInvert];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markNone:(id)sender
+{
+    [py markNone];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
+- (IBAction)markToggle:(id)sender
+{
+    OVNode *node = [matches itemAtRow:[matches clickedRow]];
+    [self performPySelection:[NSArray arrayWithObject:p2a([node indexPath])]];
+    [py toggleSelectedMark];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsMarkingChangedNotification object:self];
+}
+
 - (IBAction)moveMarked:(id)sender
 {
    NSInteger mark_count = [[py getMarkCount] intValue];
@@ -299,11 +363,58 @@ http://www.hardcoded.net/licenses/hs_license
    }
 }

+- (IBAction)openSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py openSelected];
+}
+
+- (IBAction)refresh:(id)sender
+{
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)removeMarked:(id)sender
+{
+    int mark_count = [[py getMarkCount] intValue];
+    if (!mark_count)
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",mark_count]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [py removeMarked];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)removeSelected:(id)sender
+{
+    NSArray *nodeList = [self getSelected:YES];
+    if (![nodeList count])
+        return;
+    if ([Dialogs askYesNo:[NSString stringWithFormat:@"You are about to remove %d files from results. Continue?",[nodeList count]]] == NSAlertSecondButtonReturn) // NO
+        return;
+    [self performPySelection:[self getSelectedPaths:YES]];
+    [py removeSelected];
+    [[NSNotificationCenter defaultCenter] postNotificationName:ResultsChangedNotification object:self];
+}
+
+- (IBAction)renameSelected:(id)sender
+{
+    NSInteger col = [matches columnWithIdentifier:@"0"];
+    NSInteger row = [matches selectedRow];
+    [matches editColumn:col row:row withEvent:[NSApp currentEvent] select:YES];
+}
+
 - (IBAction)resetColumnsToDefault:(id)sender
 {
    // Virtual
 }

+- (IBAction)revealSelected:(id)sender
+{
+    [self performPySelection:[self getSelectedPaths:NO]];
+    [py revealSelected];
+}
+
 - (IBAction)showPreferencesPanel:(id)sender
 {
    [preferencesPanel showWindow:sender];
@@ -347,6 +458,15 @@ http://www.hardcoded.net/licenses/hs_license
    }
 }

+- (IBAction)toggleDelta:(id)sender
+{
+    if ([deltaSwitch selectedSegment] == 1)
+        [deltaSwitch setSelectedSegment:0];
+    else
+        [deltaSwitch setSelectedSegment:1];
+    [self changeDelta:sender];
+}
+
 - (IBAction)toggleDetailsPanel:(id)sender
 {
    [[(AppDelegateBase *)app detailsPanel] toggleVisibility];