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

added preliminar search edit to the native toolbar in MacOSX

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-11-04 23:00:49 +01:00
parent b8d539dc38
commit aaa53c9456
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
YACReaderLibrary/library_window.cpp
View File

@ -822,7 +822,10 @@ void LibraryWindow::createToolBars()
libraryToolBar->addAction(toggleFullScreenAction); libraryToolBar->addAction(toggleFullScreenAction);
libraryToolBar->addStretch(); libraryToolBar->addStretch();
libraryToolBar->addWidget(searchEdit);
//Native toolbar search edit
//libraryToolBar->addWidget(searchEdit);
libraryToolBar->addSearchEdit();
//libraryToolBar->setMovable(false); //libraryToolBar->setMovable(false);

6
custom_widgets/yacreader_macosx_toolbar.h
View File

@ -19,8 +19,12 @@ public:
void hide(); void hide();
QMap<QString, QAction *> actions; QMap<QString, QAction *> actions;
signals: //convenience method for YACReaderLibrary search edit
void addSearchEdit();
signals:
//convenience signal for YACReaderLibrary search edit
void searchTextChanged(QString);
public slots: public slots:
protected: protected:

14
custom_widgets/yacreader_macosx_toolbar.mm
View File

@ -217,6 +217,7 @@ void YACReaderMacOSXToolbar::addStretch()
void YACReaderMacOSXToolbar::addWidget(QWidget *widget) void YACReaderMacOSXToolbar::addWidget(QWidget *widget)
{ {
//TODO fix it
/* QMacNativeWidget *nativeWidget = new QMacNativeWidget(); /* QMacNativeWidget *nativeWidget = new QMacNativeWidget();
QVBoxLayout *layout = new QVBoxLayout(); QVBoxLayout *layout = new QVBoxLayout();
layout->addWidget(widget); layout->addWidget(widget);
@ -238,3 +239,16 @@ void YACReaderMacOSXToolbar::hide()
{ {
[nativeToolBar setVisible:NO]; [nativeToolBar setVisible:NO];
} }
void YACReaderMacOSXToolbar::addSearchEdit()
{
QMacToolBarItem *toolBarItem = addItem(QIcon(),"");
NSToolbarItem * nativeItem = toolBarItem->nativeToolBarItem();
static const NSRect searchEditFrameRect = { { 0.0, 0.0 }, { 150, 24.0 } };
NSTextField * searchEdit = [[NSTextField alloc] initWithFrame:searchEditFrameRect];
[searchEdit setBezelStyle:NSTextFieldRoundedBezel];
[nativeItem setView:searchEdit];
}