From b8ba1e5b70bdf62098115700cbc2701e3c2a95cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Mon, 17 Nov 2014 21:34:03 +0100 Subject: [PATCH] fixed search in MacOSX --- YACReaderLibrary/library_window.cpp | 2 +- custom_widgets/yacreader_macosx_toolbar.mm | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp index 86c1b6c3..cfd62ad9 100644 --- a/YACReaderLibrary/library_window.cpp +++ b/YACReaderLibrary/library_window.cpp @@ -2067,7 +2067,7 @@ void LibraryWindow::toNormal() void LibraryWindow::setSearchFilter(const YACReader::SearchModifiers modifier, QString filter) { if(filter.isEmpty() && foldersModel->isFilterEnabled()) - { + { foldersModel->resetFilter(); comicsView->enableFilterMode(false); //foldersView->collapseAll(); diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm index 7a20ce75..0bb7c1ae 100644 --- a/custom_widgets/yacreader_macosx_toolbar.mm +++ b/custom_widgets/yacreader_macosx_toolbar.mm @@ -94,11 +94,14 @@ - (IBAction)itemClicked:(id)sender { - NSToolbarItem *item = reinterpret_cast(sender); + if([sender respondsToSelector:@selector(itemIdentifier)]) + { + NSToolbarItem *item = reinterpret_cast(sender); - QString identifier = QString::fromNSString([item itemIdentifier]); - QMacToolBarItem *toolButton = reinterpret_cast(identifier.toULongLong()); - Q_EMIT toolButton->activated(); + QString identifier = QString::fromNSString([item itemIdentifier]); + QMacToolBarItem *toolButton = reinterpret_cast(identifier.toULongLong()); + Q_EMIT toolButton->activated(); + } } - (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdentifier willBeInsertedIntoToolbar:(BOOL) willBeInserted @@ -147,6 +150,7 @@ - (void)controlTextDidChange:(NSNotification *)notification { NSTextField *textField = [notification object]; + NSLog(@"%@",[textField stringValue]); Q_EMIT mylineedit->filterChanged(YACReader::NoModifiers, QString::fromNSString([textField stringValue])); } @@ -335,6 +339,7 @@ QString YACReaderMacOSXSearchLineEdit::text() void YACReaderMacOSXSearchLineEdit::clear() { [((NSTextField *)nstextfield) setStringValue:@""]; + emit filterChanged(YACReader::NoModifiers, ""); } void YACReaderMacOSXSearchLineEdit::setDisabled(bool disabled)