From 97fb8fd85bf1cfd08a29571fbb0205e5edbb9481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Thu, 20 Aug 2015 22:46:14 +0200 Subject: [PATCH] new style for sidebar titles in OSX --- custom_widgets/yacreader_sidebar.cpp | 10 ++++++++-- custom_widgets/yacreader_titled_toolbar.cpp | 7 ++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/custom_widgets/yacreader_sidebar.cpp b/custom_widgets/yacreader_sidebar.cpp index fa9dd5d8..e94ec481 100644 --- a/custom_widgets/yacreader_sidebar.cpp +++ b/custom_widgets/yacreader_sidebar.cpp @@ -23,9 +23,15 @@ YACReaderSideBar::YACReaderSideBar(QWidget *parent) : readingListsView = new YACReaderReadingListsView; selectedLibrary = new YACReaderLibraryListWidget; - librariesTitle = new YACReaderTitledToolBar(tr("LIBRARIES")); - foldersTitle = new YACReaderTitledToolBar(tr("FOLDERS")); +#ifdef Q_OS_MAC + librariesTitle = new YACReaderTitledToolBar(tr("Libraries")); + foldersTitle = new YACReaderTitledToolBar(tr("Folders")); + readingListsTitle = new YACReaderTitledToolBar(tr("Reading Lists")); +#else + librariesTitle = new YACReaderTitledToolBar(tr("LIBRARIES")); + foldersTitle = new YACReaderTitledToolBar(tr("FOLDERS")); readingListsTitle = new YACReaderTitledToolBar(tr("READING LISTS")); +#endif splitter = new QSplitter(this); splitter->setOrientation(Qt::Vertical); diff --git a/custom_widgets/yacreader_titled_toolbar.cpp b/custom_widgets/yacreader_titled_toolbar.cpp index a1d9a973..ce337cc8 100644 --- a/custom_widgets/yacreader_titled_toolbar.cpp +++ b/custom_widgets/yacreader_titled_toolbar.cpp @@ -40,8 +40,9 @@ void DropShadowLabel::paintEvent(QPaintEvent *event) QPainter painter(this); painter.setFont(font()); - //TODO find where is the '3' comming from? +#ifndef Q_OS_MAC drawTextEffect(&painter, QPoint(contentsMargins().left(), 1)); +#endif drawText(&painter, QPoint(contentsMargins().left(), 0)); } @@ -71,8 +72,8 @@ YACReaderTitledToolBar::YACReaderTitledToolBar(const QString & title, QWidget *p nameLabel->setText(title); #ifdef Q_OS_MAC QString nameLabelStyleSheet = "QLabel {padding:0 0 0 10px; margin:0px; font-size:11px; font-weight:bold;}"; - nameLabel->setColor(QColor("#707E8C")); - nameLabel->setDropShadowColor(QColor("#F9FAFB")); + nameLabel->setColor(QColor("#808080")); + //nameLabel->setDropShadowColor(QColor("#F9FAFB")); #else QString nameLabelStyleSheet = "QLabel {padding:0 0 0 10px; margin:0px; font-size:11px; font-weight:bold;}"; nameLabel->setColor(QColor("#BDBFBF"));