From f7d58114b2192ac379bc775f8d2c4f672b6c9aa7 Mon Sep 17 00:00:00 2001 From: Vesa Date: Tue, 28 Jan 2014 22:16:25 +0200 Subject: [PATCH 1/3] Added object names for transport buttons (for theming purposes), fixed alignment issues on track labels --- data/themes/default/automation_track.png | Bin 586 -> 519 bytes data/themes/default/bb_track.png | Bin 681 -> 657 bytes data/themes/default/sample_track.png | Bin 893 -> 847 bytes data/themes/default/style.css | 11 ++++++++++ src/gui/AutomationEditor.cpp | 26 +++++++++++++---------- src/gui/MainWindow.cpp | 2 +- src/gui/bb_editor.cpp | 5 ++++- src/gui/piano_roll.cpp | 5 +++++ src/gui/song_editor.cpp | 19 +++++++++++------ src/gui/widgets/track_label_button.cpp | 2 +- 10 files changed, 49 insertions(+), 21 deletions(-) diff --git a/data/themes/default/automation_track.png b/data/themes/default/automation_track.png index d6193e4f6b6e228355b5f5c606569348f172b60c..a7480fd70fd6faa3dca4a9915d6e155a56a4500e 100644 GIT binary patch delta 507 zcmVnOfe+P6) zO+^RZ0UQ(y5GEtkYXATNrb$FWR7l5TU>F7D0u>b%c50ZzghhVTH|(dWnfW0He+LH+V$3lyF^R(!MC()Xrt`V_WV8MM&&=@mF9QP? zw=hFa*1E zT#Do55@JZmUBq_o_!V|1&)5b^zA)o*kIU&hG#K002ovPDHLkV1hv-<2V2S delta 553 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 Q*#H0l07*qoM6N<$f}ypK2LJ#7 delta 884 zcmV-)1B?962K@#xiBL{Q4GJ0x0000DNk~Le0000K0000K2nGNE0F8+q4FCWD1am@3 zR0s$N2z&@+h>;-}e;IT|SaefwW^{L9a%BK_cXuvnZfkR6VQ^(GZ*pgw?mQX*00R0+ zL_t(IjjfbVXxv2<$3Jgob~n4-ja}BJS!qlOjn*WBfto^74j{R9ZPzWjgQq&Lt={lU0R8PK>8CK1RLy1?NB z|jEWng7L7gj+f5%JL0Gxhuy$O6hdHTh-!l~*(^X@U5>n~9#^61|{jl#O;VQO30G5YZ>llL~MMM*hc^ie}+rF>(J}x_RF;-G$OJ%C22<_+Yw1S zCha6-Q9{^^seZGSZr#571Ih+~e(+Cp0P=7@9G{%{s!%GvuCG01IdRbVsw3+pq<^$9 z3wJ{Ca?5Ysx%<=F%IZbnqN@JPF3Ii&TdURHK6GT@{X(fYV!iYOnwik-G&^gzf4}v8 zI;+*%04}TQx4U6IfdC>>15N`+fl7C~39JG?s%oPb?2*9#qrU-=*;w+>EAM3h0000< KMNUMnLSTZ * Copyright (c) 2008-2013 Paul Giblock * Copyright (c) 2006-2008 Javier Serrano Polo - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -156,10 +156,14 @@ AutomationEditor::AutomationEditor() : tr( "Play/pause current pattern (Space)" ), this, SLOT( play() ), m_toolBar ); + m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), tr( "Stop playing of current pattern (Space)" ), this, SLOT( stop() ), m_toolBar ); + m_playButton->setObjectName( "playButton" ); + m_stopButton->setObjectName( "stopButton" ); + m_playButton->setWhatsThis( tr( "Click here if you want to play the current pattern. " "This is useful while editing it. The pattern is " @@ -277,7 +281,7 @@ AutomationEditor::AutomationEditor() : connect( &m_tensionModel, SIGNAL( dataChanged() ), this, SLOT( tensionChanged() ) ); - + tool_button_group = new QButtonGroup( this ); tool_button_group->addButton( m_discreteButton ); tool_button_group->addButton( m_linearButton ); @@ -524,7 +528,7 @@ void AutomationEditor::updateAfterPatternChange() } if( m_pattern->progressionType() == - AutomationPattern::DiscreteProgression && + AutomationPattern::DiscreteProgression && !m_discreteButton->isChecked() ) { m_discreteButton->setChecked( true ); @@ -763,20 +767,20 @@ void AutomationEditor::drawLine( int _x0, float _y0, int _x1, float _y1 ) float yscale = deltay / ( deltax ); - if( _x0 < _x1) + if( _x0 < _x1) { xstep = quantization(); } - else + else { xstep = -( quantization() ); } if( _y0 < _y1 ) { - ystep = 1; + ystep = 1; } - else + else { ystep = -1; } @@ -878,7 +882,7 @@ void AutomationEditor::mousePressEvent( QMouseEvent * _me ) { // then set new value MidiTime value_pos( pos_ticks ); - + MidiTime new_time = m_pattern->putValue( value_pos, level ); @@ -1577,7 +1581,7 @@ void AutomationEditor::paintEvent( QPaintEvent * _pe ) is_selected ); } delete [] values; - + // Draw cross int y = yCoordOfLevel( it.value() ); p.drawLine( x - 1, y, x + 1, y ); @@ -1803,7 +1807,7 @@ void AutomationEditor::wheelEvent( QWheelEvent * _we ) m_timeLine->setPixelsPerTact( m_ppt ); update(); } - else if( _we->modifiers() & Qt::ShiftModifier + else if( _we->modifiers() & Qt::ShiftModifier || _we->orientation() == Qt::Horizontal ) { m_leftRightScroll->setValue( m_leftRightScroll->value() - @@ -2069,7 +2073,7 @@ void AutomationEditor::selectAll() const float level = it.value(); if( level < m_selectStartLevel ) { - // if we move start-level down, we have to add + // if we move start-level down, we have to add // the difference between old and new start-level // to m_selectedLevels, otherwise the selection // is just moved down... diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 8a92a5c76..c86975b3f 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -412,7 +412,7 @@ void MainWindow::finalize( void ) toolButton * bb_editor_window = new toolButton( - embed::getIconPixmap( "bb_track" ), + embed::getIconPixmap( "bb_track_btn" ), tr( "Show/hide Beat+Bassline Editor" ) + " (F6)", this, SLOT( toggleBBEditorWin() ), diff --git a/src/gui/bb_editor.cpp b/src/gui/bb_editor.cpp index a26094e80..ec6de9034 100644 --- a/src/gui/bb_editor.cpp +++ b/src/gui/bb_editor.cpp @@ -2,7 +2,7 @@ * bb_editor.cpp - basic main-window for editing of beats and basslines * * Copyright (c) 2004-2008 Tobias Doerffel - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or @@ -85,6 +85,9 @@ bbEditor::bbEditor( bbTrackContainer* tc ) : tr( "Stop playback of current beat/bassline (Space)" ), this, SLOT( stop() ), m_toolBar ); + m_playButton->setObjectName( "playButton" ); + m_stopButton->setObjectName( "stopButton" ); + toolButton * add_bb_track = new toolButton( embed::getIconPixmap( "add_bb_track" ), tr( "Add beat/bassline" ), diff --git a/src/gui/piano_roll.cpp b/src/gui/piano_roll.cpp index ddd450faa..4a9d8203e 100644 --- a/src/gui/piano_roll.cpp +++ b/src/gui/piano_roll.cpp @@ -331,6 +331,11 @@ pianoRoll::pianoRoll() : m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), tr( "Stop playing of current pattern (Space)" ), this, SLOT( stop() ), m_toolBar ); + + m_playButton->setObjectName( "playButton" ); + m_stopButton->setObjectName( "stopButton" ); + m_recordButton->setObjectName( "recordButton" ); + m_recordAccompanyButton->setObjectName( "recordAccompanyButton" ); m_playButton->setWhatsThis( tr( "Click here to play the current pattern. " diff --git a/src/gui/song_editor.cpp b/src/gui/song_editor.cpp index 4a2205fbd..099204616 100644 --- a/src/gui/song_editor.cpp +++ b/src/gui/song_editor.cpp @@ -113,7 +113,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : this, SLOT( adjustUiAfterProjectLoad() ) ); - // add some essential widgets to global tool-bar + // add some essential widgets to global tool-bar QWidget * tb = engine::mainWindow()->toolBar(); engine::mainWindow()->addSpacingToToolBar( 10 ); @@ -153,7 +153,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : engine::mainWindow()->addWidgetToToolBar( m_timeSigDisplay ); engine::mainWindow()->addSpacingToToolBar( 10 ); - + QLabel * master_vol_lbl = new QLabel( tb ); master_vol_lbl->setPixmap( embed::getIconPixmap( "master_volume" ) ); @@ -239,7 +239,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : m_toolBar->setFixedHeight( 32 ); m_toolBar->setAutoFillBackground( true ); QPalette pal; - pal.setBrush( m_toolBar->backgroundRole(), + pal.setBrush( m_toolBar->backgroundRole(), embed::getIconPixmap( "toolbar_bg" ) ); m_toolBar->setPalette( pal ); @@ -255,19 +255,23 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : m_playButton = new toolButton( embed::getIconPixmap( "play" ), tr( "Play song (Space)" ), this, SLOT( play() ), m_toolBar ); + m_playButton->setObjectName( "playButton" ); m_recordButton = new toolButton( embed::getIconPixmap( "record" ), tr( "Record samples from Audio-device" ), this, SLOT( record() ), m_toolBar ); - m_recordAccompanyButton = new toolButton( + m_recordButton->setObjectName( "recordButton" ); + + m_recordAccompanyButton = new toolButton( embed::getIconPixmap( "record_accompany" ), tr( "Record samples from Audio-device while playing " "song or BB track" ), this, SLOT( recordAccompany() ), m_toolBar ); + m_recordAccompanyButton->setObjectName( "recordAccompanyButton" ); // FIXME: disable record button while it is not implemented m_recordButton->setDisabled( true ); - + // disable record buttons if capturing is not supported if( !engine::mixer()->audioDev()->supportsCapture() ) { @@ -278,6 +282,7 @@ songEditor::songEditor( song * _song, songEditor * & _engine_ptr ) : m_stopButton = new toolButton( embed::getIconPixmap( "stop" ), tr( "Stop song (Space)" ), this, SLOT( stop() ), m_toolBar ); + m_stopButton->setObjectName( "stopButton" ); m_addBBTrackButton = new toolButton( embed::getIconPixmap( "add_bb_track" ), @@ -566,7 +571,7 @@ void songEditor::wheelEvent( QWheelEvent * _we ) setPixelsPerTact( pixelsPerTact() ); // and make sure, all TCO's are resized and relocated realignTracks(); - } + } else if( engine::mainWindow()->isShiftPressed() == TRUE ) { m_leftRightScroll->setValue( m_leftRightScroll->value() - @@ -720,7 +725,7 @@ void songEditor::updatePosition( const MidiTime & _t ) trackOpWidth = TRACK_OP_WIDTH; } - if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong + if( ( m_s->isPlaying() && m_s->m_playMode == song::Mode_PlaySong && m_timeLine->autoScroll() == timeLine::AutoScrollEnabled) || m_scrollBack == true ) { diff --git a/src/gui/widgets/track_label_button.cpp b/src/gui/widgets/track_label_button.cpp index 0080c090c..f26485701 100644 --- a/src/gui/widgets/track_label_button.cpp +++ b/src/gui/widgets/track_label_button.cpp @@ -58,7 +58,7 @@ trackLabelButton::trackLabelButton( trackView * _tv, QWidget * _parent ) : setFixedSize( 160, 29 ); } - setIconSize( QSize( 32, 32 ) ); + setIconSize( QSize( 24, 24 ) ); setText( " " ); connect( m_trackView->getTrack(), SIGNAL( dataChanged() ), From c2672651488be91f4b6c30fd1fee4829b579c939 Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 29 Jan 2014 00:45:03 +0200 Subject: [PATCH 2/3] 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 ); From f6ee1dd25d6833b81304ff3c28432c8eb51663cb Mon Sep 17 00:00:00 2001 From: Vesa Date: Wed, 29 Jan 2014 00:49:46 +0200 Subject: [PATCH 3/3] New files --- data/themes/default/apply-selected.png | Bin 0 -> 344 bytes data/themes/default/bb_track_btn.png | Bin 0 -> 647 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 data/themes/default/apply-selected.png create mode 100644 data/themes/default/bb_track_btn.png diff --git a/data/themes/default/apply-selected.png b/data/themes/default/apply-selected.png new file mode 100644 index 0000000000000000000000000000000000000000..f4e79fb4d613956f8db7ad67bf36ac4d35f0776a GIT binary patch literal 344 zcmV-e0jK_nP)*+_z`GSWi<+q#-fl_7!<){u>^xbx1xcN$_l_$@bzH0u)XZuT}e*SH(7D>&OX`M z%HffFNh?VkN!4EtaO)}o-(2+rR6;+vu`3=WEhRli;#)~i)>XVo>cl`F zBz=0Iq36AdnN!-pQ+^Tn!mmA03v=B~6HjvA@e9DpfF6Lldk7c2GdA^rJg_kQBk&Tf z&ixo-Yi-0&z^kuoqJa_VbpjezJNkm-l+b2epIgQ>0oqC$pg41GfZJ&%Gb!OC0_~(7 q`J{v#@P29j?qA-L;QtSjIrt1o@Yx15QZP8`Px+i zZBayNiqsnt0z|0F1^!%r8z&Ae2M!>lN(hmVwB028<@I`Y*BmHqLed^kEX`?V9=&6~ z8Y|};l(eAHkt*qFq#volo(I6697NsdM%e(WBw_xu&kRp=xkyt?G#%V&LDg#LB*Er6WmzC1 z|2J|Lg#_afO4TqrB@IKYF<5KwA9*sFtR%G7m~US(aSRGd5scR4!3FbZjeNSh5 z8&_4tvnkWb7!l#2GW2@AB_%~s(0=ingTXPm*32$12!0LW;{wp{bXM%qXf_cYuiTZ0 z;CH(8_WOiEfYB+>pf