diff --git a/ChangeLog b/ChangeLog index ce00ba014..c94dbfd0f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,18 @@ * plugins/stereo_matrix/stereomatrix_controls.cpp: Allow knobs to invert phase as well + * plugins/patman/patman.cpp: + * plugins/patman/patman.h: + * plugins/patman/artwork.png: + * plugins/patman/loop_off.png: + * plugins/patman/loop_on.png: + * plugins/patman/tune_off.png: + * plugins/patman/tune_on.png: + * plugins/patman/select_file_on.png: + * plugins/patman/select_file.png: + - Integrate new patman artwork. + - Make file selection button highlight when clicked. + * include/pixmap_button.h: * src/gui/widgets/pixmap_button.cpp: Make button pixmap "activate" on click diff --git a/plugins/patman/artwork.png b/plugins/patman/artwork.png index 4e2782bc6..2f3004e48 100644 Binary files a/plugins/patman/artwork.png and b/plugins/patman/artwork.png differ diff --git a/plugins/patman/loop_off.png b/plugins/patman/loop_off.png index 7bf5cccc9..36bb2149c 100644 Binary files a/plugins/patman/loop_off.png and b/plugins/patman/loop_off.png differ diff --git a/plugins/patman/loop_on.png b/plugins/patman/loop_on.png index b1f15089c..7cc6d907d 100644 Binary files a/plugins/patman/loop_on.png and b/plugins/patman/loop_on.png differ diff --git a/plugins/patman/patman.cpp b/plugins/patman/patman.cpp index f61998e90..9fe68dad9 100644 --- a/plugins/patman/patman.cpp +++ b/plugins/patman/patman.cpp @@ -450,24 +450,27 @@ patmanView::patmanView( instrument * _instrument, QWidget * _parent ) : PLUGIN_NAME::getIconPixmap( "artwork" ) ); setPalette( pal ); - pixmapButton * open_file_btn = new pixmapButton( this, NULL ); - open_file_btn->setCursor( QCursor( Qt::PointingHandCursor ) ); - open_file_btn->move( 200, 90 ); - open_file_btn->setActiveGraphic( embed::getIconPixmap( - "project_open_down" ) ); - open_file_btn->setInactiveGraphic( embed::getIconPixmap( - "project_open" ) ); - connect( open_file_btn, SIGNAL( clicked() ), - this, SLOT( openFile() ) ); - toolTip::add( open_file_btn, tr( "Open other patch" ) ); - open_file_btn->setWhatsThis( + m_openFileButton = new pixmapButton( this, NULL ); + m_openFileButton->setObjectName( "openFileButton" ); + m_openFileButton->setCursor( QCursor( Qt::PointingHandCursor ) ); + m_openFileButton->move( 227, 86 ); + m_openFileButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( + "select_file_on" ) ); + m_openFileButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( + "select_file" ) ); + connect( m_openFileButton, SIGNAL( clicked() ), + this, SLOT( openFile() ) ); + toolTip::add( m_openFileButton, tr( "Open other patch" ) ); + + m_openFileButton->setWhatsThis( tr( "Click here to open another patch-file. Loop and Tune " "settings are not reset." ) ); m_loopButton = new pixmapButton( this, tr( "Loop" ) ); + m_loopButton->setObjectName("loopButton"); m_loopButton->setCheckable( TRUE ); - m_loopButton->move( 160, 160 ); + m_loopButton->move( 195, 138 ); m_loopButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "loop_on" ) ); m_loopButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -479,8 +482,9 @@ patmanView::patmanView( instrument * _instrument, QWidget * _parent ) : "file." ) ); m_tuneButton = new pixmapButton( this, tr( "Tune" ) ); + m_tuneButton->setObjectName("tuneButton"); m_tuneButton->setCheckable( TRUE ); - m_tuneButton->move( 180, 160 ); + m_tuneButton->move( 223, 138 ); m_tuneButton->setActiveGraphic( PLUGIN_NAME::getIconPixmap( "tune_on" ) ); m_tuneButton->setInactiveGraphic( PLUGIN_NAME::getIconPixmap( @@ -631,8 +635,9 @@ void patmanView::paintEvent( QPaintEvent * ) QPainter p( this ); p.setFont( pointSize<8>( font() ) ); - p.setPen( QColor( 0x66, 0xFF, 0x66 ) ); - p.drawText( 8, 140, m_displayFilename ); + p.drawText( 8, 116, 235, 16, + Qt::AlignLeft | Qt::TextSingleLine | Qt::AlignVCenter, + m_displayFilename ); } diff --git a/plugins/patman/patman.h b/plugins/patman/patman.h index ae49d504e..4bc77be5e 100644 --- a/plugins/patman/patman.h +++ b/plugins/patman/patman.h @@ -152,6 +152,7 @@ private: patmanInstrument * m_pi; QString m_displayFilename; + pixmapButton * m_openFileButton; pixmapButton * m_loopButton; pixmapButton * m_tuneButton; diff --git a/plugins/patman/select_file.png b/plugins/patman/select_file.png new file mode 100755 index 000000000..ae3b07a18 Binary files /dev/null and b/plugins/patman/select_file.png differ diff --git a/plugins/patman/select_file_on.png b/plugins/patman/select_file_on.png new file mode 100644 index 000000000..d0173b92a Binary files /dev/null and b/plugins/patman/select_file_on.png differ diff --git a/plugins/patman/tune_off.png b/plugins/patman/tune_off.png index a5bd16162..28fd446c1 100644 Binary files a/plugins/patman/tune_off.png and b/plugins/patman/tune_off.png differ diff --git a/plugins/patman/tune_on.png b/plugins/patman/tune_on.png index c1777c52a..1f604e6b8 100644 Binary files a/plugins/patman/tune_on.png and b/plugins/patman/tune_on.png differ