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 77a70667..00000000 Binary files a/images/empty_label_osx.png and /dev/null differ