fixed compilation in MacOSX

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

View File

@ -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));
}

View File

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

View File

@ -25,7 +25,6 @@
<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/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>../images/iconSearch.png</file>
<file>../images/clearSearch.png</file>

View File

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

View File

@ -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
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB