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

Don't use Q_OS_MAC for ui specifics, Y_MAC_UI is the replacement

Browse Source
This commit is contained in:
Luis Ángel San Martín
2023-05-23 18:51:33 +02:00
parent b45fabe057
commit 315d2deced
28 changed files with 78 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
YACReader/main_window_viewer.cpp
View File

@ -472,7 +472,7 @@ QAction *MainWindowViewer::addActionWithShortcut(const QString &text, const QStr
void MainWindowViewer::createToolBars()
{
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
comicToolBar = new YACReaderMacOSXToolbar(this);
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
comicToolBar->setIconSize(QSize(18, 18));
@ -481,12 +481,12 @@ void MainWindowViewer::createToolBars()
comicToolBar = addToolBar(tr("&File"));
#endif
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
comicToolBar->setStyleSheet("QToolBar{border:none;}");
comicToolBar->setIconSize(QSize(18, 18));
#endif
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/open")), openAction));
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/openFolder")), openFolderAction));
#else
@ -564,7 +564,7 @@ void MainWindowViewer::createToolBars()
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/flow")), showFlowAction));
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/info")), showInfoAction));
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
comicToolBar->addStretch();
#else
comicToolBar->addWidget(new YACReaderToolBarStretch());
@ -574,7 +574,7 @@ void MainWindowViewer::createToolBars()
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/options")), optionsAction));
comicToolBar->addAction(actionWithCustomIcon(QIcon(addExtensionToIconPathInToolbar(":/images/viewer_toolbar/help")), helpAboutAction));
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
comicToolBar->setMovable(false);
#endif
@ -1061,7 +1061,7 @@ void MainWindowViewer::toggleToolBars()
toolbars ? hideToolBars() : showToolBars();
Configuration::getConfiguration().setShowToolbars(toolbars);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
comicToolBar->setMovable(false);
#endif
}
@ -1289,7 +1289,7 @@ void MainWindowViewer::toggleFitToWidthSlider()
{
int y;
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
y = 0;
#else
y = this->comicToolBar->frameSize().height();

4
YACReader/main_window_viewer.h
View File

@ -8,7 +8,7 @@
#include <QCloseEvent>
#include <QSettings>
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
#include "yacreader_macosx_toolbar.h"
#endif
@ -102,7 +102,7 @@ private:
EditShortcutsDialog *editShortcutsDialog;
//! ToolBars
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
YACReaderMacOSXToolbar *comicToolBar;
#else
QToolBar *comicToolBar;

2
YACReader/notifications_label_widget.cpp
View File

@ -28,7 +28,7 @@ NotificationsLabelWidget::NotificationsLabelWidget(QWidget *parent)
textLabel->setFixedSize(200, 120);
// TODO check if the effects still be broken in OSX yet
// TODO check if the effects are still broken in OSX
#ifndef Q_OS_MAC
this->setGraphicsEffect(effect);
#endif

2
YACReader/viewer.cpp
View File

@ -952,7 +952,7 @@ void Viewer::configureContent(QString msg)
void Viewer::hideCursor()
{
#ifdef Q_OS_MAC
#ifdef Q_OS_MAC // TODO_Y_MAC_UI isn't BlankCursor supported in macos?
setCursor(QCursor(QBitmap(1, 1), QBitmap(1, 1)));
#else
setCursor(Qt::BlankCursor);