From d85ea0b84e7ea60ddb08c85b004311ad53c82753 Mon Sep 17 00:00:00 2001
From: stefan <stefan@5a81b35b-ba03-0410-adc8-b2c5c5119f08>
Date: Tue, 31 Aug 2010 13:09:50 +0000
Subject: [PATCH] Log Icons for Mac
git-svn-id: https://dng.biozentrum.unibas.ch/svn/openstructure/trunk@2683 5a81b35b-ba03-0410-adc8-b2c5c5119f08
---
modules/gui/share/CMakeLists.txt | 3 +++
modules/gui/share/icons/critical_icon.png | Bin 0 -> 480 bytes
modules/gui/share/icons/information_icon.png | Bin 0 -> 1594 bytes
modules/gui/share/icons/warning_icon.png | Bin 0 -> 652 bytes
modules/gui/src/messages/message_widget.cc | 20 +++++++++++++++++++
5 files changed, 23 insertions(+)
create mode 100644 modules/gui/share/icons/critical_icon.png
create mode 100644 modules/gui/share/icons/information_icon.png
create mode 100644 modules/gui/share/icons/warning_icon.png
diff --git a/modules/gui/share/CMakeLists.txt b/modules/gui/share/CMakeLists.txt
index db9da9d43..c87f561e8 100644
--- a/modules/gui/share/CMakeLists.txt
+++ b/modules/gui/share/CMakeLists.txt
@@ -2,9 +2,11 @@
set(GUI_ICONS
icons/add_icon.png
icons/close_icon.png
+ icons/critical_icon.png
icons/delete_icon.png
icons/distance_icon.png
icons/find_icon.png
+ icons/information_icon.png
icons/map_icon.png
icons/menubar_icon.png
icons/rigid_body_manipulator_icon.png
@@ -12,6 +14,7 @@ set(GUI_ICONS
icons/show_sidebar_icon.png
icons/site_icon.png
icons/split_icon.png
+ icons/warning_icon.png
)
set(GUI_IMAGES
diff --git a/modules/gui/share/icons/critical_icon.png b/modules/gui/share/icons/critical_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e362b6fb3eef525896e6d173c2ceb42c9109f4a
GIT binary patch
literal 480
zcmeAS@N?(olHy`uVBq!ia0y~yV2}f04mJh`25W<Lix?Of7>k44ofy`glX=O&z`&N|
z?e4;`k%57M;mVU)w;321I14-?iy0WWg+Z8+Vb&Z81_lQ95>H=O_FEkCJW32NFRLwO
zU|>w}ba4#vIDU4zVcsDJ0oVKMcCf6>NLo0DQH7h6Q%XCurbA&}lgs27My=z$+$u3M
zjCVA&X~ihsU3Q{DCsA7YacNw3<-J?hv;MB`F$_@*S;fuMXlTIj>i~ZNOW6T751VAa
z&{r#s3Rg^FayuYYu~16WfPGt>=SQc)6<3S}?kJv#KCn9djN<!+dK30B{+0@Qa(C~Q
zUAlZztJuSA`lepd`FC~GE_biZKjs;}*53H$<-D}QbJgpN?@C{=Y22Y#ZL{j8$9I!E
z8rpG5{i+SWn)E*O#?IT)<9M6L+NfH;LNxvR-j;gX(zG?H4{oO|XpG~2G;f*emO0C}
zS(ZH!crR|^82o073j6IGlL=cC{I;Ylxw6RQYmepJ-Bo#kHs|GpqP^qicCCJ@pkVxq
z;RmnR-~N+NCP;r%5k4z5;hfmI-F=Hz*o50#eEG?JJ@$BEjdl3x>DH#wdaQHKzx?9$
g%YMCqZ~Uz~#x=Z?&iH7$yaUCJr>mdKI;Vst0DMKjq5uE@
literal 0
HcmV?d00001
diff --git a/modules/gui/share/icons/information_icon.png b/modules/gui/share/icons/information_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d224adeb079092587a099fe310379a918df6147
GIT binary patch
literal 1594
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
JS?83{1OSB5>j(e<
literal 0
HcmV?d00001
diff --git a/modules/gui/share/icons/warning_icon.png b/modules/gui/share/icons/warning_icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1a2dc196e0adc0d420ad5304e47d8926bc6637c
GIT binary patch
literal 652
zcmeAS@N?(olHy`uVBq!ia0y~yV2}f04mJh`25W<Lix?Of7>k44ofy`glX=O&z`&N|
z?e4<xk>NT61IxvS>I@7FoCO|{#S9GG!XV7ZFl&wk0|NtliKnkC`z;Q69#xiw|4XVF
z7?^lGT^vI^jvt-wn=KqD(l&pxkBiCNs0*zdw{*;2nWC&Q<&DprNEXMVb33BN^?q^x
zVH9P#y!OSS*pA*j=Dz<91y2`=Z|ZQ>(i6GG-L>G$u9=<AGkZQy?9}JEv%dKL?|Ied
z64yy2pI}~_!uKQ7`dPT#Z?2ygnXi44@|HUqby8@9bjkDF<1ZpL?{#f4Pg@kBy_0E=
zwNcHzvNOknM9gRVZV_VqWq4WNt8nY<T_#ez4blgS&P)njyTsHqyqja)YbB*G)pfi#
z*!_GW_Oa{S?6cHavg2yj!%8_NA-=V$6PV^OzY{4d-5V#r{kLsBUxfe0`^IaZ{4i;L
zU0Cw=&#C+GIr<p+i|-dMzkG1hnt-=TA2hAxRc&r`-u>S5cE)<oBVk)E=WSmZwmSLJ
zgMitVuMP)42-6C$p69+cY;n-a9_3$GkKOh@a8>4r`PNBOLyj!I*s<dF_W65ehUi>M
zvevLTdF1dzf&1SLkF~Jx;EU04xWlq8l}m5!5vF~NWpe_%9&l}xXSwx$%gZkbLYZ!J
znBFZ9S~GPHOG!{)dH_!W$Bk{t`~G`>tU72v*<!t&SIC;Fb6D+y`NVRMzwr(FGw0I=
z(bW;!nN0GR-c0z|w|Ga6^|QYbg%e)rYs#-byhv!*F6Njyj312(q#gLmRxrgkTt35Q
z-@wYfBYHxK`H8DKJJc)Z8)RO1TgE8C!*;pS(`WUnKjMEFSq&FnS$r#g2?GNIgQu&X
J%Q~loCIAQ|8nFNX
literal 0
HcmV?d00001
diff --git a/modules/gui/src/messages/message_widget.cc b/modules/gui/src/messages/message_widget.cc
index 269f3eec4..5e4363397 100644
--- a/modules/gui/src/messages/message_widget.cc
+++ b/modules/gui/src/messages/message_widget.cc
@@ -133,9 +133,28 @@ void MessageWidget::Decrease(QMessageBox::Icon icon){
}
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();
int icon_size = style->pixelMetric(QStyle::PM_MessageBoxIconSize, 0, widget);
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) {
case QMessageBox::Information:
tmp_icon = style->standardIcon(QStyle::SP_MessageBoxInformation, 0, widget);
@@ -151,6 +170,7 @@ QPixmap MessageWidget::GetIcon(QMessageBox::Icon icon, QWidget* widget) {
default:
break;
}
+#endif
if (!tmp_icon.isNull())
return tmp_icon.pixmap(icon_size, icon_size);
return QPixmap();
--
GitLab