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 compilation in MacOSX

Browse Source
This commit is contained in:
Luis Ángel San Martín 2014-11-21 23:49:18 +01:00
parent ca70d6f323
commit a6210d6eee
6 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
YACReaderLibrary/empty_label_widget.cpp
View File

@ -38,7 +38,8 @@ void EmptyLabelWidget::setColor(YACReader::LabelColors color)
{ {
QPixmap p(":/images/empty_label.png"); QPixmap p(":/images/empty_label.png");
QImage img = p.toImage().convertToFormat(QImage::Format_ARGB32); 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)); iconLabel->setPixmap(QPixmap::fromImage(img));
} }

1
YACReaderLibrary/images.qrc
View File

@ -111,6 +111,7 @@
<file>../images/shortcuts_group_reading.png</file> <file>../images/shortcuts_group_reading.png</file>
<file>../images/shortcuts_group_visualization.png</file> <file>../images/shortcuts_group_visualization.png</file>
<file>../images/searching_icon.png</file> <file>../images/searching_icon.png</file>
<file>../images/empty_label.png</file>
<!--<file>../images/busy_background.png</file>--> <!--<file>../images/busy_background.png</file>-->
</qresource> </qresource>
</RCC> </RCC>

1
YACReaderLibrary/images_osx.qrc
View File

@ -25,7 +25,6 @@
<file alias="images/flow_to_grid.gif">../images/flow_to_grid.gif</file> <file alias="images/flow_to_grid.gif">../images/flow_to_grid.gif</file>
<file alias="images/grid_to_flow.gif">../images/grid_to_flow.gif</file> <file alias="images/grid_to_flow.gif">../images/grid_to_flow.gif</file>
<file alias="images/empty_folder.png">../images/empty_folder_osx.png</file> <file alias="images/empty_folder.png">../images/empty_folder_osx.png</file>
<file alias="images/empty_label.png">../images/empty_label_osx.png</file>
<file alias="images/empty_search.png">../images/empty_search_osx.png</file> <file alias="images/empty_search.png">../images/empty_search_osx.png</file>
<file>../images/iconSearch.png</file> <file>../images/iconSearch.png</file>
<file>../images/clearSearch.png</file> <file>../images/clearSearch.png</file>

1
YACReaderLibrary/images_win.qrc
View File

@ -19,7 +19,6 @@
<file>../images/flow_to_grid.gif</file> <file>../images/flow_to_grid.gif</file>
<file>../images/grid_to_flow.gif</file> <file>../images/grid_to_flow.gif</file>
<file>../images/empty_folder.png</file> <file>../images/empty_folder.png</file>
<file>../images/empty_label.png</file>
<file>../images/empty_search.png</file> <file>../images/empty_search.png</file>
<file>../images/addNew_sidebar.png</file> <file>../images/addNew_sidebar.png</file>
<file>../images/delete_sidebar.png</file> <file>../images/delete_sidebar.png</file>

5
common/yacreader_global.cpp
View File

@ -114,16 +114,17 @@ QString YACReader::labelColorToRGBString(LabelColors color)
return "#FF9FDD"; return "#FF9FDD";
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
case YWhite: case YLight: case YDark: case YWhite:
return "#E3E3E3"; return "#E3E3E3";
#else #else
case YWhite: case YWhite:
return "#FFFFFF"; return "#FFFFFF";
#endif
case YLight: case YLight:
return "#C8C8C8"; return "#C8C8C8";
case YDark: case YDark:
return "#ABABAB"; return "#ABABAB";
#endif
} }
} }

BIN
images/empty_label_osx.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.6 KiB