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

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

View File

@ -23,7 +23,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
readingListsView = new YACReaderReadingListsView;
selectedLibrary = new YACReaderLibraryListWidget;
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
librariesTitle = new YACReaderTitledToolBar(tr("Libraries"));
foldersTitle = new YACReaderTitledToolBar(tr("Folders"));
readingListsTitle = new YACReaderTitledToolBar(tr("Reading Lists"));
@ -36,7 +36,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
splitter = new QSplitter(this);
splitter->setOrientation(Qt::Vertical);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
splitter->setStyleSheet("QSplitter::handle { "
" image: none; background-color = black; "
" }"
@ -55,20 +55,20 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
l->setContentsMargins(0, 0, 0, 0);
// LIBRARIES-------------------------------------------------------
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
l->addSpacing(5);
#endif
l->addWidget(librariesTitle);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
l->addSpacing(4);
l->addWidget(new YACReaderSideBarSeparator(this));
l->addSpacing(3);
#endif
l->addWidget(selectedLibrary);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
l->addSpacing(11);
#else
l->addSpacing(6);
@ -82,7 +82,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
foldersLayout->setContentsMargins(0, 0, 0, 0);
foldersLayout->setSpacing(0);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
// foldersLayout->addSpacing(6);
// foldersLayout->addSpacing(5);
@ -94,7 +94,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
foldersLayout->addWidget(foldersTitle);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
foldersLayout->addSpacing(4);
foldersLayout->addWidget(new YACReaderSideBarSeparator(this));
foldersLayout->addSpacing(4);
@ -114,7 +114,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
readingListsHeaderLayout->setContentsMargins(0, 0, 0, 0);
readingListsHeaderLayout->setSpacing(0);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
// readingListsHeaderLayout->addSpacing(6);
// readingListsHeaderLayout->addSpacing(5);
@ -126,7 +126,7 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent)
readingListsHeaderLayout->addWidget(readingListsTitle);
#ifndef Q_OS_MAC
#ifndef Y_MAC_UI
readingListsHeaderLayout->addSpacing(4);
readingListsHeaderLayout->addWidget(new YACReaderSideBarSeparator(this));
readingListsHeaderLayout->addSpacing(4);
@ -152,7 +152,7 @@ void YACReaderSideBar::paintEvent(QPaintEvent *event)
{
Q_UNUSED(event)
#ifdef Q_OS_MAC
#ifdef Y_MAC_UI
QPainter painter(this);
painter.fillRect(0, 0, width(), height(), QColor("#F1F1F1"));