From a6210d6eee77d31d0f414a4992044a9d4ab59c3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 21 Nov 2014 23:49:18 +0100 Subject: [PATCH] fixed compilation in MacOSX --- YACReaderLibrary/empty_label_widget.cpp | 3 ++- YACReaderLibrary/images.qrc | 1 + YACReaderLibrary/images_osx.qrc | 1 - YACReaderLibrary/images_win.qrc | 1 - common/yacreader_global.cpp | 5 +++-- images/empty_label_osx.png | Bin 2637 -> 0 bytes 6 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 images/empty_label_osx.png diff --git a/YACReaderLibrary/empty_label_widget.cpp b/YACReaderLibrary/empty_label_widget.cpp index e1a5350e..d530dad8 100644 --- a/YACReaderLibrary/empty_label_widget.cpp +++ b/YACReaderLibrary/empty_label_widget.cpp @@ -38,7 +38,8 @@ void EmptyLabelWidget::setColor(YACReader::LabelColors color) { QPixmap p(":/images/empty_label.png"); QImage img = p.toImage().convertToFormat(QImage::Format_ARGB32); - YACReader::colorize(img,QColor(YACReader::labelColorToRGBString(color))); + QColor destColor(YACReader::labelColorToRGBString(color)); + YACReader::colorize(img,destColor); iconLabel->setPixmap(QPixmap::fromImage(img)); } diff --git a/YACReaderLibrary/images.qrc b/YACReaderLibrary/images.qrc index 356907f6..a6e4be01 100644 --- a/YACReaderLibrary/images.qrc +++ b/YACReaderLibrary/images.qrc @@ -111,6 +111,7 @@ ../images/shortcuts_group_reading.png ../images/shortcuts_group_visualization.png ../images/searching_icon.png + ../images/empty_label.png diff --git a/YACReaderLibrary/images_osx.qrc b/YACReaderLibrary/images_osx.qrc index 9d873f1a..65aed99b 100644 --- a/YACReaderLibrary/images_osx.qrc +++ b/YACReaderLibrary/images_osx.qrc @@ -25,7 +25,6 @@ ../images/flow_to_grid.gif ../images/grid_to_flow.gif ../images/empty_folder_osx.png - ../images/empty_label_osx.png ../images/empty_search_osx.png ../images/iconSearch.png ../images/clearSearch.png diff --git a/YACReaderLibrary/images_win.qrc b/YACReaderLibrary/images_win.qrc index 40f2f769..f0f62517 100644 --- a/YACReaderLibrary/images_win.qrc +++ b/YACReaderLibrary/images_win.qrc @@ -19,7 +19,6 @@ ../images/flow_to_grid.gif ../images/grid_to_flow.gif ../images/empty_folder.png - ../images/empty_label.png ../images/empty_search.png ../images/addNew_sidebar.png ../images/delete_sidebar.png diff --git a/common/yacreader_global.cpp b/common/yacreader_global.cpp index 09bf8a54..1d445a41 100644 --- a/common/yacreader_global.cpp +++ b/common/yacreader_global.cpp @@ -114,16 +114,17 @@ QString YACReader::labelColorToRGBString(LabelColors color) return "#FF9FDD"; #ifdef Q_OS_MAC - case YWhite: case YLight: case YDark: + case YWhite: return "#E3E3E3"; #else case YWhite: return "#FFFFFF"; +#endif case YLight: return "#C8C8C8"; case YDark: return "#ABABAB"; -#endif + } } diff --git a/images/empty_label_osx.png b/images/empty_label_osx.png deleted file mode 100644 index 77a7066777c3c809d68d59131ef769fbf6b0584b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2637 zcmcImeN>Y79!Erc1Kn(zk}r?fRpxtYdeIE1hI1~gdaH1% z6-C{s?h=dJm||&d z*}_UZby7dJ2Sxqv4+Ei&5rAZj^(o^%;!ghrHyH2OJInE}0d^Cuu*mgxi} zVnC!BI{m)BxkvB68p2N+aYm?+?%_(+u2Y}!zd9Bw`Q9u<`h93bWComQph>pnk(_IA zNvn}`K2msSQAQ4v)}9a8%^!JKr^_8(bWJMOz6s^{c3`w*xbBXFjJ6bP-d2@K~TMlEIqZ`gY!*gGbAQiK&RNk6D*X{xu zo0qkT7wS$QvuVj_;o9cce5~S#E4#OxWXJQl*1DfWT|+&dOLJLz%Nu>~$T(8j{g712 znw3?>29*jEraTBVR#%;i+Tj+?=bGytZCLa3EjAhq5@bv1MFdMvxlni(A<|Psz?RCx zISl|DKR!4>i9sBM@F3g;1PNgu&Tnya1ytUO*yE}GS>|3bhZPh5oG@a{C%t^!^uvZ( zkAAVD0SWD($uU=V(ZcG+Jr4+oiQ^!9_N^Ax&GW!t4y$7*;z(B1K{$~^`}Yg1J$4LSqw%pb;D@sL{j(29s?40qGe6(h zci`ReElvfOtMWj!+YJ3xxqXO~EV_}ag$)N|whaKcig(PWX;M^gUt_fSY3H!;j{23B z{zXyw+#oB>y-mO6VkT??moxU~>*Zh!Nw5x#7;WFaHZ!sv!m80uL8-h%yTx7PAz!KI zxF;PHiGmdH+u6@nG(k^OyUu~(?73sQ-)?H)c;%vQN@@I?YlN0UdB!tAc{bZHindn;`%D zhH{U`iLM@maFMc0vT2--5Vlrs*cIu_@teKIdF)Q*_#GW?t@H|!KE;!kZ7zkZZh;f0 z4L8IFDcJH;q3RRR!P>mxdBgQ~alvS8JP;e`4qG$P5a?XfxLS&4IucbiD7gqTIZ&M;C22pj>~` zurYd)WkJAJp_DtW?#XX6V(Kk{#u>Z>v=-%4-P$T)sb|J3&>jx^i~Y7dt=_JUOylZ@ z$hi@F>WWMdcGJbx*&B(~d8>zVrg}H(cDhkABc;(6f`_{0oDN30`HWY2`7GD?jW}1> zZ7CckN^fc&Ae!-$3T#yb5*@`USa@#P6cmT6im*j9-w#`ssvXnV96zR$x+ynDKWuru zqNCr@$ChV7_wug`@eu^Yec|d*$Lw8$;gvg=cq z#%XHn^+BtLM{FmW2P@0NqY~ZZiF>C2Nykd(@16JbX$mMb-&YzQsGD%$m!Di`HIeHn z2ns}zZpL(ZHgvne=qGrwWJ1C3$yG4`=B136%%|Bj?N`<~UGwI})fVY(8HMjV``?~C zzwt>mw$NEU(lD331bZ$X`uz&TpZ9PF>4Coa)feXeJlh?F=D4@oyw`!=2QpaG@@OF3 zKEHrMxX|73!U{abb)VIVPY1$}6z@kdx}9?1t=Kt_iB2!ZbU|#I>kzc#)5)z7X&~o{ zg|53IpE)OnqySn=br)abNIu$K0&B$vga#+)+X)yyTF@~-BR(#>6!z}guS?&M&tLjo2g(^xTnM_1XMb~ODi?OyYQ*Uz6AGS z16bP$tO;2h1ST;jgT0m}BD)e0=4$Fee`F#6{yQKJZi4?`YTFX%4n?uJhX|G0fbMvX zpgX|VB=;?PJlt&v=tG2>N)GnJRBBp-SIQ9{*&UDNAVP*X5M=NG*785p1MFt&c`d7^ z$o1BpUAq%ql4=#%8+De_03eN%O$pnsJzhfM=us4Y@!Tem8y*4qt0qA}sH$Qh0D~+uK?e`t}n)cVc5^0VA zi1MW?GJO1MkGiYGqT>Nz`jWdm7-=Z(AXYR2P~ z+y}ZWx_NJt@#?qE)L97gVyWr?GtzA+?3ZVri|y07+j~y?+qUG|NBUdpa@CM|Sa?*3 kA=;=x_Vm4DLlF>TDhv(v-^T&}4