From 8e6347801baf2911eac9a88c661264096eaf334f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Sat, 19 Jul 2014 08:57:48 +0200 Subject: [PATCH] updated grid UI design for OSX --- YACReaderLibrary/YACReaderLibrary.pro | 3 +++ YACReaderLibrary/grid_comics_view.cpp | 4 ++-- YACReaderLibrary/qml.qrc | 2 -- YACReaderLibrary/qml/page-macosx.png | Bin 0 -> 171 bytes YACReaderLibrary/qml/star-macosx.png | Bin 0 -> 288 bytes YACReaderLibrary/qml_osx.qrc | 6 ++++++ YACReaderLibrary/qml_win.qrc | 6 ++++++ 7 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 YACReaderLibrary/qml/page-macosx.png create mode 100644 YACReaderLibrary/qml/star-macosx.png create mode 100644 YACReaderLibrary/qml_osx.qrc create mode 100644 YACReaderLibrary/qml_win.qrc 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 0000000000000000000000000000000000000000..c8216591679ffb2e0dac358288275c4ce8d539ce GIT binary patch literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^96-#)!3HEdkIOdzDajJoh?3y^w370~qErUQl>DSr z1<%~X^wgl##FWaylc_d9MZTUcjv*Ddl6d&}|DSK*6bfGxv60~nlO_Wbn*`g(g%*rQ z(i0ExF*Q~=y12A3>9M|ESYq48wBT-!f!T$Y|2{k{46-5{4#+fnGdeUdGC1cdp31NN R!3#8)!PC{xWt~$(697>)GP3{x literal 0 HcmV?d00001 diff --git a/YACReaderLibrary/qml/star-macosx.png b/YACReaderLibrary/qml/star-macosx.png new file mode 100644 index 0000000000000000000000000000000000000000..37577a74c8a41fc0fefcab1b1fe49c750f2ee8ac GIT binary patch literal 288 zcmV+*0pI?KP)C24IAC14hUQ z{YySGLN_QQFan?XWQ4LoH)uNnY>?WLi7H4=I{CQR_rj!rre}xA-v7M^7fDX>;cf~LG0Dm%$F|N521bkdXAUS~WA?lm?MZ7#7tIvulm>39y z^0RoR(IeYhR2qTw+usVKMhmq=u>Go$FUqaTSFcB63jr5@3tQ!@qV0MlUxilrY|T!@ m`KRr){7>jM>~=Ii0R{k? + + 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 + +