mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-21 06:24:39 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

replaced QToolBar by YACReaderMacOSXToolbar in YACReaderLibrary

Browse Source
This commit is contained in:
Luis Ángel San Martín
2014-11-04 21:58:45 +01:00
parent 9f81583a1b
commit 3cf2e2c3fa
2 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
YACReaderLibrary/library_window.cpp
View File

@ -161,7 +161,7 @@ void LibraryWindow::doLayout()
editInfoToolBar->setStyleSheet("QToolBar {border: none;}"); editInfoToolBar->setStyleSheet("QToolBar {border: none;}");
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryToolBar = addToolBar(tr("Library")); libraryToolBar = new YACReaderMacOSXToolbar(this);
#else #else
libraryToolBar = new YACReaderMainToolBar(this); libraryToolBar = new YACReaderMainToolBar(this);
#endif #endif
@ -803,14 +803,12 @@ void LibraryWindow::createToolBars()
{ {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
libraryToolBar->setIconSize(QSize(16,16)); //TODO make icon size dynamic //libraryToolBar->setIconSize(QSize(16,16)); //TODO make icon size dynamic
libraryToolBar->addAction(backAction); libraryToolBar->addAction(backAction);
libraryToolBar->addAction(forwardAction); libraryToolBar->addAction(forwardAction);
{QWidget * w = new QWidget(); libraryToolBar->addSpace(10);
w->setFixedWidth(10);
libraryToolBar->addWidget(w);}
#ifdef SERVER_RELEASE #ifdef SERVER_RELEASE
libraryToolBar->addAction(serverConfigAction); libraryToolBar->addAction(serverConfigAction);
@ -818,17 +816,17 @@ void LibraryWindow::createToolBars()
libraryToolBar->addAction(optionsAction); libraryToolBar->addAction(optionsAction);
libraryToolBar->addAction(helpAboutAction); libraryToolBar->addAction(helpAboutAction);
{ QWidget * w2 = new QWidget(); libraryToolBar->addSpace(10);
w2->setFixedWidth(10);
libraryToolBar->addWidget(w2);}
libraryToolBar->addAction(toggleComicsViewAction); libraryToolBar->addAction(toggleComicsViewAction);
libraryToolBar->addAction(toggleFullScreenAction); libraryToolBar->addAction(toggleFullScreenAction);
libraryToolBar->addWidget(new QToolBarStretch()); libraryToolBar->addStretch();
libraryToolBar->addWidget(searchEdit); libraryToolBar->addWidget(searchEdit);
libraryToolBar->setMovable(false); //libraryToolBar->setMovable(false);
libraryToolBar->attachToWindow(this->windowHandle());
#else #else
@ -2330,7 +2328,9 @@ void LibraryWindow::showNoLibrariesWidget()
void LibraryWindow::showRootWidget() void LibraryWindow::showRootWidget()
{ {
#ifndef Q_OS_MAC
libraryToolBar->setDisabled(false); libraryToolBar->setDisabled(false);
#endif
searchEdit->setEnabled(true); searchEdit->setEnabled(true);
mainWidget->setCurrentIndex(0); mainWidget->setCurrentIndex(0);
} }
@ -2339,7 +2339,9 @@ void LibraryWindow::showImportingWidget()
{ {
disableAllActions(); disableAllActions();
importWidget->clear(); importWidget->clear();
#ifndef Q_OS_MAC
libraryToolBar->setDisabled(true); libraryToolBar->setDisabled(true);
#endif
searchEdit->setDisabled(true); searchEdit->setDisabled(true);
mainWidget->setCurrentIndex(2); mainWidget->setCurrentIndex(2);
} }

6
YACReaderLibrary/library_window.h
View File

@ -8,6 +8,10 @@
#include "yacreader_global.h" #include "yacreader_global.h"
#include <yacreader_libraries.h> #include <yacreader_libraries.h>
#ifdef Q_OS_MAC
#include "yacreader_macosx_toolbar.h"
#endif
class QTreeView; class QTreeView;
class QDirModel; class QDirModel;
class QAction; class QAction;
@ -200,7 +204,7 @@ private:
QList<QAction *> viewActions; QList<QAction *> viewActions;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QToolBar * libraryToolBar; YACReaderMacOSXToolbar * libraryToolBar;
#else #else
YACReaderMainToolBar * libraryToolBar; YACReaderMainToolBar * libraryToolBar;
#endif #endif