From 3cd8b97623bae4021edb6d3e8b0584fa8b7db9d8 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 8 Sep 2008 22:48:43 +0000 Subject: [PATCH] further UI finetuning git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1592 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 8 ++++++++ data/locale/de.qm | Bin 169109 -> 169105 bytes data/locale/de.ts | 2 +- include/gui_templates.h | 5 +++++ src/core/instrument_sound_shaping.cpp | 4 ++-- .../widgets/instrument_sound_shaping_view.cpp | 6 +++--- src/gui/widgets/lcd_spinbox.cpp | 8 ++++---- 7 files changed, 23 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index ace602b94..9d9943a51 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2008-09-08 Tobias Doerffel + * include/gui_templates.h: + * src/core/instrument_sound_shaping.cpp: + * src/gui/widgets/instrument_sound_shaping_view.cpp: + * src/gui/widgets/lcd_spinbox.cpp: + * data/locale/de.qm: + * data/locale/de.ts: + further UI finetuning + * include/midi_winmm.h: * src/core/midi/midi_winmm.cpp: finally made WinMM MIDI driver work properly by fixing internal data diff --git a/data/locale/de.qm b/data/locale/de.qm index cf37c821a5d22991bb5d193905ce9aa46c7d9589..6366df887eae1ea7cefb6408c8c7660958640cf1 100644 GIT binary patch delta 8939 zcmY+J2UHZv*2nMd>7JSHNd$Go00vkDRuB*c!GM4Wia7y_5d{?^W@SW0C5TF^V9r@s zTtpPbHNdKkEK4h-U$`%>k4ffoXqy?V^$V0e~L1fTP0KR=Svs06j%OMG|of!1@`)JpkW!NJNDt zKyV>2&KL8B#r~8K`qOJ=- zSbKoPJb-W?fL7%;a^cxSiMaVCz{m>#%to1?yNS7IkMqSx*s;F`*w7__J_=yR&jM86 zmpN(^uq%53=AHyLbs0ddpF~s~2X@~)!0#h~-CqirS`F;sSb)zp5)np;kxZcZU|{do z0p=NGp1LO%Fh;9zU|$acNFOB;KUzv;&_b+X?9Dp?*I^Vu(-Mg|q`hdTurcKU7ZgsG zbq22YUVz_hB{Ez9a8XTw@lFPACEfot7`P57k z*$!aAOqnnGO2o#&GJ{sitf`X7bPNI~Co*fTFoXv^oue2k!uGv4X(LazOXa&@(+6V4A++`T1ACwr3&8n_O_T9)eLOf{J{~ZY-i<B30RGg=to#Z?qjSjnTEfs;@|Hf$CF1QNFie*~ zAzLF6xlu4IiOdtS6vAAn-j@)G2xlQ|67`~^nM~hM2rEdV@!W>6!l{5a*UKF9_%4Lk z>q(*x!Y2~H@05tj1~6Pn*KadnLSlTWn%AY>6&pIDCVkcOmkr2qD_Fot0gl0I9SwRFyPyZ5Leq8@TeCgcsBzaejZkj zTni8o22f)eS;bKP%U^;ojwJLJEDjnRqGY_DfOpI9$ zclWyjOnN|cr}xa@VYmK(UPi|%G7d~$l0V*yd7=wZF`i^Xo zBfu3GR40A~Cx)#;eoQ{u*G3|8X{fEE4m50oIty}(eZQg3kM#DHyI89>di{fqXVGWs z8eyveHv#SJ(Pc;~sd7Vf%Odg5a)*FUst~VaVV?fSzZu?~Y-B*DGX}J;i?QwgE)l#UXF%fMK3tm^Z0` zhgxQrG#p(&YyF}y#_9|(=9h8Wy)J;uS)Ak94j2!TeyR^*1#fP;fUBm`vq@H%HsB1P z#u?K}X950t4~v*sz~i}ic^N5JdIK!Zj3xy-f;T(10X#7k?`*UNXt^ElWJOUuOT6={ zAuyBU@xCYdWAzt&lw<*DVTOUqHO za;%(6gFjh>&%9p&(_y%{N-&y2u_jYN&9A_JR`}D}dj;RQMA2vL@yjJWFn+7C_R>gz z^Y#pr*&OhBg3PK!Mlsr*41JU_-+u>~m`bMkc`eCMDAVS21mM~liHuVc<9xLg&?%Z} zFZKZ}yv}se(6HVwWCl#F0W>|{%8Yb51F$xqnUQP<5Z#E0JxDtFUct;dIt9S(Dl@m} zG~l@{%o2(Y+}4&^(bx{~p8_Vylb*Mo#iaUG0&d>Gteubr$QLr3%U%PVn8NJu`UK$X zJc)=end2ldnB0^(QTv{l#+(}O4wKMoDN|ToO%YJVTs-$TV2|<4O;SIMp3K||q(~`D zVM=R0lZRU}6|pptwSi2<*;9aI$J6*o;Srztq~WAMOv4Z-4*k*-cjSeiiLY= zt?JcWA|u2r7PUGExPF(|Q0HPAp-3vEt6$s|8Li3d^|>;`Pbo6y(c5pz75nEt0qi?M zak$AslH41Lto7Rf7f)3jZM~MXZM!1hm%1Q2D+=Dkk;@nrg+pmU3L2y+EFj4^UoH`Q zUQ=9pybCZOUQyDIA@)+-xIpcirZ!aEJiL^|FjaB8LltS%0*M$?qquXKEFSiU;_iN5 zfQSSlWf~DD6c0+s=c3Lj9{jP4TO)>z&M^`4R=lgZhXO- zS&|QCB(i3o+yR%J7i08BujOoulkEWQ|7BZL(&x)sux-|40b`rSwmEkha7{YvP!&m` zc9eB(mjmd$gLUwxVZuoLIghg$YwCnViyP^ z;ITkt3z6yVx_^J&t;P`Nk0Rghz-qLOl#PT zAX0~|!)1Qz&u)(*^&5SG-5yQrKyEp^Yw1aVv(wn!+4OPECwAY-I?Aqwu?MFg0_+mZ z9!`BrdEIg%`Ebff;s@eOA_e^_8{!w@0OB`d0(*Eh`Q)k-M6#M`)e9;pDNDB|s)_xH zJaHLOAm*`$Gm2@8vP))Fsm$6v5|K5^EQ(-{aQ3(*#j~f0JwCS~ zVDDk<@zrqvW0teW|0V1GRK}huIs+PPc85K4XC2^}8DfaJ(Q7MP;?{&zkdry8l)cf0 z_EJ#F-pel{5&Fj7E1-T4U&%fhbqrv70$cssmsYGKajUs8dMgJ*NcvXSa(t{SFcvL2 z?T%UG0-q$}-3m_Etq$-H7p`HpC28b zIJ@ju0J%<_gK-n(R^?pVmxD<`(#7T$F1SMsv9NLdnd^}q0ob*a>*+~7#a&##Ncu+8 zMqK}Nn%SNmxc-~VC~fS*g&ioO?MS$|)xy|+CpSK?4Dj$AE{ch#{=em-yxd7srgBl< zrNk55(R5;4ey+iqz=N$3J@=i5rsfkoWz?1|(>FSy-b$wMy=m;eYxyhx_|35mz_ss+`PrTmNr&-+$C>X z;@^MZt_F~~Hud1HhAknd3>F_zCt2Z0n%>y=(_%D&j zXzG*}p9272i^^sfqJeSir?i<%iH4i&Kg!ktel+`YmG-mAr-sBRUDF0r%ym(^ZjJz^ zFR$#dfV?P)QFfZp2N>tIVrB!Q)i$MHeIi(wB@wxnGA~^aA2l%YuarY4ZlldYidfsg z-ju4GYDnGBBYND9hH(ptR|uva)*>Fp5Owt3fpK%YBt^W2whm*D2p#?E=i8MCHe)vA|5^ zRZPdb02BMDxar#f#;#MTW>Ec!29;2h1$ediw%)6nbC%rvmv^dp8avuK4Ujp; zPL+7~0ke^%88J7jpM zvVtiQ?eT|r&1i!Q#2TZ~)Kc~DN(aF0r&S-_E>PWU)kpDf+O9p5h=G-=Pq$msXz!?M zmFEHd6V=Lr0)Y7!wV*HqEa|K^??l%YTh*2Y6iPxbwblJiBoK?#w%51OF4d@RJCL%) zu>BI5&T6%LR0RoBt=jtm36i+9vAHQ+9rTH(Ez&>g{?_E1^PZ{)b|6FO1Jr}Dn53{= zX5~rs(2_X7zfY@&KeDECnS<)FT{#NhIMCt0Myt7(33)u{#8AD;44Z~nyVK_de9c^lsevWFZIFF%F1h~dZ{g1k&6i=&VcJ3}lTG>PoP^Ukl(T6^h$oLFZ?_kpax3+;+Z=0S4y|s^3>U%#?jQiR3BSb4cIwOeSC2+ZF$MLVCDa78YuiPF%c4#IM znbqoBUn42KWz6q1#^ z?H(SW%`@Jvc`0qdhw%=c9EF@W@9Z&!Y*DJ^U2l>{n^b&^B{JSk zc(3DUfbnd{2PSL;D6-*$VnbBL(pPEBq+Ss2z*J}!3 zGdI4-hpfJ*9e=4aS?xXH&ul((FdOy*dFFRXA3;SIDakI;GMjR;- zXZ|iWZ)Rh9$$uJ79u@XZA`|Atf1zu<_KN?OMQ69Ozwxz$-vQKw2+WfJl2t2#ZB2t) za6n)`PXe?YF7UB#z*zny2syNnciSkK^``bNb{AT2CI5}L73^+P8Wp%gurDX^hzk{* zMw6Im-wB=rVgXFGask=#f|pGKZ8GBpuWtVU{JmZ1G_nL3`*NYH4+RtJD)_eD1~{&X z&|~>Lz{fU1&zHAIFcO7cSBC?f@fQX}lu_Um2m`kj1G%CwY-2Gc)BS}J?exI3@D#@R z(7?`z3y~+Ak-Sz2;~UHacT8U(Ot7^BoYG&28Iwg@lPSW?HhKW{D`8gSDmoQdAk0an za~h#in49NFc5NrdG&cqn2!Xzr)J5^}GUP>NtDUTbb+aud!Z@22fiqVU_fIAEIY7tZI! z0rp=fT&|>V7R(lk_h$j5?iGr2v#Hg4!j*M2*U1-!D}^*zuSvqyU^2pQM}^z|cK{!3 z5lYSakSZ1k_mW>xI#wz?jHmZIG!-8C(~0`>D?-_P`nttYp?1Yg(u+#H868 zy<;js!UK&(qY;2+>orYBHX*(EOJf~GlD^hL)5@7=br?;P9jX;BPzV-XmWbz@Y0c|b=nu(S^X9~Rf#Qf3MhA_yX|YJU z@|(6*mI#>hL2LUHdHN1#ty2oQ+NM4d@zMlwYYSsgiq>cL8_Mg)Ydd$2037g9+xhYw zI$OA_?d`D_ASF)Q&we6c{_ol$b(VDavOzmm*$QxEvUaTVSUMKjtQ}i*kdBjs#M%}{ zK3f~RmmI1rO>ExMXwqs^KNVA!|5lrpRYDuqTJ5?c6bg3X+D(HQ+L%t3`Mq3wXaVgJ zHtQu~v5)r9c7d|_CfaO0o$fsh)Mn>jrW2`C+EYkw=5$IBnU6VoC&OYX71mRrppS5f#4Lzvffe zn(DMwr+1UJdTMJ%=mF-3YCo_1PK%9N`{h~vTv+KiC+b5^nob#3Lf=T#>2j=T(SN41 zoN5fXP#^qSS()DJ!k$u{d`sQv_jD9KL!}!-i!=UG zr5k(U0UhP0$$YMth`o2qEJ>BfL@&{eA45^)k)fOHSpzVuhs<+hbPFFilgLKs;pgCSr~*{R}mnbxEvkWn&80 z9r{dRHiFX~9Zx38NYx$9qt!gcUU$BZr`+45yWEakg!j^2K2G&qN_98yli6Jw=Tbvzy+COM(_@Zav-cg~(|vmL22}C)je6sNp>#6QP;VTMw5#*f zH=Ys)SZXdlYHj1yPj7vhW@@8{zGa$7vDrueQ*jm@41CbLhS2uPy;ASC`vd(FFhuXY z=mBlRUg~`uy3@(_Owq&E-t<&IqK0a3&Crh?M}z(TMn5)Z0xetz^iv+4r{rv`-ZYM) zY0DISLf>g*;|%?Z?S*utm8uta_5rY0>a)5oralJfvwc=ljT`sg{p>D~1gN0E`f z6iGz%)L+UVO^EnIf8DGMAT~k&U?>^OEq|2$!3|mg^F{riPs!?zk@~VDa${l|E(@`h!t<}e?+G2{>2dVh~_lG%`o_tb5I)xt@I{&-{0O=7i^hfsJ^*mhCc`Kl)i>2<8e(eNQ|jkxn0L04He}BY zrsTEsL+xop#u^%zf1qI#OFtXsEir6$q+fG7u9n$7#&7_GNJ*O*GCR_e;_PVnWg~Um z@}A)sPxc$+Zz$}2hO}XV;a+J8;9s2KzCusGQ$!moe$OFaIc0dVI}RGdkg-w$g>=K4 z_zF7D`I+W=O1GTgpSHAMztdk%b&oNuR1*93D%aQFQd0^GO8WnpzM~6cBgTdNBrfTF z{ePdmlb+?og^c!*+o?!A+gL8`-*qHPBS1e0f5B$faQ}*iJ5` zxL|-(5*ICKlV0nBjpY0Bu4t9st{pncml5sI_rD&T{?7wZyT~oQnd^Vv>fnljQnfsK ze>uu;XxuU9f9;Va{?)aKc(24N{kuD^muqFT$8GYfojfp3el_oO2VC&O7~b8`@yFe0 zUu^uN?S$^QU4FlfA6}44|M+3D+)|uBe)pAc#xKVxxm2?pJIE#b75GuE*lHzeezfSC zh@SG}m_+>cqm+bS<G)rlhNXvipF;2}oCh7kG#^#%J delta 8960 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 K#jDmb$^Qr6qGv<^ diff --git a/data/locale/de.ts b/data/locale/de.ts index 2f8955e01..235429144 100644 --- a/data/locale/de.ts +++ b/data/locale/de.ts @@ -2143,7 +2143,7 @@ Bitte stellen Sie sicher, dass Sie Schreibrechte auf diese Datei und das Verzeic PITCH - TONHÖHE + PITCH diff --git a/include/gui_templates.h b/include/gui_templates.h index a831e5422..8045e26c9 100644 --- a/include/gui_templates.h +++ b/include/gui_templates.h @@ -40,8 +40,13 @@ template inline QFont pointSize( QFont _f ) { static const float DPI = 96; +#ifdef LMMS_BUILD_WIN32 + _f.setPointSizeF( ((float) SIZE+0.5f) * DPI / + QApplication::desktop()->logicalDpiY() ); +#else _f.setPointSizeF( (float) SIZE * DPI / QApplication::desktop()->logicalDpiY() ); +#endif return( _f ); } diff --git a/src/core/instrument_sound_shaping.cpp b/src/core/instrument_sound_shaping.cpp index 0c3989223..420a39872 100644 --- a/src/core/instrument_sound_shaping.cpp +++ b/src/core/instrument_sound_shaping.cpp @@ -53,8 +53,8 @@ const QString __targetNames[instrumentSoundShaping::NumTargets][3] = instrumentSoundShaping::tr( "Pitch" ),*/ { instrumentSoundShaping::tr( "CUTOFF" ), "cut", instrumentSoundShaping::tr( "Cutoff frequency" ) }, - { instrumentSoundShaping::tr( "Q/RESO" ), "res", - instrumentSoundShaping::tr( "Q/Resonance" ) } + { instrumentSoundShaping::tr( "RESO" ), "res", + instrumentSoundShaping::tr( "Resonance" ) } } ; diff --git a/src/gui/widgets/instrument_sound_shaping_view.cpp b/src/gui/widgets/instrument_sound_shaping_view.cpp index f4acae5f9..357b3e8a1 100644 --- a/src/gui/widgets/instrument_sound_shaping_view.cpp +++ b/src/gui/widgets/instrument_sound_shaping_view.cpp @@ -111,9 +111,9 @@ instrumentSoundShapingView::instrumentSoundShapingView( QWidget * _parent ) : m_filterResKnob = new knob( knobBright_26, m_filterGroupBox ); - m_filterResKnob->setLabel( tr( "Q/RESO" ) ); - m_filterResKnob->move( 190, 18 ); - m_filterResKnob->setHintText( tr( "Q/Resonance:" ) + " ", "" ); + m_filterResKnob->setLabel( tr( "RESO" ) ); + m_filterResKnob->move( 196, 18 ); + m_filterResKnob->setHintText( tr( "Resonance:" ) + " ", "" ); m_filterResKnob->setWhatsThis( tr( "Use this knob for setting Q/Resonance for the selected " "filter. Q/Resonance tells the filter how much it " diff --git a/src/gui/widgets/lcd_spinbox.cpp b/src/gui/widgets/lcd_spinbox.cpp index 1f5e79ffd..dd046618b 100644 --- a/src/gui/widgets/lcd_spinbox.cpp +++ b/src/gui/widgets/lcd_spinbox.cpp @@ -116,7 +116,7 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me ) int margin = 1; // QStyle::PM_DefaultFrameWidth; int lcdWidth = m_cellWidth * m_numDigits + (margin*m_marginWidth)*2; - p.translate( width() / 2 - lcdWidth / 2, 0 ); +// p.translate( width() / 2 - lcdWidth / 2, 0 ); p.save(); p.translate( margin, margin ); @@ -180,12 +180,12 @@ void lcdSpinBox::paintEvent( QPaintEvent * _me ) p.setFont( pointSize<6>( p.font() ) ); p.setPen( QColor( 64, 64, 64 ) ); p.drawText( width() / 2 - - p.fontMetrics().width( m_label ) / 2 + 1, - height() - 1, m_label ); + p.fontMetrics().width( m_label ) / 2 + 1, + height(), m_label ); p.setPen( QColor( 255, 255, 255 ) ); p.drawText( width() / 2 - p.fontMetrics().width( m_label ) / 2, - height() - 2, m_label ); + height() - 1, m_label ); } }