Skip to content
Snippets Groups Projects
Commit d85ea0b8 authored by stefan's avatar stefan
Browse files

Log Icons for Mac

git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2683 5a81b35b-ba03-0410-adc8-b2c5c5119f08
parent a8032322
Branches
Tags
No related merge requests found
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
set(GUI_ICONS set(GUI_ICONS
icons/add_icon.png icons/add_icon.png
icons/close_icon.png icons/close_icon.png
icons/critical_icon.png
icons/delete_icon.png icons/delete_icon.png
icons/distance_icon.png icons/distance_icon.png
icons/find_icon.png icons/find_icon.png
icons/information_icon.png
icons/map_icon.png icons/map_icon.png
icons/menubar_icon.png icons/menubar_icon.png
icons/rigid_body_manipulator_icon.png icons/rigid_body_manipulator_icon.png
...@@ -12,6 +14,7 @@ set(GUI_ICONS ...@@ -12,6 +14,7 @@ set(GUI_ICONS
icons/show_sidebar_icon.png icons/show_sidebar_icon.png
icons/site_icon.png icons/site_icon.png
icons/split_icon.png icons/split_icon.png
icons/warning_icon.png
) )
set(GUI_IMAGES set(GUI_IMAGES
......
modules/gui/share/icons/critical_icon.png

480 B

modules/gui/share/icons/information_icon.png

1.56 KiB

modules/gui/share/icons/warning_icon.png

652 B

...@@ -133,9 +133,28 @@ void MessageWidget::Decrease(QMessageBox::Icon icon){ ...@@ -133,9 +133,28 @@ void MessageWidget::Decrease(QMessageBox::Icon icon){
} }
QPixmap MessageWidget::GetIcon(QMessageBox::Icon icon, QWidget* widget) { QPixmap MessageWidget::GetIcon(QMessageBox::Icon icon, QWidget* widget) {
QDir icon_path(GetSharedDataPath().c_str());
icon_path.cd("gui");
icon_path.cd("icons");
QStyle *style = widget ? widget->style() : QApplication::style(); QStyle *style = widget ? widget->style() : QApplication::style();
int icon_size = style->pixelMetric(QStyle::PM_MessageBoxIconSize, 0, widget); int icon_size = style->pixelMetric(QStyle::PM_MessageBoxIconSize, 0, widget);
QIcon tmp_icon; QIcon tmp_icon;
#if defined(__APPLE__)
switch (icon) {
case QMessageBox::Information:
tmp_icon = QIcon(icon_path.absolutePath()+QDir::separator()+QString("information_icon.png"));
break;
case QMessageBox::Warning:
tmp_icon = QIcon(icon_path.absolutePath()+QDir::separator()+QString("warning_icon.png"));
break;
case QMessageBox::Critical:
tmp_icon = QIcon(icon_path.absolutePath()+QDir::separator()+QString("critical_icon.png"));
break;
default:
break;
}
#else
switch (icon) { switch (icon) {
case QMessageBox::Information: case QMessageBox::Information:
tmp_icon = style->standardIcon(QStyle::SP_MessageBoxInformation, 0, widget); tmp_icon = style->standardIcon(QStyle::SP_MessageBoxInformation, 0, widget);
...@@ -151,6 +170,7 @@ QPixmap MessageWidget::GetIcon(QMessageBox::Icon icon, QWidget* widget) { ...@@ -151,6 +170,7 @@ QPixmap MessageWidget::GetIcon(QMessageBox::Icon icon, QWidget* widget) {
default: default:
break; break;
} }
#endif
if (!tmp_icon.isNull()) if (!tmp_icon.isNull())
return tmp_icon.pixmap(icon_size, icon_size); return tmp_icon.pixmap(icon_size, icon_size);
return QPixmap(); return QPixmap();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment