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

first version of native NSToolbar working, it still needs some work for adding the adjust to width slider in YACReder and the search edit in YACReaderLibrary

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-11-04 20:01:48 +01:00
parent 38b98888a9
commit 9f81583a1b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
YACReader/main_window_viewer.cpp
View File

@ -123,7 +123,7 @@ void MainWindowViewer::setupUI()
{
setWindowIcon(QIcon(":/images/icon.png"));
setUnifiedTitleAndToolBarOnMac(true);
//setUnifiedTitleAndToolBarOnMac(true);
viewer = new Viewer(this);
connect(viewer,SIGNAL(reset()),this,SLOT(processReset()));
@ -427,6 +427,10 @@ void MainWindowViewer::createToolBars()
comicToolBar->setStyleSheet("QToolBar{border:none;}");
#endif
#ifdef Q_OS_MAC
comicToolBar->addAction(openAction);
comicToolBar->addAction(openFolderAction);
#else
QToolButton * tb = new QToolButton();
tb->addAction(openAction);
tb->addAction(openFolderAction);
@ -434,6 +438,7 @@ void MainWindowViewer::createToolBars()
tb->setDefaultAction(openAction);
comicToolBar->addWidget(tb);
#endif
comicToolBar->addAction(saveImageAction);
comicToolBar->addAction(openPreviousComicAction);
comicToolBar->addAction(openNextComicAction);
@ -471,8 +476,11 @@ void MainWindowViewer::createToolBars()
//comicToolBar->addAction(adjustWidth);
#ifdef Q_OS_MAC
comicToolBar->addAction(adjustWidthAction);
#else
QMenu * menu = new QMenu();
sliderAction = new YACReaderSliderAction(this);
menu->setAutoFillBackground(false);
@ -491,6 +499,8 @@ void MainWindowViewer::createToolBars()
tb2->setPopupMode(QToolButton::MenuButtonPopup);
tb2->setDefaultAction(adjustWidthAction);
comicToolBar->addWidget(tb2);
#endif
comicToolBar->addAction(adjustHeightAction);
comicToolBar->addAction(adjustToFullSizeAction);
comicToolBar->addAction(leftRotationAction);

7
custom_widgets/yacreader_macosx_toolbar.mm
View File

@ -91,7 +91,10 @@
- (IBAction)itemClicked:(id)sender
{
NSToolbarItem *item = reinterpret_cast<NSToolbarItem *>(sender);
//toolbarPrivate->itemClicked(item);
QString identifier = QString::fromNSString([item itemIdentifier]);
QMacToolBarItem *toolButton = reinterpret_cast<QMacToolBarItem *>(identifier.toULongLong());
Q_EMIT toolButton->activated();
}
- (NSToolbarItem *) toolbar: (NSToolbar *)toolbar itemForItemIdentifier: (NSString *) itemIdentifier willBeInsertedIntoToolbar:(BOOL) willBeInserted
@ -100,8 +103,6 @@
Q_UNUSED(willBeInserted);
QList<QMacToolBarItem *> items = mytoolbar->items();
int i = [itemIdentifier intValue];
foreach (const QMacToolBarItem * item, items) {
NSToolbarItem *toolbarItem = item->nativeToolBarItem();
if([toolbarItem.itemIdentifier isEqual:itemIdentifier])