From 308d238b2d1fedbfeb463f970404269e2bfb9ce1 Mon Sep 17 00:00:00 2001
From: Anakin <Battlefrontler@t-online.de>
Date: Tue, 24 Jan 2017 19:39:34 +0100
Subject: [PATCH] add settings icon, set ogl verison to 2.0 to make it
 compatible with more PCs

---
 QtMeshViewer/Resources/Resources.qrc  |   1 +
 QtMeshViewer/Resources/StyleSheet.txt |   4 ++++
 QtMeshViewer/Resources/settings.png   | Bin 0 -> 1309 bytes
 QtMeshViewer/Source/MainWindow.cpp    |   3 +++
 4 files changed, 8 insertions(+)
 create mode 100644 QtMeshViewer/Resources/settings.png

diff --git a/QtMeshViewer/Resources/Resources.qrc b/QtMeshViewer/Resources/Resources.qrc
index 71e7c0b..080db7a 100644
--- a/QtMeshViewer/Resources/Resources.qrc
+++ b/QtMeshViewer/Resources/Resources.qrc
@@ -26,5 +26,6 @@
         <file>X_disabled.png</file>
         <file>Y_disabled.png</file>
         <file>Z_disabled.png</file>
+        <file>settings.png</file>
     </qresource>
 </RCC>
diff --git a/QtMeshViewer/Resources/StyleSheet.txt b/QtMeshViewer/Resources/StyleSheet.txt
index 8c7d7b8..b36e3a9 100644
--- a/QtMeshViewer/Resources/StyleSheet.txt
+++ b/QtMeshViewer/Resources/StyleSheet.txt
@@ -71,6 +71,10 @@ QToolButton#light:checked {
 	image: url(:/images/toolbar/light_on.png);
 }
 
+QToolButton#settings {
+	image: url(:/images/toolbar/settings.png);
+}
+
 QToolButton#fileInfo {
 	image: url(:/images/toolbar/info.png);
 }
diff --git a/QtMeshViewer/Resources/settings.png b/QtMeshViewer/Resources/settings.png
new file mode 100644
index 0000000000000000000000000000000000000000..9c51c3a88ae2c37a3de0377d00b867ffe213049b
GIT binary patch
literal 1309
zcmV+&1>*XNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ=qe(<TRCwB?m)mO`bri=x^ZU)MP0eO=>m|K-2_)7FrnO2HE22niwNMD?o7E>D
z3xcHJlL!{Ur~VT@6bnMBs31ixwY6C4gRPAeO0HXzW<xHU*_l}%&W!WRW;45O4h-{~
z>-T%EzjLfR^EDcX295#4D-i=h%yVIkj+0j#egRm?Sy^B!B3E(U)7%2i0^b7Bnr|8q
zI2y)$H5V|jScT;XsxibhIo1O=NhnJWN5LiyZ4Pv}+_DuP1LyMyd{GV<nW?~h081gP
zL=YO_wI&QKD<ffB;Az-wL%R!IJ``L|1E<pWZR6X|XDW=8mf`*iEL5RlYTp95NkWlX
z!PkZ|F(X|*5%8&Lfy3p13locQFVTKE6!6H<yhVI0!xB1mMPh{>A9l1s!Q}|>oek(}
z%$b=A%&tH=fTikc@COysRcY*`F4UP@&Nzxe1q_!1`pZFL_Hbk1jmShb`DY~*jB)_w
zfPP?D0ml}qnU6LKzS+(vu@VW^LKT4HsuFRq5<&0);L3t0+Qpak@?;SneI%bm5J`Yn
zB3`hoF@4ooQY}h+m8aeQo(%l=5=1dfFH4|3RfJc!!xjfVySDcGIKc=LBGs5aJB)Et
z;Jh^RHN4gb2YRx59Uf=}Z8i*b!y7xr#6L~s#6-;?662~AxJGs~l6^h!bTPaBWeP4%
zz{H}Y*Zzdq<!ShNGJ9`lTU~Y-SrXTzUgTD|4iDbm1F!c<E~j#NT1=msw&=+@)!tEX
za4Wn&03GgHE2MBLFW|HV`?}%z9$B06;UE-}A1{VkaK6|p>&M&S&<-K;OxOA;s+#5S
zq3yB`Vz@MwJ?r$~#DHkN*Ko~|-EeppytNx#1y@UOySzSzokt+9!LL*B@;3OV43|rA
zcLCn(m*+(fKH4jl&6J^Tx%cCk#7dsn%?is8W0JQwW@V3<58&(3j6@0^*Wm9m+?<2b
zvbgS#f14LByOrv8adP$b<P!XKUy4pDK@1n}N|^<itw^zHChB3z?SbCa;Ax#WF^~mj
zE8uD1wk*Dem$t&Qof*ijx$Jq-TTP;sZCjc9cb>Gn@Xj81bC;|^0`r?Y5)<_#I^5=6
z6M#}ycEd6n%X%5=hVdm?S7W#_Be4-g5_t6_J{XiVT+^r+3M&hgtq62-k!OWhwn<<C
zT%QrmOUqeBt0z%#r5H7A*DNV)wjxlDV%$;EK&C_*ri+4i`(bQRic2FgN&Hrl4y!)k
zbkeLk3LM3_?Q5?1n#Wu%Alho&eqWlBX7$h6{0L7;+%C(GXPQ6J8dpm|`<g2XIJd=-
zz24WtOj~PX;rlVTdat$gx;fVvJnfJ-+tM=t=M-?Z;4)fp<)&|Emay2kn40?uaKVLw
z%P4SG0g<CP+2zXyQ*dRH@eFII2P9(|{&tl7t1SWU^khJB6eocwEyd>xE~mqok#rkg
zP-~mihaF5jEt+?F(7WmX>F9j@UT~_*2U{`X>0~|#CC@i9nz@P33+s$#jfT_X)tE2K
z0sZE97S&ptj?yAy23_L!QAhC!aIV>O4B!Gsjq!Yc7-t=Gi{m-2;##xu{J#MJhY$=(
T#IuB900000NkvXXu0mjfIm}s<

literal 0
HcmV?d00001

diff --git a/QtMeshViewer/Source/MainWindow.cpp b/QtMeshViewer/Source/MainWindow.cpp
index c2d8977..01b1f07 100644
--- a/QtMeshViewer/Source/MainWindow.cpp
+++ b/QtMeshViewer/Source/MainWindow.cpp
@@ -29,6 +29,9 @@ MainWindow::MainWindow(QWidget *parent)
 
 	QSurfaceFormat format;
 	format.setDepthBufferSize(24);
+	format.setMajorVersion(2);
+	format.setMinorVersion(0);
+	format.setProfile(QSurfaceFormat::NoProfile);
 	QSurfaceFormat::setDefaultFormat(format);
 
 	setupWidgets();