From 842af2812d07f8a46d68868f97909febcee32053 Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Mon, 16 Jun 2008 06:05:39 +0000 Subject: [PATCH] Flushing my working-copy git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1151 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 32 +++++++++++++++++++++++++ plugins/stereo_matrix/stereo_matrix.cpp | 2 +- src/gui/lfo_controller_dialog.cpp | 22 ----------------- src/gui/widgets/fade_button.cpp | 12 ++++++++-- src/gui/widgets/graph.cpp | 2 +- src/tracks/instrument_track.cpp | 4 ++-- 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index b00596a73..fc7544e90 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,35 @@ +2008-06-16 Paul Giblock + + * plugins/stereo_matrix/stereo_matrix.cpp: + update author email address + + * src/gui/widgets/graph.cpp: + * src/gui/lfo_controller_dialog.cpp: + code cleanup + + * src/gui/widgets/fade_button.cpp: + * src/tracks/instrument_track.cpp: + improve appearance of fade buttons + + * include/tool_button.h: + * src/gui/widgets/tool_button.cpp: + * src/gui/lmms_style.cpp: + * data/themes/default/style.css: + remove styling, rely on QStyle and stylesheets now + + * include/song_editor.h: + * include/main_window.h: + * include/timeline.h: + * src/gui/main_window.cpp: + * src/gui/song_editor.cpp: + * src/gui/widgets/nstate_button.cpp: + * src/core/timeline.cpp: + + * data/themes/default/main_toolbar_bg.png: + * data/themes/default/toolbar_bg.png: + Enlarge images for resizable toolbars - quick fix. Could just clamp the + texture at the bottom + 2008-06-15 Tobias Doerffel * include/knob.h: diff --git a/plugins/stereo_matrix/stereo_matrix.cpp b/plugins/stereo_matrix/stereo_matrix.cpp index 673676e9d..3dbb6ecd6 100644 --- a/plugins/stereo_matrix/stereo_matrix.cpp +++ b/plugins/stereo_matrix/stereo_matrix.cpp @@ -39,7 +39,7 @@ plugin::descriptor PLUGIN_EXPORT stereomatrix_plugin_descriptor = "Stereophonic Matrix", QT_TRANSLATE_NOOP( "pluginBrowser", "Plugin for freely manipulating stereo output" ), - "Paul Giblock ", + "Paul Giblock ", 0x0100, plugin::Effect, new pluginPixmapLoader( "logo" ), diff --git a/src/gui/lfo_controller_dialog.cpp b/src/gui/lfo_controller_dialog.cpp index 41d5c7016..619736399 100644 --- a/src/gui/lfo_controller_dialog.cpp +++ b/src/gui/lfo_controller_dialog.cpp @@ -210,28 +210,6 @@ lfoControllerDialog::lfoControllerDialog( controller * _model, QWidget * _parent m_lfoWaveBtnGrp->addButton( uwb ); -/* - if( getEffect()->getControls()->getControlCount() > 0 ) - { - QPushButton * ctls_btn = new QPushButton( tr( "Controls" ), - this ); - QFont f = ctls_btn->font(); - ctls_btn->setFont( pointSize<7>( f ) ); - ctls_btn->setGeometry( 140, 14, 50, 20 ); - connect( ctls_btn, SIGNAL( clicked() ), - this, SLOT( editControls() ) ); - } - - - m_controlView = getEffect()->getControls()->createView(); - m_subWindow = engine::getMainWindow()->workspace()->addSubWindow( - m_controlView ); - connect( m_controlView, SIGNAL( closed() ), - this, SLOT( closeEffects() ) ); - - m_subWindow->hide(); -*/ - setModel( _model ); } diff --git a/src/gui/widgets/fade_button.cpp b/src/gui/widgets/fade_button.cpp index 69da9bb7a..4592f94cd 100644 --- a/src/gui/widgets/fade_button.cpp +++ b/src/gui/widgets/fade_button.cpp @@ -98,10 +98,18 @@ void fadeButton::paintEvent( QPaintEvent * _pe ) m_state -= 0.1f; QTimer::singleShot( 20, this, SLOT( update() ) ); } + QPainter p( this ); p.fillRect( rect(), col ); - p.setPen( QColor( 0, 0, 0 ) ); - p.drawRect( 0, 0, rect().right(), rect().bottom() ); + + int w = rect().right(); + int h = rect().bottom(); + p.setPen( QColor( 37, 39, 46 ) ); + p.drawLine( w, 1, w, h ); + p.drawLine( 1, h, w, h ); + p.setPen( QColor( 145, 147, 154 ) ); + p.drawLine( 0, 0, 0, h-1 ); + p.drawLine( 0, 0, w, 0 ); } diff --git a/src/gui/widgets/graph.cpp b/src/gui/widgets/graph.cpp index df68c0618..2b2543f24 100644 --- a/src/gui/widgets/graph.cpp +++ b/src/gui/widgets/graph.cpp @@ -244,7 +244,7 @@ void graph::paintEvent( QPaintEvent * ) ); } - // Draw last segment flat + // Draw last segment wrapped around p.drawLine(2+static_cast(length*xscale), 2+static_cast( ( (*samps)[length] - maxVal ) * yscale ), width()-2, diff --git a/src/tracks/instrument_track.cpp b/src/tracks/instrument_track.cpp index e0975619d..8f6dc54e4 100644 --- a/src/tracks/instrument_track.cpp +++ b/src/tracks/instrument_track.cpp @@ -894,8 +894,8 @@ instrumentTrackView::instrumentTrackView( instrumentTrack * _it, m_midiInputAction->setText( tr( "MIDI input" ) ); m_midiOutputAction->setText( tr( "MIDI output" ) ); - m_tswActivityIndicator = new fadeButton( QColor( 96, 96, 96 ), - QColor( 0, 255, 0 ), + m_tswActivityIndicator = new fadeButton( QColor( 37, 57, 42 ), + QColor( 64, 255, 16 ), getTrackSettingsWidget() ); m_tswActivityIndicator->setGeometry( 212, 2, 8, 28 ); m_tswActivityIndicator->show();