mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed search in MacOSX

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-11-17 21:34:03 +01:00
parent 3b08d75d15
commit b8ba1e5b70
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
YACReaderLibrary/library_window.cpp
View File

@ -2067,7 +2067,7 @@ void LibraryWindow::toNormal()
void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter) void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter)
{ {
if(filter.isEmpty() && foldersModel->isFilterEnabled()) if(filter.isEmpty() && foldersModel->isFilterEnabled())
{ {
foldersModel->resetFilter(); foldersModel->resetFilter();
comicsView->enableFilterMode(false); comicsView->enableFilterMode(false);
//foldersView->collapseAll(); //foldersView->collapseAll();

13
custom_widgets/yacreader_macosx_toolbar.mm
View File

@ -94,11 +94,14 @@
- (IBAction)itemClicked:(id)sender - (IBAction)itemClicked:(id)sender
{ {
NSToolbarItem *item = reinterpret_cast<NSToolbarItem *>(sender); if([sender respondsToSelector:@selector(itemIdentifier)])
{
NSToolbarItem *item = reinterpret_cast<NSToolbarItem *>(sender);
QString identifier = QString::fromNSString([item itemIdentifier]); QString identifier = QString::fromNSString([item itemIdentifier]);
QMacToolBarItem *toolButton = reinterpret_cast<QMacToolBarItem *>(identifier.toULongLong()); QMacToolBarItem *toolButton = reinterpret_cast<QMacToolBarItem *>(identifier.toULongLong());
Q_EMIT toolButton->activated(); Q_EMIT toolButton->activated();
}
} }
- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdentifier willBeInsertedIntoToolbar:(BOOL) willBeInserted - (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdentifier willBeInsertedIntoToolbar:(BOOL) willBeInserted
@ -147,6 +150,7 @@
- (void)controlTextDidChange:(NSNotification *)notification { - (void)controlTextDidChange:(NSNotification *)notification {
NSTextField *textField = [notification object]; NSTextField *textField = [notification object];
NSLog(@"%@",[textField stringValue]);
Q_EMIT mylineedit->filterChanged(YACReader::NoModifiers, QString::fromNSString([textField stringValue])); Q_EMIT mylineedit->filterChanged(YACReader::NoModifiers, QString::fromNSString([textField stringValue]));
} }
@ -335,6 +339,7 @@ QString YACReaderMacOSXSearchLineEdit::text()
void YACReaderMacOSXSearchLineEdit::clear() void YACReaderMacOSXSearchLineEdit::clear()
{ {
[((NSTextField *)nstextfield) setStringValue:@""]; [((NSTextField *)nstextfield) setStringValue:@""];
emit filterChanged(YACReader::NoModifiers, "");
} }
void YACReaderMacOSXSearchLineEdit::setDisabled(bool disabled) void YACReaderMacOSXSearchLineEdit::setDisabled(bool disabled)