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

fixed some graphic styles in MacOSX

Browse Source
This commit is contained in:
Luis Ángel San Martín 2015-01-19 21:49:27 +01:00
parent d01e49dd3f
commit bb2e55d0b6
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
YACReaderLibrary/images_osx.qrc
View File

@ -60,6 +60,5 @@
<file alias="images/lists/label_white@2x.png">../images/lists/label_white_osx@2x.png</file> <file alias="images/lists/label_white@2x.png">../images/lists/label_white_osx@2x.png</file>
<file alias="images/lists/label_yellow@2x.png">../images/lists/label_yellow_osx@2x.png</file> <file alias="images/lists/label_yellow@2x.png">../images/lists/label_yellow_osx@2x.png</file>
<file alias="images/lists/list@2x.png">../images/lists/list_osx@2x.png</file> <file alias="images/lists/list@2x.png">../images/lists/list_osx@2x.png</file>
<file alias="images/empty_reading_list@2x.png">../images/empty_reading_list_osx@2x.png</file>
</qresource> </qresource>
</RCC> </RCC>

2
YACReaderLibrary/library_window.cpp
View File

@ -788,7 +788,9 @@ void LibraryWindow::createActions()
this->addAction(setFolderAsNotCompletedAction); this->addAction(setFolderAsNotCompletedAction);
this->addAction(setFolderAsReadAction); this->addAction(setFolderAsReadAction);
this->addAction(setFolderAsUnreadAction); this->addAction(setFolderAsUnreadAction);
#ifndef Q_OS_MAC
this->addAction(toggleFullScreenAction); this->addAction(toggleFullScreenAction);
#endif
//disable actions //disable actions
disableAllActions(); disableAllActions();

5
custom_widgets/yacreader_library_item_widget.cpp
View File

@ -134,9 +134,10 @@ void YACReaderLibraryItemWidget::deselect()
void YACReaderLibraryItemWidget::select() void YACReaderLibraryItemWidget::select()
{ {
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QString styleSheet ="color: white; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;"; //QString styleSheet ="color: white; background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;";
QString styleSheet = "color: white; background-color:#91c4f4; border-bottom:1px solid #91c4f4;";
#else #else
QString styleSheet = "color: white; background-color:#2E2E2E; font-weight:bold;"; QString styleSheet = "color: white; background-color:#2E2E2E; font-weight:bold;";
#endif #endif
setStyleSheet(styleSheet); setStyleSheet(styleSheet);

7
custom_widgets/yacreader_sidebar.cpp
View File

@ -150,12 +150,7 @@ void YACReaderSideBar::paintEvent(QPaintEvent * event)
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
QPainter painter(this); QPainter painter(this);
QLinearGradient lG(0,0,0,height()); painter.fillRect(0,0,width(),height(),QColor("#F6F0F2"));
lG.setColorAt(0,QColor("#E8ECF1"));
lG.setColorAt(1,QColor("#D1D8E0"));
painter.fillRect(0,0,width(),height(),lG);
#else #else
QPainter painter(this); QPainter painter(this);

4
custom_widgets/yacreader_titled_toolbar.cpp
View File

@ -118,7 +118,11 @@ void YACReaderTitledToolBar::addSepartor()
QWidget * w = new QWidget(this); QWidget * w = new QWidget(this);
w->setFixedSize(1,14); w->setFixedSize(1,14);
#ifdef Q_OS_MAC
w->setStyleSheet("QWidget {background-color:#AFAFAF;}");
#else
w->setStyleSheet("QWidget {background-color:#6F6F6F;}"); w->setStyleSheet("QWidget {background-color:#6F6F6F;}");
#endif
mainLayout->addSpacing(10); mainLayout->addSpacing(10);
mainLayout->addWidget(w); mainLayout->addWidget(w);

8
custom_widgets/yacreader_treeview.cpp
View File

@ -21,7 +21,7 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent) :
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
bool oldStyle = false; bool oldStyle = false;
switch (QSysInfo::MacVersion()) /*switch (QSysInfo::MacVersion())
{ {
case QSysInfo::MV_SNOWLEOPARD: case QSysInfo::MV_SNOWLEOPARD:
case QSysInfo::MV_LION: case QSysInfo::MV_LION:
@ -32,7 +32,7 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent) :
default: default:
oldStyle = false; oldStyle = false;
break; break;
} }*/
if(oldStyle) if(oldStyle)
{ {
@ -56,8 +56,8 @@ YACReaderTreeView::YACReaderTreeView(QWidget *parent) :
else else
{ {
setStyleSheet("QTreeView {background-color:transparent; border: none;}" setStyleSheet("QTreeView {background-color:transparent; border: none;}"
"QTreeView::item:selected {background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;}" "QTreeView::item:selected {background-color:#91c4f4; border-top: 1px solid #91c4f4; border-left:none;border-right:none;border-bottom:1px solid #91c4f4;}"
"QTreeView::branch:selected {background-color:qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #6BAFE4, stop: 1 #3984D2); border-top: 2px solid qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #5EA3DF, stop: 1 #73B8EA); border-left:none;border-right:none;border-bottom:1px solid #3577C2;}" "QTreeView::branch:selected {background-color:#91c4f4; border-top: 1px solid #91c4f4; border-left:none;border-right:none;border-bottom:1px solid #91c4f4;}"
"QTreeView::branch:open:selected:has-children {image: url(':/images/expanded_branch_osx.png');}" "QTreeView::branch:open:selected:has-children {image: url(':/images/expanded_branch_osx.png');}"
"QTreeView::branch:closed:selected:has-children {image: url(':/images/collapsed_branch_osx.png');}" "QTreeView::branch:closed:selected:has-children {image: url(':/images/collapsed_branch_osx.png');}"