diff --git a/YACReaderLibrary/YACReaderLibrary.pro b/YACReaderLibrary/YACReaderLibrary.pro index 7a396a70..bb4f8252 100644 --- a/YACReaderLibrary/YACReaderLibrary.pro +++ b/YACReaderLibrary/YACReaderLibrary.pro @@ -209,6 +209,9 @@ SOURCES += grid_comics_view.cpp \ comics_view_transition.cpp RESOURCES += qml.qrc +win32:RESOURCES += qml_win.qrc +unix:!macx:RESOURCES += qml_win.qrc +macx:RESOURCES += qml_osx.qrc } else { Release:DESTDIR = ../release diff --git a/YACReaderLibrary/grid_comics_view.cpp b/YACReaderLibrary/grid_comics_view.cpp index a8effdd9..257c2d63 100644 --- a/YACReaderLibrary/grid_comics_view.cpp +++ b/YACReaderLibrary/grid_comics_view.cpp @@ -64,8 +64,8 @@ void GridComicsView::setModel(TableModel *model) } #ifdef Q_OS_MAC - ctxt->setContextProperty("backgroundColor", "#FAFAFA"); - ctxt->setContextProperty("cellColor", "#EDEDED"); + ctxt->setContextProperty("backgroundColor", "#EDEDED"); + ctxt->setContextProperty("cellColor", "#FFFFFF"); ctxt->setContextProperty("selectedColor", "#DDDDDD"); ctxt->setContextProperty("titleColor", "#121212"); ctxt->setContextProperty("textColor", "#636363"); diff --git a/YACReaderLibrary/qml.qrc b/YACReaderLibrary/qml.qrc index ec494823..a02ccead 100644 --- a/YACReaderLibrary/qml.qrc +++ b/YACReaderLibrary/qml.qrc @@ -2,8 +2,6 @@ qml/GridComicsView.qml qml/YACReaderScrollView.qml - qml/page.png - qml/star.png qml/tick.png qml/reading.png diff --git a/YACReaderLibrary/qml/page-macosx.png b/YACReaderLibrary/qml/page-macosx.png new file mode 100644 index 00000000..c8216591 Binary files /dev/null and b/YACReaderLibrary/qml/page-macosx.png differ diff --git a/YACReaderLibrary/qml/star-macosx.png b/YACReaderLibrary/qml/star-macosx.png new file mode 100644 index 00000000..37577a74 Binary files /dev/null and b/YACReaderLibrary/qml/star-macosx.png differ diff --git a/YACReaderLibrary/qml_osx.qrc b/YACReaderLibrary/qml_osx.qrc new file mode 100644 index 00000000..85397d2f --- /dev/null +++ b/YACReaderLibrary/qml_osx.qrc @@ -0,0 +1,6 @@ + + + qml/page-macosx.png + qml/star-macosx.png + + diff --git a/YACReaderLibrary/qml_win.qrc b/YACReaderLibrary/qml_win.qrc new file mode 100644 index 00000000..59e2872f --- /dev/null +++ b/YACReaderLibrary/qml_win.qrc @@ -0,0 +1,6 @@ + + + qml/page.png + qml/star.png + +