From c2672651488be91f4b6c30fd1fee4829b579c939 Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 29 Jan 2014 00:45:03 +0200 Subject: [PATCH] Retouched transport icons, commented stylesheet for better documentation, fixed faint line in bitinvader knob --- data/themes/default/pause.png | Bin 228 -> 415 bytes data/themes/default/play.png | Bin 337 -> 602 bytes data/themes/default/record.png | Bin 610 -> 742 bytes data/themes/default/record_accompany.png | Bin 692 -> 975 bytes data/themes/default/reload.png | Bin 1211 -> 962 bytes data/themes/default/stop.png | Bin 244 -> 507 bytes data/themes/default/style.css | 99 +++++++++++++++-------- src/gui/widgets/knob.cpp | 1 + 8 files changed, 68 insertions(+), 32 deletions(-) diff --git a/data/themes/default/pause.png b/data/themes/default/pause.png index c9b45d7d948f21331ae93aebf3266894b7fa0b7e..04725f997e18ab73d34ad049ddd332a9e895d866 100644 GIT binary patch delta 315 zcmV-B0mS~~0iOeqZGQnANkl1*p)l{)g0dDW~~NK zXw8VG{@QJd88zzf&tpyLyAC|_Zd0zz46XGMVFTyvZiZc3!&$R>hn}!)Y6zis2fJ-* zj8bEA?wIiQ^fb1j@7nv*^MaZ03)coNSNRMRF62Z+VyypDXam5B^vlHE<9bh&3Jl`t^$opC)|rjL5~; gpv=pRBd>r30CT$~FWiIDvd1+!7t%WBG_J3 zP%ok&eg!{DPW={zYQ^e7ZPSg$lbV9$rfquAgx%Tfdmc0)bhD<`{NcgCFhAbRJQ5Ks zGHRjPNsx$E7Y%;3);5V~<;y0!`pNh!0(==ED*Vfh%I)@;1U}n5;C;YL~DU8t@!{Kl)Tmo<1zJt(3ztOI=r1n;v6c69h1+gqF5PFf70?Y(~n;0J)? z@$nK^6eAR)5%S!_XDI;SxZlUCm)o4Qc3Fs~p#;E=h;R%l!9365y@%2o!@&T_{vLNa z9~eY!pJkO$CFrvh-g~@z`-Z=K{=_t=qmwC(O&rJE>-AVEHHLly*q;Z@1eH>$F{YE} t`9DKd9j*d+cot|T_y=`ofhxiO%`fL%O58hk^&S8K002ovPDHLkV1iM5@b>@! delta 236 zcmVEEAs9F~kkz7Q~Pok=R3Q*t%Y=Eh|7g|2>T~}Z| z6!wC~n7ad4z$z5>f@zu-Ns^p9a0x7dNgpU~Y(zu>vMej?_hps3uIEkDEZVl6*~dy? z3mjGT+3iU$=rqm;Uo3ob;UF*o-rEyDq6a%D#6zy!3yx`u7yJTMzz#V0Aou0}2b;*F m7xm|m17-~59laPUdaz#@%JH^ha%utq0000hZGQq|Nkl8mcG(0_uTz- z_uTUyDa#TMS;m9X{s+*!OW0^O8-)WCx%ENWf zTcehB;M%q`SFe+XZ36(p@fiImDu;1APLAFZ5GDx1a*T$pofp0)!w_YGw)2$pqbfslQtq{+w5nQf5Xb5~2=>2?$DaYbDa-Qf zy+8o)IDfq0IJ+$=m#?CMg3`etjxV~S(ec&E-rj`W3j_c{2*)(Ei}(=@|H`wIS$F&~ e@NeqDKiKcQA}KQcftzmt0000yvdZGQpZNkl$pC zwlDCq+l?-}-Dsb^^wyCt+U*{IA&AZa4C>_(m~R1G|Cr70_J0O`=yX0Z^9=wE00b}q zFhKPdOGKZ)Pp4o139MmX0H7(Q?Zxp!90V2sOi}1NV@~E-_VOX3PrJ}9;6=OL1JO?a zx_^B9&`**{*l464Q3(K!+0R!iHC`;b1By zlzKW+>PbtvjDLLpxt}D{rj)jB$#4@Owi`g_0B{<|k3pl6${?^xh@}!D1%R}w6aZAt z`KNLGIG@e*y5^5RthE>rz;O^*;d!M`lq(@p9fn4Sp;1DlK2a__uZ)Ah*25ZXD)oM1 zf16Bx0T?krrYLmfoL@4BX;mqk=dsQ6IISvGGKZCOzIZ7LU28O|YXR)`koguwXZOam zT2W-Oq9_5Na!vw3>0Fo>n z&1>FQ>>cP~uHHHaeH?bP_H1*SZ)Gpw|K#9e{{|Sc5)wKJ&tm`p002ovPDHLkV1g8D B^g;jt diff --git a/data/themes/default/record_accompany.png b/data/themes/default/record_accompany.png index 0dbbb91b94acfa0275a4b49a912f9b0cd0552514..7dd091a1246a3cd3218c8dc61cb7ab98a845a50c 100644 GIT binary patch delta 879 zcmV-#1Cac*1F&g{%)CMD)4F=}H%strx06s3yT zAU%|zQtL%n@uXM1`5%ZNf_m~I6vUIgNFg?aNMqYe5lmW}WYIucT5Yo3>}(Tfc4yw1 zcODNlYfZsJ$#Z_54_|n`-{(;x!d_NkPiZ?qrIf!{KqVqrmVXr}rM@)Ad?q5T2OC}; z8F{RjByYH``?krl$y}u9IL_}{>mQP0@zePmH|{+IR7%Ov(2%LsYFb1-&a&)t5s6O@ z4vtuk^K+Ny_4JfVg&yC>wr#eXO=@8%wJ=OVt;?6I)$bnyo;vj=aiXbImQ8hIBPqex z$NKu-KhWRr4}T8~;JPlBWdV>ILz<>kgMjOI?&N<)(FfOp;41)ohwQj6UEMtlKRsea zQRL0f&U|>WdRJ-N=D_~_`2VOwDRN^-;+V$^1#*!>zP|oNuj4G#wZ76;SbpbS{LW4~ zJf9BF$8}w9t*tS4ewuot&WW)x%EymWavUwswk(=;W^QnXI6Y#R`MTe{BN`Dv*)>gvSUm@2<@`u$NCat!!=0$5|Et--*aN{F`MTcn_EdmSoq} zRZ3aFFfa-{1GvB+z#4E>L`=JPXI3etc7qpTx_FgtoS@Ff&cVh<^x-F#@m$;5mR-MAYjG zZdld@1-MJVGJq?75xb0No2lx?X1QEC3fPYVfM)<+uSBD_6yOa2V~_w~NGt$6-m>kN z6M>xbdbis>3jmz4YRWXj5nWfqn)bsoj8<6FzH>$Kno=4ELWG;`cF5;E>_bO@*=+Wy zZQGfqu1=_9~`q}B2AIjxqOUfW4dhxDOc{C9? z^dD-&w)53y^U@gj%bjF$UrK2fg^2IeYUcs$Y}xkZseiy>aNV}^wK4G3XtcUyS*`b_ zQksBHz%a~X8{5N3w+AuR%#)rRJgn?sZGOJsx~^FiB2I^H+I?Fn$cey7O$l=DU9+s> zgH-CH0tDKw8*+O+{i_gRKWF>53W;(<{;F&3_ra0f>mYeZk)@2lxwi9RMdHOgl@nv)a8( gW@eg({r4OD7q~Qr*Sh@s4gdfE07*qoM6N<$f{t|^2><{9 diff --git a/data/themes/default/reload.png b/data/themes/default/reload.png index 699153a9386365535470ea21d5363d0393464d72..c92882ecdc5ef71499288811d847f265fbaf3b92 100644 GIT binary patch literal 962 zcmV;z13mnSP)$m(GYfGX0+=d${xDi4jOCJ!D zW&y>xhb0>>MvU=cVq$zS>R;fC#te-=p5}x4qR}nth8t$f#uiC7MsQ&)Oa!46TKaRW$?Nr+m*>@2V|Y3b%XTYk-+eFZLer6n3!Hm+S9 zyct~dw~9zQC(u#i>gx1$pL(*X#WD2L4=XoDu1l8&!!ri z+Y0gu3SUu5IUy@;itTpa-nx3zr{mAFc;n9b&s{|5sq8=E|neJ9?Oh6A3MrfDAn z&x*)DwJairQpyV)1}^1#H>H%e)9!q=v8koM&D*(WDY$4%-@Sd)FpMc+7&fWp93Xei z?#I5dJ4+n3dmnc@OUw1Zg5MZA`|a_9IN k1|qPR18a! z@R>P#2w9kwv!`imJ+z0Kb+Vf2dTwRDD(`UJbMEiE-}le`=boDz5w?tGG0Oq~XyWBT zQAV9P*=7VIKO`M8H_DVmp+pFvYv&U4{su6ujtE^TGUhUXB>>C+r_^ZeAqId0@G~8% zM34kfJOhfCfXoWE0PJ;!gI*w`gTev!P(aCsGH;MGAe#|ueD11fjOn+XOfiylZpU14UAKy1h@aLNJH2tE(}5_E*^)bPqY!0wm|>4uOjIy&uOsF=Vu3v>nW%I^r86p7Sj5JC zEG%}xVmB-n-~ksb2}ZRO9-NP*T-36#oQo9_tmI*p7;8hYj*lk-Q5S;^8}Rf_H29z) z3C|>AQv{w}gy+7+^C{SpjF(p7Wk0;K2(RW~Ybv(!u{|E|WMPK@I|bO4fZdtcyA1n^ z@R{LyrV5Q`n!YV6EE-Iwkj>1@%qbKKl}epzX>C1oCY^3;KX=}|dCd8)Zfv$YhqJ)L zW1+VXm&@fZ2?`dkkVM8xX%kLnH07cN|A|Km~0`(JW>66p4DQjyyh}+<)!ne%qq8?ax-!DK<+3 zw!iFdok1kEKeO`ms=vKS+KheI+2R~CFNzzJAYVRuZ+=<8iPT@hN63noPA)Y()9)wx zNKDeF1Dkju)`H8czHA@x&0z3vbyBH9O4rcCj2#cAb3XQ5eB-ex_KYK3)erjf?$S7H z>A92`Mowj{Y-sH)ED zSSbLs)=)PrK5c&nh7btTM4Te3N=lh!{lQ&EciY#5KoI%7{n>|d#5os1fB}4bRpW@a zC+uU;d#CqKt$+0_bBuvm!QH8?(p#f{MU>rVj+>nVxZBY?RyN!WccZ$$2f7=R#nT$C zH9~ld%?f4Puu{%MzXg_3PSf_*(L;m*^ww}UtQ1PwC}n#Ov}4ieyU#2}f&>Qp-B$PG z>1{7dW{hzL5Apsqu6IWK1Q!vxKBxV9lmGt5{sr+(@Day?+E&2;0000G#Hn;D8=J|~%KAXQyO1b*)Ul1w3lqXvvI?y9=o=4%F9 xGQkOs0K$J?SC^Zs=et}2oAV0x$oP+P0@HgcAlzGhCjbBd00>D%PDHLkV1i(tJy-w$ diff --git a/data/themes/default/style.css b/data/themes/default/style.css index 54c9d9412..94a4b393c 100644 --- a/data/themes/default/style.css +++ b/data/themes/default/style.css @@ -1,4 +1,6 @@ -/* LMMS style sheet */ +/******************** + * LMMS style sheet * + ********************/ QWhatsThat { color: black; @@ -12,6 +14,7 @@ AutomationEditor { background-color: rgb(0, 0, 0); } +/* text box */ QLineEdit { border-radius: 4px; @@ -20,6 +23,8 @@ QLineEdit { color: #e0e0e0; } +/* text box when it wants text */ + QLineEdit:focus { border: 1px solid rgba(0,0,0, 128); } @@ -89,6 +94,20 @@ pianoRoll { background-color: rgb(0, 0, 0); } +/* main toolbar oscilloscope - can have transparent bg now */ + +visualizationWidget { + background: none; + border: none; +} + +/* main toolbar cpu load widget - this can have transparent bg now */ + +cpuloadWidget { + border: none; + background: url(resources:cpuload_bg.png); +} + /* scrollbar: trough */ QScrollBar:horizontal { @@ -104,15 +123,6 @@ QScrollBar:vertical { margin: 13px 0px; } -visualizationWidget { - background: none; - border: none; -} - -cpuloadWidget { - border: none; - background: url(resources:cpuload_bg.png); -} /* scrollbar: trough clicky things */ QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal, @@ -130,7 +140,7 @@ QScrollBar::add-page:vertical:pressed, QScrollBar::sub-page:vertical:pressed { QScrollBar::handle:horizontal { background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, - stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080); + stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #aaa); border: 1px outset #888; border-radius: 2px; min-width: 24px; @@ -139,7 +149,7 @@ QScrollBar::handle:horizontal { QScrollBar::handle:horizontal:hover { background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, - stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080); + stop:0 #969696, stop:0.5 #f0f0f0, stop:1 #aaa); } QScrollBar::handle:horizontal:pressed { @@ -151,7 +161,7 @@ QScrollBar::handle:horizontal:pressed { QScrollBar::handle:vertical { background: qlineargradient(spread:reflect, x1:0, y1:0.5, x2:1, y2:0.5, - stop:0 #747474, stop:0.5 #c9c9c9, stop:1 #808080); + stop:0 #969696, stop:0.5 #c9c9c9, stop:1 #aaa); border: 1px outset #888; border-radius: 2px; min-height: 24px; @@ -160,7 +170,7 @@ QScrollBar::handle:vertical { QScrollBar::handle:vertical:hover { background: qlineargradient(spread:reflect, x1:0, y1:0.5, x2:1, y2:0.5, - stop:0 #747474, stop:0.5 #f0f0f0, stop:1 #808080); + stop:0 #969696, stop:0.5 #f0f0f0, stop:1 #aaa); } QScrollBar::handle:vertical:pressed { @@ -201,6 +211,8 @@ QScrollBar::add-line:disabled, QScrollBar::sub-line:disabled { background: #747474; } +/* arrow button arrows */ + QScrollBar::left-arrow:horizontal, QScrollBar::right-arrow:horizontal, QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical { border: none; @@ -218,18 +230,23 @@ QScrollBar::right-arrow:horizontal:disabled { background-image: url(resources:sb QScrollBar::up-arrow:vertical:disabled { background-image: url(resources:sbarrow_up_d.png);} QScrollBar::down-arrow:vertical:disabled { background-image: url(resources:sbarrow_down_d.png);} +/* background for song editor and bb-editor */ TrackContainerView QFrame{ background-color: #49515b; } -nStateButton { +/* autoscroll, loop, stop behaviour toggle buttons */ + +nStateButton { max-height: 26px; max-width: 26px; min-height: 26px; min-width: 26px; } +/* gear button in tracks */ + trackOperationsWidget > QPushButton { max-height: 26px; max-width: 26px; @@ -260,15 +277,19 @@ trackOperationsWidget > QPushButton::menu-indicator:checked top: 3px; } -trackWidget { -/* border-bottom: 1px solid rgb(0, 0, 0);*/ +/* actually has no effect yet so disabled */ +/*trackWidget { +/* border-bottom: 1px solid rgb(0, 0, 0);*//* background-color: rgb(0, 0, 0); -} +}*/ + +/* font sizes */ + nameLabel, effectLabel, sf2InstrumentView > QLabel { font-size:10px; } - +/* main toolbar sliders (master vol, master pitch) */ automatableSlider::groove:vertical { background: rgba(0,0,0, 128); @@ -287,11 +308,14 @@ automatableSlider::handle:vertical { margin: -4px -12px -2px; } +/* window that shows up when you add effects */ EffectSelectDialog QScrollArea { background: #5b6571; } +/* the inner boxes in LADSPA effect windows */ + EffectControlDialog QGroupBox { background: #49515b; margin-top: 1ex; @@ -300,6 +324,8 @@ EffectControlDialog QGroupBox { border: 1px solid rgba(0,0,0, 64); } +/* the inner box titles when present (channel 1, channel 2...) */ + EffectControlDialog QGroupBox::title { subcontrol-origin: margin; subcontrol-position: top left; @@ -310,10 +336,14 @@ EffectControlDialog QGroupBox::title { padding: 2px 1px; } +/* main toolbar */ + QWidget#mainToolbar { background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f); } +/* smaller toolbars */ + QToolBar { background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #98a2a7, stop:1 #5b646f); } @@ -327,16 +357,22 @@ QToolButton, toolButton { color: black; } +/* separate corner rounding for play and stop buttons! */ + toolButton#playButton { - border-top-left-radius: 10px 6px; - border-bottom-left-radius: 10px 6px; + border-top-left-radius: 8px 6px; + border-bottom-left-radius: 8px 6px; } toolButton#stopButton { - border-top-right-radius: 10px 6px; - border-bottom-right-radius: 10px 6px; + border-top-right-radius: 8px 6px; + border-bottom-right-radius: 8px 6px; } +/* record and record-accompany can be styled with #recordButton and #recordAccompanyButton respectively */ + +/* all tool buttons */ + QToolButton:hover, toolButton:hover { background: qradialgradient(cx:0.3, cy:0.3, radius:0.8, fx:0.3, fy:0.3, stop:0 #e0e0e0, stop:0.5 #c9c9c9, stop:1 #969696 ); border: 1px solid rgba(0,0,0,128); @@ -358,6 +394,8 @@ QToolButton:checked, toolButton:checked { color: black; } +/* track label buttons - the part that contains the icon and track title */ + trackLabelButton { background-color: #5b6571; color: #c9c9c9; @@ -400,7 +438,7 @@ trackLabelButton:checked:pressed { background: qlineargradient(spread:reflect, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 #49515b, stop:0.3 #5b6571, stop:1 #6b7581 ); } - +/* sidebar, sidebar buttons */ SideBar { background: qlineargradient(x1:0, y1:0, x2:1, y2:0, stop: 0 #98a2a7, stop: 1.0 #5b646f); @@ -410,13 +448,16 @@ SideBar QToolButton { font-size: 12px; } +/* font sizes for text buttons */ + FxMixerView QPushButton, EffectRackView QPushButton, ControllerRackView QPushButton { font-size: 10px; } -timeLine { +/* has no effect yet */ +/*timeLine { font-size: 8px; -} +}*/ QTreeView { alternate-background-color: #747474; @@ -522,9 +563,3 @@ palette:brighttext {color: #4afd85} palette:highlight {color: #202020} palette:highlightedtext {color: #ffffff} -/* Notes: - -lcd-spinbox colors: (12, 250, 150), (37, 57, 42) - - -*/ diff --git a/src/gui/widgets/knob.cpp b/src/gui/widgets/knob.cpp index 44b4449b5..e03d2a6fc 100644 --- a/src/gui/widgets/knob.cpp +++ b/src/gui/widgets/knob.cpp @@ -352,6 +352,7 @@ void knob::drawKnob( QPainter * _p ) } case knobDark_28: { + p.setPen( QPen( QApplication::palette().color( QPalette::Active, QPalette::WindowText ), 2 ) ); const float rb = qMax( ( radius - 10 ) / 3.0, 0.0 ); const float re = qMax( ( radius - 4 ), 0.0 );