From 67182d2721393eb48dde528797348a2b3ad25649 Mon Sep 17 00:00:00 2001 From: David Marsh Date: Fri, 15 Nov 2024 18:36:00 +0000 Subject: [PATCH] Logo sizing changes for platform brand guidelines --- config-dialog.cpp | 2 +- media/youtube.png | Bin 3788 -> 2295 bytes multistream.cpp | 13 +++++++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/config-dialog.cpp b/config-dialog.cpp index 039f857..a8f1d49 100644 --- a/config-dialog.cpp +++ b/config-dialog.cpp @@ -543,7 +543,7 @@ void OBSBasicSettings::AddServer(QFormLayout *outputsLayout, obs_data_t *setting auto platformIconLabel = new QLabel; auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(QString::fromUtf8(obs_data_get_string(settings, "stream_server"))); - platformIconLabel->setPixmap(platformIcon.pixmap(30, 30)); + platformIconLabel->setPixmap(platformIcon.pixmap(36, 36)); server_title_layout->addWidget(platformIconLabel, 0); auto streaming_title = new QLabel(QString::fromUtf8(obs_data_get_string(settings, "name"))); diff --git a/media/youtube.png b/media/youtube.png index 471a914dee114b4e99095c0978a8c125463c8a5f..ab1a32de459afa2806b5fd95c7769f579c7f0f02 100644 GIT binary patch delta 2266 zcmV<02qpK-9rqECBa?9k7JrXPL_t(|ob8=!j1*NC$A7nahMA!UbOfA1$46XP6GZmm z2V*3l22ekckc|l&zlf_@B8KlK#?7(;lo+FiD7q#KAwh_b2xv@%fn;Dwd_{pM5@d}A zjKf=)NB4Bk%-Ij89|JQZeY&f=x~J-wRHl0R+^*B--?#3qdvBd`lz)JT#DTfMd|(#v zd!Q9)1}2p9*)>24=mAav$ABZiK48CduD93^b=CqR;(!N%$AQH_Q?UmhrzC(6fsMc? z&N;CZHVGmke*yjh{J~N##2f73hMXn}$R5s}{k8-Rty`4xJ015Y{U{&zLQs|q3_ zOM!m_lYMY3%v=JNJAdc4{g#n8)*B+?L}WFvjYteXm<((ck=2=YcvMDxBU4~K@N}7+ z3p;P3r?3$X{#Z3+Es+@IWH}n+5sauIBJx*YYq>p&0N_#Q+-0%8Opr`(>MNo)qf&GO ze;VHVy7H8@fk=!>G6{`&j+`Kwi@xYOqw*}w#2(0;vNFA@uYZZIz=Ps2@JHvIWNXMG zA~Aww4mv)VJ7ql{oG%d>mI1iT5c*l5F;I6RlE73CozIBG2%bh@u7^%8MN|j#Jz#dw zUPR=W?Ey1`_97z3Ob?hAv=V7({`+x3=!Rbqv^gSDJW+r%yw7cRuhvJ-Q_l8q`EW-%BPnK*^-O zE(fug1|L+YSWHD~Zr0ZmCg}Uax9hHhDN~@W4O&~_wtw4nKl?d8;ZF@orQrSdVgG*k z{Bt;VOaq!u``}^~5{qdKnlS_Jy%!#O2o^0;QA^lvTmJ7eSPo&sg|v-PGtT1fCSmRIrson>-O%u6&B>c0g;xL;Jv(57;KixpU?!7;2J9J*yb734ij#4<>Wph{b|At{;@Oh6L5!jmP1M zCt%jBV2)o3=g*tW?We3DNF-q8O6}J_`J_L?+?C?uMU%NrknV1ixo->%=&`3yhqvB> zy?b>Iq89k|SChF-5Tn|@;hc(+W$s+~=p)#)3FgcR#-~C_BuwVDA;@UNV({2wdK!E7 zS%0|ZnxH)zow5qj(_=EP2-Bv)>ecYsXRvHp(B6#17&Dt7gM%jXigNqyuyG^o+zI#J zAG9}lhM#H+z$Qp7Tof)|47+#he8jD{2JKCm$Fi!qh72bbgB2@uWcrzBU~+)BP4?On z1C38Xvb46s^UuSsU9fa%(B2e;O^_>B4u94Pci#=$w&^V1U3XRX*vX{Hyz*-$gJj7P z_~Hv~{BOFcGRI7%Oy=Pd1hm(aOq#C`ipDt1yNJA?K_X=pH+kDnTH^eC)arPmwPL|FxCZZ?@$gsv`KYy8F=dW&1N zVQhD8*3+u!hTZ;t*t}WA`0l%)y&0QHlT7Bd(aRFK{MdW9q8U)oPU!E?{SmMyh06#!-KWq-A{n#_Hpz8==CgM$aF`}8y#EiEQnX{D(A4_|&MGIeV3DJ-gWYi}1hdbFs}7AJ^^$lGrR z|HZ3yd+)uX!&r81&iw+dV^{ zr_=enje2`ks8~$*6A2Bb=jGGO7IK`%#(c`yp&=C~duxK{<MB|J;0W(CZe32@qq7x_97z3_a5*~&|XC3_{IbF1?@#dj(yQX z!Kw#+D427u7uXTBH-8cAbk6l==R-CH=}82T(O~$aR}Z33oQ$YEmp^*dIVZrXV0{WT z|H^1E;(6-3h@Kc-X*!&9xtNdkfcvk}=X^($pKjpK&beF)?8_E8IDPW{-z)7^h*>^d z3>anAiF0ln@Iu903NJ4>=SD2)A9b)l)9YFfJY8!DpZy6OdKPe(JP*E26;8+;xKx@TSA1G4L zQc~yK@l0R&5%j7uqA(5tk2vQR79s`|SVM-BY49He{st^28YRAxB=8~dAK;U*+KRC# zX-S2MGy`*ic~8J>^x5pKKr>K73EGPy4fFt~fn&h8Kqv5D=UmYVj{gteQik9;enZv( o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g12m6ZvX%Q literal 3788 zcmai1dpy&7A0Kse$cQ?RF9m#ZC(by6K_%U}f;UOU*1|fz9oFH#F5{*W~5hyqcr4KOld7*4RU7*kAsf#5(X%HAZ&mb0;&*HEl zVokaSCzy|e!2lfcS)3tYeN|`kK8Ft^0xm}2NCO1?k90nZ`8RYi@(rEq!{KvyJ{<0s z0RD8u7x)`PAbo#rBA|2sicBW|Z+bw$pTgkrtquc;_?*-~`ShOyc#ff52Hb(c;{*qJ zGOP|W*nIW1Oo;P>p|AuDe`f+KfWhVg*~P(-2*iJ(E`NvOIsTj=D$rI8z--M(oI4CD zfbPxsiRH!j`KtC6uw}5lzd^*_`3H;3OJlQucu-%}oWEi?*e(?O4+pvYCG@2hm^J^% z9528B&a~h(p)SFGOUG_z{4JjoF){5$bcRt` zLNe+eC8Gq{Rnv1PFVxWY=(Q0Q(xomZdyh%c@s?xN^-hVz&cWP=2;8$Cs(KF3Z1Kp; z#Sz|>MK^96Z|_K%{GMjYJB}oUq!?#Xr9Q@*4(Of8>Eif@XC`W~t;PmZ(!0D@ZNCfZ*ldC*?O?BlnR zp4|!peUBg!EF1-AXMgrP>FBN85h+ABG_>~i8VoWn7o`tMT3aSvym)JU@$oIx`xJ0V z5qX>6HffVvW%iW`--8^~=??^EvGNPCeWx`dd z+Y(KCwE84get0OqLLw~R($(?ASu=?WR&0Q!0t!CZ8x};mm&P@#}&QMrn%WzbdF@ZKGc@*5Zb-k02 zzpmTLYoS;!$ohSBMPkJT36srvbc>C(B${YTeyciaLM>4XD~F|=ADjLeyhM9wCBJg_ zWolePPnkydtD09nHk53iiq4Mvrxk9B#ctH$Su)SRfn^I#PEOqmC9^ah&#c~Q9BaG?4VX0z$l#XP z;$2;Jk0$F3cHN7T2pT%%?lXGucaADSc&^;h{`{C*f2^6eLFYbr;rJyXRQtV4;~8Yz z!tL3|7OV2j$xrK_{%(JreG?`7Z5wUDcbm<74X!;&tS+%`{TZ2**)w!Qdc?;#;H}*3 z5H*Ae+LFRY@ZIwhGRvWto6Pi{_$Chb&T3*xVy6y8v^!iV*?H}KN=(SgJB>uHxL$o4UE9s>pXUO(t$sPS4YuC?e^W=N8WkBi9cg zjEcJVPNy4APW!Fh&67}_eZwx&3Q7RDt|Cw zNZDh4kFH9`j?iZ)*I$}#eIMcaHcjumS@t|D=Ar-#oo~{j&?OMKV=rNY^oT$H4Qux;N^YWeSS5i;8)S8ZFgoC zF_N<*-7fB6^V5YW;~81xuLr7$22EKB??(#)JJY$9bvui!-qm(s1M$vB zt|`O1bCYq|Zr!MBk%~Fqmr_HQ7l}NoRrfuBdY*#FKy?I?+#)wuUtP5f>mTeoGZ`AS zW7_v%rjZ6v3XLBgf9H9a<9NZ(AFvmkcDTx;AZr<5M(j@0b3<{#lG!ch4&_G?QN`#_S@Pv zzVTv=QM0POA!u0MZL@Q0Z>shUj>xs+17)6l)C@1n7P(rZ^fmo9&C2Frz?}~`megm{ zFHA6+I-nH%#I3xZDPQnnv?%9!c1oOvlHR4$mD=eWcl#B3`Vw1LVu)8BIn--%Yc6NT z?%(ZM$ncGCv@2pgiAO)JadXR(9$jh9ueuIefDTU;4v`**w_Nl$3Otb8{0ahIU>j#t zIcvrZUs8I$dRNEDGTJGV$cueFXv12XlHC6|Q4_I%mCBDuzo8ZRq^4J2P;jtl^pXu> zeVc^HBKMx{(sBsPt^Pq(E~ci8g6b+?zJCHM|3*g8amwEGUesbQ{aS|Byxrl6;B(i_ z`d}_q~a<%SjBMwH;P&NPXKGZ~BoSC#v?@dDr&UuCwE%ls($a zW zEUnG<>6-+NS9zys$5G|Dzlukr=?o~YLOd(+at9Q1MahlnyQ|H6D=3Hb4zEi1W~6of67Rc9{3n!TWk3;m**yCE& diff --git a/multistream.cpp b/multistream.cpp index 2afab9b..dd17b87 100644 --- a/multistream.cpp +++ b/multistream.cpp @@ -126,6 +126,8 @@ auto outputTitleStyle = QString("QLabel{}"); auto outputGroupStyle = QString("background-color: %1; padding: 0px;") .arg(QPalette().color(QPalette::ColorRole::Mid).name(QColor::HexRgb)); // wrapper around above +auto outputPlatformIconSize = 36; + // For showing warning for no vertical integration void showVerticalWarning(QVBoxLayout *verticalLayout) { @@ -146,7 +148,7 @@ void showVerticalWarning(QVBoxLayout *verticalLayout) verticalLayout->addWidget(verticalWarning); } -static config_t *(*get_user_config_func)(void) = nullptr; +//static config_t *(*get_user_config_func)(void) = nullptr; config_t *get_user_config(void) { @@ -222,9 +224,8 @@ MultistreamDock::MultistreamDock(QWidget *parent) : QFrame(parent) // blank because we're pulling settings through from bis later mainPlatformIconLabel = new QLabel; auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(QString::fromUtf8("")); - - mainPlatformIconLabel->setPixmap(platformIcon.pixmap(30, 30)); - + mainPlatformIconLabel->setPixmap(platformIcon.pixmap(outputPlatformIconSize, outputPlatformIconSize)); + l2->addWidget(mainPlatformIconLabel); l2->addWidget(bisHeaderLabel, 1); @@ -404,7 +405,7 @@ MultistreamDock::MultistreamDock(QWidget *parent) : QFrame(parent) : ""); if (url != mainPlatformUrl) { mainPlatformUrl = url; - mainPlatformIconLabel->setPixmap(ConfigUtils::getPlatformIconFromEndpoint(url).pixmap(30, 30)); + mainPlatformIconLabel->setPixmap(ConfigUtils::getPlatformIconFromEndpoint(url).pixmap(outputPlatformIconSize, outputPlatformIconSize)); } int idx = 0; @@ -638,7 +639,7 @@ void MultistreamDock::LoadOutput(obs_data_t *output_data, bool vertical) auto platformIconLabel = new QLabel; auto platformIcon = ConfigUtils::getPlatformIconFromEndpoint(endpoint); - platformIconLabel->setPixmap(platformIcon.pixmap(30, 30)); + platformIconLabel->setPixmap(platformIcon.pixmap(outputPlatformIconSize, outputPlatformIconSize)); l2->addWidget(platformIconLabel);