From 5a5a2552247cfcbf26bac7e91abfc9bbebdc9592 Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Sat, 17 Mar 2018 08:11:18 +0100 Subject: [PATCH 01/10] Update the UI a bit --- images/qss/down_arrow_disabled.png | Bin 81 -> 14601 bytes images/qss/up_arrow_disabled.png | Bin 84 -> 15038 bytes src/mainwindow.cpp | 3 +- ui/mainwindow.ui | 157 +++++++++++++++-------------- 4 files changed, 83 insertions(+), 77 deletions(-) diff --git a/images/qss/down_arrow_disabled.png b/images/qss/down_arrow_disabled.png index e76b557f71aa958786c750c7216f18f55b71367f..6861213e91fb37e3e3eea1a2c8f435a7578333df 100644 GIT binary patch literal 14601 zcmeI3Pi)&%9LFCLLZxVj0fNy9$#_fxf#W}^lh`ELO48B7(p7EH+7or`m&R&hySB5W z)g-2IVFy4$LPGpGfRF$oaou5uArPDp;sTnuaYEgNGaMMtcK-a5CVd0#_$;OQ_2=*J z_j~X2e(%K>Ut3*y>DcVtEJEnm@=|$?d_PD&56s+8{@(cM@=E0JmNo-~9(pAD+=o8+ z=mbJJ$*yjM89$ga<<@Yj+wzDSq5PSyXP7%U&`-2xxy)rlRsMV^Z#;ZA{HhzfEW zl~u0f`j}Hw8NrlgnagS^S>O963Qs z3v#w9<#b8Y6&dCL%JCdz|5!$7+*KB+1$it}ue*NB2#a>h*v6vgZ0E(H6DS8=rI*~M z>yu&OqMR2exj|IiY5KAggob0{<#LfYQnqdBijk8vO)&&ju4zKun$HQjoT3Vfsv0?Y z9xK_b8bhp9VECcbW!G#+yM?4q4i?KbN&4ZiOhr{JoRb7atI2{aV^Szv$AW33jm&&4 zJ)hB(ej$+TP@xOHP0l@|2{h4Mtp7Nd326?MTCxMut$U!0NiWAI+dAGI_4aQx?f8W9 z3_rlp{wwhP4LCT`1}9b&6Ypc)Fr%}rXhz!uTX}KBI~>*^vKMCm-{nm5gYfA!It}a` zwY`#5v1)pfz^#WJ!^aETq(kmz=OM;vHR|ep?-0&wO;m>7*CP zxQuuW$W}V!8&*#A8_}9J+p#{YNaP|vgyial!rSAan@5Mj+vB0b$X6XZERxL<4|L28 zqM~y+IV9G}BLgmGR5eZZ^0<3EV%6^A=0@2jyE%xuQtO3``zOY24&yQ~4)}X<$wGmj z_IMo=FL`hv&n)8Lp=ET52ixEt8^a0RD*|ayZH9}A2nrZ3NP}uKTvS9*z;Hnt zRGZj3(}z43>Os<6fj(n2GwS`sED9|;es@%Hp4|l1O*Hiq(QYAE-E4@V7MR+ zs?Bgw5kUdN1!+)ihKq^_3K%X(gK9HeR76m~a6uYWo8h7&f&zvM(xBQ57Zni{FkFxZ z)n>S;h@gPsf;6Z$!$m~|1q>IYLA4n!Dk3OgxF8Lx&2Ui>K>@=BX;5v3i;4&e7%oVI zYBO9^L{PwRK^jz>;i4jf0)`9HpxQ^`njO9dh#m6oUx&Qpcj5LsZ<7}UIdf^Pg3$hH zgs!}S&|i1R_W?p}38C9t2Tgm%lxE-POK3kQUeGehJ%=btCg%U2)ngz}d!ko0JIai#qAi(6O!1$-#TxBvhE delta 51 zcmeAy3Y?&#E8*$l7{YNqIpF}?vl@psi6#jx!!5=S*cg^wkvO=Fv&EeO2s~Z=T-G@y GGywqC4H1z5 diff --git a/images/qss/up_arrow_disabled.png b/images/qss/up_arrow_disabled.png index f99b6cc6e36594229122902bb20cb21046f4d5c0..a65fc25f202fa40c296e43b01d289a4d024bb943 100644 GIT binary patch literal 15038 zcmeI3&x;&I6vs=^U{)3q0xBM)=_nYqr+>`PZf7PYI~!-kS=Y@-c0n*T-8H+-&UAOW zdv|6R5BULtgxeQj~uH9S<*BY-FrrXV6%WaWNzw6Q22$fIvJ#21~P-u}2+o_1Z-1=M;Y^x%k%QuvU zw?H=S`kqhD?kzXXy)9F>#FN#za^Ii=T@qrU-|aYo(XWWHu0g*?!?GyEQ^Ku^cq&RL ztTk4I1=lA+K2wlPRaJ$eo>B9qtd@UX&=fTQKHc`xUa4^O5_9sc9f#r$DXWa6nR>ZWsYLJZNC#Q%`#=uAzk8x0gY3q z#(A4==mwkajFcny%*1q08jVrzsq5`_r=||V#T|-ZfOKkP(A@Qiyh;Lh+c(ML4!xD* z)9yaB+vCmIrxbZ+uATJl8DWtp35!c1*`YGMS7X5^ICTA{>vpP1m8}dB3JVKyRSD0Y zvmMLr1t-cf3>okDSdG+hNUF3Ri;|*An%Y!oF&2!R_8cutMM;SyGl53Kwe0rpP@^O% zSxGH6m6D<8Mt+}0Y9`d6{bS(}A4nxVH>G2lM%(qfIIP-Tyg_8o*(l57!PLxART&Fz z$Mxy5NL4M%(}q(~aitkcP7q?pBulj_9mv?WW#kH_g4xcsq?S%JsifyDsny1&WM*}( zR8;j+u|?G->rqa$r}Vns1=9~;<=&bF!< zwFj}v^1jjWvPO}EFnh{&9tc6Ap9-Iyqqj*MR(mB<@vPY*f!hvy*e9npXoVc4^Apwm zVNkv-N52If`#;!-0Ppy8~(=`j~C6bz@LqF>PDct1-Y_DHpm&u8;x84kmU6}wM5Yc-pm!$EYO=z|bAJ~eKA z99KxkrN#$w$ws9f%Hj@8M(HCTecF^qkDC+CIXc7c=a=yf-A`4Z#ghOaY?I?+^8sFt z3jkr892c7p@N!%L2;1bi*nEJO;{rg~Cdb9*1H2p;0KzsoE;b+F<+uP4w#jj^`2a7+ z1%R+kj*HC)csVWrgl%$MY(ButaRDG~ljCCZ0bY&^0AZUP7n=|8a$Eoi+vK>|e1MnZ z0zlX%$HnFYyc`z*!ZtZBHXq>SxBw8g$#Jpy058V{fUr%Di_HgkIW7Q%ZE{>}KETUy z0U&IX<6`pxUXBX@VVfKmn-B1ETmT5$2tDq;`{tc9bnfy}?Nqb>qxG#i ze^EJtZr^+R=;6)}FFyQK{mAXh4<7nD^YqOt@4b9pe&PDXt3Q2g9{csTov*$;ap|?f wH)rbC-Z*si3nCs}y!qLU8=s#3<6aNpkB)qB;m^m`sWMtxT&{g``uyd;0rNORTL1t6 delta 54 zcmdm28Ztq}K-$yAF@z&JIpF~Bvzh|}430dEDvm7-v%FXs7^0p@9Q^!8#h3vIJYD@< J);T3K0RZC25k3F_ diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index c41b6ac..119fe14 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -39,6 +39,7 @@ #ifdef Q_OS_WIN # include +# pragma comment(lib,"user32.lib") #endif // Used for Parameter- and Valuelineedits as they need to modify the layout often @@ -547,7 +548,7 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : setCentralWidget(ui->tabWidget); ui->tabWidget->setCurrentIndex(0); - ui->tabWidget->setMinimumWidth(920); + ui->tabWidget->setMinimumWidth(740); setCorner( Qt::TopRightCorner, Qt::RightDockWidgetArea ); setCorner( Qt::BottomRightCorner, Qt::RightDockWidgetArea ); diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 3ff53a5..72a0a1b 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -668,33 +668,33 @@ QAbstractSpinBox { QAbstractSpinBox:up-button { - background-color: #333; - border: 0px solid #333; + /* background-color: #222;*/ + border: 0px solid #222; width: 20px; subcontrol-position: top right; } QAbstractSpinBox:down-button { - background-color: #333; + /* background-color: #222;*/ width: 20px; - border: 0px solid #333; + border: 0px solid #222; subcontrol-position: bottom right; } QAbstractSpinBox:up-button:disabled { - background-color: #333; - border: 0px solid #333; + /* background-color: #222;*/ + border: 0px solid #222; width: 20px; subcontrol-position: top right; } QAbstractSpinBox:down-button:disabled { - background-color: #333; + /* background-color: #222;*/ width: 20px; - border: 0px solid #333; + border: 0px solid #222; subcontrol-position: bottom right; } @@ -706,7 +706,7 @@ QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox: QAbstractSpinBox::up-arrow:hover { - background-color: #282828; + background-color: #222; } @@ -718,7 +718,7 @@ QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpin } QAbstractSpinBox::down-arrow:hover { - background-color: #282828; + background-color: #222; } @@ -822,7 +822,7 @@ QTreeView::branch:open:has-children:has-siblings:hover { QSlider::groove:horizontal { border: 0px solid #222; - height: 9px; + height: 5px; background: #222; margin: 0px 0px; @@ -841,12 +841,17 @@ QSlider:selected, QTabBar:tab:selected { QSlider::handle:horizontal { background: #666; border: 0px solid #666; - border-radius: 0px; - width: 10px; - margin: -2px 0px; + border-radius: 6px; + width: 13px; + margin: -4px 0px; } +QSlider::handle:horizontal::hover { + background: #777; + +} + QSlider::handle:horizontal:disabled { background: #444; } @@ -1071,7 +1076,7 @@ QGroupBox::title { - 900 + 0 0 @@ -1320,7 +1325,7 @@ QGroupBox::title { 0 - 0 + -1850 926 5907 @@ -2172,7 +2177,7 @@ QToolButton:pressed - 200 + 250 0 @@ -2499,7 +2504,7 @@ QToolButton:pressed - 200 + 250 0 @@ -4902,7 +4907,7 @@ QToolButton:pressed - 200 + 250 0 @@ -4984,7 +4989,7 @@ QToolButton:pressed - 200 + 250 0 @@ -7842,7 +7847,7 @@ QToolButton:pressed - 200 + 250 0 @@ -8741,7 +8746,7 @@ QToolButton:pressed - 200 + 250 0 @@ -9058,7 +9063,7 @@ QToolButton:pressed - 200 + 250 0 @@ -9121,7 +9126,7 @@ QToolButton:pressed - 200 + 250 0 @@ -9197,7 +9202,7 @@ QToolButton:pressed - 200 + 250 0 @@ -9476,7 +9481,7 @@ QToolButton:pressed - 200 + 250 0 @@ -9605,7 +9610,7 @@ QToolButton:pressed - 200 + 250 0 @@ -10193,7 +10198,7 @@ QToolButton:pressed - 200 + 250 0 @@ -10255,7 +10260,7 @@ QToolButton:pressed - 200 + 250 0 @@ -10664,7 +10669,7 @@ QToolButton:pressed - 200 + 250 0 @@ -10777,7 +10782,7 @@ QToolButton:pressed - 200 + 250 0 @@ -10921,7 +10926,7 @@ QToolButton:pressed - 200 + 250 0 @@ -11130,7 +11135,7 @@ QToolButton:pressed - 200 + 250 0 @@ -11262,7 +11267,7 @@ QToolButton:pressed - 200 + 250 0 @@ -11433,7 +11438,7 @@ QToolButton:pressed - 200 + 250 0 @@ -11787,7 +11792,7 @@ QToolButton:pressed - 200 + 250 0 @@ -11987,7 +11992,7 @@ QToolButton:pressed - 200 + 250 0 @@ -12091,7 +12096,7 @@ QToolButton:pressed - 200 + 250 0 @@ -12433,7 +12438,7 @@ QToolButton:pressed - 200 + 250 0 @@ -12523,7 +12528,7 @@ QToolButton:pressed - 200 + 250 0 @@ -12585,7 +12590,7 @@ QToolButton:pressed - 200 + 250 0 @@ -12804,7 +12809,7 @@ QToolButton:pressed - 200 + 250 0 @@ -13103,13 +13108,13 @@ QToolButton:pressed - 200 + 150 0 - 200 + 169 16777215 @@ -13272,7 +13277,7 @@ QToolButton:pressed - 200 + 250 0 @@ -13373,7 +13378,7 @@ QToolButton:pressed - 200 + 250 0 @@ -13548,7 +13553,7 @@ QToolButton:pressed - 200 + 250 0 @@ -13670,7 +13675,7 @@ QToolButton:pressed - 200 + 250 0 @@ -13922,7 +13927,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14069,7 +14074,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14216,7 +14221,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14295,7 +14300,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14374,7 +14379,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14494,7 +14499,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14732,7 +14737,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14848,7 +14853,7 @@ QToolButton:pressed - 200 + 250 0 @@ -14927,7 +14932,7 @@ QToolButton:pressed - 200 + 250 0 @@ -15174,7 +15179,7 @@ QToolButton:pressed - 200 + 250 0 @@ -15218,7 +15223,7 @@ QToolButton:pressed - 200 + 250 0 @@ -15391,7 +15396,7 @@ QToolButton:pressed - 200 + 250 0 @@ -16333,7 +16338,7 @@ QToolButton:pressed - 200 + 250 0 @@ -16554,7 +16559,7 @@ QToolButton:pressed - 200 + 250 0 @@ -16822,7 +16827,7 @@ QToolButton:pressed - 200 + 250 0 @@ -17041,7 +17046,7 @@ QToolButton:pressed - 200 + 250 0 @@ -17172,7 +17177,7 @@ QToolButton:pressed - 200 + 250 0 @@ -17304,7 +17309,7 @@ QToolButton:pressed - 200 + 250 0 @@ -17664,7 +17669,7 @@ QToolButton:pressed - 200 + 250 0 @@ -17802,7 +17807,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18039,7 +18044,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18115,7 +18120,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18191,7 +18196,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18267,7 +18272,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18331,7 +18336,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18395,7 +18400,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18561,7 +18566,7 @@ QToolButton:pressed - 200 + 250 0 @@ -18637,7 +18642,7 @@ QToolButton:pressed - 200 + 250 0 From fda0281d7f1e48a065ca93d65534c97ed7f5d06d Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Sat, 17 Mar 2018 08:22:21 +0100 Subject: [PATCH 02/10] More styling updates --- ui/mainwindow.ui | 130 +++++++++++++++++++++++++++-------------------- 1 file changed, 74 insertions(+), 56 deletions(-) diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 72a0a1b..8560e3e 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -839,8 +839,8 @@ QSlider:selected, QTabBar:tab:selected { } QSlider::handle:horizontal { - background: #666; - border: 0px solid #666; + background: #777; + border: 0px solid #777; border-radius: 6px; width: 13px; margin: -4px 0px; @@ -848,7 +848,7 @@ QSlider::handle:horizontal { } QSlider::handle:horizontal::hover { - background: #777; + background: #888; } @@ -1325,7 +1325,7 @@ QGroupBox::title { 0 - -1850 + -2799 926 5907 @@ -7841,6 +7841,34 @@ QToolButton:pressed + + + + true + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Opacity: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -7923,15 +7951,12 @@ QToolButton:pressed - - - - true - + + 100 - 0 + 23 @@ -7944,19 +7969,22 @@ QToolButton:pressed - Opacity: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + Decal - - + + + + + 0 + 0 + + - 100 - 23 + 120 + 19 @@ -7969,7 +7997,7 @@ QToolButton:pressed - Decal + Alpha test @@ -8001,8 +8029,8 @@ QToolButton:pressed - - + + 0 @@ -8012,7 +8040,7 @@ QToolButton:pressed 120 - 19 + 23 @@ -8025,12 +8053,12 @@ QToolButton:pressed - Alpha test + Translucent - - + + 0 @@ -8039,7 +8067,7 @@ QToolButton:pressed - 120 + 100 23 @@ -8053,7 +8081,7 @@ QToolButton:pressed - Translucent + Additive @@ -8072,7 +8100,7 @@ QToolButton:pressed - 74 + 0 0 @@ -8148,34 +8176,6 @@ QToolButton:pressed - - - - - 0 - 0 - - - - - 100 - 23 - - - - - Segoe UI - 9 - 50 - false - false - - - - Additive - - - @@ -10667,6 +10667,9 @@ QToolButton:pressed + + false + 250 @@ -10780,6 +10783,9 @@ QToolButton:pressed + + false + 250 @@ -10924,6 +10930,9 @@ QToolButton:pressed + + false + 250 @@ -11133,6 +11142,9 @@ QToolButton:pressed + + false + 250 @@ -11265,6 +11277,9 @@ QToolButton:pressed + + false + 250 @@ -11436,6 +11451,9 @@ QToolButton:pressed + + false + 250 From 9ef316f22df5b7a8323d20740be19e041bf69fcb Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Sun, 18 Mar 2018 23:52:29 +0100 Subject: [PATCH 03/10] Refactor UI more --- ui/mainwindow.ui | 2299 +++++++++++++++++----------------------------- 1 file changed, 862 insertions(+), 1437 deletions(-) diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 8560e3e..4f85b28 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -507,7 +507,7 @@ QToolButton { color: silver; background-color: #333; - border-width: 1px; + border-width: 2px; border-color: #333; border-style: solid; padding: 2px; @@ -517,7 +517,7 @@ QToolButton QToolButton:disabled { background-color:#333; - border-width: 1px; + border-width: 2px; border-color: #333; border-style: solid; padding: 2px; @@ -670,14 +670,14 @@ QAbstractSpinBox:up-button { /* background-color: #222;*/ border: 0px solid #222; - width: 20px; + width: 15px; subcontrol-position: top right; } QAbstractSpinBox:down-button { /* background-color: #222;*/ - width: 20px; + width: 15px; border: 0px solid #222; subcontrol-position: bottom right; } @@ -686,28 +686,26 @@ QAbstractSpinBox:up-button:disabled { /* background-color: #222;*/ border: 0px solid #222; - width: 20px; subcontrol-position: top right; } QAbstractSpinBox:down-button:disabled { /* background-color: #222;*/ - width: 20px; border: 0px solid #222; subcontrol-position: bottom right; } QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off { image: url(:/images/qss/up_arrow_disabled.png); - width: 20px; + width: 15px; height: 10px; } -QAbstractSpinBox::up-arrow:hover +/*QAbstractSpinBox::up-arrow:hover { background-color: #222; -} +}*/ QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off @@ -1001,7 +999,7 @@ QToolButton { color: silver; background-color: #282828; - border-width: 1px; + border-width: 2px; border-color: #282828; border-style: solid; padding-top: 5px; @@ -1014,7 +1012,7 @@ QToolButton QToolButton:disabled { background-color:#444; - border-width: 1px; + border-width: 2px; border-color: #444; border-style: solid; padding-top: 5px; @@ -1325,9 +1323,9 @@ QGroupBox::title { 0 - -2799 + 0 926 - 5907 + 5903 @@ -1467,7 +1465,7 @@ QGroupBox::title { - 300 + 220 0 @@ -1955,7 +1953,7 @@ QToolButton:pressed - 75 + 71 23 @@ -1995,7 +1993,7 @@ QToolButton:pressed - 75 + 72 23 @@ -2199,7 +2197,7 @@ QToolButton:pressed - 70 + 60 23 @@ -2243,40 +2241,6 @@ QToolButton:pressed - - - - false - - - - 0 - 20 - - - - - 80 - 20 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - @@ -2287,13 +2251,13 @@ QToolButton:pressed - 75 + 150 23 - 75 + 150 23 @@ -2307,7 +2271,7 @@ QToolButton:pressed - Pick color + @@ -2529,7 +2493,7 @@ QToolButton:pressed - 70 + 60 23 @@ -3064,7 +3028,7 @@ QToolButton:pressed - 100 + 140 0 @@ -3086,7 +3050,7 @@ QToolButton:pressed - 120 + 140 0 @@ -3123,7 +3087,7 @@ QToolButton:pressed - 100 + 95 0 @@ -3146,6 +3110,12 @@ QToolButton:pressed false + + + 40 + 23 + + Segoe UI @@ -3179,7 +3149,7 @@ QToolButton:pressed - 100 + 140 0 @@ -3773,7 +3743,7 @@ QToolButton:pressed - 70 + 60 23 @@ -3851,7 +3821,7 @@ QToolButton:pressed - 70 + 60 23 @@ -3995,7 +3965,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4035,7 +4005,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4078,7 +4048,7 @@ QToolButton:pressed - 65 + 88 0 @@ -4109,7 +4079,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4163,7 +4133,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4203,7 +4173,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4246,7 +4216,7 @@ QToolButton:pressed - 65 + 88 0 @@ -4277,7 +4247,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4314,7 +4284,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4426,7 +4396,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4466,7 +4436,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4509,7 +4479,7 @@ QToolButton:pressed - 65 + 88 0 @@ -4540,7 +4510,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4577,7 +4547,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4659,7 +4629,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4699,7 +4669,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4742,7 +4712,7 @@ QToolButton:pressed - 65 + 88 0 @@ -4773,7 +4743,7 @@ QToolButton:pressed - 80 + 70 23 @@ -4941,7 +4911,7 @@ QToolButton:pressed - 70 + 60 23 @@ -5023,7 +4993,7 @@ QToolButton:pressed - 70 + 60 23 @@ -5102,7 +5072,7 @@ QToolButton:pressed - 80 + 70 23 @@ -5142,7 +5112,7 @@ QToolButton:pressed - 80 + 70 23 @@ -5185,7 +5155,7 @@ QToolButton:pressed - 65 + 88 0 @@ -5216,7 +5186,7 @@ QToolButton:pressed - 80 + 70 23 @@ -5270,7 +5240,7 @@ QToolButton:pressed - 80 + 70 23 @@ -5310,7 +5280,7 @@ QToolButton:pressed - 80 + 70 23 @@ -5353,7 +5323,7 @@ QToolButton:pressed - 65 + 88 0 @@ -5384,7 +5354,7 @@ QToolButton:pressed - 80 + 70 23 @@ -5421,7 +5391,7 @@ QToolButton:pressed - 80 + 70 23 @@ -6003,7 +5973,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6043,7 +6013,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6126,7 +6096,7 @@ QToolButton:pressed - 75 + 71 23 @@ -6163,7 +6133,7 @@ QToolButton:pressed - 75 + 72 23 @@ -6252,7 +6222,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6355,7 +6325,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6420,7 +6390,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6640,7 +6610,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6724,7 +6694,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6814,7 +6784,7 @@ QToolButton:pressed - 70 + 60 23 @@ -6885,7 +6855,7 @@ QToolButton:pressed - 75 + 71 23 @@ -6922,7 +6892,7 @@ QToolButton:pressed - 75 + 72 23 @@ -6986,7 +6956,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7076,7 +7046,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7302,7 +7272,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7411,7 +7381,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7451,7 +7421,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7572,7 +7542,7 @@ QToolButton:pressed - 75 + 71 23 @@ -7609,7 +7579,7 @@ QToolButton:pressed - 75 + 72 23 @@ -7739,7 +7709,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7779,7 +7749,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7869,7 +7839,7 @@ QToolButton:pressed - + @@ -7909,7 +7879,7 @@ QToolButton:pressed - 70 + 60 23 @@ -7951,12 +7921,18 @@ QToolButton:pressed - - + + + + + 0 + 0 + + 100 - 23 + 19 @@ -7969,12 +7945,12 @@ QToolButton:pressed - Decal + Alpha test - - + + 0 @@ -7983,8 +7959,8 @@ QToolButton:pressed - 120 - 19 + 100 + 23 @@ -7997,7 +7973,7 @@ QToolButton:pressed - Alpha test + Translucent @@ -8011,7 +7987,7 @@ QToolButton:pressed - 120 + 100 23 @@ -8029,8 +8005,11 @@ QToolButton:pressed - - + + + + false + 0 @@ -8039,7 +8018,7 @@ QToolButton:pressed - 120 + 60 23 @@ -8052,12 +8031,77 @@ QToolButton:pressed false + + 1 + + + 1.000000000000000 + + + 0.100000000000000 + + + 0.700000000000000 + + + + + + + false + + + + 0 + 0 + + + + + 0 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + - Translucent + Treshold: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + + + + + 100 + 23 + + + + + Segoe UI + 9 + 50 + false + false + + + + Decal + + + + @@ -8085,97 +8129,6 @@ QToolButton:pressed - - - - - - false - - - - 0 - 0 - - - - - 0 - 0 - - - - - Segoe UI - 9 - 50 - false - false - - - - Treshold: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - false - - - - 0 - 0 - - - - - 70 - 23 - - - - - Segoe UI - 9 - 50 - false - false - - - - 1 - - - 1.000000000000000 - - - 0.100000000000000 - - - 0.700000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -8370,7 +8323,7 @@ QToolButton:pressed - 80 + 75 23 @@ -8419,7 +8372,7 @@ QToolButton:pressed - 80 + 75 23 @@ -8522,7 +8475,7 @@ QToolButton:pressed - 80 + 75 23 @@ -8571,7 +8524,7 @@ QToolButton:pressed - 80 + 75 23 @@ -8774,7 +8727,7 @@ QToolButton:pressed - 70 + 60 23 @@ -8798,22 +8751,6 @@ QToolButton:pressed - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 8 - 20 - - - - @@ -8821,7 +8758,7 @@ QToolButton:pressed - 120 + 150 0 @@ -8914,19 +8851,6 @@ QToolButton:pressed - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -9091,7 +9015,7 @@ QToolButton:pressed - 70 + 60 23 @@ -9154,7 +9078,7 @@ QToolButton:pressed - 70 + 60 23 @@ -9193,7 +9117,7 @@ QToolButton:pressed - + @@ -9230,7 +9154,7 @@ QToolButton:pressed - 70 + 60 23 @@ -9254,22 +9178,6 @@ QToolButton:pressed - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 8 - 20 - - - - @@ -9277,7 +9185,7 @@ QToolButton:pressed - 120 + 150 0 @@ -9405,14 +9313,8 @@ QToolButton:pressed true - - - - - 100 - 0 - - + + Segoe UI @@ -9423,15 +9325,21 @@ QToolButton:pressed - Seamless scale: + Reflectivity 2: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + 100 + 0 + + Segoe UI @@ -9442,27 +9350,15 @@ QToolButton:pressed - Reflectivity 2: + Seamless scale: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 75 - 23 - - - - - 75 - 23 - - + + Segoe UI @@ -9472,9 +9368,6 @@ QToolButton:pressed false - - Pick color - @@ -9502,8 +9395,20 @@ QToolButton:pressed - - + + + + + 150 + 23 + + + + + 150 + 23 + + Segoe UI @@ -9513,9 +9418,12 @@ QToolButton:pressed false + + + - + Qt::Horizontal @@ -9528,20 +9436,8 @@ QToolButton:pressed - - - - - 0 - 0 - - - - - 100 - 0 - - + + Segoe UI @@ -9552,33 +9448,39 @@ QToolButton:pressed - Light warp: + Reflectivity: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - Segoe UI - 9 - 50 - false - false - + + + + + 250 + 0 + - - Reflectivity: + + + 200 + 16777215 + - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 100 + + + 100 + + + Qt::Horizontal - + @@ -9606,45 +9508,20 @@ QToolButton:pressed - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - 100 - - - 100 - - - Qt::Horizontal + + + + + 0 + 0 + - - - - - 70 + 100 0 - - - 70 - 21 - - Segoe UI @@ -9654,11 +9531,11 @@ QToolButton:pressed false - - Qt::ScrollBarAlwaysOff + + Light warp: - - Qt::ScrollBarAlwaysOff + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -9672,7 +9549,7 @@ QToolButton:pressed - 70 + 60 23 @@ -9697,17 +9574,17 @@ QToolButton:pressed - + - 70 - 0 + 150 + 23 - 70 - 21 + 150 + 23 @@ -9719,39 +9596,8 @@ QToolButton:pressed false - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - - - - - - 75 - 23 - - - - - 75 - 23 - - - - - Segoe UI - 9 - 50 - false - false - - - - Pick color + + @@ -9762,7 +9608,7 @@ QToolButton:pressed - 70 + 60 23 @@ -9799,7 +9645,7 @@ QToolButton:pressed - 70 + 60 23 @@ -9957,7 +9803,7 @@ QToolButton:pressed - 168 + 150 0 @@ -10028,6 +9874,19 @@ QToolButton:pressed true + + + + + Segoe UI + 9 + 50 + false + false + + + + @@ -10053,32 +9912,6 @@ QToolButton:pressed - - - - - Segoe UI - 9 - 50 - false - false - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -10104,17 +9937,17 @@ QToolButton:pressed - + - 75 + 150 23 - 75 + 150 23 @@ -10128,21 +9961,21 @@ QToolButton:pressed - Pick color + - + - 75 + 150 23 - 75 + 150 23 @@ -10156,108 +9989,25 @@ QToolButton:pressed - Pick color - - - - - - - false - - - - 70 - 0 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff + - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - 100 - - - 1 - - - 100 - + + Qt::Horizontal - - - - - - false - - - - 70 - 0 - - - + - 70 - 21 + 40 + 20 - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - + - - + + 250 @@ -10291,7 +10041,7 @@ QToolButton:pressed - 70 + 60 23 @@ -10352,44 +10102,35 @@ QToolButton:pressed - - - - true - + + - 70 - 23 + 250 + 0 - 50 + 200 16777215 - - - Segoe UI - 9 - 50 - false - false - - - 16.000000000000000 + 100 - 0.010000000000000 + 1 - 1.000000000000000 + 100 + + + Qt::Horizontal - + @@ -10417,13 +10158,50 @@ QToolButton:pressed - + + + + true + + + + 60 + 23 + + + + + 50 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 16.000000000000000 + + + 0.010000000000000 + + + 1.000000000000000 + + + + - 130 + 140 0 @@ -10703,7 +10481,7 @@ QToolButton:pressed - 75 + 60 23 @@ -10819,7 +10597,7 @@ QToolButton:pressed - 75 + 60 23 @@ -10966,7 +10744,7 @@ QToolButton:pressed - 75 + 60 23 @@ -10997,20 +10775,20 @@ QToolButton:pressed - + false - 70 - 0 + 150 + 23 - 70 - 21 + 150 + 23 @@ -11022,42 +10800,8 @@ QToolButton:pressed false - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - - - - - false - - - - 75 - 23 - - - - - 75 - 23 - - - - - Segoe UI - 9 - 50 - false - false - - - - Pick color + + @@ -11172,7 +10916,7 @@ QToolButton:pressed - 75 + 60 23 @@ -11313,7 +11057,7 @@ QToolButton:pressed - 75 + 60 23 @@ -11350,7 +11094,7 @@ QToolButton:pressed - 90 + 71 23 @@ -11396,7 +11140,7 @@ QToolButton:pressed - 90 + 72 23 @@ -11487,7 +11231,7 @@ QToolButton:pressed - 75 + 60 23 @@ -11838,7 +11582,7 @@ QToolButton:pressed - 75 + 60 23 @@ -11878,7 +11622,7 @@ QToolButton:pressed - 110 + 150 0 @@ -11903,7 +11647,7 @@ QToolButton:pressed - 75 + 60 23 @@ -12038,7 +11782,7 @@ QToolButton:pressed - 75 + 60 23 @@ -12139,7 +11883,7 @@ QToolButton:pressed - 75 + 60 23 @@ -12169,51 +11913,17 @@ QToolButton:pressed - - - - false - - - - 75 - 20 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - - 75 + 150 23 - 75 + 150 23 @@ -12227,7 +11937,7 @@ QToolButton:pressed - Pick color + @@ -12235,7 +11945,7 @@ QToolButton:pressed - 75 + 60 23 @@ -12303,11 +12013,79 @@ QToolButton:pressed - - + + - 100 + 150 + 23 + + + + + 150 + 23 + + + + + Segoe UI + 9 + 50 + false + false + + + + + + + + + + + + 60 + 23 + + + + + 75 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 16.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + 0 + 0 + + + + + 150 0 @@ -12321,15 +12099,49 @@ QToolButton:pressed - Amount 2: + Mask brightness 2: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + + + + 60 + 23 + + + + + 75 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 20.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + 100 @@ -12346,7 +12158,7 @@ QToolButton:pressed - Glossiness 2: + Amount 2: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -12384,21 +12196,12 @@ QToolButton:pressed - - - - false - + + - 75 - 20 - - - - - 70 - 21 + 100 + 0 @@ -12410,11 +12213,11 @@ QToolButton:pressed false - - Qt::ScrollBarAlwaysOff + + Glossiness 2: - - Qt::ScrollBarAlwaysOff + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -12422,7 +12225,7 @@ QToolButton:pressed - 75 + 60 23 @@ -12480,101 +12283,64 @@ QToolButton:pressed - - + + - 75 - 23 + 250 + 0 - 75 + 200 16777215 - - - Segoe UI - 9 - 50 - false - false - - - 16.000000000000000 + 1600 - 0.100000000000000 + 25 - 1.000000000000000 + 100 + + + Qt::Horizontal - - + + - 75 - 23 + 250 + 0 - 75 - 23 + 200 + 16777215 - - - Segoe UI - 9 - 50 - false - false - + + 800 - - Pick color - - - - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - 1600 - - - 25 - - - 100 + + 100 Qt::Horizontal - - + + - 75 + 60 23 @@ -12593,47 +12359,22 @@ QToolButton:pressed false - - 1 - - 1024 - - - 5 - - - - - - - - 250 - 0 - - - - - 200 - 16777215 - + 100.000000000000000 - - 800 + + 0.100000000000000 - 100 - - - Qt::Horizontal + 1.000000000000000 - - + + - 75 + 60 23 @@ -12652,18 +12393,18 @@ QToolButton:pressed false - - 100.000000000000000 + + 1 - - 0.100000000000000 + + 1024 - 1.000000000000000 + 5 - + Qt::Horizontal @@ -12676,88 +12417,6 @@ QToolButton:pressed - - - - - - - 0 - 0 - - - - - 110 - 0 - - - - - Segoe UI - 9 - 50 - false - false - - - - Mask brightness 2: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - 75 - 23 - - - - - 75 - 16777215 - - - - - Segoe UI - 9 - 50 - false - false - - - - 20.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -12796,138 +12455,6 @@ QToolButton:pressed false - - - - - 100 - 0 - - - - - Segoe UI - 9 - 50 - false - false - - - - Tint: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - 255 - - - 1 - - - 255 - - - Qt::Horizontal - - - - - - - false - - - - 75 - 20 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - - - - - - 75 - 23 - - - - - 75 - 23 - - - - - Segoe UI - 9 - 50 - false - false - - - - Pick color - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - @@ -13120,6 +12647,31 @@ QToolButton:pressed + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Warp: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + @@ -13132,7 +12684,7 @@ QToolButton:pressed - 169 + 184 16777215 @@ -13154,7 +12706,7 @@ QToolButton:pressed - 75 + 60 23 @@ -13233,8 +12785,14 @@ QToolButton:pressed - - + + + + + 0 + 0 + + 100 @@ -13251,21 +12809,15 @@ QToolButton:pressed - Warp: + Boost: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - 0 - 0 - - + + 100 @@ -13282,7 +12834,7 @@ QToolButton:pressed - Boost: + Fresnel: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -13323,7 +12875,7 @@ QToolButton:pressed - 75 + 60 23 @@ -13365,31 +12917,6 @@ QToolButton:pressed - - - - - 100 - 0 - - - - - Segoe UI - 9 - 50 - false - false - - - - Fresnel: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - @@ -13508,19 +13035,142 @@ QToolButton:pressed false - - 90: - - - 0.100000000000000 - - - 1.000000000000000 + + 90: + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Diffuse tint boost: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + 250 + 0 + + + + + 200 + 16777215 + + + + 1000 + + + 1 + + + 100 + + + Qt::Horizontal + + + + + + + + 60 + 23 + + + + + 75 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 255.000000000000000 + + + 1.000000000000000 + + + + + + + + Segoe UI + 9 + 50 + false + false + + + + Glossiness green channel diffuse tint - + Qt::Horizontal @@ -13534,14 +13184,8 @@ QToolButton:pressed - - - - - 0 - 0 - - + + 100 @@ -13558,17 +13202,17 @@ QToolButton:pressed - Diffuse tint boost: + Tint: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + - + 250 @@ -13582,13 +13226,13 @@ QToolButton:pressed - 1000 + 255 1 - 100 + 255 Qt::Horizontal @@ -13596,38 +13240,19 @@ QToolButton:pressed - + - 75 + 150 23 - 75 - 16777215 + 150 + 23 - - - Segoe UI - 9 - 50 - false - false - - - - 255.000000000000000 - - - 1.000000000000000 - - - - - Segoe UI @@ -13638,12 +13263,12 @@ QToolButton:pressed - Glossiness green channel diffuse tint + - + Qt::Horizontal @@ -13724,7 +13349,7 @@ QToolButton:pressed - 70 + 60 23 @@ -13754,40 +13379,6 @@ QToolButton:pressed - - - - false - - - - 70 - 0 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - @@ -13795,13 +13386,13 @@ QToolButton:pressed - 75 + 150 23 - 75 + 150 23 @@ -13815,7 +13406,7 @@ QToolButton:pressed - Pick color + @@ -13976,7 +13567,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14006,40 +13597,6 @@ QToolButton:pressed - - - - false - - - - 70 - 0 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - @@ -14047,13 +13604,13 @@ QToolButton:pressed - 75 + 150 23 - 75 + 150 23 @@ -14067,7 +13624,7 @@ QToolButton:pressed - Pick color + @@ -14123,7 +13680,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14153,40 +13710,6 @@ QToolButton:pressed - - - - false - - - - 70 - 0 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - @@ -14194,13 +13717,13 @@ QToolButton:pressed - 75 + 150 23 - 75 + 150 23 @@ -14214,7 +13737,7 @@ QToolButton:pressed - Pick color + @@ -14267,7 +13790,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14346,7 +13869,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14425,7 +13948,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14545,7 +14068,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14783,7 +14306,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14834,7 +14357,7 @@ QToolButton:pressed - 100 + 140 0 @@ -14845,6 +14368,12 @@ QToolButton:pressed + + + 140 + 0 + + Edge punch in @@ -14899,7 +14428,7 @@ QToolButton:pressed - 70 + 60 23 @@ -14978,7 +14507,7 @@ QToolButton:pressed - 70 + 60 23 @@ -15104,7 +14633,7 @@ QToolButton:pressed - 70 + 60 23 @@ -15166,7 +14695,7 @@ QToolButton:pressed - 70 + 60 23 @@ -15442,7 +14971,7 @@ QToolButton:pressed - 70 + 60 23 @@ -15466,51 +14995,17 @@ QToolButton:pressed - - - - false - - - - 70 - 20 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - - 75 + 150 23 - 75 + 150 23 @@ -15524,7 +15019,7 @@ QToolButton:pressed - Pick color + @@ -15574,7 +15069,7 @@ QToolButton:pressed - 90 + 81 23 @@ -15608,7 +15103,7 @@ QToolButton:pressed - 90 + 81 23 @@ -15642,7 +15137,7 @@ QToolButton:pressed - 90 + 81 23 @@ -15814,7 +15309,7 @@ QToolButton:pressed - 70 + 60 23 @@ -15873,7 +15368,7 @@ QToolButton:pressed - 70 + 60 23 @@ -15916,27 +15411,11 @@ QToolButton:pressed - - - - - Segoe UI - 9 - 50 - false - false - - - - Flow debug - - - - 70 + 60 23 @@ -15992,7 +15471,7 @@ QToolButton:pressed - 70 + 60 23 @@ -16073,7 +15552,7 @@ QToolButton:pressed - 70 + 60 23 @@ -16132,7 +15611,7 @@ QToolButton:pressed - 70 + 60 23 @@ -16191,7 +15670,7 @@ QToolButton:pressed - 70 + 60 23 @@ -16221,6 +15700,22 @@ QToolButton:pressed + + + + + Segoe UI + 9 + 50 + false + false + + + + Flow debug + + + @@ -16380,51 +15875,17 @@ QToolButton:pressed - - - - false - - - - 70 - 0 - - - - - 70 - 20 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - - 75 + 150 23 - 75 + 149 23 @@ -16438,7 +15899,7 @@ QToolButton:pressed - Pick color + @@ -16494,7 +15955,7 @@ QToolButton:pressed - 70 + 60 23 @@ -16520,6 +15981,12 @@ QToolButton:pressed 0 + + + 80 + 0 + + Segoe UI @@ -16532,13 +15999,16 @@ QToolButton:pressed Fog end: + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - 70 + 60 23 @@ -16605,7 +16075,7 @@ QToolButton:pressed - 70 + 60 23 @@ -16673,6 +16143,12 @@ QToolButton:pressed + + + 140 + 0 + + Segoe UI @@ -16689,6 +16165,12 @@ QToolButton:pressed + + + 140 + 0 + + Segoe UI @@ -16869,17 +16351,17 @@ QToolButton:pressed - + - 75 + 150 23 - 75 + 149 23 @@ -16893,45 +16375,11 @@ QToolButton:pressed - Pick color - - - - - - - false - - - - 70 - 0 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff + - + Qt::Horizontal @@ -16952,7 +16400,7 @@ QToolButton:pressed - 0 + 140 23 @@ -16977,7 +16425,7 @@ QToolButton:pressed - 0 + 140 23 @@ -16991,6 +16439,12 @@ QToolButton:pressed false + + + 140 + 0 + + Segoe UI @@ -17010,6 +16464,12 @@ QToolButton:pressed false + + + 140 + 0 + + Segoe UI @@ -17042,6 +16502,12 @@ QToolButton:pressed false + + + 140 + 0 + + Segoe UI @@ -17092,7 +16558,7 @@ QToolButton:pressed - 70 + 60 23 @@ -17191,6 +16657,34 @@ QToolButton:pressed + + + + + 150 + 23 + + + + + 149 + 23 + + + + + Segoe UI + 9 + 50 + false + false + + + + + + + @@ -17220,34 +16714,6 @@ QToolButton:pressed - - - - 75 - 23 - - - - - 75 - 23 - - - - - Segoe UI - 9 - 50 - false - false - - - - Pick color - - - - Qt::Horizontal @@ -17260,40 +16726,6 @@ QToolButton:pressed - - - - false - - - - 70 - 0 - - - - - 70 - 21 - - - - - Segoe UI - 9 - 50 - false - false - - - - Qt::ScrollBarAlwaysOff - - - Qt::ScrollBarAlwaysOff - - - @@ -17355,7 +16787,7 @@ QToolButton:pressed - 70 + 60 23 @@ -17715,7 +17147,7 @@ QToolButton:pressed - 70 + 60 23 @@ -17789,7 +17221,7 @@ QToolButton:pressed - 70 + 60 23 @@ -17853,7 +17285,7 @@ QToolButton:pressed - 70 + 60 23 @@ -17924,7 +17356,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18090,7 +17522,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18166,7 +17598,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18242,7 +17674,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18318,7 +17750,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18382,7 +17814,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18446,7 +17878,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18612,7 +18044,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18688,7 +18120,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18770,7 +18202,7 @@ QToolButton:pressed - 70 + 60 23 @@ -18829,7 +18261,7 @@ QToolButton:pressed - 70 + 60 23 @@ -21039,7 +20471,6 @@ border: 1px solid #222; lineEdit_lightWarp doubleSpinBox_saturation doubleSpinBox_fresnelReflection - color_selfIllumTint toolButton_selfIllumTint doubleSpinBox_selfIllumFresnelMin doubleSpinBox_selfIllumFresnelMax @@ -21053,15 +20484,10 @@ border: 1px solid #222; doubleSpinBox_scrollX2 doubleSpinBox_scrollY2 toolButton_reflectionTint - color_reflectionTint toolButton_refractionTint - color_refractionTint lineEdit_diffuse2 lineEdit_bumpmap2 comboBox_surface2 - doubleSpinBox_alphaTestRef - color_color1 - color_color2 toolButton_color1 toolButton_color2 lineEdit_flowMap @@ -21070,7 +20496,6 @@ border: 1px solid #222; doubleSpinBox_bumpStrength lineEdit_noiseTexture toolButton_noiseTexture - color_fogTint toolButton_fogTint spinBox_fogStart spinBox_fogEnd From 6b687bd46b870659174a10bfcf03f4fb44cd8b2a Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Sun, 18 Mar 2018 23:52:51 +0100 Subject: [PATCH 04/10] Add reconvert dialog option to each lineedit --- images/reconvert_dialog.png | Bin 0 -> 15021 bytes resources.qrc | 1 + src/mainwindow.cpp | 232 +++++++++++++--------- src/mainwindow.h | 8 +- src/tintslider.cpp | 2 +- src/tintslider.h | 5 +- src/user-interface/layerblend.cpp | 18 +- src/user-interface/phong.cpp | 24 +-- src/user-interface/shaders.cpp | 2 +- src/user-interface/shading-reflection.cpp | 2 +- src/user-interface/view-helper.cpp | 10 +- src/user-interface/view-helper.h | 10 +- 12 files changed, 183 insertions(+), 131 deletions(-) create mode 100644 images/reconvert_dialog.png diff --git a/images/reconvert_dialog.png b/images/reconvert_dialog.png new file mode 100644 index 0000000000000000000000000000000000000000..507f4f3a094b72d3c88aa4ad418f3ada262e57b2 GIT binary patch literal 15021 zcmeI3&x<2P6vs;kRvlSbP;l{LlVw5CPXEZS={CtSPG+2e%{a_PcIM)4rMh~ica!ek z?#?DNAo%0tRS=fN|3DEz4}yqZym=D5_#e0kvMhqXAXazhN6$-A47%c_8fKDLuip1{ zeX8C|U;4eB?N`q(Kf8<&I=i*m*kzyR;=jkwu>a3J7-IJEgul5TBJ|`_@!uop?uX|Q zGJbYid(mF=vPryd9$Q|U<_BG$%|@ttY2agWlSWdT9yo3-_sf@G=Oo9f<*t^RYSUk% zhtB44K(8Ecx5)8LVpzFL_2ufoWCC3pVQJ9qxS=_y1(iimuCSh8!Nb5gy2Hcp()T>ojOc0>_UW&y`|b z-1d4=EtiWEO|H?py8a}Q8;;m9ipl`{ik4TEc|jJL#Q43SliZp`6xyL(>P8`p)8@wc zhhF4`hu(se6ZgWzY)_iaN$$D#+wIOx9Y*W78G;egxshS($fwFK4ZU7K==yE8lne7# zA364Pb51D5o`v^L2hM`9*pr4OMLvKpD0P=nQvg(G|_mF(P%jzvt{3%WR}J6(K072iFmD$~Kt%*m-T*SwAw zu-l^bLRFbJoQX=DaviiirH=#iEP+5mdnIw6B`rF zsMra_W-}W;Bi-;wFRm6Qoi-NBBTRmJTP0P~)D^uf>)58UrqLDIC=*>aN-Av^)C#5* zZJa10Hk0VJz+rt4cQSM0wOA~fp<2YCswG#7tearHSdiQCTH0kBm$6nV=qrp=ieiq; zOsY*MWT*8gbBftnPCDBadh6uq*wJy44&~z@q;dV#a^nJ=w6sabier*GHZh5NTb;z^ zL9MECVsv_2lgLq+GrOIqLy+oc!WZZ0A5xcBUa3?vYq3b^*-;+{boGFpkkeFts(LaE z%2$>6x1i(v2OAOM+y8DGPFGd`U>g>7sQ+&prl*)3V)uYrb!B{j#{;L^xpY5IR@S&$ zXDhK9|2UbfirI<6N%gSqF*7#JoX+2itFhBd=2vu;UF;EtU8B&f8;0)lL$hueI*okY zb)vdH$_9orQSmQm+TO3Qhdo*^mr8|FRe{4WV#gWK&R)Y|eK?H!iB=xPK*!v`{Y8Np z$0#t}s?1|qQiJIzd+1}&o66*YbEZ5eUF>0gnXc$zssb&M1OVZi0vDeT@CsZ22;UUA z_h!Z!sj zJ|Ex}xBw8oDRA-m0I$FWfbdO$i_Zsm1ug)DZwg#|KENw*0U&%+;NtTEUV#e$;hO>% zpAYZ~TmT5)6u9_&fLGuGK=`J>#peUO0v7}5Qm%X>yXD?`8`>v<6mpdi0 zx!XkO_##4Yy^GNAL-zR-LOm6sd)E;%?;!My_x`nSH`v^lw;HRh!H@0VhQmus7w^1% z S-v5G`Xls4D@yRRK-}xJ-=|K|! literal 0 HcmV?d00001 diff --git a/resources.qrc b/resources.qrc index 401ffb9..a66a4d2 100644 --- a/resources.qrc +++ b/resources.qrc @@ -95,6 +95,7 @@ images/clear.png images/layerblend.png images/reconvert_half.png + images/reconvert_dialog.png misc/completions.txt diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 119fe14..0304ee3 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -321,15 +321,15 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : ui->doubleSpinBox_reflectivity->setDoubleSlider(ui->horizontalSlider_reflectivity); ui->doubleSpinBox_reflectivity_2->setDoubleSlider(ui->horizontalSlider_reflectivity_2); ui->doubleSpinBox_selfIllumTint->setDoubleSlider(ui->horizontalSlider_selfIllumTint); - ui->horizontalSlider_phongTint->initialize(ui->color_phongTint); - //ui->horizontalSlider_envmapTint->initialize(ui->color_envmapTint); - //ui->horizontalSlider_selfIllumTint->initialize(ui->color_selfIllumTint); - //ui->horizontalSlider_reflectivity->initialize(ui->color_reflectivity); - //ui->horizontalSlider_reflectivity_2->initialize(ui->color_reflectivity_2); + ui->horizontalSlider_phongTint->initialize(ui->toolButton_phongTint); + //ui->horizontalSlider_envmapTint->initialize(ui->toolButton_envmapTint); + //ui->horizontalSlider_selfIllumTint->initialize(ui->toolButton_selfIllumTint); + //ui->horizontalSlider_reflectivity->initialize(ui->toolButton_reflectivity); + //ui->horizontalSlider_reflectivity_2->initialize(ui->toolButton_reflectivity_2); - ui->horizontalSlider_waterReflectColor->initialize(ui->color_reflectionTint); - ui->horizontalSlider_waterRefractColor->initialize(ui->color_refractionTint); - ui->horizontalSlider_waterFogColor->initialize(ui->color_fogTint); + ui->horizontalSlider_waterReflectColor->initialize(ui->toolButton_reflectionTint); + ui->horizontalSlider_waterRefractColor->initialize(ui->toolButton_refractionTint); + ui->horizontalSlider_waterFogColor->initialize(ui->toolButton_fogTint); //----------------------------------------------------------------------------------------// @@ -565,20 +565,20 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : //----------------------------------------------------------------------------------------// - ui->color_envmapTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_phongTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_reflectionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_refractionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_fogTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_refractTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_color1->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_color2->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_selfIllumTint->setStyleSheet("background-color: rgb(255, 255, 255)"); - ui->color_reflectivity->setStyleSheet("background-color: rgb(255, 255, 255)"); - ui->color_reflectivity_2->setStyleSheet("background-color: rgb(255, 255, 255)"); - ui->color_layer1tint->setStyleSheet("background-color: rgb(255, 255, 255)"); - ui->color_layer2tint->setStyleSheet("background-color: rgb(255, 255, 255)"); - ui->color_layerBorderTint->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_envmapTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_phongTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_reflectionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_refractionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_fogTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_refractTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_color1->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_color2->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_selfIllumTint->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_reflectivity->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_reflectivity_2->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_layer1tint->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_layer2tint->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_layerBorderTint->setStyleSheet("background-color: rgb(255, 255, 255)"); phong::initialize(ui); @@ -1231,7 +1231,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) if( !( value = vmt.parameters.take("$reflectivity") ).isEmpty() ) { applyColor("$reflectivity", value, - ui->color_reflectivity, + ui->toolButton_reflectivity, ui->doubleSpinBox_reflectivity, ui); showOther = true; @@ -1241,7 +1241,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) if( vmt.shaderName.compare("WorldVertexTransition", Qt::CaseInsensitive) ) Error("$reflectivity is only works with WorldVertexTransition shader!") applyColor("$reflectivity2", value, - ui->color_reflectivity_2, + ui->toolButton_reflectivity_2, ui->doubleSpinBox_reflectivity_2, ui); showOther = true; @@ -1942,7 +1942,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) Error("$envmaptint is only supported with $envmap!") applyColor("$envmaptint", value, - ui->color_envmapTint, + ui->toolButton_envmapTint, ui->doubleSpinBox_envmapTint, ui); showShadingReflection = true; @@ -2126,7 +2126,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) Error("$selfillumtint only works with \"$selfillum 1\"!") applyColor("$selfillumtint", value, - ui->color_selfIllumTint, + ui->toolButton_selfIllumTint, ui->doubleSpinBox_selfIllumTint, ui); showSelfIllumination = true; @@ -2737,9 +2737,9 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) if( (vmt.shaderName != "Refract") && (vmt.shaderName != "Water") ) Error("$refracttint only works with the Refract or Water shaders!") - QPlainTextEdit* colorWidget = (vmt.shader == Shader::S_Water) - ? ui->color_refractionTint - : ui->color_refractTint; + QToolButton* colorWidget = (vmt.shader == Shader::S_Water) + ? ui->toolButton_refractionTint + : ui->toolButton_refractTint; applyBackgroundColor("$refracttint", value, colorWidget, ui->horizontalSlider_waterRefractColor, ui); @@ -2825,7 +2825,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) Error("$fogcolor only works with the Water shader!") applyBackgroundColor("$fogcolor", value, - ui->color_fogTint, + ui->toolButton_fogTint, ui->horizontalSlider_waterFogColor, ui); showWaterFog = true; @@ -3188,7 +3188,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) Error("$reflecttint only works with \"$abovewater 1\"!") applyBackgroundColor("$reflecttint", value, - ui->color_reflectionTint, + ui->toolButton_reflectionTint, ui->horizontalSlider_waterReflectColor, ui); showWaterReflection = true; @@ -3473,7 +3473,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) if( !( value = vmt.parameters.take("$color") ).isEmpty() ) { QString col1 = "$color"; - utils::applyColor(col1, value, ui->color_color1, ui->doubleSpinBox_color1, ui, true); + utils::applyColor(col1, value, ui->toolButton_color1, ui->doubleSpinBox_color1, ui, true); showColor = true; } @@ -3481,7 +3481,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) if( !( value = vmt.parameters.take("$color2") ).isEmpty() ) { QString col1 = "$color2"; - utils::applyColor(col1, value, ui->color_color2, ui->doubleSpinBox_color2, ui); + utils::applyColor(col1, value, ui->toolButton_color2, ui->doubleSpinBox_color2, ui); showColor = true; } @@ -3905,12 +3905,12 @@ VmtFile MainWindow::makeVMT() if( ui->doubleSpinBox_seamlessScale->isEnabled() && ui->doubleSpinBox_seamlessScale->value() != 0.0 ) vmtFile.parameters.insert( "$seamless_scale", Str( ui->doubleSpinBox_seamlessScale->value() )); - tmp = toParameterBig(utils::getBG(ui->color_reflectivity), + tmp = toParameterBig(utils::getBG(ui->toolButton_reflectivity), ui->doubleSpinBox_reflectivity->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$reflectivity", tmp ); - tmp = toParameterBig(utils::getBG(ui->color_reflectivity_2), + tmp = toParameterBig(utils::getBG(ui->toolButton_reflectivity_2), ui->doubleSpinBox_reflectivity_2->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$reflectivity2", tmp ); @@ -3928,7 +3928,7 @@ VmtFile MainWindow::makeVMT() if( ui->checkBox_envmapAlpha->isChecked() ) vmtFile.parameters.insert( "$selfillum_envmapmask_alpha", "1" ); - tmp = toParameterBig(utils::getBG(ui->color_selfIllumTint), + tmp = toParameterBig(utils::getBG(ui->toolButton_selfIllumTint), ui->doubleSpinBox_selfIllumTint->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$selfillumtint", tmp ); @@ -3969,7 +3969,7 @@ VmtFile MainWindow::makeVMT() Str(ui->spinBox_exponent->value())); } - tmp = toParameter(utils::getBG(ui->color_phongTint)); + tmp = toParameter(utils::getBG(ui->toolButton_phongTint)); if( ui->toolButton_phongTint->isEnabled() && tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$phongtint", tmp ); @@ -4003,7 +4003,7 @@ VmtFile MainWindow::makeVMT() vmtFile.parameters.insert( "$phongexponent", Str( ui->spinBox_exponent2->value() ) ); float multiplier = ui->doubleSpinBox_phongAmount->value(); - const QColor &color = (utils::getBG(ui->color_phongAmount)); + const QColor &color = (utils::getBG(ui->toolButton_phongAmount)); QString red = QString::number(color.redF() * multiplier, 'f', 2); QString green = QString::number(color.greenF() * multiplier, 'f', 2); QString blue = QString::number(color.blueF() * multiplier, 'f', 2); @@ -4047,9 +4047,9 @@ VmtFile MainWindow::makeVMT() } float multiplier2 = ui->doubleSpinBox_spec_amount2->value(); - if ( multiplier2 != multiplier || utils::getBG(ui->color_phongAmount) != utils::getBG(ui->color_spec_amount2) ) { + if ( multiplier2 != multiplier || utils::getBG(ui->toolButton_phongAmount) != utils::getBG(ui->toolButton_spec_amount2) ) { - const QColor color2 = (utils::getBG(ui->color_spec_amount2)); + const QColor color2 = (utils::getBG(ui->toolButton_spec_amount2)); QString red2 = QString::number(color2.redF() * multiplier2, 'f', 2); QString green2 = QString::number(color2.greenF() * multiplier2, 'f', 2); QString blue2 = QString::number(color2.blueF() * multiplier2, 'f', 2); @@ -4113,17 +4113,17 @@ VmtFile MainWindow::makeVMT() vmtFile.parameters.insert( "$blendsoftness", Str( ui->doubleSpinBox_layerBlendSoftness->value() )); - tmp = toParameterBig(utils::getBG(ui->color_layer1tint), + tmp = toParameterBig(utils::getBG(ui->toolButton_layer1tint), ui->doubleSpinBox_layer1tint->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$layertint1", tmp ); - tmp = toParameterBig(utils::getBG(ui->color_layer2tint), + tmp = toParameterBig(utils::getBG(ui->toolButton_layer2tint), ui->doubleSpinBox_layer2tint->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$layertint2", tmp ); - tmp = toParameterBig(utils::getBG(ui->color_layerBorderTint), + tmp = toParameterBig(utils::getBG(ui->toolButton_layerBorderTint), ui->doubleSpinBox_layerBorderTint->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$layerbordertint", tmp ); @@ -4234,12 +4234,12 @@ VmtFile MainWindow::makeVMT() if( !ui->groupBox_color->isHidden() ) { - tmp = toParameterBig(utils::getBG(ui->color_color1), + tmp = toParameterBig(utils::getBG(ui->toolButton_color1), ui->doubleSpinBox_color1->value(), true); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$color", tmp ); - tmp = toParameterBig(utils::getBG(ui->color_color2), + tmp = toParameterBig(utils::getBG(ui->toolButton_color2), ui->doubleSpinBox_color2->value()); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$color2", tmp ); @@ -4329,7 +4329,7 @@ VmtFile MainWindow::makeVMT() if( !( tmp = ui->lineEdit_refractTexture->text().trimmed() ).isEmpty() ) vmtFile.parameters.insert( "$refracttinttexture", tmp ); - tmp = toParameter(utils::getBG(ui->color_refractTint)); + tmp = toParameter(utils::getBG(ui->toolButton_refractTint)); if( tmp != "[1 1 1]" ) vmtFile.parameters.insert( "$refracttint", tmp ); @@ -4447,7 +4447,7 @@ VmtFile MainWindow::makeVMT() if( !ui->groupBox_waterReflection->isHidden() ) { - tmp = toWaterParameter(utils::getBG(ui->color_reflectionTint)); + tmp = toWaterParameter(utils::getBG(ui->toolButton_reflectionTint)); if( tmp != "{255 255 255}" ) vmtFile.parameters.insert( "$reflecttint", tmp ); @@ -4485,7 +4485,7 @@ VmtFile MainWindow::makeVMT() vmtFile.parameters.insert("$refracttexture", "_rt_waterrefraction"); - tmp = toWaterParameter(utils::getBG(ui->color_refractionTint)); + tmp = toWaterParameter(utils::getBG(ui->toolButton_refractionTint)); if( tmp != "{255 255 255}" ) vmtFile.parameters.insert( "$refracttint", tmp ); @@ -4497,7 +4497,7 @@ VmtFile MainWindow::makeVMT() if( !ui->groupBox_waterFog->isHidden() ) { - tmp = toWaterParameter(utils::getBG(ui->color_fogTint)); + tmp = toWaterParameter(utils::getBG(ui->toolButton_fogTint)); if( tmp != "{255 255 255}" ) vmtFile.parameters.insert( "$fogcolor", tmp ); @@ -4693,10 +4693,10 @@ void MainWindow::resetWidgets() { // Other ui->doubleSpinBox_reflectivity->setValue(1.0); - ui->color_reflectivity->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_reflectivity->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->doubleSpinBox_reflectivity_2->setValue(1.0); - ui->color_reflectivity_2->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_reflectivity_2->setStyleSheet( "background-color: rgb(255, 255, 255)" ); //----------------------------------------------------------------------------------------// @@ -4778,7 +4778,7 @@ void MainWindow::resetWidgets() { ui->doubleSpinBox_envmapTint->setDisabled(true); ui->doubleSpinBox_envmapTint->setValue(1.0); ui->horizontalSlider_envmapTint->setDisabled(true); - ui->color_envmapTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_envmapTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->toolButton_envmapTint->setDisabled(true); ui->checkBox_basealpha->setDisabled(true); @@ -4901,7 +4901,7 @@ void MainWindow::resetWidgets() { //----------------------------------------------------------------------------------------// - ui->color_reflectionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_reflectionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->doubleSpinBox_reflectionAmount->setValue(0.0); @@ -4916,7 +4916,7 @@ void MainWindow::resetWidgets() { ui->lineEdit_maskTexture->setText(""); ui->checkBox_envmapAlpha->setChecked(false); ui->doubleSpinBox_selfIllumTint->setValue(1.0); - ui->color_selfIllumTint->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_selfIllumTint->setStyleSheet("background-color: rgb(255, 255, 255)"); ui->doubleSpinBox_selfIllumFresnelMin->setValue(0.0); ui->doubleSpinBox_selfIllumFresnelMax->setValue(1.0); ui->doubleSpinBox_selfIllumFresnelExp->setValue(1.0); @@ -4928,13 +4928,13 @@ void MainWindow::resetWidgets() { ui->lineEdit_refractNormalMap->clear(); ui->lineEdit_refractNormalMap2->clear(); - ui->color_refractionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_refractionTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->doubleSpinBox_refractionAmount->setValue(0.0); //----------------------------------------------------------------------------------------// - ui->color_fogTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_fogTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->spinBox_fogStart->setValue(0.0); ui->spinBox_fogEnd->setValue(0.0); @@ -4947,7 +4947,7 @@ void MainWindow::resetWidgets() { ui->lineEdit_refractTexture->clear(); - ui->color_refractTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_refractTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->doubleSpinBox_refractAmount->setValue(0.0); ui->doubleSpinBox_refractBlur->setValue(0.0); @@ -4956,8 +4956,8 @@ void MainWindow::resetWidgets() { ui->doubleSpinBox_color1->setValue(1.0); ui->doubleSpinBox_color2->setValue(1.0); - ui->color_color1->setStyleSheet( "background-color: rgb(255, 255, 255)" ); - ui->color_color2->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_color1->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_color2->setStyleSheet( "background-color: rgb(255, 255, 255)" ); ui->lineEdit_tintMask->clear(); ui->checkBox_blendTint->setChecked(false); @@ -5580,8 +5580,8 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) ui->lineEdit_tintMask->text() != "" || ui->checkBox_blendTint->text() != "" || ui->checkBox_noTint->text() != "" || - utils::getBG(ui->color_color1) != QColor(255, 255, 255) || - utils::getBG(ui->color_color2) != QColor(255, 255, 255)); + utils::getBG(ui->toolButton_color1) != QColor(255, 255, 255) || + utils::getBG(ui->toolButton_color2) != QColor(255, 255, 255)); case OtherTexture: @@ -5589,8 +5589,8 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) ui->doubleSpinBox_seamlessScale->value() != 0.0 || ui->doubleSpinBox_reflectivity->value() != 1.0 || ui->doubleSpinBox_reflectivity_2->value() != 1.0 || - utils::getBG(ui->color_reflectivity) != QColor(255, 255, 255) || - utils::getBG(ui->color_reflectivity_2) != QColor(255, 255, 255)); + utils::getBG(ui->toolButton_reflectivity) != QColor(255, 255, 255) || + utils::getBG(ui->toolButton_reflectivity_2) != QColor(255, 255, 255)); case Phong: case PhongBrush: @@ -5612,7 +5612,7 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) ui->checkBox_normalalpha->isChecked() || ui->checkBox_tintSpecMask->isChecked() || ui->doubleSpinBox_envmapTint->value() != 1.0 || - utils::getBG(ui->color_reflectionTint) != QColor(255, 255, 255) || + utils::getBG(ui->toolButton_reflectionTint) != QColor(255, 255, 255) || ui->doubleSpinBox_saturation->value() != 1.0 || ui->doubleSpinBox_contrast->value() != 0.0 || ui->doubleSpinBox_fresnelReflection->value() != 1.0) || @@ -5625,7 +5625,7 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) ui->checkBox_envmapAlpha->isChecked() || //ui->checkBox_baseAlpha->isChecked() || ui->doubleSpinBox_selfIllumTint->value() != 1.0 || - utils::getBG(ui->color_selfIllumTint) != QColor(255, 255, 255) || + utils::getBG(ui->toolButton_selfIllumTint) != QColor(255, 255, 255) || ui->doubleSpinBox_selfIllumFresnelMin->value() != 0.0 || ui->doubleSpinBox_selfIllumFresnelMax->value() != 1.0 || ui->doubleSpinBox_selfIllumFresnelExp->value() != 1.0); @@ -5661,7 +5661,7 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) case WaterReflection: - return (utils::getBG(ui->color_reflectionTint) != QColor(255, 255, 255) || + return (utils::getBG(ui->toolButton_reflectionTint) != QColor(255, 255, 255) || ui->doubleSpinBox_reflectionAmount->value() != 0.0 || ui->checkBox_skybox->isChecked() || ui->checkBox_reflectEntities->isChecked() || @@ -5669,12 +5669,12 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) case WaterRefraction: - return (utils::getBG(ui->color_refractionTint) != QColor(255, 255, 255) || + return (utils::getBG(ui->toolButton_refractionTint) != QColor(255, 255, 255) || ui->doubleSpinBox_refractionAmount->value() != 0.0); case Fog: - return (utils::getBG(ui->color_fogTint) != QColor(255, 255, 255) || + return (utils::getBG(ui->toolButton_fogTint) != QColor(255, 255, 255) || ui->spinBox_fogStart->value() != 0 || ui->spinBox_fogEnd->value() != 0 || ui->doubleSpinBox_flashlightTint->value() != 0.0 || @@ -6967,7 +6967,7 @@ void MainWindow::shaderChanged() ui->horizontalSlider_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); ui->doubleSpinBox_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); - ui->color_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); + ui->toolButton_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); ui->toolButton_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); ui->label_reflectivity2->setVisible( shader == "WorldVertexTransition" ); @@ -8432,6 +8432,8 @@ void MainWindow::processVtf(const QString& objectName, QAction *reconvertHalf = lineEdit->addAction(QIcon(":/icons/reconvert_half"), QLineEdit::TrailingPosition); connect(reconvertHalf, SIGNAL(triggered()), SLOT(reconvertTextureHalf())); + QAction *openConvertDialog = lineEdit->addAction(QIcon(":/icons/reconvert_dialog"), QLineEdit::TrailingPosition); + connect(openConvertDialog, SIGNAL(triggered()), SLOT(openReconvertDialogAction())); mIniPaths->setValue(relativeFilePath, fileName); @@ -8466,6 +8468,9 @@ void MainWindow::processVtf(const QString& objectName, QAction *reconvertHalf = lineEdit->addAction(QIcon(":/icons/reconvert_half"), QLineEdit::TrailingPosition); connect(reconvertHalf, SIGNAL(triggered()), SLOT(reconvertTextureHalf())); + QAction *openConvertDialog = lineEdit->addAction(QIcon(":/icons/reconvert_dialog"), QLineEdit::TrailingPosition); + connect(openConvertDialog, SIGNAL(triggered()), SLOT(openReconvertDialogAction())); + InfoReconvert("Converting \"" + fileName.replace("\\", "/").section("/", -1) + "\"..."); ConversionThread* conversionThread = new ConversionThread(this); @@ -8607,7 +8612,7 @@ void MainWindow::requestedCubemap( bool enabled ) ui->toolButton_envmap->setEnabled( !(enabled) && (getCurrentGame() != "") ); } -void MainWindow::changeColor(QPlainTextEdit* colorField , TintSlider *slider) { +void MainWindow::changeColor(QToolButton* colorField , TintSlider *slider) { #ifdef Q_OS_WIN QString bytes = mIniSettings->value( "customColors" ).toByteArray(); @@ -8676,7 +8681,7 @@ void MainWindow::changeColor(QPlainTextEdit* colorField , TintSlider *slider) { #endif } -void MainWindow::changeColor(QPlainTextEdit* colorField) +void MainWindow::changeColor(QToolButton* colorField) { #ifdef Q_OS_WIN QString bytes = mIniSettings->value( "customColors" ).toByteArray(); @@ -8747,54 +8752,54 @@ void MainWindow::changedColor() { QWidget* caller = qobject_cast( sender() ); if( caller->objectName() == "toolButton_envmapTint" ) - changeColor(ui->color_envmapTint); + changeColor(ui->toolButton_envmapTint); else if( caller->objectName() == "toolButton_phongTint" ) - changeColor(ui->color_phongTint, ui->horizontalSlider_phongTint); + changeColor(ui->toolButton_phongTint, ui->horizontalSlider_phongTint); else if( caller->objectName() == "toolButton_refractTint" ) - changeColor(ui->color_refractTint); + changeColor(ui->toolButton_refractTint); else if( caller->objectName() == "toolButton_refractionTint" ) - changeColor(ui->color_refractionTint, ui->horizontalSlider_waterRefractColor); + changeColor(ui->toolButton_refractionTint, ui->horizontalSlider_waterRefractColor); else if( caller->objectName() == "toolButton_reflectionTint" ) - changeColor(ui->color_reflectionTint, ui->horizontalSlider_waterReflectColor); + changeColor(ui->toolButton_reflectionTint, ui->horizontalSlider_waterReflectColor); else if( caller->objectName() == "toolButton_fogTint" ) - changeColor(ui->color_fogTint, ui->horizontalSlider_waterFogColor); + changeColor(ui->toolButton_fogTint, ui->horizontalSlider_waterFogColor); else if( caller->objectName() == "toolButton_color1" ) { - changeColor(ui->color_color1); + changeColor(ui->toolButton_color1); colorChanged(); } else if( caller->objectName() == "toolButton_color2" ) { - changeColor(ui->color_color2); + changeColor(ui->toolButton_color2); colorChanged(); } else if( caller->objectName() == "toolButton_reflectivity" ) - changeColor(ui->color_reflectivity); + changeColor(ui->toolButton_reflectivity); else if( caller->objectName() == "toolButton_reflectivity_2" ) - changeColor(ui->color_reflectivity_2); + changeColor(ui->toolButton_reflectivity_2); else if( caller->objectName() == "toolButton_selfIllumTint" ) - changeColor(ui->color_selfIllumTint); + changeColor(ui->toolButton_selfIllumTint); else if( caller->objectName() == "toolButton_phongAmount" ) - changeColor(ui->color_phongAmount); + changeColor(ui->toolButton_phongAmount); else if( caller->objectName() == "toolButton_spec_amount2" ) - changeColor(ui->color_spec_amount2); + changeColor(ui->toolButton_spec_amount2); else if( caller->objectName() == "toolButton_layer1tint" ) - changeColor(ui->color_layer1tint); + changeColor(ui->toolButton_layer1tint); else if( caller->objectName() == "toolButton_layer2tint" ) - changeColor(ui->color_layer2tint); + changeColor(ui->toolButton_layer2tint); else if( caller->objectName() == "toolButton_layerBorderTint" ) - changeColor(ui->color_layerBorderTint); + changeColor(ui->toolButton_layerBorderTint); } void MainWindow::resetColor() @@ -8805,11 +8810,11 @@ void MainWindow::resetColor() if( caller->objectName() == "pushButton_envmapTint" ) { - ui->color_envmapTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_envmapTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); } else if( caller->objectName() == "pushButton_phongTint" ) { - ui->color_phongTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); + ui->toolButton_phongTint->setStyleSheet( "background-color: rgb(255, 255, 255)" ); } } @@ -10023,6 +10028,34 @@ void MainWindow::displayConversionDialog() dialog.exec(); #endif } + +void MainWindow::displayConversionDialogTexture(QString file) +{ +#ifdef Q_OS_WIN + if( QDir().exists("vtfcmd.exe") ) { + + QString dir = mIniSettings->value("lastSaveAsDir").toString(); + + mIniSettings->setValue("lastTextureConvertDir", dir); + ConversionDialog dialog( mIniSettings, this ); + + if (file != "") { + dialog.addFile( file ); + } + dialog.show(); + dialog.exec(); + + } else { + + MsgBox::warning(this, "VMT Editor - Application Missing", "vtfcmd.exe is needed for the batch process and was not found in the working directory!"); + } +#else + ConversionDialog dialog(mIniSettings, this); + dialog.show(); + dialog.exec(); +#endif +} + void MainWindow::displayBatchDialog() { BatchDialog dialog( mAvailableGames, makeVMT(), mIniSettings, this ); @@ -10064,6 +10097,15 @@ void MainWindow::gameTriggered( bool triggered ) } } +void MainWindow::openReconvertDialogAction() { + const auto lineEdit = + qobject_cast(qobject_cast(sender())->parent()); + const auto tooltip = lineEdit->toolTip(); + + displayConversionDialogTexture(tooltip); +} + + void MainWindow::reconvertTextureHalf() { const auto lineEdit = qobject_cast(qobject_cast(sender())->parent()); @@ -10285,6 +10327,10 @@ void MainWindow::createReconvertAction(QLineEdit* lineEdit, QString fileName) { QAction *reconvertHalf = lineEdit->addAction(QIcon(":/icons/reconvert_half"), QLineEdit::TrailingPosition); connect(reconvertHalf, SIGNAL(triggered()), SLOT(reconvertTextureHalf())); + QAction *openConvertDialog = lineEdit->addAction(QIcon(":/icons/reconvert_dialog"), QLineEdit::TrailingPosition); + connect(openConvertDialog, SIGNAL(triggered()), SLOT(openReconvertDialogAction())); + + if (lineEdit == ui->lineEdit_bumpmap) { ui->label_bumpmapAlpha->setVisible(true); ui->lineEdit_bumpmapAlpha->setVisible(true); @@ -10530,8 +10576,8 @@ void MainWindow::createBlendToolTexture() } else { - QColor tint1 = utils::getBG(ui->color_layer1tint); - QColor tint2 = utils::getBG(ui->color_layer2tint); + QColor tint1 = utils::getBG(ui->toolButton_layer1tint); + QColor tint2 = utils::getBG(ui->toolButton_layer2tint); const double mult1 = ui->doubleSpinBox_layer1tint->value(); const double mult2 = ui->doubleSpinBox_layer2tint->value(); @@ -10823,8 +10869,8 @@ void MainWindow::opacityChanged( double value ) { void MainWindow::colorChanged() { - QColor color1 = utils::getBG(ui->color_color1); - QColor color2 = utils::getBG(ui->color_color2); + QColor color1 = utils::getBG(ui->toolButton_color1); + QColor color2 = utils::getBG(ui->toolButton_color2); double multiplier1 = ui->doubleSpinBox_color1->value(); double multiplier2 = ui->doubleSpinBox_color2->value(); diff --git a/src/mainwindow.h b/src/mainwindow.h index aa11e09..627ece5 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -258,9 +258,9 @@ class MainWindow : public QMainWindow //----------------------------------------------------------------------------------------// - void changeColor( QPlainTextEdit* colorField ); + void changeColor( QToolButton* colorField ); - void changeColor( QPlainTextEdit* colorField, TintSlider* slider ); + void changeColor( QToolButton *colorField, TintSlider* slider ); bool previewTexture( const int type, const QString& texture ); @@ -415,6 +415,8 @@ private slots: void displayOptionsDialog(); + void displayConversionDialogTexture(QString file); + void displayConversionDialog(); void displayBatchDialog(); @@ -433,6 +435,8 @@ private slots: void addCSGOParameter(QString value, VmtFile& vmt, QString string, QDoubleSpinBox* doubleSpinBox); + void openReconvertDialogAction(); + void reconvertTexture(); void reconvertTextureHalf(); diff --git a/src/tintslider.cpp b/src/tintslider.cpp index 6dc8607..6aa243c 100644 --- a/src/tintslider.cpp +++ b/src/tintslider.cpp @@ -27,7 +27,7 @@ void TintSlider::valueChangedSlot(int value) { .arg( hsl.blue() )); } -void TintSlider::initialize(QPlainTextEdit* colorWidget, const QColor& color) { +void TintSlider::initialize(QToolButton *colorWidget, const QColor& color) { this->colorWidget = colorWidget; this->color = color; diff --git a/src/tintslider.h b/src/tintslider.h index 1101151..3007a9a 100644 --- a/src/tintslider.h +++ b/src/tintslider.h @@ -3,6 +3,7 @@ #include #include +#include class TintSlider : public QSlider { @@ -15,11 +16,11 @@ class TintSlider : public QSlider { void wheelEvent(QWheelEvent* event); - void initialize( QPlainTextEdit* colorWidget, const QColor& color = QColor(255, 255, 255) ); + void initialize(QToolButton *colorWidget, const QColor& color = QColor(255, 255, 255) ); private: - QPlainTextEdit* colorWidget; + QToolButton* colorWidget; QColor color; diff --git a/src/user-interface/layerblend.cpp b/src/user-interface/layerblend.cpp index ff97894..866a055 100644 --- a/src/user-interface/layerblend.cpp +++ b/src/user-interface/layerblend.cpp @@ -17,16 +17,16 @@ bool layerblend::hasChanged(Ui::MainWindow *ui) START VAL(ui->doubleSpinBox_layer1tint, "1.0") - COL(ui->color_layer1tint) + COL(ui->toolButton_layer1tint) VAL(ui->doubleSpinBox_layer2tint, "1.0") - COL(ui->color_layer2tint) + COL(ui->toolButton_layer2tint) CHE(ui->checkBox_newLayerBlend) VAL(ui->doubleSpinBox_layerBlendSoftness, "0.5") VAL(ui->doubleSpinBox_layerBorderOffset, "0.0") VAL(ui->doubleSpinBox_layerBorderSoftness, "0.5") VAL(ui->doubleSpinBox_layerBorderStrength, "0.5") VAL(ui->doubleSpinBox_layerBorderTint, "1.0") - COL(ui->color_layerBorderTint) + COL(ui->toolButton_layerBorderTint) CHE(ui->checkBox_layerEdgeNormal) CHE(ui->checkBox_layerEdgePunchin) VAL(ui->doubleSpinBox_layerEdgeSoftness, "0.5") @@ -45,8 +45,8 @@ void layerblend::resetWidgets(Ui::MainWindow *ui) { ui->doubleSpinBox_layer1tint->setValue(1.0); ui->doubleSpinBox_layer2tint->setValue(1.0); - ui->color_layer1tint->setStyleSheet(whiteBG); - ui->color_layer2tint->setStyleSheet(whiteBG); + ui->toolButton_layer1tint->setStyleSheet(whiteBG); + ui->toolButton_layer2tint->setStyleSheet(whiteBG); ui->checkBox_newLayerBlend->setChecked(false); ui->doubleSpinBox_layerBlendSoftness->setValue(0.5); @@ -55,7 +55,7 @@ void layerblend::resetWidgets(Ui::MainWindow *ui) ui->doubleSpinBox_layerBorderSoftness->setValue(0.5); ui->doubleSpinBox_layerBorderStrength->setValue(0.5); ui->doubleSpinBox_layerBorderTint->setValue(1.0); - ui->color_layerBorderTint->setStyleSheet(whiteBG); + ui->toolButton_layerBorderTint->setStyleSheet(whiteBG); ui->checkBox_layerEdgeNormal->setChecked(false); ui->checkBox_layerEdgePunchin->setChecked(false); @@ -115,9 +115,9 @@ void layerblend::parseParameters(Ui::MainWindow *ui, VmtFile *vmt) } initializeLayerblend(ui, vmt); - COLOR("$layertint1", ui->color_layer1tint, ui->doubleSpinBox_layer1tint) - COLOR("$layertint2", ui->color_layer2tint, ui->doubleSpinBox_layer2tint) - COLOR("$layerbordertint", ui->color_layerBorderTint, ui->doubleSpinBox_layerBorderTint) + COLOR("$layertint1", ui->toolButton_layer1tint, ui->doubleSpinBox_layer1tint) + COLOR("$layertint2", ui->toolButton_layer2tint, ui->doubleSpinBox_layer2tint) + COLOR("$layerbordertint", ui->toolButton_layerBorderTint, ui->doubleSpinBox_layerBorderTint) BOOL("$newlayerblending", ui->checkBox_newLayerBlend) //BOOL("$layeredgenormal", ui->checkBox_layerEdgeNormal) //BOOL("$layeredgepunchin", ui->checkBox_layerEdgePunchin) diff --git a/src/user-interface/phong.cpp b/src/user-interface/phong.cpp index 8520d41..dc32d17 100644 --- a/src/user-interface/phong.cpp +++ b/src/user-interface/phong.cpp @@ -7,8 +7,8 @@ void phong::initialize(Ui::MainWindow *ui) { - ui->color_phongAmount->setStyleSheet(whiteBG); - ui->color_spec_amount2->setStyleSheet(whiteBG); + ui->toolButton_phongAmount->setStyleSheet(whiteBG); + ui->toolButton_spec_amount2->setStyleSheet(whiteBG); } utils::Preview phong::toggle(Ui::MainWindow *ui) @@ -52,7 +52,7 @@ bool phong::hasChanged(MainWindow::GroupBoxes groupBox, Ui::MainWindow *ui) VAL(ui->doubleSpinBox_fresnelRangesX, "0.5") VAL(ui->doubleSpinBox_fresnelRangesY, "0.75") VAL(ui->doubleSpinBox_fresnelRangesZ, "1") - COL(ui->color_phongTint) + COL(ui->toolButton_phongTint) CHE(ui->checkBox_albedoTint) VAL(ui->spinBox_exponent, "5") TEX(ui->lineEdit_exponentTexture) @@ -70,14 +70,14 @@ bool phong::hasChanged(MainWindow::GroupBoxes groupBox, Ui::MainWindow *ui) START // LightmappedGeneric shader VAL(ui->doubleSpinBox_phongAmount, "1") - COL(ui->color_phongAmount) + COL(ui->toolButton_phongAmount) VAL(ui->doubleSpinBox_phongAmountAlpha, "1") VAL(ui->spinBox_spec_exponent2, "5") VAL(ui->doubleSpinBox_maskContrast, "1") VAL(ui->doubleSpinBox_maskBrightness, "1") // WorldVertexTransition shader VAL(ui->doubleSpinBox_spec_amount2, "1") - COL(ui->color_spec_amount2) + COL(ui->toolButton_spec_amount2) VAL(ui->doubleSpinBox_spec_amountAlpha2, "1") VAL(ui->spinBox_spec_exponent2, "5") VAL(ui->doubleSpinBox_spec_maskContrast2, "1") @@ -99,7 +99,7 @@ void phong::resetWidgets(Ui::MainWindow *ui) ui->doubleSpinBox_fresnelRangesY->setValue(0.75); ui->doubleSpinBox_fresnelRangesZ->setValue(1.0); - ui->color_phongTint->setStyleSheet(whiteBG); + ui->toolButton_phongTint->setStyleSheet(whiteBG); ui->checkBox_albedoTint->setChecked(false); @@ -118,7 +118,7 @@ void phong::resetWidgets(Ui::MainWindow *ui) // LightmappedGeneric shader (WorldVertexTransition also has those!) ui->doubleSpinBox_phongAmount->setValue(1.0); - ui->color_phongAmount->setStyleSheet(whiteBG); + ui->toolButton_phongAmount->setStyleSheet(whiteBG); ui->doubleSpinBox_phongAmountAlpha->setValue(1.0); ui->spinBox_exponent2->setValue(5); @@ -132,7 +132,7 @@ void phong::resetWidgets(Ui::MainWindow *ui) // WorldVertexTransition shader ui->doubleSpinBox_spec_amount2->setValue(1.0); - ui->color_spec_amount2->setStyleSheet(whiteBG); + ui->toolButton_spec_amount2->setStyleSheet(whiteBG); ui->doubleSpinBox_spec_amountAlpha2->setValue(1.0); ui->spinBox_spec_exponent2->setValue(5); @@ -295,16 +295,16 @@ void processPhongAmount(const QString ¶meter, const QString &value, if (first) { utils::applyBackgroundColor(red * 255, green * 255, blue * 255, - ui->color_phongAmount); + ui->toolButton_phongAmount); ui->doubleSpinBox_phongAmount->setValue(max); ui->doubleSpinBox_phongAmountAlpha->setValue(alpha); utils::applyBackgroundColor(red * 255, green * 255, blue * 255, - ui->color_spec_amount2); + ui->toolButton_spec_amount2); ui->doubleSpinBox_spec_amount2->setValue(max); ui->doubleSpinBox_spec_amountAlpha2->setValue(alpha); } else { utils::applyBackgroundColor(red * 255, green * 255, blue * 255, - ui->color_spec_amount2); + ui->toolButton_spec_amount2); ui->doubleSpinBox_spec_amount2->setValue(max); ui->doubleSpinBox_spec_amountAlpha2->setValue(alpha); } @@ -383,7 +383,7 @@ void phong::parseParameters(Ui::MainWindow *ui, VmtFile *vmt) // VertexLitGeneric shader DO_WITH_VMT("$phongfresnelranges", processFresnelRanges) - COLOR("$phongtint", ui->color_phongTint, + COLOR("$phongtint", ui->toolButton_phongTint, ui->horizontalSlider_phongTint); BOOL("$phongalbedotint", ui->checkBox_albedoTint) DO_WITH_VMT("$phongexponent", processExponent1) diff --git a/src/user-interface/shaders.cpp b/src/user-interface/shaders.cpp index eb71997..37f0e9c 100644 --- a/src/user-interface/shaders.cpp +++ b/src/user-interface/shaders.cpp @@ -53,7 +53,7 @@ void shaders::handlePhongBrushRim(Ui::MainWindow *ui, const QString &shader) ui->label_spec_amount2->setVisible(hide); ui->horizontalSlider_spec_amount2->setVisible(hide); ui->doubleSpinBox_spec_amount2->setVisible(hide); - ui->color_spec_amount2->setVisible(hide); + ui->toolButton_spec_amount2->setVisible(hide); ui->toolButton_spec_amount2->setVisible(hide); ui->doubleSpinBox_spec_amountAlpha2->setVisible(hide); diff --git a/src/user-interface/shading-reflection.cpp b/src/user-interface/shading-reflection.cpp index d5a3a63..5b9a872 100644 --- a/src/user-interface/shading-reflection.cpp +++ b/src/user-interface/shading-reflection.cpp @@ -43,7 +43,7 @@ void insertParametersFromViews(VmtFile *vmt, Ui::MainWindow *ui) if (ui->toolButton_envmapTint->isEnabled()) { const QString tint = - toParameterBig(utils::getBG(ui->color_envmapTint), + toParameterBig(utils::getBG(ui->toolButton_envmapTint), ui->doubleSpinBox_envmapTint->value()); if (tint != "[1 1 1]") vmt->parameters.insert("$envmaptint", tint); diff --git a/src/user-interface/view-helper.cpp b/src/user-interface/view-helper.cpp index 1c51184..d00f091 100644 --- a/src/user-interface/view-helper.cpp +++ b/src/user-interface/view-helper.cpp @@ -37,7 +37,7 @@ void utils::toggle(MainWindow *mainWindow, bool checked, FadeGroupBox *groupBox, } void utils::applyBackgroundColor(const QString ¶meter, const QString &value, - QPlainTextEdit *colorWidget, TintSlider *sliderWidget, + QToolButton *colorWidget, TintSlider *sliderWidget, Ui::MainWindow *ui) { utils::ColorResult r = utils::parseColor(parameter, value, ui); @@ -57,7 +57,7 @@ void utils::applyBackgroundColor(const QString ¶meter, const QString &value, } void utils::applyBackgroundColor(const QString ¶meter, const QString &value, - QPlainTextEdit *colorWidget, Ui::MainWindow *ui, bool toSrgb) + QToolButton *colorWidget, Ui::MainWindow *ui, bool toSrgb) { utils::ColorResult r = utils::parseColor(parameter, value, ui, toSrgb); @@ -75,7 +75,7 @@ void utils::applyBackgroundColor(const QString ¶meter, const QString &value, } void utils::applyColor(const QString ¶meter, const QString &value, - QPlainTextEdit *colorWidget, QDoubleSpinBox *spinBox, Ui::MainWindow *ui, + QToolButton *colorWidget, QDoubleSpinBox *spinBox, Ui::MainWindow *ui, bool toSrgb) { utils::ColorResult r = utils::parseColor(parameter, value, ui, toSrgb); @@ -99,7 +99,7 @@ void utils::applyColor(const QString ¶meter, const QString &value, } void utils::applyBackgroundColor(int red, int green, int blue, - QPlainTextEdit *colorWidget) + QToolButton *colorWidget) { // according to the documentation the cast to the string is not // required but we seem to need it @@ -108,7 +108,7 @@ void utils::applyBackgroundColor(int red, int green, int blue, colorWidget->setStyleSheet(s); } -QColor utils::getBG(QPlainTextEdit *widget) +QColor utils::getBG(QToolButton *widget) { // TODO: Debug and explain how and why this works! QColor result; diff --git a/src/user-interface/view-helper.h b/src/user-interface/view-helper.h index ce13d72..03eb25f 100644 --- a/src/user-interface/view-helper.h +++ b/src/user-interface/view-helper.h @@ -61,14 +61,14 @@ void toggle(MainWindow *mainWindow, bool checked, FadeGroupBox *groupBox, * Make sure that no passed strings are empty! */ void applyBackgroundColor(const QString ¶meter, const QString &value, - QPlainTextEdit *colorWidget, TintSlider *sliderWidget, + QToolButton *colorWidget, TintSlider *sliderWidget, Ui::MainWindow *ui); void applyBackgroundColor(const QString ¶meter, const QString &value, - QPlainTextEdit *colorWidget, Ui::MainWindow *ui, bool toSrgb = false); + QToolButton *colorWidget, Ui::MainWindow *ui, bool toSrgb = false); void applyColor(const QString ¶meter, const QString &value, - QPlainTextEdit *colorWidget, QDoubleSpinBox *spinBox, Ui::MainWindow *ui, + QToolButton *colorWidget, QDoubleSpinBox *spinBox, Ui::MainWindow *ui, bool toSrgb = false); /*! @@ -77,7 +77,7 @@ void applyColor(const QString ¶meter, const QString &value, * The color values should be between 0 and 255. */ void applyBackgroundColor(int red, int green, int blue, - QPlainTextEdit *colorWidget); + QToolButton *colorWidget); /*! * Parses the stylesheet of the passed widget to cast the background-color @@ -86,7 +86,7 @@ void applyBackgroundColor(int red, int green, int blue, * Make sure that only background-color is defined as the only CSS property * of the passed widget. */ -QColor getBG(QPlainTextEdit *widget); +QColor getBG(QToolButton *widget); /*! * Returns the spin box value if the view is enabled and different to the From b51df84175e9a09ecbaca8de7cd8cd03fa3c4b05 Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Sun, 18 Mar 2018 23:54:39 +0100 Subject: [PATCH 05/10] Update version number --- README.md | 2 +- app.rc | 10 +++++----- misc/version.txt | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 99a90d9..60798cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# VMT Editor ![version](https://img.shields.io/badge/version-1.3.9-blue.svg) +# VMT Editor ![version](https://img.shields.io/badge/version-1.3.10-blue.svg) [Official website](https://gira-x.github.io/VMT-Editor/) diff --git a/app.rc b/app.rc index 60fecda..5ce1761 100755 --- a/app.rc +++ b/app.rc @@ -5,18 +5,18 @@ IDI_ICON3 ICON DISCARDABLE "vtffile.ico" #include VS_VERSION_INFO VERSIONINFO -FILEVERSION 1,3,9 -PRODUCTVERSION 1,3,9 +FILEVERSION 1,3,10 +PRODUCTVERSION 1,3,10 BEGIN BLOCK "StringFileInfo" BEGIN BLOCK "040904E4" BEGIN VALUE "FileDescription", "VMT Editor" - VALUE "FileVersion", "1.3.9" - VALUE "ProductVersion", "1.3.9" + VALUE "FileVersion", "1.3.10" + VALUE "ProductVersion", "1.3.10" VALUE "ProductName", "VMT Editor" - VALUE "LegalCopyright", "Copyright © 2016-2017" + VALUE "LegalCopyright", "Copyright © 2016-2018" END END diff --git a/misc/version.txt b/misc/version.txt index d4c4950..0c00f61 100644 --- a/misc/version.txt +++ b/misc/version.txt @@ -1 +1 @@ -1.3.9 +1.3.10 From e3e2dc531e36e4ba96ad5ecda0416c7a0bd44e85 Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Mon, 19 Mar 2018 01:06:03 +0100 Subject: [PATCH 06/10] Change scrollbars --- ui/conversiondialog.ui | 196 ++++++----------- ui/mainwindow.ui | 477 ++++++++++++++--------------------------- ui/optionsdialog.ui | 190 +++++----------- 3 files changed, 282 insertions(+), 581 deletions(-) diff --git a/ui/conversiondialog.ui b/ui/conversiondialog.ui index a74aaf2..cb7c28f 100644 --- a/ui/conversiondialog.ui +++ b/ui/conversiondialog.ui @@ -86,137 +86,66 @@ QLineEdit:disabled color: silver; } -QScrollBar:horizontal -{ - height: 15px; - margin: 0px 15px 0px 15px; - border: 0px ; - background-color: #222; -} - -QScrollBar::handle:horizontal -{ - background-color: #333; - min-width: 5px; - } - -QScrollBar::sub-line:horizontal -{ - border-image: url(:/images/qss/scrollrt.png); - width: 15px; - height: 15px; - background-color: #222; - subcontrol-position: right; - subcontrol-origin: margin; -} - -QScrollBar::add-line:horizontal +QScrollBar { - border-image: url(:/images/qss/scrolllf.png); - height: 15px; - width: 15px; - background-color: #222; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:horizontal:hover,QScrollBar::sub-line:horizontal:on -{ - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} - - -QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on -{ - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal -{ - background: none; + background-color: #404040; } - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal +QScrollBar:horizontal { - background: none; + height: 10px; + margin: 0; + border: 0; } -/* Vertical scroll bar, works fine */ - - QScrollBar:vertical { - background-color: #222; - width: 15px; - margin: 15px 0 15px 0; - border: 0px solid #222; - -} - -QScrollBar::handle:vertical -{ - background-color: #333; - min-height: 5px; - + width: 10px; + margin: 0; + border: 0; + background-color: #404040; } -QScrollBar::sub-line:vertical +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal { - border-image: url(:/images/qss/scrollup.png); - background-color: #222; - height: 15px; - width: 15px; - subcontrol-position: top; - subcontrol-origin: margin; + background-color: #282828; + min-width: 5px; + min-height: 5px; + border: 1px solid #404040; } -QScrollBar::add-line:vertical +QScrollBar::handle:hover { - - border-image: url(:/images/qss/scrolldn.png); - background-color: #222; - height: 15px; - width: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} + background-color: #303030; + } -QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on +QScrollBar::sub-line { - - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: top; - subcontrol-origin: margin; + width: 0px; + height: 0px; + background: none; } - -QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on +QScrollBar::add-line { - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; + height: 0px; + width: 0px; + background: none; } -QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical +QScrollBar::up-arrow:vertical, +QScrollBar::down-arrow:vertical, +QScrollBar::add-page:vertical, +QScrollBar::sub-page:vertical { background: none; } - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical +QScrollBar::up-arrow:horizontal, +QScrollBar::down-arrow:horizontal, +QScrollBar::add-page:horizontal, + QScrollBar::sub-page:horizontal { background: none; } @@ -533,7 +462,8 @@ QComboBox::down-arrow:focus /* Spinboxes */ -QAbstractSpinBox { +QAbstractSpinBox +{ padding-top: 0px; padding-bottom: 0px; min-height: 21px; @@ -544,49 +474,46 @@ QAbstractSpinBox { QAbstractSpinBox:up-button { - background-color: #333; - border: 0px solid #333; - width: 20px; + /* background-color: #222;*/ + border: 0px solid #222; + width: 15px; subcontrol-position: top right; } QAbstractSpinBox:down-button { - background-color: #333; - width: 20px; - border: 0px solid #333; + /* background-color: #222;*/ + width: 15px; + border: 0px solid #222; subcontrol-position: bottom right; } QAbstractSpinBox:up-button:disabled { - background-color: #333; - border: 0px solid #333; - width: 20px; + /* background-color: #222;*/ + border: 0px solid #222; subcontrol-position: top right; } QAbstractSpinBox:down-button:disabled { - background-color: #333; - width: 20px; - border: 0px solid #333; + /* background-color: #222;*/ + border: 0px solid #222; subcontrol-position: bottom right; } -QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off { +QAbstractSpinBox::up-arrow, +QAbstractSpinBox::up-arrow:disabled, +QAbstractSpinBox::up-arrow:off +{ image: url(:/images/qss/up_arrow_disabled.png); - width: 20px; + width: 15px; height: 10px; } -QAbstractSpinBox::up-arrow:hover -{ - background-color: #444; -} - - -QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off +QAbstractSpinBox::down-arrow, +QAbstractSpinBox::down-arrow:disabled, +QAbstractSpinBox::down-arrow:off { image: url(:/images/qss/down_arrow_disabled.png); width: 20px; @@ -594,10 +521,9 @@ QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpin } QAbstractSpinBox::down-arrow:hover { - background-color: #444; + background-color: #222; } - QLabel { border: 0px solid black; @@ -971,6 +897,16 @@ QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical background-color: #222; border: 1px solid #222; outline: none; +} +QScrollBar +{ + background-color: #222; +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal +{ + border: 1px solid #222; } diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 4f85b28..7cdb37b 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -27,7 +27,6 @@ QWidget { font: 9pt "Segoe UI"; - /*background-color: #404040;*/ } /* Progress bar */ @@ -42,31 +41,16 @@ QProgressBar::chunk:horizontal { background-color: qlineargradient(spread:reflect, x1:1, y1:0.545, x2:1, y2:0, stop:0 rgba(28, 66, 111, 255), stop:1 rgba(37, 87, 146, 255)); } - /* Tool tip (with fancy animation, how to turn that off?) */ - -/* -QToolTip -{ - border: 1px solid #ddd; - background-color: #eee; - color: black; - padding: 1px; - opacity: 200; -} -*/ - QWidget#centralwidget { color: silver; background-color: #333; - } QMainWindow { color: silver; background-color: #333; - } /* Make everything black */ @@ -78,14 +62,13 @@ QWidget QWidget:disabled { - color: #505050; - + color: #505050; } QMenuBar { background-color: #333; - color: silver; + color: silver; } QMenuBar::item @@ -97,8 +80,6 @@ QMenuBar::item:selected { border: 1px solid #151515; background-color: #151515; - - } QMenuBar::item:pressed @@ -106,8 +87,7 @@ QMenuBar::item:pressed border: 1px solid #151515; background-color: #151515; - margin-bottom: 0px; - + margin-bottom: 0px; } QMenu @@ -148,34 +128,6 @@ QMenu::right-arrow right: 3px; } - -/* No idea what this is */ - -/* QAbstractItemView -{ - alternate-background-color: #fff; - color: silver; - border: 1px solid 3A3939; - border-radius: 0px; - padding: 1px; -} - -/* this seems unnecessary */ - - -/* -QWidget:focus, QMenuBar:focus -{ - border: 0px solid #666; -} - -QTabWidget:focus, QCheckBox:focus -{ - border: none; -} - -/* yes */ - QLineEdit { background-color: #222; @@ -194,162 +146,68 @@ QLineEdit:disabled color: silver; } -/* Groupbox and titles */ - -/* No idea +/* SCROLL BARS */ -QAbstractScrollArea +QScrollBar { - border-radius: 0px; - border: 1px solid #3A3939; + background-color: #404040; } -/* Horizontal scroll bar, still old */ - - QScrollBar:horizontal { - height: 15px; - margin: 0px 15px 0px 15px; - border: 0px ; - background-color: #222; -} - -QScrollBar::handle:horizontal -{ - background-color: #333; - min-width: 5px; - } - -QScrollBar::handle:horizontal:hover -{ - background-color: #303030; - min-width: 5px; - } - - -QScrollBar::sub-line:horizontal -{ - border-image: url(:/images/qss/scrollrt.png); - width: 15px; - height: 15px; - background-color: #222; - subcontrol-position: right; - subcontrol-origin: margin; -} - -QScrollBar::add-line:horizontal -{ - border-image: url(:/images/qss/scrolllf.png); - height: 15px; - width: 15px; - background-color: #222; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar::sub-line:horizontal:hover,QScrollBar::sub-line:horizontal:on -{ - background-color: #151515; - height: 15px; - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} - - -QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on -{ - background-color: #151515; - height: 15px; - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal -{ - background: none; -} - - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal -{ - background: none; + height: 10px; + margin: 0; + border: 0; } -/* Vertical scroll bar, works fine */ - - QScrollBar:vertical { - background-color: #222; - width: 15px; - margin: 15px 0 15px 0; - border: 0px solid #222; - + width: 10px; + margin: 0; + border: 0; + background-color: #404040; } -QScrollBar::handle:vertical +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal { - background-color: #333; - min-height: 5px; + background-color: #282828; + min-width: 5px; + min-height: 5px; + border: 1px solid #404040; } -QScrollBar::handle:vertical:hover +QScrollBar::handle:hover { background-color: #303030; - min-height: 5px; -} - -QScrollBar::sub-line:vertical -{ - border-image: url(:/images/qss/scrollup.png); - background-color: #222; - height: 15px; - width: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} - -QScrollBar::add-line:vertical -{ - - border-image: url(:/images/qss/scrolldn.png); - background-color: #222; - height: 15px; - width: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} + } -QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on +QScrollBar::sub-line { - - background-color: #151515; - height: 15px; - width: 15px; - subcontrol-position: top; - subcontrol-origin: margin; + width: 0px; + height: 0px; + background: none; } - -QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on +QScrollBar::add-line { - background-color: #151515; - height: 15px; - width: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; + height: 0px; + width: 0px; + background: none; } -QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical +QScrollBar::up-arrow:vertical, +QScrollBar::down-arrow:vertical, +QScrollBar::add-page:vertical, +QScrollBar::sub-page:vertical { background: none; } - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical +QScrollBar::up-arrow:horizontal, +QScrollBar::down-arrow:horizontal, +QScrollBar::add-page:horizontal, + QScrollBar::sub-page:horizontal { background: none; } @@ -371,19 +229,6 @@ QPlainTextEdit border-radius: 0px; } -/* Suspicious stuff - -QHeaderView::section -{ - background-color: #3A3939; - color: silver; - padding-left: 4px; - border: 1px solid #6c6c6c; -} - -/* */ - - QCheckBox:disabled { color: #505050; @@ -414,16 +259,15 @@ QMainWindow::separator:hover /* Radio buttons */ - -QRadioButton::indicator:checked, QRadioButton::indicator:unchecked{ +QRadioButton::indicator:checked, +QRadioButton::indicator:unchecked +{ color: #b1b1b1; background-color: #333; border: 1px solid silver; border-radius: 5px; } - - QRadioButton::indicator:checked { background-color: qradialgradient( @@ -443,7 +287,8 @@ QRadioButton::indicator } -QRadioButton::indicator:hover, QCheckBox::indicator:hover +QRadioButton::indicator:hover, +QCheckBox::indicator:hover { background-color: #151515; border: 1px solid #151515; @@ -462,7 +307,8 @@ QCheckBox::indicator:checked image:url(:/images/qss/checkbox.png); } -QCheckBox::indicator:disabled, QRadioButton::indicator:disabled +QCheckBox::indicator:disabled, +QRadioButton::indicator:disabled { border: 1px solid #222; } @@ -472,15 +318,6 @@ QFrame border-radius: 0px; } -/* what is this - -QStackedWidget -{ - border: none; -} - -/* toolbar, do we use toolbar? */ - QToolBar { border: 0px solid #393838; background: 1px solid #333; @@ -502,7 +339,6 @@ QToolBar::separator:vertical { /* Buttons, both are the same */ - QToolButton { color: silver; @@ -530,7 +366,6 @@ QToolButton:hover border-color: #303030; } - QPushButton { color: silver; @@ -594,20 +429,17 @@ QComboBox /* Make stuff light up on hover */ - -QComboBox:hover,QAbstractSpinBox:hover,QLineEdit:hover,QAbstractView:hover,QTreeView:hover +QComboBox:hover, +QAbstractSpinBox:hover, +QLineEdit:hover, +QAbstractView:hover, +QTreeView:hover { background-color: #151515; border-color: #151515; color: silver; } -/*QTextEdit:hover -{ - border-color: #151515; - background-color: #151515; -}*/ - QComboBox:on { background-color: #222; @@ -616,9 +448,6 @@ QComboBox:on selection-background-color: #4a4a4a; } -/* No idea */ - - QComboBox QAbstractItemView { background-color: #222; @@ -626,7 +455,6 @@ QComboBox QAbstractItemView border: 1px solid #222; selection-background-color: #151515; outline: 0; - } QComboBox::drop-down @@ -647,17 +475,17 @@ QComboBox::down-arrow image: url(:/images/qss/gopen.png); } -QComboBox::down-arrow:on, QComboBox::down-arrow:hover, +QComboBox::down-arrow:on, +QComboBox::down-arrow:hover, QComboBox::down-arrow:focus { image: url(:/images/qss/gopen.png); } - - /* Spinboxes */ -QAbstractSpinBox { +QAbstractSpinBox +{ padding-top: 0px; padding-bottom: 0px; min-height: 21px; @@ -696,19 +524,18 @@ QAbstractSpinBox:down-button:disabled subcontrol-position: bottom right; } -QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off { +QAbstractSpinBox::up-arrow, +QAbstractSpinBox::up-arrow:disabled, +QAbstractSpinBox::up-arrow:off +{ image: url(:/images/qss/up_arrow_disabled.png); width: 15px; height: 10px; } -/*QAbstractSpinBox::up-arrow:hover -{ - background-color: #222; -}*/ - - -QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off +QAbstractSpinBox::down-arrow, +QAbstractSpinBox::down-arrow:disabled, +QAbstractSpinBox::down-arrow:off { image: url(:/images/qss/down_arrow_disabled.png); width: 20px; @@ -719,7 +546,6 @@ QAbstractSpinBox::down-arrow:hover background-color: #222; } - QLabel { border: 0px solid black; @@ -748,7 +574,6 @@ QDockWidget::title padding-left: 10px; } - QDockWidget { border: 0px solid lightgray; titlebar-close-icon: url(:/images/qss/close.png); @@ -762,68 +587,23 @@ QDockWidget::close-button, QDockWidget::float-button { icon-size: 10px; } -QDockWidget::close-button:hover, QDockWidget::float-button:hover { - background: #3A3939; -} - -QDockWidget::close-button:pressed, QDockWidget::float-button:pressed { - padding: 1px -1px -1px 1px; -} - -/* We don't grow trees here - -QTreeView, QListView, QTableView +QDockWidget::close-button:hover, +QDockWidget::float-button:hover { - border: 1px solid #3A3939; - background-color: #201F1F; + background: #3A3939; } -QTreeView:branch:selected, QTreeView:branch:hover +QDockWidget::close-button:pressed, +QDockWidget::float-button:pressed { - background: url(:/images/qss/transparent.png); -} - -QTreeView::branch:has-siblings:!adjoins-item { - border-image: url(:/images/qss/transparent.png); -} - -QTreeView::branch:has-siblings:adjoins-item { - border-image: url(:/images/qss/transparent.png); -} - -QTreeView::branch:!has-children:!has-siblings:adjoins-item { - border-image: url(:/images/qss/transparent.png); -} - -QTreeView::branch:has-children:!has-siblings:closed, -QTreeView::branch:closed:has-children:has-siblings { - image: url(:/images/qss/branch_closed.png); -} - -QTreeView::branch:open:has-children:!has-siblings, -QTreeView::branch:open:has-children:has-siblings { - image: url(:/images/qss/branch_open.png); + padding: 1px -1px -1px 1px; } -QTreeView::branch:has-children:!has-siblings:closed:hover, -QTreeView::branch:closed:has-children:has-siblings:hover { - image: url(:/images/qss/branch_closed-on.png); - } - -QTreeView::branch:open:has-children:!has-siblings:hover, -QTreeView::branch:open:has-children:has-siblings:hover { - image: url(:/images/qss/branch_open-on.png); - } - -/* slider horizontal, works */ - - QSlider::groove:horizontal { border: 0px solid #222; height: 5px; background: #222; - margin: 0px 0px; - + margin: 0px 0px; } QSlider::groove:horizontal::hover { @@ -832,8 +612,7 @@ QSlider::groove:horizontal::hover { } QSlider:selected, QTabBar:tab:selected { - border: 0px; - + border: 0px; } QSlider::handle:horizontal { @@ -842,7 +621,6 @@ QSlider::handle:horizontal { border-radius: 6px; width: 13px; margin: -4px 0px; - } QSlider::handle:horizontal::hover { @@ -852,27 +630,6 @@ QSlider::handle:horizontal::hover { QSlider::handle:horizontal:disabled { background: #444; -} - - -/* Slider vertical, doesn't work */ - -QSlider::groove:vertical { - border: 1px solid #3A3939; - width: 8px; - background: #201F1F; - margin: 0 0px; - border-radius: 0px; -} - -QSlider::handle:vertical { - background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 silver, - stop: 0.2 #a8a8a8, stop: 1 #727272); - border: 1px solid #3A3939; - width: 14px; - height: 14px; - margin: 0 -4px; - border-radius: 0px; } @@ -936,7 +693,7 @@ QTabBar::tab { } QTabWidget::pane { - border: 1px solid #404040; + border: 0px solid #404040; background-color: #404040; top: -1 px; } @@ -1324,7 +1081,7 @@ QGroupBox::title { 0 0 - 926 + 933 5903 @@ -19212,8 +18969,8 @@ QToolButton:pressed 0 0 - 941 - 751 + 943 + 753 @@ -19437,6 +19194,37 @@ QToolButton:pressed 9 + + QScrollBar +{ + background-color: #222; +} + +QScrollBar:horizontal +{ + background-color: #222; +} + +QScrollBar:vertical +{ + background-color: #222; +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal +{ + background-color: #404040; + border: 1px solid #222; +} +QScrollBar::up-arrow:vertical, +QScrollBar::down-arrow:vertical, +QScrollBar::add-page:vertical, + QScrollBar::sub-page:vertical +{ + background: none; +} + + QDockWidget::NoDockWidgetFeatures @@ -19481,7 +19269,16 @@ QToolButton:pressed - + QScrollBar +{ + background-color: #222; +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal +{ + border: 1px solid #222; +} QTextEdit::NoWrap @@ -19570,7 +19367,37 @@ QToolButton:pressed QWidget { background-color: #333; -} +} + +QScrollBar +{ + background-color: #222; +} + +QScrollBar:horizontal +{ + height: 10px; + margin: 0; + border: 0; +} + +QScrollBar:vertical +{ + width: 10px; + margin: 0; + border: 0; + background-color: #222; +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal +{ + background-color: #404040; + min-width: 5px; + min-height: 5px; + border: 1px solid #222; +} + false @@ -19604,9 +19431,21 @@ QToolButton:pressed - QWidget { + QWidget +{ background-color: #222; -border: 1px solid #222; +border: 0px solid #222; +} + +QScrollBar +{ + background-color: #222; +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal +{ + border: 1px solid #222; } diff --git a/ui/optionsdialog.ui b/ui/optionsdialog.ui index 2782317..a28a239 100644 --- a/ui/optionsdialog.ui +++ b/ui/optionsdialog.ui @@ -97,137 +97,66 @@ QLineEdit:disabled color: silver; } -QScrollBar:horizontal -{ - height: 15px; - margin: 0px 15px 0px 15px; - border: 0px ; - background-color: #222; -} - -QScrollBar::handle:horizontal -{ - background-color: #333; - min-width: 5px; - } - -QScrollBar::sub-line:horizontal +QScrollBar { - border-image: url(:/images/qss/scrollrt.png); - width: 15px; - height: 15px; - background-color: #222; - subcontrol-position: right; - subcontrol-origin: margin; -} - -QScrollBar::add-line:horizontal -{ - border-image: url(:/images/qss/scrolllf.png); - height: 15px; - width: 15px; - background-color: #222; - subcontrol-position: left; - subcontrol-origin: margin; + background-color: #404040; } -QScrollBar::sub-line:horizontal:hover,QScrollBar::sub-line:horizontal:on -{ - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} - - -QScrollBar::add-line:horizontal:hover, QScrollBar::add-line:horizontal:on -{ - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} - -QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal -{ - background: none; -} - - -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal +QScrollBar:horizontal { - background: none; + height: 10px; + margin: 0; + border: 0; } -/* Vertical scroll bar, works fine */ - - QScrollBar:vertical { - background-color: #222; - width: 15px; - margin: 15px 0 15px 0; - border: 0px solid #222; - -} - -QScrollBar::handle:vertical -{ - background-color: #333; - min-height: 5px; - + width: 10px; + margin: 0; + border: 0; + background-color: #404040; } -QScrollBar::sub-line:vertical +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal { - border-image: url(:/images/qss/scrollup.png); - background-color: #222; - height: 15px; - width: 15px; - subcontrol-position: top; - subcontrol-origin: margin; + background-color: #282828; + min-width: 5px; + min-height: 5px; + border: 1px solid #404040; } -QScrollBar::add-line:vertical +QScrollBar::handle:hover { - - border-image: url(:/images/qss/scrolldn.png); - background-color: #222; - height: 15px; - width: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} + background-color: #303030; + } -QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on +QScrollBar::sub-line { - - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: top; - subcontrol-origin: margin; + width: 0px; + height: 0px; + background: none; } - -QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on +QScrollBar::add-line { - background-color: #333; - height: 15px; - width: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; + height: 0px; + width: 0px; + background: none; } -QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical +QScrollBar::up-arrow:vertical, +QScrollBar::down-arrow:vertical, +QScrollBar::add-page:vertical, +QScrollBar::sub-page:vertical { background: none; } - -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical +QScrollBar::up-arrow:horizontal, +QScrollBar::down-arrow:horizontal, +QScrollBar::add-page:horizontal, + QScrollBar::sub-page:horizontal { background: none; } @@ -547,7 +476,8 @@ QComboBox::down-arrow:focus /* Spinboxes */ -QAbstractSpinBox { +QAbstractSpinBox +{ padding-top: 0px; padding-bottom: 0px; min-height: 21px; @@ -558,49 +488,46 @@ QAbstractSpinBox { QAbstractSpinBox:up-button { - background-color: #333; - border: 0px solid #333; - width: 20px; + /* background-color: #222;*/ + border: 0px solid #222; + width: 15px; subcontrol-position: top right; } QAbstractSpinBox:down-button { - background-color: #333; - width: 20px; - border: 0px solid #333; + /* background-color: #222;*/ + width: 15px; + border: 0px solid #222; subcontrol-position: bottom right; } QAbstractSpinBox:up-button:disabled { - background-color: #333; - border: 0px solid #333; - width: 20px; + /* background-color: #222;*/ + border: 0px solid #222; subcontrol-position: top right; } QAbstractSpinBox:down-button:disabled { - background-color: #333; - width: 20px; - border: 0px solid #333; + /* background-color: #222;*/ + border: 0px solid #222; subcontrol-position: bottom right; } -QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off { +QAbstractSpinBox::up-arrow, +QAbstractSpinBox::up-arrow:disabled, +QAbstractSpinBox::up-arrow:off +{ image: url(:/images/qss/up_arrow_disabled.png); - width: 20px; + width: 15px; height: 10px; } -QAbstractSpinBox::up-arrow:hover -{ - background-color: #444; -} - - -QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off +QAbstractSpinBox::down-arrow, +QAbstractSpinBox::down-arrow:disabled, +QAbstractSpinBox::down-arrow:off { image: url(:/images/qss/down_arrow_disabled.png); width: 20px; @@ -608,10 +535,9 @@ QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpin } QAbstractSpinBox::down-arrow:hover { - background-color: #444; + background-color: #222; } - QLabel { border: 0px solid black; @@ -799,8 +725,8 @@ QSlider::handle:vertical { 0 - -278 - 522 + -651 + 527 1203 From 1af3071268dbd2466a03d1077e1962d4a6450943 Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Mon, 19 Mar 2018 01:44:32 +0100 Subject: [PATCH 07/10] More style updates --- images/reconvert_dialog.png | Bin 15021 -> 15029 bytes ui/mainwindow.ui | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/images/reconvert_dialog.png b/images/reconvert_dialog.png index 507f4f3a094b72d3c88aa4ad418f3ada262e57b2..cb7226aadde76e1c6357f43a0fab7e7d316445bf 100644 GIT binary patch delta 346 zcmZ2my0vt}c4jWi5CcOiLlY|_lgS5}ZIHR_Ec297O$-u^j7@bD4a_WclMGFgbuH6U zQguzz3``Bo%~Q=&Qzjp0apN^Nu}DlcGdI;WN-{{CEX5kGYGjmVk&;fDKiQvEa`JlCqsm06o-D^&7J|i)1lI1}0$sM+) z$?|Mmo8NO-8?vkjcl|M0&q_bS+0(@_q~g|_$s0Kt6c`Tw%E^1RvsBRCHH4**qvVvp zib)x)xxx&LNxR?5xw9~ZusVO^&hh`KyifAuEop8B28RFtnHe@b@p~CH=~gC?%i!ti K=d#Wzp$Py<;%UkN delta 338 zcmdm5y0&z~c4jV%5F=wN6LTvQz%0#H1EXQHG`3##rBQb80EaktaVzP^|Nr*Psxun1*w)1D{q_IV)z$x%H-Ai= zC2?Rw)z>T$GdrJJW;fJW#~nZ}gQu&X%Q~loCIEez BZc+dM diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 7cdb37b..0cce533 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -1080,7 +1080,7 @@ QGroupBox::title { 0 - 0 + -1811 933 5903 @@ -7789,7 +7789,7 @@ QToolButton:pressed - 1 + 2 1.000000000000000 @@ -18704,6 +18704,16 @@ QToolButton:pressed QWidget { font: 9pt "Consolas"; +} +QScrollBar +{ + background-color: #222; +} + +QScrollBar::handle:vertical, +QScrollBar::handle:horizontal +{ + border: 1px solid #222; } From 3e5ffd276d84ffcd41aec93ae6db306e7315f070 Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Mon, 19 Mar 2018 21:35:42 +0100 Subject: [PATCH 08/10] Add emissive blend --- VMT_Editor.pro | 6 +- src/mainwindow.cpp | 99 + src/mainwindow.h | 8 +- src/user-interface/emissive-blend.cpp | 148 ++ src/user-interface/emissive-blend.h | 52 + src/vmtparser.cpp | 2 +- src/vmtparser.h | 4 + ui/mainwindow.ui | 2400 ++++++++++++++++--------- 8 files changed, 1907 insertions(+), 812 deletions(-) create mode 100644 src/user-interface/emissive-blend.cpp create mode 100644 src/user-interface/emissive-blend.h diff --git a/VMT_Editor.pro b/VMT_Editor.pro index 6ef94d5..3a9bb60 100644 --- a/VMT_Editor.pro +++ b/VMT_Editor.pro @@ -79,7 +79,8 @@ SOURCES += \ src/vmttextedit.cpp \ src/texturedragdroplineedit.cpp \ src/texturepreviewdialog.cpp \ - src/user-interface/layerblend.cpp + src/user-interface/layerblend.cpp \ + src/user-interface/emissive-blend.cpp HEADERS += \ src/mainwindow.h \ @@ -129,7 +130,8 @@ HEADERS += \ src/vmttextedit.h \ src/texturedragdroplineedit.h \ src/texturepreviewdialog.h \ - src/user-interface/layerblend.h + src/user-interface/layerblend.h \ + src/user-interface/emissive-blend.h FORMS += \ ui/mainwindow.ui \ diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 0304ee3..bbc1823 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -14,6 +14,7 @@ #include "user-interface/phong.h" #include "user-interface/normal-blend.h" +#include "user-interface/emissive-blend.h" #include "user-interface/detail-texture.h" #include "user-interface/shaders.h" #include "user-interface/view-helper.h" @@ -313,6 +314,9 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : ui->doubleSpinBox_layerEdgeSoftness->setDoubleSlider(ui->horizontalSlider_layerEdgeSoftness); ui->doubleSpinBox_layerEdgeStrength->setDoubleSlider(ui->horizontalSlider_layerEdgeStrength); + ui->doubleSpinBox_emissiveBlendStrength->setDoubleSlider(ui->horizontalSlider_emissiveBlendStrength); + ui->doubleSpinBox_emissiveBlendTint->setDoubleSlider(ui->horizontalSlider_emissiveBlendTint); + //----------------------------------------------------------------------------------------// ui->doubleSpinBox_envmapTint->setDoubleSlider(ui->horizontalSlider_envmapTint); @@ -360,6 +364,11 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : ui->lineEdit_bump2->setValidator(windowsFilenameValidator); ui->lineEdit_tintMask->setValidator(windowsFilenameValidator); ui->lineEdit_phongWarp->setValidator(windowsFilenameValidator); + ui->lineEdit_emissiveBlendTexture->setValidator(windowsFilenameValidator); + ui->lineEdit_emissiveBlendBaseTexture->setValidator(windowsFilenameValidator); + ui->lineEdit_emissiveBlendFlowTexture->setValidator(windowsFilenameValidator); + + //--------------------------------------------------------------------// @@ -421,6 +430,13 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : SLOT(handleTextureDrop(QString))); connect(ui->lineEdit_diffuseAlpha, SIGNAL(droppedTexture(QString)), SLOT(handleTextureDrop(QString))); + connect(ui->lineEdit_emissiveBlendTexture, SIGNAL(droppedTexture(QString)), + SLOT(handleTextureDrop(QString))); + connect(ui->lineEdit_emissiveBlendBaseTexture, SIGNAL(droppedTexture(QString)), + SLOT(handleTextureDrop(QString))); + connect(ui->lineEdit_emissiveBlendFlowTexture, SIGNAL(droppedTexture(QString)), + SLOT(handleTextureDrop(QString))); + //----------------------------------------------------------------------------------------// @@ -579,6 +595,7 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : ui->toolButton_layer1tint->setStyleSheet("background-color: rgb(255, 255, 255)"); ui->toolButton_layer2tint->setStyleSheet("background-color: rgb(255, 255, 255)"); ui->toolButton_layerBorderTint->setStyleSheet("background-color: rgb(255, 255, 255)"); + ui->toolButton_emissiveBlendTint->setStyleSheet("background-color: rgb(255, 255, 255)"); phong::initialize(ui); @@ -2065,6 +2082,7 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) normalblend::parseParameters(ui, &vmt); treesway::parseParameters(ui, &vmt); layerblend::parseParameters(ui, &vmt); + emissiveblend::parseParameters(ui, &vmt, this); if( !( value = vmt.parameters.take("$phongexponenttexture") ).isEmpty() ) { @@ -3589,6 +3607,10 @@ void MainWindow::parseVMT( VmtFile vmt, bool isTemplate ) ui->action_layerBlend->trigger(); } + if(vmt.state.showEmissiveBlend && !ui->action_emissiveBlend->isChecked()) { + ui->action_emissiveBlend->trigger(); + } + if(showDecal && !ui->action_decal->isChecked()) ui->action_decal->trigger(); @@ -4161,6 +4183,32 @@ VmtFile MainWindow::makeVMT() } + if( !ui->groupBox_emissiveBlend->isHidden() ) + { + vmtFile.parameters.insert( "$emissiveblendenabled", "1" ); + + if( !ui->lineEdit_emissiveBlendTexture->text().trimmed().isEmpty() ) + vmtFile.parameters.insert( "$emissiveblendtexture", ui->lineEdit_emissiveBlendTexture->text().trimmed() ); + + if( !ui->lineEdit_emissiveBlendBaseTexture->text().trimmed().isEmpty() ) + vmtFile.parameters.insert( "$emissiveblendbasetexture", ui->lineEdit_emissiveBlendBaseTexture->text().trimmed() ); + + if( !ui->lineEdit_emissiveBlendFlowTexture->text().trimmed().isEmpty() ) + vmtFile.parameters.insert( "$emissiveblendflowtexture", ui->lineEdit_emissiveBlendFlowTexture->text().trimmed() ); + + tmp = toParameterBig(utils::getBG(ui->toolButton_emissiveBlendTint), + ui->doubleSpinBox_emissiveBlendTint->value()); + if( tmp != "[1 1 1]" ) + vmtFile.parameters.insert( "$emissiveblendtint", tmp ); + + if( ui->doubleSpinBox_emissiveBlendStrength->value() != 1.0 ) + vmtFile.parameters.insert( "$emissiveblendstrength", + Str( ui->doubleSpinBox_emissiveBlendStrength->value() )); + + vmtFile.parameters.insert( "$emissiveblendscrollvector", QString( "[" + Str(ui->doubleSpinBox_emissiveBlendScrollX->value()) + + " " + Str(ui->doubleSpinBox_emissiveBlendScrollY->value()) + "]" ) ); + } + if( !ui->groupBox_treeSway->isHidden() ) { vmtFile.parameters.insert( "$treesway", "1" ); @@ -4625,6 +4673,9 @@ void MainWindow::resetWidgets() { clearLineEditAction(ui->lineEdit_bumpmapAlpha); clearLineEditAction(ui->lineEdit_specmap2); clearLineEditAction(ui->lineEdit_tintMask); + clearLineEditAction(ui->lineEdit_emissiveBlendTexture); + clearLineEditAction(ui->lineEdit_emissiveBlendBaseTexture); + clearLineEditAction(ui->lineEdit_emissiveBlendFlowTexture); //----------------------------------------------------------------------------------------// @@ -4812,6 +4863,7 @@ void MainWindow::resetWidgets() { normalblend::resetWidgets(ui); treesway::resetWidgets(ui); layerblend::resetWidgets(ui); + emissiveblend::resetWidgets(ui); //----------------------------------------------------------------------------------------// @@ -5602,6 +5654,9 @@ bool MainWindow::isGroupboxChanged(MainWindow::GroupBoxes groupBox) case LayerBlend: return layerblend::hasChanged(ui); + case EmissiveBlend: + return emissiveblend::hasChanged(ui); + case Reflection: return (ui->lineEdit_envmap->text() != "" || @@ -6124,6 +6179,15 @@ void MainWindow::handleTextureDrop(const QString& filePath) else if (name == "lineEdit_tintMask" ) processVtf( "", filePath, ui->lineEdit_tintMask ); + else if (name == "lineEdit_emissiveBlendTexture" ) + processVtf( "", filePath, ui->lineEdit_emissiveBlendTexture ); + + else if (name == "lineEdit_emissiveBlendBaseTexture" ) + processVtf( "", filePath, ui->lineEdit_emissiveBlendBaseTexture ); + + else if (name == "lineEdit_emissiveBlendFlowTexture" ) + processVtf( "", filePath, ui->lineEdit_emissiveBlendFlowTexture ); + } void MainWindow::finishedLoading() @@ -6652,6 +6716,10 @@ void MainWindow::gameChanged( const QString& game ) ui->toolButton_maskTexture->setDisabled(true); + ui->toolButton_emissiveBlendTexture->setDisabled(true); + ui->toolButton_emissiveBlendBaseTexture->setDisabled(true); + ui->toolButton_emissiveBlendFlowTexture->setDisabled(true); + QStringList defaultSurfaces = extractLines(":/surfaces/default"); ui->comboBox_surface->insertItems(1, defaultSurfaces); ui->comboBox_surface2->insertItems(1, defaultSurfaces); @@ -6709,6 +6777,10 @@ void MainWindow::gameChanged( const QString& game ) ui->toolButton_unlitTwoTextureDiffuse->setEnabled(true); ui->toolButton_unlitTwoTextureDiffuse2->setEnabled(true); + ui->toolButton_emissiveBlendTexture->setEnabled(true); + ui->toolButton_emissiveBlendBaseTexture->setEnabled(true); + ui->toolButton_emissiveBlendFlowTexture->setEnabled(true); + QStringList tmp(extractLines(":/surfaces/default")); if( getCurrentGame() == "Alien Swarm" ) @@ -6842,6 +6914,9 @@ void MainWindow::shaderChanged() case LayerBlend: layerblend::resetAction(ui); break; + case EmissiveBlend: + emissiveblend::resetAction(ui); + break; case Reflection: ui->groupBox_shadingReflection->setVisible(false);ui->action_reflection->setChecked(false);break; case SelfIllumination: ui->groupBox_selfIllumination->setVisible(false);ui->action_selfIllumination->setChecked(false);break; case RimLight: ui->groupBox_rimLight->setVisible(false);ui->action_rimLight->setChecked(false);break; @@ -6965,6 +7040,8 @@ void MainWindow::shaderChanged() } ui->action_layerBlend->setVisible(isBlend); + ui->action_emissiveBlend->setVisible(isVertexLitGeneric); + ui->horizontalSlider_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); ui->doubleSpinBox_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); ui->toolButton_reflectivity_2->setVisible( shader == "WorldVertexTransition" ); @@ -7226,6 +7303,7 @@ void MainWindow::shaderChanged() ui->action_treeSway->setVisible( ui->action_treeSway->isEnabled() ); ui->action_decal->setVisible( ui->action_decal->isEnabled() ); ui->action_layerBlend->setVisible( ui->action_layerBlend->isEnabled() ); + ui->action_emissiveBlend->setVisible( ui->action_emissiveBlend->isEnabled() ); //----------------------------------------------------------------------------------------// @@ -8063,6 +8141,15 @@ void MainWindow::browseVTF() else if (name == "toolButton_specmap2" ) processVtf( "", "", ui->lineEdit_specmap2 ); + + else if (name == "toolButton_emissiveBlendTexture" ) + processVtf( "", "", ui->lineEdit_emissiveBlendTexture ); + + else if (name == "toolButton_emissiveBlendBaseTexture" ) + processVtf( "", "", ui->lineEdit_emissiveBlendBaseTexture ); + + else if (name == "toolButton_emissiveBlendFlowTexture" ) + processVtf( "", "", ui->lineEdit_emissiveBlendFlowTexture ); } QString MainWindow::launchBrowseVtfDialog(QLineEdit* lineEdit) @@ -8800,6 +8887,9 @@ void MainWindow::changedColor() { else if( caller->objectName() == "toolButton_layerBorderTint" ) changeColor(ui->toolButton_layerBorderTint); + + else if( caller->objectName() == "toolButton_emissiveBlendTint" ) + changeColor(ui->toolButton_emissiveBlendTint); } void MainWindow::resetColor() @@ -10383,6 +10473,10 @@ void MainWindow::reconvertAll() { triggerLineEditAction(ui->lineEdit_phongWarp); triggerLineEditAction(ui->lineEdit_blendmodulate); triggerLineEditAction(ui->lineEdit_tintMask); + triggerLineEditAction(ui->lineEdit_emissiveBlendTexture); + triggerLineEditAction(ui->lineEdit_emissiveBlendBaseTexture); + triggerLineEditAction(ui->lineEdit_emissiveBlendFlowTexture); + } } @@ -11144,6 +11238,11 @@ void MainWindow::on_action_layerBlend_triggered(bool checked) HANDLE_ACTION(ui->groupBox_layerblend) } +void MainWindow::on_action_emissiveBlend_triggered(bool checked) +{ + HANDLE_ACTION(ui->groupBox_emissiveBlend) +} + void MainWindow::on_action_decal_triggered(bool checked) { HANDLE_ACTION(ui->groupBox_textureDecal) diff --git a/src/mainwindow.h b/src/mainwindow.h index 627ece5..89a17b0 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -74,7 +74,8 @@ class MainWindow : public QMainWindow UnlitTwoTexture, NormalBlend, TreeSway, - LayerBlend + LayerBlend, + EmissiveBlend }; MainWindow( QString fileToOpen = "", QWidget* parent = NULL ); @@ -405,6 +406,8 @@ public slots: void paste(); + void createReconvertAction(QLineEdit* lineEdit, QString fileName); + private slots: void previewTexture(); @@ -457,8 +460,6 @@ private slots: void vmtPreviewChanged(); - void createReconvertAction(QLineEdit* lineEdit, QString fileName); - void reconvertAll(); void createBlendToolTexture(); @@ -518,6 +519,7 @@ private slots: void on_action_treeSway_triggered(bool checked); void on_action_decal_triggered(bool checked); void on_action_layerBlend_triggered(bool checked); + void on_action_emissiveBlend_triggered(bool checked); }; //----------------------------------------------------------------------------// diff --git a/src/user-interface/emissive-blend.cpp b/src/user-interface/emissive-blend.cpp new file mode 100644 index 0000000..667f441 --- /dev/null +++ b/src/user-interface/emissive-blend.cpp @@ -0,0 +1,148 @@ +#include "emissive-blend.h" + +#include "user-interface/constants.h" +#include "errors.h" +#include "logging/logging.h" +#include "utilities/strings.h" + +bool emissiveblend::hasChanged(Ui::MainWindow *ui) +{ + // simplifying default checks + #define START return ( + #define VAL(w, s) stripZeroes(w->cleanText()) != s || + #define CHE(w) w->isChecked() || + #define COL(w) utils::getBG(w) != white || + #define TEX(w) w->text() != "" || + #define END false); + + START + TEX(ui->lineEdit_emissiveBlendTexture) + TEX(ui->lineEdit_emissiveBlendBaseTexture) + TEX(ui->lineEdit_emissiveBlendFlowTexture) + VAL(ui->doubleSpinBox_emissiveBlendScrollX, "0.0") + VAL(ui->doubleSpinBox_emissiveBlendScrollY, "0.0") + VAL(ui->doubleSpinBox_emissiveBlendStrength, "1.0") + COL(ui->toolButton_emissiveBlendTint) + END +} + +void emissiveblend::resetAction(Ui::MainWindow *ui) +{ + ui->groupBox_emissiveBlend->setVisible(false); + ui->action_emissiveBlend->setChecked(false); +} + +void emissiveblend::resetWidgets(Ui::MainWindow *ui) +{ + ui->lineEdit_emissiveBlendTexture->clear(); + ui->lineEdit_emissiveBlendBaseTexture->clear(); + ui->lineEdit_emissiveBlendFlowTexture->clear(); + ui->toolButton_emissiveBlendTint->setStyleSheet(whiteBG); + ui->doubleSpinBox_emissiveBlendTint->setValue(1.0); + ui->doubleSpinBox_emissiveBlendScrollX->setValue(0.0); + ui->doubleSpinBox_emissiveBlendScrollY->setValue(0.0); +} + +void initializeEmissiveBlend(Ui::MainWindow *ui, VmtFile *vmt) +{ + utils::BooleanResult raw = utils::takeBoolean("$emissiveblendenabled", vmt, ui); + if (!raw.present) + return; + + vmt->state.showEmissiveBlend = true; + + switch (vmt->shader) + { + case Shader::S_VertexLitGeneric: + ui->groupBox_emissiveBlend->setEnabled(true); + ui->groupBox_emissiveBlend->setChecked(true); + vmt->state.emissiveBlendEnabled = true; + break; + default: + ERROR("Emissive blend only works with the VertexLitGeneric shader"); + } +} + +void processScrollVector(const QString ¶meter, const QString &value, + Ui::MainWindow *ui) +{ + const utils::DoubleTuple tuple = utils::toDoubleTuple(value, 2); + + if (tuple.valid) { + double xd = tuple.values.at(0); + double yd = tuple.values.at(1); + ui->doubleSpinBox_emissiveBlendScrollX->setValue(xd); + ui->doubleSpinBox_emissiveBlendScrollY->setValue(yd); + } else { + logging::error(parameter + " has invalid value: " + value, + ui); + } +} + +void emissiveblend::parseParameters(Ui::MainWindow *ui, VmtFile *vmt, MainWindow *mainwindow) +{ + // golfing away the checks to quickly parse parameters + // note that the DO... macros all require an additional end bracket as + // PREP opens an if + #define PREP(p) \ + if (vmt->parameters.contains(p)) { \ + if (!vmt->state.emissiveBlendEnabled) \ + ERROR(p " only works with $emissiveblendenabled 1") \ + vmt->state.showEmissiveBlend = true; + #define DO(p, m) { \ + PREP(p) \ + m(p, vmt->parameters.take(p), ui); \ + } \ + } + #define DO_CHOICE(p, m, b) { \ + PREP(p) \ + m(p, vmt->parameters.take(p), ui, b); \ + } \ + } + #define DO_WITH_VMT(p, m) { \ + PREP(p) \ + m(p, vmt->parameters.take(p), ui, *vmt); \ + } \ + } + #define DOUBLE(p, def, widget) { \ + PREP(p) \ + const QString &v = vmt->parameters.take(p); \ + utils::DoubleResult r = \ + utils::parseDouble(p, v, def, ui); \ + if (r.notDefault) widget->setValue(r.value); \ + } \ + } + #define BOOL(p, widget) { \ + PREP(p) \ + const QString &v = vmt->parameters.take(p); \ + utils::BooleanResult r = \ + utils::parseBoolean(p, v, ui); \ + if (r.value) widget->setChecked(true); \ + } \ + } + #define COLOR(p, color, slider) { \ + PREP(p) \ + const QString &v = vmt->parameters.take(p); \ + utils::applyColor(p, v, color, slider, ui); \ + } \ + } + #define TEXTURE(p, widget) { \ + PREP(p) \ + const QString &v = vmt->parameters.take(p); \ + utils::parseTexture(p, v, ui, widget, *vmt); \ + mainwindow->createReconvertAction(widget, v); \ + } \ + } + + initializeEmissiveBlend(ui, vmt); + + DO("$emissiveblendscrollvector", processScrollVector) + TEXTURE("$emissiveblendtexture", ui->lineEdit_emissiveBlendTexture) + TEXTURE("$emissiveblendbasetexture", ui->lineEdit_emissiveBlendBaseTexture) + TEXTURE("$emissiveblendflowtexture", ui->lineEdit_emissiveBlendFlowTexture) + COLOR("$emissiveblendtint", ui->toolButton_emissiveBlendTint, ui->doubleSpinBox_emissiveBlendTint) + DOUBLE("$emissiveblendstrength", "1", ui->doubleSpinBox_emissiveBlendStrength) + DOUBLE("$bumpdetailscale2", "1", ui->doubleSpinBox_bumpdetailscale2) + + +} diff --git a/src/user-interface/emissive-blend.h b/src/user-interface/emissive-blend.h new file mode 100644 index 0000000..55f5db9 --- /dev/null +++ b/src/user-interface/emissive-blend.h @@ -0,0 +1,52 @@ +#ifndef EMISSIVEBLEND_H +#define EMISSIVEBLEND_H + +#include "ui_mainwindow.h" + +#include "view-helper.h" +#include "vmt/vmt-helper.h" + +/*! + * Functions for interacting with the Normal blend named groupbox. + */ +namespace emissiveblend { + +/*! + * Detects if the views are not in their default state and returns true if + * any field differs from the default. + * + * Call from MainWindow::isGroupChanged(). + */ +bool hasChanged(Ui::MainWindow *ui); + +/*! + * Hides the groupbox and unchecks the action. + * + * Call from MainWindow::shaderChanged() for hiding group boxes whose + * content did not change after a shader change. + */ +void resetAction(Ui::MainWindow *ui); + +/*! + * Resets the widgets to their default state. + * + * Call from MainWindow::resetWidgets(). + */ +void resetWidgets(Ui::MainWindow *ui); + +/*! + * Processes the passed parameter from the VmtFile and initializes the + * user interface with it. + * + * Checks vmt->state.normalBlendEnabled. + * + * The user interface is set up and errors are returned should any + * parameters have an invalid format. + * + * We only process the parameter if it exists. + */ +void parseParameters(Ui::MainWindow *ui, VmtFile *vmt, MainWindow *mainwindow); + +} // namespace normalblend + +#endif diff --git a/src/vmtparser.cpp b/src/vmtparser.cpp index eadaae3..1eb6174 100644 --- a/src/vmtparser.cpp +++ b/src/vmtparser.cpp @@ -29,7 +29,6 @@ VmtParser::VmtParser( QListWidget* logger ) : mGroups.append( "$phong;$phongexponenttexture;$basemapluminancephongmask;$phongfresnelranges;$phongwarptexture;$phongtint;$halflambert;$phongdisablehalflambert;$phongalbedotint;$phongexponent;$phongboost;$phongalbedoboost;$basemapalphaphongmask;$phongamount;$phongmaskcontrastbrightness;$phongexponent2;$phongamount2;$phongmaskcontrastbrightness2" ); mGroups.append( "$rimlight;$rimlightexponent;$rimlightboost;$rimlightmask"); mGroups.append( "$selfillum;$selfillum_envmapmask_alpha;$selfillumfresnelminmaxexp;$selfillummask;$selfillumtint" ); - // Needed to allow a proper grouping of $normalmap in the Water and Refract Shaders mGroups.append( ""); @@ -40,6 +39,7 @@ VmtParser::VmtParser( QListWidget* logger ) : mGroups.append( "$refracttexture;$refract;$refracttinttexture;$refracttint;$refractamount;$bluramount;$refractblur" ); mGroups.append( "$fogenable;$fogcolor;$fogstart;$fogend;$flashlighttint;$lightmapwaterfog" ); + mGroups.append( "$emissiveblendenabled;$emissiveblendtexture;$emissiveblendbasetexture;$emissiveblendflowtexture;$emissiveblendtint;$emissiveblendstrength;$emissiveblendscrollvector"); mGroups.append( "$addbumpmaps;$bumpdetailscale1;$bumpdetailscale2;$bumptransform2" ); mGroups.append( "$basetexturetransform;$bumptransform" ); mGroups.append( "$vertexcolor;$vertexalpha;$nodecal;$ignorez;$nofog;$nolod;$no_fullbright;$disablecsmlookup" ); diff --git a/src/vmtparser.h b/src/vmtparser.h index 8b3569d..06718a3 100644 --- a/src/vmtparser.h +++ b/src/vmtparser.h @@ -45,6 +45,10 @@ struct VmtState bool showLayerBlend = false; + bool showEmissiveBlend = false; + + bool emissiveBlendEnabled = false; + /*! * Helper field to persist the directory of the game so textures can be * validated and previewed. diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 0cce533..feb3dfe 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -150,7 +150,7 @@ QLineEdit:disabled QScrollBar { - background-color: #404040; + background-color: #222; } QScrollBar:horizontal @@ -165,21 +165,21 @@ QScrollBar:vertical width: 10px; margin: 0; border: 0; - background-color: #404040; + background-color: #222; } QScrollBar::handle:vertical, QScrollBar::handle:horizontal { - background-color: #282828; + background-color: #333; min-width: 5px; min-height: 5px; - border: 1px solid #404040; + border: 1px solid #222; } QScrollBar::handle:hover { - background-color: #303030; + background-color: #444; } QScrollBar::sub-line @@ -1080,9 +1080,9 @@ QGroupBox::title { 0 - -1811 + -4280 933 - 5903 + 6121 @@ -14943,7 +14943,7 @@ QToolButton:pressed - + 0 @@ -14960,7 +14960,7 @@ QToolButton:pressed - Flow + Emissive Blend Qt::AlignCenter @@ -14968,9 +14968,27 @@ QToolButton:pressed true - - - + + false + + + + + + true + + + + 75 + 23 + + + + + 75 + 23 + + Segoe UI @@ -14980,10 +14998,38 @@ QToolButton:pressed false + + Browse... + + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Strength: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + - + 100 @@ -15000,15 +15046,31 @@ QToolButton:pressed - Flowmap: + Texture Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + Segoe UI + 9 + 50 + false + false + + + + - + + + true + 75 @@ -15035,35 +15097,63 @@ QToolButton:pressed - - - - + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Tint: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + - 100 + 250 0 - - - Segoe UI - 9 - 50 - false - false - + + + 200 + 16777215 + - - Normal map size: + + 100 - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1 + + + 100 + + + Qt::Horizontal - - + + 60 @@ -15072,7 +15162,7 @@ QToolButton:pressed - 70 + 50 16777215 @@ -15085,54 +15175,26 @@ QToolButton:pressed false - - 1 - - - 16384.000000000000000 - - 128.000000000000000 - - - - - - - - 100 - 0 - - - - - Segoe UI - 9 - 50 - false - false - - - - Bump strength: + 0.100000000000000 - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + 1.000000000000000 - - + + - 60 + 150 23 - 70 - 16777215 + 150 + 23 @@ -15144,19 +15206,13 @@ QToolButton:pressed false - - 3 - - - 16.000000000000000 - - - 0.100000000000000 + + - - + + Qt::Horizontal @@ -15168,17 +15224,46 @@ QToolButton:pressed - - + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Scroll: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + - 60 + 70 23 - 70 + 90 16777215 @@ -15191,20 +15276,32 @@ QToolButton:pressed false - - 16.000000000000000 + + X: + + + 3 - 0.050000000000000 + 0.100000000000000 + + + 0.000000000000000 - - + + - 80 - 0 + 70 + 23 + + + + + 90 + 16777215 @@ -15216,8 +15313,500 @@ QToolButton:pressed false - - Time interval: + + Y: + + + 3 + + + 0.100000000000000 + + + 0.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + true + + + + 75 + 23 + + + + + 75 + 23 + + + + + Segoe UI + 9 + 50 + false + false + + + + Browse... + + + + + + + + Segoe UI + 9 + 50 + false + false + + + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Base texture: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + UV texture: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + Segoe UI + 9 + 50 + false + false + + + + + + + + + + + 250 + 0 + + + + + 200 + 16777215 + + + + 1000 + + + 1 + + + 1000 + + + Qt::Horizontal + + + + + + + + 60 + 23 + + + + + 75 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 100.000000000000000 + + + 0.010000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + 0 + 0 + + + + + Segoe UI + 14 + 50 + false + false + + + + Flow + + + Qt::AlignCenter + + + true + + + + + + + Segoe UI + 9 + 50 + false + false + + + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Flowmap: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 75 + 23 + + + + + 75 + 23 + + + + + Segoe UI + 9 + 50 + false + false + + + + Browse... + + + + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Normal map size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 23 + + + + + 70 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 1 + + + 16384.000000000000000 + + + 128.000000000000000 + + + + + + + + 100 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Bump strength: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 60 + 23 + + + + + 70 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 3 + + + 16.000000000000000 + + + 0.100000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 60 + 23 + + + + + 70 + 16777215 + + + + + Segoe UI + 9 + 50 + false + false + + + + 16.000000000000000 + + + 0.050000000000000 + + + + + + + + 80 + 0 + + + + + Segoe UI + 9 + 50 + false + false + + + + Time interval: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -19097,6 +19686,7 @@ QScrollBar::handle:horizontal + @@ -19150,6 +19740,7 @@ QScrollBar::handle:horizontal + @@ -20255,6 +20846,27 @@ QScrollBar::handle:horizontal Ctrl+Shift+Z + + + true + + + + :/icons/illu + + + + Emissive Blend + + + + + Refresh Material In-Game + + + F5 + + @@ -20385,12 +20997,12 @@ QScrollBar::handle:horizontal setDisabled(bool) - 450 - -944 + 429 + -2078 - 450 - -976 + 429 + -2105 @@ -20401,8 +21013,8 @@ QScrollBar::handle:horizontal alphaTestReferenceChanged() - 607 - -974 + 549 + -2107 373 @@ -20417,12 +21029,12 @@ QScrollBar::handle:horizontal setDisabled(bool) - 450 - -976 + 429 + -2105 - 450 - -944 + 429 + -2078 @@ -20433,12 +21045,12 @@ QScrollBar::handle:horizontal setEnabled(bool) - 450 - -976 + 429 + -2105 - 531 - -974 + 483 + -2107 @@ -20449,12 +21061,12 @@ QScrollBar::handle:horizontal setEnabled(bool) - 450 - -976 + 429 + -2105 - 607 - -974 + 549 + -2107 @@ -20465,8 +21077,8 @@ QScrollBar::handle:horizontal opacityChanged(double) - 607 - -1005 + 646 + -2137 344 @@ -20481,8 +21093,8 @@ QScrollBar::handle:horizontal detailTextureChanged(QString) - 832 - -847 + 838 + -1981 204 @@ -20497,8 +21109,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -112 + 919 + -1246 624 @@ -20513,8 +21125,8 @@ QScrollBar::handle:horizontal modifiedLineEdit(QString) - 832 - -112 + 838 + -1246 492 @@ -20529,8 +21141,8 @@ QScrollBar::handle:horizontal widgetChanged() - 607 - -1005 + 646 + -2137 490 @@ -20545,8 +21157,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 429 - -141 + 428 + -1275 614 @@ -20561,8 +21173,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 469 - -25 + 468 + -1159 615 @@ -20577,8 +21189,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 615 - -25 + 614 + -1159 622 @@ -20593,8 +21205,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -83 + 919 + -1217 625 @@ -20609,8 +21221,8 @@ QScrollBar::handle:horizontal changedColor() - 768 - 5 + 801 + -1129 251 @@ -20625,8 +21237,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - 572 + 918 + -511 627 @@ -20641,8 +21253,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 705 - 628 + 862 + -577 623 @@ -20657,8 +21269,8 @@ QScrollBar::handle:horizontal modifiedLineEdit(QString) - 831 - 572 + 837 + -511 492 @@ -20673,8 +21285,8 @@ QScrollBar::handle:horizontal widgetChanged() - 399 - -460 + 388 + -1594 311 @@ -20689,8 +21301,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -847 + 838 + -1981 309 @@ -20705,8 +21317,8 @@ QScrollBar::handle:horizontal widgetChanged() - 774 - -786 + 801 + -1920 309 @@ -20721,8 +21333,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -817 + 404 + -1951 308 @@ -20737,8 +21349,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -786 + 645 + -1920 309 @@ -20753,8 +21365,8 @@ QScrollBar::handle:horizontal widgetChanged() - 450 - -944 + 429 + -2078 491 @@ -20769,8 +21381,8 @@ QScrollBar::handle:horizontal widgetChanged() - 607 - -974 + 549 + -2107 577 @@ -20785,8 +21397,8 @@ QScrollBar::handle:horizontal widgetChanged() - 450 - -915 + 429 + -2049 490 @@ -20801,8 +21413,8 @@ QScrollBar::handle:horizontal widgetChanged() - 450 - -976 + 429 + -2105 493 @@ -20817,8 +21429,8 @@ QScrollBar::handle:horizontal widgetChanged() - 405 - -2928 + 400 + -4038 187 @@ -20833,8 +21445,8 @@ QScrollBar::handle:horizontal widgetChanged() - 486 - -2928 + 478 + -4038 187 @@ -20849,8 +21461,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - -2958 + 478 + -4068 99 @@ -20865,8 +21477,8 @@ QScrollBar::handle:horizontal changedColor() - 491 - -2768 + 479 + -3878 414 @@ -20881,8 +21493,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - -2768 + 918 + -3878 586 @@ -20897,8 +21509,8 @@ QScrollBar::handle:horizontal widgetChanged() - 831 - -2768 + 837 + -3878 98 @@ -20913,8 +21525,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -2079 + 399 + -3189 96 @@ -20929,8 +21541,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -2079 + 475 + -3189 186 @@ -20945,8 +21557,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -2048 + 399 + -3158 188 @@ -20961,8 +21573,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -2048 + 475 + -3158 187 @@ -20977,8 +21589,8 @@ QScrollBar::handle:horizontal widgetChanged() - 653 - -2079 + 645 + -3189 97 @@ -20993,8 +21605,8 @@ QScrollBar::handle:horizontal widgetChanged() - 653 - -2048 + 645 + -3158 187 @@ -21009,8 +21621,8 @@ QScrollBar::handle:horizontal widgetChanged() - 739 - -2048 + 721 + -3158 96 @@ -21025,8 +21637,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -1979 + 399 + -3089 192 @@ -21041,8 +21653,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -1979 + 475 + -3089 186 @@ -21057,8 +21669,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -1948 + 399 + -3058 277 @@ -21073,8 +21685,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -1948 + 475 + -3058 279 @@ -21089,8 +21701,8 @@ QScrollBar::handle:horizontal widgetChanged() - 653 - -1979 + 645 + -3089 278 @@ -21105,8 +21717,8 @@ QScrollBar::handle:horizontal widgetChanged() - 653 - -1948 + 645 + -3058 277 @@ -21121,8 +21733,8 @@ QScrollBar::handle:horizontal widgetChanged() - 739 - -1948 + 721 + -3058 277 @@ -21137,8 +21749,8 @@ QScrollBar::handle:horizontal changedColor() - 687 - 1982 + 735 + 1141 732 @@ -21153,8 +21765,8 @@ QScrollBar::handle:horizontal changedColor() - 687 - 1796 + 735 + 955 733 @@ -21169,8 +21781,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -2513 + 919 + -3623 406 @@ -21185,8 +21797,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 430 - -2423 + 469 + -3533 219 @@ -21201,8 +21813,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 556 - -2423 + 615 + -3533 219 @@ -21217,8 +21829,8 @@ QScrollBar::handle:horizontal widgetChanged() - 912 - 2628 + 918 + 1787 188 @@ -21233,8 +21845,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - 2599 + 918 + 1758 586 @@ -21249,12 +21861,12 @@ QScrollBar::handle:horizontal setEnabled(bool) - 431 - -2394 + 425 + -3504 - 476 - -2398 + 471 + -3508 @@ -21265,12 +21877,12 @@ QScrollBar::handle:horizontal setDisabled(bool) - 662 - -2423 + 761 + -3533 - 405 - 1923 + 406 + 1082 @@ -21281,12 +21893,12 @@ QScrollBar::handle:horizontal setDisabled(bool) - 662 - -2423 + 761 + -3533 - 287 - -2484 + 285 + -3594 @@ -21297,8 +21909,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - 1430 + 919 + 589 406 @@ -21313,12 +21925,12 @@ QScrollBar::handle:horizontal setDisabled(bool) - 662 - -2423 + 761 + -3533 - 832 - -2484 + 838 + -3594 @@ -21329,8 +21941,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - 1459 + 919 + 618 406 @@ -21345,8 +21957,8 @@ QScrollBar::handle:horizontal changedColor() - 687 - 1637 + 735 + 796 733 @@ -21361,8 +21973,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 662 - -2423 + 761 + -3533 219 @@ -21377,8 +21989,8 @@ QScrollBar::handle:horizontal browseVMT() - 913 - -2484 + 919 + -3594 326 @@ -21393,8 +22005,8 @@ QScrollBar::handle:horizontal changedColor() - 762 - -297 + 800 + -1431 494 @@ -21409,8 +22021,8 @@ QScrollBar::handle:horizontal changedColor() - 762 - -268 + 800 + -1402 494 @@ -21425,8 +22037,8 @@ QScrollBar::handle:horizontal widgetChanged() - 831 - 2599 + 837 + 1758 187 @@ -21441,8 +22053,8 @@ QScrollBar::handle:horizontal changedColor() - 763 - 1331 + 801 + 272 252 @@ -21457,8 +22069,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -1631 + 838 + -2741 578 @@ -21473,8 +22085,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - -1602 + 478 + -2712 489 @@ -21489,8 +22101,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -1689 + 838 + -2799 487 @@ -21505,8 +22117,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -1660 + 838 + -2770 488 @@ -21521,8 +22133,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -1660 + 919 + -2770 118 @@ -21537,8 +22149,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -1689 + 919 + -2799 118 @@ -21553,8 +22165,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -1631 + 919 + -2741 96 @@ -21569,8 +22181,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -847 + 919 + -1981 120 @@ -21585,8 +22197,8 @@ QScrollBar::handle:horizontal widgetChanged() - 556 - -944 + 589 + -2078 99 @@ -21601,8 +22213,8 @@ QScrollBar::handle:horizontal widgetChanged() - 636 - 2682 + 635 + 1841 99 @@ -21617,8 +22229,8 @@ QScrollBar::handle:horizontal widgetChanged() - 480 - 2708 + 479 + 1867 99 @@ -21633,8 +22245,8 @@ QScrollBar::handle:horizontal widgetChanged() - 480 - 2682 + 479 + 1841 99 @@ -21649,8 +22261,8 @@ QScrollBar::handle:horizontal changedColor() - 692 - 541 + 735 + -542 251 @@ -21665,8 +22277,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 600 - 656 + 599 + -427 627 @@ -21681,8 +22293,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - -2859 + 918 + -3969 436 @@ -21697,8 +22309,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - -2828 + 918 + -3938 417 @@ -21713,8 +22325,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -547 + 919 + -1681 415 @@ -21729,8 +22341,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -547 + 838 + -1681 309 @@ -21745,8 +22357,8 @@ QScrollBar::handle:horizontal widgetChanged() - 460 - -213 + 469 + -1339 123 @@ -21761,8 +22373,8 @@ QScrollBar::handle:horizontal widgetChanged() - 636 - 2656 + 635 + 1815 651 @@ -21777,8 +22389,8 @@ QScrollBar::handle:horizontal widgetChanged() - 792 - 2656 + 791 + 1815 842 @@ -21793,8 +22405,8 @@ QScrollBar::handle:horizontal widgetChanged() - 792 - 2682 + 791 + 1841 843 @@ -21809,8 +22421,8 @@ QScrollBar::handle:horizontal widgetChanged() - 636 - 2708 + 635 + 1867 861 @@ -21825,8 +22437,8 @@ QScrollBar::handle:horizontal widgetChanged() - 480 - 2656 + 479 + 1815 506 @@ -21841,8 +22453,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -2638 + 919 + -3748 422 @@ -21857,8 +22469,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -2638 + 838 + -3748 288 @@ -21873,8 +22485,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -2609 + 919 + -3719 411 @@ -21889,8 +22501,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -2609 + 838 + -3719 287 @@ -21905,8 +22517,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - -2580 + 478 + -3690 173 @@ -21921,8 +22533,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 1827 + 645 + 986 96 @@ -21937,8 +22549,8 @@ QScrollBar::handle:horizontal widgetChanged() - 451 - 1887 + 469 + 1046 87 @@ -21953,8 +22565,8 @@ QScrollBar::handle:horizontal widgetChanged() - 702 - 1883 + 761 + 1042 230 @@ -21969,8 +22581,8 @@ QScrollBar::handle:horizontal widgetChanged() - 568 - 1910 + 615 + 1069 736 @@ -21985,8 +22597,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - 2081 + 474 + 1240 204 @@ -22001,8 +22613,8 @@ QScrollBar::handle:horizontal widgetChanged() - 401 - 2081 + 398 + 1240 90 @@ -22017,8 +22629,8 @@ QScrollBar::handle:horizontal widgetChanged() - 401 - 2110 + 398 + 1269 97 @@ -22033,8 +22645,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - 2110 + 474 + 1269 195 @@ -22049,8 +22661,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2013 + 645 + 1172 576 @@ -22065,8 +22677,8 @@ QScrollBar::handle:horizontal widgetChanged() - 400 - 1668 + 389 + 827 605 @@ -22081,8 +22693,8 @@ QScrollBar::handle:horizontal widgetChanged() - 528 - 1668 + 541 + 827 734 @@ -22097,8 +22709,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 1699 + 645 + 858 608 @@ -22113,8 +22725,8 @@ QScrollBar::handle:horizontal widgetChanged() - 428 - 1724 + 469 + 883 540 @@ -22129,8 +22741,8 @@ QScrollBar::handle:horizontal widgetChanged() - 525 - 1724 + 615 + 883 663 @@ -22145,8 +22757,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - 1163 + 644 + 104 580 @@ -22161,8 +22773,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - 1192 + 644 + 133 581 @@ -22177,8 +22789,8 @@ QScrollBar::handle:horizontal widgetChanged() - 529 - 1213 + 578 + 154 565 @@ -22193,8 +22805,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -112 + 838 + -1246 675 @@ -22209,8 +22821,8 @@ QScrollBar::handle:horizontal widgetChanged() - 429 - -141 + 428 + -1275 620 @@ -22225,8 +22837,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -83 + 838 + -1217 634 @@ -22241,8 +22853,8 @@ QScrollBar::handle:horizontal widgetChanged() - 469 - -25 + 468 + -1159 620 @@ -22257,8 +22869,8 @@ QScrollBar::handle:horizontal widgetChanged() - 615 - -25 + 614 + -1159 623 @@ -22273,8 +22885,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 36 + 645 + -1076 600 @@ -22289,8 +22901,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 67 + 645 + -1045 746 @@ -22305,8 +22917,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - 1430 + 838 + 589 715 @@ -22321,8 +22933,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 98 + 645 + -1014 601 @@ -22337,8 +22949,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - 1459 + 838 + 618 720 @@ -22353,8 +22965,8 @@ QScrollBar::handle:horizontal widgetChanged() - 411 - 1568 + 496 + 727 534 @@ -22369,8 +22981,8 @@ QScrollBar::handle:horizontal widgetChanged() - 593 - 1547 + 563 + 706 791 @@ -22385,8 +22997,8 @@ QScrollBar::handle:horizontal widgetChanged() - 400 - 1518 + 390 + 677 795 @@ -22401,8 +23013,8 @@ QScrollBar::handle:horizontal widgetChanged() - 593 - 1518 + 563 + 677 798 @@ -22417,8 +23029,8 @@ QScrollBar::handle:horizontal widgetChanged() - 400 - 1489 + 390 + 648 654 @@ -22433,8 +23045,8 @@ QScrollBar::handle:horizontal widgetChanged() - 593 - 1489 + 563 + 648 659 @@ -22449,8 +23061,8 @@ QScrollBar::handle:horizontal widgetChanged() - 775 - 1489 + 735 + 648 642 @@ -22465,8 +23077,8 @@ QScrollBar::handle:horizontal widgetChanged() - 400 - 1547 + 390 + 706 640 @@ -22481,8 +23093,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 479 + 660 + -635 569 @@ -22497,8 +23109,8 @@ QScrollBar::handle:horizontal widgetChanged() - 773 - 479 + 822 + -635 746 @@ -22513,8 +23125,8 @@ QScrollBar::handle:horizontal widgetChanged() - 692 - 479 + 741 + -635 635 @@ -22529,8 +23141,8 @@ QScrollBar::handle:horizontal widgetChanged() - 600 - 656 + 599 + -427 593 @@ -22545,8 +23157,8 @@ QScrollBar::handle:horizontal widgetChanged() - 705 - 628 + 862 + -577 581 @@ -22561,8 +23173,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 572 + 579 + -511 573 @@ -22577,8 +23189,8 @@ QScrollBar::handle:horizontal widgetChanged() - 831 - 572 + 837 + -511 681 @@ -22593,8 +23205,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 510 + 645 + -604 621 @@ -22609,8 +23221,8 @@ QScrollBar::handle:horizontal widgetChanged() - 470 - 628 + 469 + -455 558 @@ -22625,8 +23237,8 @@ QScrollBar::handle:horizontal widgetChanged() - 831 - -2859 + 837 + -3969 307 @@ -22641,8 +23253,8 @@ QScrollBar::handle:horizontal widgetChanged() - 622 - 628 + 621 + -455 707 @@ -22657,8 +23269,8 @@ QScrollBar::handle:horizontal widgetChanged() - 831 - -2828 + 837 + -3938 334 @@ -22673,8 +23285,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - -2798 + 478 + -3908 186 @@ -22689,8 +23301,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -2737 + 645 + -3847 148 @@ -22705,8 +23317,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -2706 + 645 + -3816 157 @@ -22721,8 +23333,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - 1280 + 838 + 221 222 @@ -22737,8 +23349,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - 1301 + 838 + 242 175 @@ -22753,8 +23365,8 @@ QScrollBar::handle:horizontal widgetChanged() - 612 - 1362 + 584 + 303 334 @@ -22769,8 +23381,8 @@ QScrollBar::handle:horizontal widgetChanged() - 516 - 1362 + 497 + 303 250 @@ -22785,8 +23397,8 @@ QScrollBar::handle:horizontal widgetChanged() - 420 - 1362 + 410 + 303 153 @@ -22801,8 +23413,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 451 - 1887 + 469 + 1046 575 @@ -22817,12 +23429,12 @@ QScrollBar::handle:horizontal setValue(int) - 530 - 571 + 513 + -512 - 611 - 572 + 579 + -511 @@ -22833,12 +23445,12 @@ QScrollBar::handle:horizontal setValue(int) - 611 - 572 + 579 + -511 - 530 - 571 + 513 + -512 @@ -22849,8 +23461,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -2269 + 919 + -3379 420 @@ -22865,8 +23477,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -2329 + 919 + -3439 426 @@ -22881,8 +23493,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -2329 + 838 + -3439 487 @@ -22897,8 +23509,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -2269 + 838 + -3379 487 @@ -22913,8 +23525,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - -2209 + 478 + -3319 486 @@ -22929,8 +23541,8 @@ QScrollBar::handle:horizontal widgetChanged() - 556 - -915 + 589 + -2049 -5 @@ -22945,8 +23557,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -1411 + 919 + -2521 -4 @@ -22961,8 +23573,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -1220 + 919 + -2330 -6 @@ -22977,8 +23589,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -1411 + 838 + -2521 -2 @@ -22993,8 +23605,8 @@ QScrollBar::handle:horizontal widgetChanged() - 405 - -1375 + 400 + -2485 -1 @@ -23009,8 +23621,8 @@ QScrollBar::handle:horizontal widgetChanged() - 486 - -1375 + 478 + -2485 -8 @@ -23025,8 +23637,8 @@ QScrollBar::handle:horizontal widgetChanged() - 405 - -1566 + 400 + -2676 -6 @@ -23041,8 +23653,8 @@ QScrollBar::handle:horizontal widgetChanged() - 486 - -1566 + 478 + -2676 -5 @@ -23057,8 +23669,8 @@ QScrollBar::handle:horizontal widgetChanged() - 578 - -2180 + 580 + -3290 -5 @@ -23073,8 +23685,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -2159 + 594 + -3269 -7 @@ -23089,8 +23701,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -2159 + 877 + -3269 -7 @@ -23105,8 +23717,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1536 + 594 + -2646 623 @@ -23121,8 +23733,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -1536 + 877 + -2646 -3 @@ -23137,8 +23749,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1507 + 594 + -2617 -7 @@ -23153,8 +23765,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -1507 + 877 + -2617 -6 @@ -23169,8 +23781,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1478 + 594 + -2588 -6 @@ -23185,8 +23797,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1345 + 594 + -2455 -5 @@ -23201,8 +23813,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -1345 + 877 + -2455 -7 @@ -23217,8 +23829,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1316 + 594 + -2426 -5 @@ -23233,8 +23845,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -1316 + 877 + -2426 -4 @@ -23249,8 +23861,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1287 + 594 + -2397 -6 @@ -23265,8 +23877,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -1220 + 838 + -2330 -6 @@ -23281,8 +23893,8 @@ QScrollBar::handle:horizontal widgetChanged() - 405 - -1184 + 400 + -2294 -5 @@ -23297,8 +23909,8 @@ QScrollBar::handle:horizontal widgetChanged() - 486 - -1184 + 478 + -2294 -2 @@ -23313,8 +23925,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1154 + 594 + -2264 -3 @@ -23329,8 +23941,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -1154 + 877 + -2264 -4 @@ -23345,8 +23957,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1124 + 594 + -2235 -5 @@ -23361,8 +23973,8 @@ QScrollBar::handle:horizontal widgetChanged() - 898 - -1124 + 877 + -2235 -4 @@ -23377,8 +23989,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -1074 + 594 + -2206 -4 @@ -23393,8 +24005,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 450 - -944 + 429 + -2078 -4 @@ -23409,8 +24021,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 450 - -976 + 429 + -2105 -6 @@ -23425,8 +24037,8 @@ QScrollBar::handle:horizontal fresnelYEdited(double) - 692 - 479 + 741 + -635 -2 @@ -23441,8 +24053,8 @@ QScrollBar::handle:horizontal widgetChanged() - 568 - 1887 + 615 + 1046 -4 @@ -23457,8 +24069,8 @@ QScrollBar::handle:horizontal changedColor() - 762 - -518 + 800 + -1652 -2 @@ -23473,8 +24085,8 @@ QScrollBar::handle:horizontal widgetChanged() - 529 - -519 + 578 + -1652 -1 @@ -23489,8 +24101,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -817 + 485 + -1951 929 @@ -23505,8 +24117,8 @@ QScrollBar::handle:horizontal toggledDetailUniformScale(bool) - 602 - -819 + 591 + -1949 928 @@ -23521,12 +24133,12 @@ QScrollBar::handle:horizontal setValue(int) - 611 - 260 + 645 + -852 - 530 - 259 + 579 + -853 @@ -23537,12 +24149,12 @@ QScrollBar::handle:horizontal setValue(int) - 530 - 259 + 579 + -853 - 611 - 260 + 645 + -852 @@ -23553,12 +24165,12 @@ QScrollBar::handle:horizontal setValue(int) - 611 - 379 + 645 + -733 - 530 - 378 + 579 + -734 @@ -23569,12 +24181,12 @@ QScrollBar::handle:horizontal setValue(int) - 530 - 378 + 579 + -734 - 611 - 379 + 645 + -733 @@ -23585,8 +24197,8 @@ QScrollBar::handle:horizontal changedColor() - 773 - 229 + 801 + -883 592 @@ -23601,8 +24213,8 @@ QScrollBar::handle:horizontal changedColor() - 773 - 350 + 801 + -762 592 @@ -23617,12 +24229,12 @@ QScrollBar::handle:horizontal toggle() - 469 - -25 + 468 + -1159 - 470 - 316 + 469 + -796 @@ -23633,12 +24245,12 @@ QScrollBar::handle:horizontal toggle() - 470 - 316 + 469 + -796 - 469 - -25 + 468 + -1159 @@ -23649,12 +24261,12 @@ QScrollBar::handle:horizontal toggle() - 615 - -25 + 614 + -1159 - 590 - 316 + 589 + -796 @@ -23665,12 +24277,12 @@ QScrollBar::handle:horizontal toggle() - 590 - 316 + 589 + -796 - 615 - -25 + 614 + -1159 @@ -23681,8 +24293,8 @@ QScrollBar::handle:horizontal fresnelSliderEdited(int) - 530 - 478 + 579 + -636 592 @@ -23697,8 +24309,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -1880 + 919 + -2990 592 @@ -23713,12 +24325,12 @@ QScrollBar::handle:horizontal setValue(int) - 605 - 1163 + 644 + 104 - 529 - 1162 + 578 + 103 @@ -23729,12 +24341,12 @@ QScrollBar::handle:horizontal setValue(int) - 529 - 1162 + 578 + 103 - 605 - 1163 + 644 + 104 @@ -23745,8 +24357,8 @@ QScrollBar::handle:horizontal widgetChanged() - 522 - -209 + 531 + -1343 576 @@ -23761,8 +24373,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -1880 + 838 + -2990 576 @@ -23777,8 +24389,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 350 + 645 + -762 576 @@ -23793,8 +24405,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 229 + 645 + -883 576 @@ -23809,8 +24421,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 160 + 645 + -952 576 @@ -23825,8 +24437,8 @@ QScrollBar::handle:horizontal widgetChanged() - 707 - 129 + 722 + -983 576 @@ -23841,8 +24453,8 @@ QScrollBar::handle:horizontal widgetChanged() - 803 - 129 + 800 + -983 576 @@ -23857,8 +24469,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 129 + 645 + -983 576 @@ -23873,8 +24485,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -1757 + 645 + -2867 576 @@ -23889,8 +24501,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -1788 + 645 + -2898 576 @@ -23905,8 +24517,8 @@ QScrollBar::handle:horizontal widgetChanged() - 739 - -1819 + 721 + -2929 576 @@ -23921,8 +24533,8 @@ QScrollBar::handle:horizontal widgetChanged() - 653 - -1819 + 645 + -2929 576 @@ -23937,8 +24549,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -1819 + 475 + -2929 576 @@ -23953,8 +24565,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -1819 + 399 + -2929 576 @@ -23969,8 +24581,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -1850 + 475 + -2960 576 @@ -23985,8 +24597,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -1850 + 399 + -2960 576 @@ -24001,8 +24613,8 @@ QScrollBar::handle:horizontal widgetChanged() - 653 - -1850 + 645 + -2960 576 @@ -24017,8 +24629,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 409 + 645 + -704 576 @@ -24033,8 +24645,8 @@ QScrollBar::handle:horizontal widgetChanged() - 809 - 409 + 867 + -704 576 @@ -24049,8 +24661,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 291 + 645 + -821 576 @@ -24065,8 +24677,8 @@ QScrollBar::handle:horizontal widgetChanged() - 808 - 291 + 867 + -821 576 @@ -24081,8 +24693,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 260 + 645 + -852 576 @@ -24097,8 +24709,8 @@ QScrollBar::handle:horizontal widgetChanged() - 530 - 4 + 579 + -1129 -3 @@ -24113,8 +24725,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 379 + 645 + -733 896 @@ -24129,8 +24741,8 @@ QScrollBar::handle:horizontal widgetChanged() - 530 - 1330 + 579 + 271 896 @@ -24145,8 +24757,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - 1280 + 919 + 221 887 @@ -24161,8 +24773,8 @@ QScrollBar::handle:horizontal widgetChanged() - 530 - 540 + 579 + -543 -1 @@ -24177,8 +24789,8 @@ QScrollBar::handle:horizontal widgetChanged() - 530 - 1795 + 579 + 954 -7 @@ -24193,8 +24805,8 @@ QScrollBar::handle:horizontal widgetChanged() - 530 - 1981 + 579 + 1140 -5 @@ -24209,8 +24821,8 @@ QScrollBar::handle:horizontal widgetChanged() - 530 - 1636 + 579 + 795 -7 @@ -24225,8 +24837,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - 1857 + 919 + 1016 -9 @@ -24241,8 +24853,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - 1857 + 838 + 1016 -5 @@ -24257,8 +24869,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -2513 + 838 + -3623 -5 @@ -24273,8 +24885,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -2484 + 838 + -3594 -3 @@ -24289,8 +24901,8 @@ QScrollBar::handle:horizontal widgetChanged() - 479 - -2455 + 478 + -3565 -1 @@ -24305,8 +24917,8 @@ QScrollBar::handle:horizontal widgetChanged() - 430 - -2423 + 469 + -3533 -2 @@ -24321,8 +24933,8 @@ QScrollBar::handle:horizontal widgetChanged() - 476 - -2398 + 471 + -3508 -3 @@ -24337,8 +24949,8 @@ QScrollBar::handle:horizontal widgetChanged() - 556 - -2423 + 615 + -3533 -1 @@ -24353,8 +24965,8 @@ QScrollBar::handle:horizontal widgetChanged() - 662 - -2423 + 761 + -3533 -2 @@ -24369,8 +24981,8 @@ QScrollBar::handle:horizontal widgetChanged() - 702 - 1910 + 761 + 1069 -2 @@ -24385,8 +24997,8 @@ QScrollBar::handle:horizontal widgetChanged() - 748 - 2178 + 777 + 1337 -6 @@ -24401,8 +25013,8 @@ QScrollBar::handle:horizontal widgetChanged() - 748 - 2209 + 777 + 1368 -7 @@ -24417,8 +25029,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2178 + 645 + 1337 -7 @@ -24433,8 +25045,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2209 + 645 + 1368 -4 @@ -24449,8 +25061,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2254 + 645 + 1413 -7 @@ -24465,8 +25077,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2285 + 645 + 1444 -6 @@ -24481,8 +25093,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2316 + 645 + 1475 -4 @@ -24497,8 +25109,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2361 + 645 + 1520 -4 @@ -24513,8 +25125,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2392 + 645 + 1551 -2 @@ -24529,8 +25141,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2423 + 645 + 1582 -5 @@ -24545,8 +25157,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2454 + 645 + 1613 -2 @@ -24561,8 +25173,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 2499 + 645 + 1658 -2 @@ -24577,8 +25189,8 @@ QScrollBar::handle:horizontal widgetChanged() - 400 - 2530 + 389 + 1689 -2 @@ -24593,8 +25205,8 @@ QScrollBar::handle:horizontal widgetChanged() - 542 - 2530 + 521 + 1689 -4 @@ -24609,8 +25221,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -547 + 838 + -1681 -4 @@ -24625,8 +25237,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -393 + 838 + -1527 -3 @@ -24641,8 +25253,8 @@ QScrollBar::handle:horizontal widgetChanged() - 497 - -364 + 494 + -1498 -4 @@ -24657,12 +25269,12 @@ QScrollBar::handle:horizontal setValue(int) - 606 - 2316 + 645 + 1475 - 530 - 2315 + 579 + 1474 @@ -24673,12 +25285,12 @@ QScrollBar::handle:horizontal setValue(int) - 530 - 2315 + 579 + 1474 - 606 - 2316 + 645 + 1475 @@ -24689,12 +25301,12 @@ QScrollBar::handle:horizontal setValue(int) - 530 - 2422 + 579 + 1581 - 606 - 2423 + 645 + 1582 @@ -24705,12 +25317,12 @@ QScrollBar::handle:horizontal setValue(int) - 606 - 2423 + 645 + 1582 - 530 - 2422 + 579 + 1581 @@ -24721,12 +25333,12 @@ QScrollBar::handle:horizontal setValue(int) - 530 - 2453 + 579 + 1612 - 606 - 2454 + 645 + 1613 @@ -24737,12 +25349,12 @@ QScrollBar::handle:horizontal setValue(int) - 606 - 2454 + 645 + 1613 - 530 - 2453 + 579 + 1612 @@ -24753,8 +25365,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -393 + 919 + -1527 -3 @@ -24769,8 +25381,8 @@ QScrollBar::handle:horizontal widgetChanged() - 497 - -364 + 494 + -1498 -2 @@ -24785,8 +25397,8 @@ QScrollBar::handle:horizontal widgetChanged() - 831 - 603 + 837 + -480 255 @@ -24801,8 +25413,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - 603 + 918 + -480 281 @@ -24881,8 +25493,8 @@ QScrollBar::handle:horizontal changeShader() - 696 - -3112 + 615 + -4222 1208 @@ -24897,8 +25509,8 @@ QScrollBar::handle:horizontal changeShader() - 762 - -3112 + 681 + -4222 1208 @@ -24913,8 +25525,8 @@ QScrollBar::handle:horizontal changeShader() - 828 - -3112 + 747 + -4222 888 @@ -24929,8 +25541,8 @@ QScrollBar::handle:horizontal widgetChanged() - 529 - -490 + 578 + -1623 -5 @@ -24945,8 +25557,8 @@ QScrollBar::handle:horizontal widgetChanged() - 470 - 656 + 469 + -427 -7 @@ -24961,8 +25573,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - -2239 + 918 + -3349 1231 @@ -24977,8 +25589,8 @@ QScrollBar::handle:horizontal changeShader() - 894 - -3112 + 813 + -4222 434 @@ -24993,8 +25605,8 @@ QScrollBar::handle:horizontal widgetChanged() - 611 - 5 + 645 + -1129 -6 @@ -25009,8 +25621,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -268 + 644 + -1402 -8 @@ -25025,8 +25637,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -297 + 644 + -1431 -6 @@ -25041,8 +25653,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -297 + 644 + -1431 92 @@ -25057,8 +25669,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -518 + 644 + -1652 -3 @@ -25073,8 +25685,8 @@ QScrollBar::handle:horizontal widgetChanged() - 605 - -489 + 644 + -1623 -4 @@ -25089,8 +25701,8 @@ QScrollBar::handle:horizontal colorChanged() - 605 - -297 + 644 + -1431 -2 @@ -25105,8 +25717,8 @@ QScrollBar::handle:horizontal colorChanged() - 605 - -268 + 644 + -1402 -4 @@ -25121,8 +25733,8 @@ QScrollBar::handle:horizontal browseVTF() - 912 - -2299 + 918 + -3409 -4 @@ -25137,8 +25749,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 728 + 645 + -355 -1 @@ -25153,8 +25765,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 759 + 645 + -324 -5 @@ -25169,8 +25781,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 818 + 645 + -265 -4 @@ -25185,8 +25797,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 867 + 645 + -216 -7 @@ -25201,8 +25813,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 898 + 645 + -185 -5 @@ -25217,8 +25829,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 929 + 645 + -154 -6 @@ -25233,8 +25845,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 960 + 645 + -123 -4 @@ -25249,8 +25861,8 @@ QScrollBar::handle:horizontal widgetChanged() - 430 - 999 + 469 + -60 -7 @@ -25265,8 +25877,8 @@ QScrollBar::handle:horizontal widgetChanged() - 531 - 999 + 615 + -60 -8 @@ -25281,8 +25893,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 1033 + 645 + -26 -10 @@ -25297,8 +25909,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 1064 + 645 + 5 -3 @@ -25313,8 +25925,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - 1095 + 645 + 36 -8 @@ -25329,8 +25941,8 @@ QScrollBar::handle:horizontal widgetChanged() - 442 - 784 + 441 + -299 -4 @@ -25345,8 +25957,8 @@ QScrollBar::handle:horizontal colorChanged() - 763 - 728 + 801 + -355 39 @@ -25361,8 +25973,8 @@ QScrollBar::handle:horizontal colorChanged() - 763 - 759 + 801 + -324 -9 @@ -25377,8 +25989,8 @@ QScrollBar::handle:horizontal colorChanged() - 763 - 960 + 801 + -123 -6 @@ -25393,8 +26005,8 @@ QScrollBar::handle:horizontal changedColor() - 763 - 728 + 801 + -355 -2 @@ -25409,8 +26021,8 @@ QScrollBar::handle:horizontal changedColor() - 763 - 759 + 801 + -324 -3 @@ -25425,8 +26037,8 @@ QScrollBar::handle:horizontal changedColor() - 763 - 960 + 801 + -123 -5 @@ -25441,8 +26053,8 @@ QScrollBar::handle:horizontal widgetChanged() - 854 - 350 + 867 + -762 -10 @@ -25457,8 +26069,8 @@ QScrollBar::handle:horizontal widgetChanged() - 854 - 229 + 867 + -883 -4 @@ -25473,8 +26085,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -54 + 919 + -1188 -3 @@ -25489,8 +26101,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -54 + 838 + -1188 -3 @@ -25505,8 +26117,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -25 + 838 + -1159 -2 @@ -25521,8 +26133,8 @@ QScrollBar::handle:horizontal widgetChanged() - 662 - -239 + 766 + -1373 -3 @@ -25537,8 +26149,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -239 + 919 + -1373 -3 @@ -25553,8 +26165,8 @@ QScrollBar::handle:horizontal detailTextureChanged(QString) - 584 - -738 + 688 + -1872 -4 @@ -25569,8 +26181,8 @@ QScrollBar::handle:horizontal widgetChanged() - 832 - -738 + 838 + -1872 -2 @@ -25585,8 +26197,8 @@ QScrollBar::handle:horizontal widgetChanged() - 774 - -677 + 801 + -1811 -3 @@ -25601,8 +26213,8 @@ QScrollBar::handle:horizontal widgetChanged() - 410 - -708 + 404 + -1842 -6 @@ -25617,8 +26229,8 @@ QScrollBar::handle:horizontal widgetChanged() - 496 - -708 + 485 + -1842 -2 @@ -25633,8 +26245,8 @@ QScrollBar::handle:horizontal toggledDetailUniformScale(bool) - 602 - -710 + 591 + -1840 -5 @@ -25649,8 +26261,8 @@ QScrollBar::handle:horizontal browseVTF() - 913 - -738 + 919 + -1872 -4 @@ -25665,8 +26277,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -677 + 645 + -1811 -4 @@ -25681,8 +26293,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -646 + 645 + -1780 -5 @@ -25697,8 +26309,8 @@ QScrollBar::handle:horizontal widgetChanged() - 606 - -615 + 645 + -1749 -2 @@ -25713,8 +26325,8 @@ QScrollBar::handle:horizontal modifiedCheckBox(bool) - 370 - 621 + 469 + -455 -12 @@ -25722,6 +26334,182 @@ QScrollBar::handle:horizontal + + toolButton_emissiveBlendFlowTexture + clicked() + MainWindow + browseVTF() + + + 892 + 419 + + + -9 + 425 + + + + + toolButton_emissiveBlendBaseTexture + clicked() + MainWindow + browseVTF() + + + 903 + 393 + + + -5 + 377 + + + + + toolButton_emissiveBlendTexture + clicked() + MainWindow + browseVTF() + + + 903 + 358 + + + -3 + 350 + + + + + doubleSpinBox_emissiveBlendTint + valueChanged(double) + MainWindow + widgetChanged() + + + 608 + 452 + + + -5 + 497 + + + + + doubleSpinBox_emissiveBlendStrength + valueChanged(double) + MainWindow + widgetChanged() + + + 625 + 481 + + + -7 + 536 + + + + + doubleSpinBox_emissiveBlendScrollX + valueChanged(double) + MainWindow + widgetChanged() + + + 367 + 513 + + + -7 + 485 + + + + + doubleSpinBox_emissiveBlendScrollY + valueChanged(double) + MainWindow + widgetChanged() + + + 417 + 504 + + + -5 + 478 + + + + + toolButton_emissiveBlendTint + clicked() + MainWindow + changedColor() + + + 748 + 448 + + + -8 + 464 + + + + + lineEdit_emissiveBlendTexture + textChanged(QString) + MainWindow + widgetChanged() + + + 370 + 359 + + + -4 + 339 + + + + + lineEdit_emissiveBlendBaseTexture + textChanged(QString) + MainWindow + widgetChanged() + + + 445 + 389 + + + -4 + 324 + + + + + lineEdit_emissiveBlendFlowTexture + textEdited(QString) + MainWindow + widgetChanged() + + + 348 + 415 + + + -5 + 283 + + + widgetChanged() From c8bf0db2a1fcf412f7151057ec12804630a504cc Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Mon, 19 Mar 2018 23:30:58 +0100 Subject: [PATCH 09/10] Add refresh material in game --- src/mainwindow.cpp | 39 +++++++++++++++++++++++++++++++++++++++ src/mainwindow.h | 4 ++++ ui/mainwindow.ui | 10 +++++----- 3 files changed, 48 insertions(+), 5 deletions(-) diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index bbc1823..f5dae39 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -234,6 +234,8 @@ MainWindow::MainWindow(QString fileToOpen, QWidget* parent) : connect( ui->action_Paste, SIGNAL(triggered()), this, SLOT(paste())); + connect( ui->action_refreshInGame, SIGNAL(triggered()), this, SLOT(refreshInGame())); + //----------------------------------------------------------------------------------------// @@ -10480,6 +10482,43 @@ void MainWindow::reconvertAll() { } } +void MainWindow::refreshInGame() { + QProcess process; + QString game = getCurrentGame(); + + if (game.isEmpty()) { + Error("No game selected!"); + return; + } + + if (!mVMTLoaded) { + Error("No file opened!"); + return; + } + + QDir dir(mAvailableGames.value(game)); + dir.cdUp(); + + QStringList nameFilter("*.exe"); + QStringList exes = dir.entryList(nameFilter); + + qDebug() << exes; + + QString exe = QDir::toNativeSeparators(dir.absoluteFilePath(exes[0])); + + QString relativeFilePath = QDir(currentGameMaterialDir()) + .relativeFilePath(vmtParser->lastVMTFile().directory + "/" + + vmtParser->lastVMTFile().fileName) + .section(".", 0, -2); + + QString arg = "\"" + exe + "\" -hijack +mat_reloadmaterial \"" + relativeFilePath + "\""; + qDebug() << arg; + + process.startDetached(arg); + Info("Reloading material \"" + relativeFilePath + "\""); + +} + bool MainWindow::combineMaps(QLineEdit *lineEditBase, QLineEdit *lineEditAlpha) { QString basePath = lineEditBase->toolTip(); QString alphaPath = lineEditAlpha->text().trimmed(); diff --git a/src/mainwindow.h b/src/mainwindow.h index 89a17b0..ec7b1f7 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -12,6 +12,8 @@ #include #include #include +#include + #ifdef Q_OS_WIN # include @@ -466,6 +468,8 @@ private slots: bool combineMaps(QLineEdit *lineEditBase, QLineEdit *lineEditAlpha); + void refreshInGame(); + //----------------------------------------------------------------------------------------// void action_New(); diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index feb3dfe..1c2a327 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -1080,7 +1080,7 @@ QGroupBox::title { 0 - -4280 + -4199 933 6121 @@ -15046,7 +15046,7 @@ QToolButton:pressed - Texture + Texture: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -19686,9 +19686,9 @@ QScrollBar::handle:horizontal - + @@ -20859,12 +20859,12 @@ QScrollBar::handle:horizontal Emissive Blend - + Refresh Material In-Game - F5 + F8 From 1ff4f86f0da888e01eca761455e770a7c30275f8 Mon Sep 17 00:00:00 2001 From: Jan Gortnar Date: Fri, 23 Mar 2018 16:39:01 +0100 Subject: [PATCH 10/10] Fix spinner down arrow --- ui/conversiondialog.ui | 4 ---- ui/mainwindow.ui | 6 +----- ui/optionsdialog.ui | 6 +----- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/ui/conversiondialog.ui b/ui/conversiondialog.ui index cb7c28f..21ecbc5 100644 --- a/ui/conversiondialog.ui +++ b/ui/conversiondialog.ui @@ -519,10 +519,6 @@ QAbstractSpinBox::down-arrow:off width: 20px; height: 10px; } -QAbstractSpinBox::down-arrow:hover -{ - background-color: #222; -} QLabel { diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index 1c2a327..0b47528 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -541,10 +541,6 @@ QAbstractSpinBox::down-arrow:off width: 20px; height: 10px; } -QAbstractSpinBox::down-arrow:hover -{ - background-color: #222; -} QLabel { @@ -1080,7 +1076,7 @@ QGroupBox::title { 0 - -4199 + 0 933 6121 diff --git a/ui/optionsdialog.ui b/ui/optionsdialog.ui index a28a239..74c2ded 100644 --- a/ui/optionsdialog.ui +++ b/ui/optionsdialog.ui @@ -533,10 +533,6 @@ QAbstractSpinBox::down-arrow:off width: 20px; height: 10px; } -QAbstractSpinBox::down-arrow:hover -{ - background-color: #222; -} QLabel { @@ -725,7 +721,7 @@ QSlider::handle:vertical { 0 - -651 + 0 527 1203