Apple-2-Tools/ample
1
0
Fork 0
mirror of https://github.com/ksherlock/ample.git synced 2026-03-11 07:42:10 +00:00
Code Issues Projects Releases Wiki Activity

add a search field to the rom window.

Browse Source
This commit is contained in:
Kelvin Sherlock
2026-01-11 15:16:31 -05:00
parent 2efdcc268b
commit 94517dc396
2 changed files with 66 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Ample/Base.lproj/DownloadWindow.xib
View File

@@ -13,6 +13,7 @@
<outlet property="downloadField" destination="sJz-So-jbA" id="WjK-48-FcE"/>
<outlet property="formatButton" destination="2Rg-eX-DUq" id="oYo-MG-Sc6"/>
<outlet property="missingFilterButton" destination="6c7-tU-3F3" id="89Y-wQ-9pB"/>
<outlet property="searchFilter" destination="EuH-NO-RLR" id="ZtY-CC-pgz"/>
<outlet property="tableView" destination="FLX-Wt-y53" id="a4O-pk-EAt"/>
<outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
</connections>
@@ -251,7 +252,6 @@
<toolbar key="toolbar" implicitIdentifier="B60021E6-BFBC-44E6-97DC-120AA9FD3269" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconOnly" sizeMode="regular" id="kpz-W4-xgh">
<allowedToolbarItems>
<toolbarItem implicitItemIdentifier="NSToolbarSpaceItem" id="tbY-ts-Irb"/>
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="3Kc-zG-IdN"/>
<toolbarItem implicitItemIdentifier="BD743A15-0B61-48FF-9EED-FD8D57EF8459" label="All" paletteLabel="All" tag="1" sizingBehavior="auto" id="Jj0-n8-I5a">
<nil key="toolTip"/>
<button key="view" verticalHuggingPriority="750" tag="1" id="Kgj-LP-FsF">
@@ -280,10 +280,28 @@
</connections>
</button>
</toolbarItem>
<toolbarItem implicitItemIdentifier="NSToolbarFlexibleSpaceItem" id="3Kc-zG-IdN"/>
<toolbarItem implicitItemIdentifier="5FAD9453-A303-4057-A122-37BF870A4D81" label="Search" paletteLabel="Search" tag="3" sizingBehavior="auto" id="kT0-k4-f7d">
<nil key="toolTip"/>
<searchField key="view" wantsLayer="YES" verticalHuggingPriority="750" tag="3" textCompletion="NO" id="EuH-NO-RLR">
<rect key="frame" x="0.0" y="14" width="96" height="22"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<searchFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" usesSingleLineMode="YES" bezelStyle="round" id="6vV-pw-9Ej">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</searchFieldCell>
<connections>
<action selector="search:" target="-2" id="JsE-wh-qQV"/>
</connections>
</searchField>
</toolbarItem>
</allowedToolbarItems>
<defaultToolbarItems>
<toolbarItem reference="Jj0-n8-I5a"/>
<toolbarItem reference="GV4-aX-5Ox"/>
<toolbarItem reference="3Kc-zG-IdN"/>
<toolbarItem reference="kT0-k4-f7d"/>
</defaultToolbarItems>
</toolbar>
<connections>

53
Ample/DownloadWindowController.m
View File

@@ -133,6 +133,7 @@ enum {
/* filter buttons */
@property (weak) IBOutlet NSButton *allFilterButton;
@property (weak) IBOutlet NSButton *missingFilterButton;
@property (weak) IBOutlet NSSearchField *searchFilter;
@property (strong) IBOutlet NSArrayController *arrayController;
@@ -152,6 +153,11 @@ enum {
NSUserDefaults *_defaults;
NSArray<NSButton *> *_filterButtons;
NSPredicate *_missingPredicate;
NSPredicate *_searchPredicate;
}
+(instancetype)sharedInstance {
@@ -519,30 +525,65 @@ enum {
}
-(void)updatePredicate {
if (!_missingPredicate && !_searchPredicate) {
[_arrayController setFilterPredicate: nil];
return;
}
if (_missingPredicate && !_searchPredicate) {
[_arrayController setFilterPredicate: _missingPredicate];
return;
}
if (_searchPredicate && !_missingPredicate) {
[_arrayController setFilterPredicate: _searchPredicate];
return;
}
NSCompoundPredicate *p = [NSCompoundPredicate andPredicateWithSubpredicates: @[ _missingPredicate, _searchPredicate]];
[_arrayController setFilterPredicate: p];
}
- (IBAction)filterButton:(id)sender {
NSPredicate *p = nil;
NSUInteger tag = [sender tag];
[sender setState: NSControlStateValueOn];
for (NSButton *b in _filterButtons) {
if (b != sender) [b setState: NSControlStateValueOff];
}
switch (tag) {
case 1: // all
default:
[_arrayController setFilterPredicate: nil];
_missingPredicate = nil;
break;
case 2: // missing.
p = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
_missingPredicate = [NSPredicate predicateWithBlock: ^BOOL(DownloadItem *item, NSDictionary *bindings){
NSURL *localURL = [item localURL];
return localURL == nil;
}];
[_arrayController setFilterPredicate: p];
break;
}
[self updatePredicate];
}
- (IBAction)search:(id)sender {
NSString *text = [sender stringValue];
if (![text length]) {
_searchPredicate = nil;
} else {
text = [text lowercaseString];
NSPredicate *p = [NSPredicate predicateWithBlock: ^(DownloadItem *item, NSDictionary *bindings){
NSString *value = [[item value] lowercaseString];
NSString *name = [[item name] lowercaseString];
BOOL ok = [name containsString: text] || [value containsString: text];
return ok;
}];
_searchPredicate = p;
}
[self updatePredicate];
}