From 055a795cb3d8733672066dfa9371af8f86bb134f Mon Sep 17 00:00:00 2001 From: Javier Serrano Polo Date: Sun, 16 Jul 2006 00:47:06 +0000 Subject: [PATCH] added automation icon git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@241 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 17 +++++++++++++++++ configure.in | 4 ++-- data/themes/default/automation.png | Bin 0 -> 515 bytes resources/automation.png | Bin 0 -> 515 bytes src/core/automation_editor.cpp | 3 +-- src/core/main_window.cpp | 3 +-- src/core/piano_roll.cpp | 4 ++-- src/core/piano_widget.cpp | 3 +-- src/core/surround_area.cpp | 5 ++--- src/widgets/automatable_button.cpp | 3 +-- src/widgets/automatable_slider.cpp | 3 +-- src/widgets/combobox.cpp | 3 +-- src/widgets/knob.cpp | 3 +-- src/widgets/lcd_spinbox.cpp | 3 +-- src/widgets/tempo_sync_knob.cpp | 3 +-- 15 files changed, 32 insertions(+), 25 deletions(-) create mode 100755 data/themes/default/automation.png create mode 100755 resources/automation.png diff --git a/ChangeLog b/ChangeLog index 6a2eb5efd..507388125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2006-07-16 Javier Serrano Polo + + * data/themes/default/automation.png: + * resources/automation.png: + * src/core/automation_editor.cpp: + * src/core/main_window.cpp: + * src/core/piano_roll.cpp: + * src/core/piano_widget.cpp: + * src/core/surround_area.cpp: + * src/widgets/automatable_button.cpp: + * src/widgets/automatable_slider.cpp: + * src/widgets/combobox.cpp: + * src/widgets/knob.cpp: + * src/widgets/lcd_spinbox.cpp: + * src/widgets/tempo_sync_knob.cpp: + added automation icon + 2006-07-15 Javier Serrano Polo * data/locale/ca.ts: diff --git a/configure.in b/configure.in index 20d2339da..6a9585105 100644 --- a/configure.in +++ b/configure.in @@ -2,8 +2,8 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.50) -AC_INIT(lmms, 0.1.4-cvs20060715, tobydox/at/users/dot/sourceforge/dot/net) -AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060715) +AC_INIT(lmms, 0.1.4-cvs20060716, tobydox/at/users/dot/sourceforge/dot/net) +AM_INIT_AUTOMAKE(lmms, 0.1.4-cvs20060716) AM_CONFIG_HEADER(config.h) diff --git a/data/themes/default/automation.png b/data/themes/default/automation.png new file mode 100755 index 0000000000000000000000000000000000000000..b5346bb8855ed04953b2b2aaccc055317b914967 GIT binary patch literal 515 zcmV+e0{s1nP)V zK~zY`?Ug-CBT*EFpE>y;NwZ}bw%KTsBE<@e^^z*JtYBfGr5d~V19Dpn?c9H`+pTP) z%S;uvOC?GqgrQ8tS}aa`Q_ zTT%bgw9#l_nkE3zTrLNgMW8xAtDTiLn4s~ zB7*Pxc%H{#Fqi;b*9{w@3h*tm%;n;R(si962rvwTSS&_5oyN9pM1(@2K(pCIM95?^ zSeC{8p3!c%`N9300%*LC{+KKFZ00{~Q` zM==04^@$xo`QtWc-l^(zI<(tudc7X5>plcLv7*qGh1EabEU;T&RhDIu&1Pw}S{!fu zQEX7tmZ-hNU@H8_%1`Dib879wy5h@Zpx`&Pml{lkT6k4?2DkXJAmC-in+6A&61 zAJNPJ@pyc;fMhcH#sR5R>Wv%J>-Cueq5#Ip`_KCya|eLoqN>*4ES3NO002ovPDHLk FV1lP=+*JSo literal 0 HcmV?d00001 diff --git a/resources/automation.png b/resources/automation.png new file mode 100755 index 0000000000000000000000000000000000000000..b5346bb8855ed04953b2b2aaccc055317b914967 GIT binary patch literal 515 zcmV+e0{s1nP)V zK~zY`?Ug-CBT*EFpE>y;NwZ}bw%KTsBE<@e^^z*JtYBfGr5d~V19Dpn?c9H`+pTP) z%S;uvOC?GqgrQ8tS}aa`Q_ zTT%bgw9#l_nkE3zTrLNgMW8xAtDTiLn4s~ zB7*Pxc%H{#Fqi;b*9{w@3h*tm%;n;R(si962rvwTSS&_5oyN9pM1(@2K(pCIM95?^ zSeC{8p3!c%`N9300%*LC{+KKFZ00{~Q` zM==04^@$xo`QtWc-l^(zI<(tudc7X5>plcLv7*qGh1EabEU;T&RhDIu&1Pw}S{!fu zQEX7tmZ-hNU@H8_%1`Dib879wy5h@Zpx`&Pml{lkT6k4?2DkXJAmC-in+6A&61 zAJNPJ@pyc;fMhcH#sR5R>Wv%J>-Cueq5#Ip`_KCya|eLoqN>*4ES3NO002ovPDHLk FV1lP=+*JSo literal 0 HcmV?d00001 diff --git a/src/core/automation_editor.cpp b/src/core/automation_editor.cpp index 87c0d58d7..3b5ed13cc 100644 --- a/src/core/automation_editor.cpp +++ b/src/core/automation_editor.cpp @@ -387,8 +387,7 @@ automationEditor::automationEditor( engine * _engine ) : tb_layout->addStretch(); // setup our actual window -//TODO: change icon - setWindowIcon( embed::getIconPixmap( "piano" ) ); + setWindowIcon( embed::getIconPixmap( "automation" ) ); resize( INITIAL_WIDTH, INITIAL_HEIGHT ); setCurrentPattern( NULL ); diff --git a/src/core/main_window.cpp b/src/core/main_window.cpp index 75918996a..0271cdf07 100644 --- a/src/core/main_window.cpp +++ b/src/core/main_window.cpp @@ -367,9 +367,8 @@ void mainWindow::finalize( void ) "rap-samples) directly into the playlist." ) ); -//TODO: Change icon toolButton * automation_editor_window = new toolButton( - embed::getIconPixmap( "piano" ), + embed::getIconPixmap( "automation" ), tr( "Show/hide Automation Editor" ) + " (F9)", this, diff --git a/src/core/piano_roll.cpp b/src/core/piano_roll.cpp index abecb1d19..eee8a7c85 100644 --- a/src/core/piano_roll.cpp +++ b/src/core/piano_roll.cpp @@ -188,10 +188,10 @@ pianoRoll::pianoRoll( engine * _engine ) : s_toolMove = new QPixmap( embed::getIconPixmap( "edit_move" ) ); } -//TODO: Change pixmap! if( s_toolOpen == NULL ) { - s_toolOpen = new QPixmap( embed::getIconPixmap( "piano" ) ); + s_toolOpen = new QPixmap( embed::getIconPixmap( + "automation" ) ); } #ifdef QT4 diff --git a/src/core/piano_widget.cpp b/src/core/piano_widget.cpp index 8a4d85765..8137c1cd6 100644 --- a/src/core/piano_widget.cpp +++ b/src/core/piano_widget.cpp @@ -255,8 +255,7 @@ void pianoWidget::contextMenuEvent( QContextMenuEvent * _me ) caption->setAlignment( Qt::AlignCenter ); contextMenu.addAction( caption ); #endif -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), m_noteKnob->getAutomationPattern(), SLOT( openInAutomationEditor() ) ); diff --git a/src/core/surround_area.cpp b/src/core/surround_area.cpp index 5ee0ace65..c03ee957c 100644 --- a/src/core/surround_area.cpp +++ b/src/core/surround_area.cpp @@ -192,12 +192,11 @@ void surroundArea::contextMenuEvent( QContextMenuEvent * ) caption->setAlignment( Qt::AlignCenter ); contextMenu.addAction( caption ); #endif -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "Open &X in automation editor" ), m_position_x->getAutomationPattern(), SLOT( openInAutomationEditor() ) ); - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "Open &Y in automation editor" ), m_position_y->getAutomationPattern(), SLOT( openInAutomationEditor() ) ); diff --git a/src/widgets/automatable_button.cpp b/src/widgets/automatable_button.cpp index 44baf8706..f13daec00 100644 --- a/src/widgets/automatable_button.cpp +++ b/src/widgets/automatable_button.cpp @@ -122,8 +122,7 @@ void automatableButton::contextMenuEvent( QContextMenuEvent * _me ) caption->setAlignment( Qt::AlignCenter ); contextMenu.addAction( caption ); #endif -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), pattern, SLOT( openInAutomationEditor() ) ); diff --git a/src/widgets/automatable_slider.cpp b/src/widgets/automatable_slider.cpp index 9adc244d8..01485d55a 100644 --- a/src/widgets/automatable_slider.cpp +++ b/src/widgets/automatable_slider.cpp @@ -126,8 +126,7 @@ void automatableSlider::contextMenuEvent( QContextMenuEvent * _me ) caption->setAlignment( Qt::AlignCenter ); contextMenu.addAction( caption ); #endif -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), m_knob->getAutomationPattern(), SLOT( openInAutomationEditor() ) ); diff --git a/src/widgets/combobox.cpp b/src/widgets/combobox.cpp index 71731e374..e44d666a4 100644 --- a/src/widgets/combobox.cpp +++ b/src/widgets/combobox.cpp @@ -197,8 +197,7 @@ void comboBox::contextMenuEvent( QContextMenuEvent * _me ) caption->setAlignment( Qt::AlignCenter ); contextMenu.addAction( caption ); #endif -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), getAutomationPattern(), SLOT( openInAutomationEditor() ) ); diff --git a/src/widgets/knob.cpp b/src/widgets/knob.cpp index 7936bdb86..e29e720a8 100644 --- a/src/widgets/knob.cpp +++ b/src/widgets/knob.cpp @@ -377,8 +377,7 @@ void knob::contextMenuEvent( QContextMenuEvent * ) contextMenu.addSeparator(); if( !nullTrack() ) { -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), getAutomationPattern(), SLOT( openInAutomationEditor() ) ); diff --git a/src/widgets/lcd_spinbox.cpp b/src/widgets/lcd_spinbox.cpp index 4e197004d..a19e9d14f 100644 --- a/src/widgets/lcd_spinbox.cpp +++ b/src/widgets/lcd_spinbox.cpp @@ -197,8 +197,7 @@ void lcdSpinBox::contextMenuEvent( QContextMenuEvent * _me ) caption->setAlignment( Qt::AlignCenter ); contextMenu.addAction( caption ); #endif -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), getAutomationPattern(), SLOT( openInAutomationEditor() ) ); diff --git a/src/widgets/tempo_sync_knob.cpp b/src/widgets/tempo_sync_knob.cpp index b788acc89..a4673a27f 100644 --- a/src/widgets/tempo_sync_knob.cpp +++ b/src/widgets/tempo_sync_knob.cpp @@ -177,8 +177,7 @@ void tempoSyncKnob::contextMenuEvent( QContextMenuEvent * ) contextMenu.addSeparator(); -//TODO: Change icon - contextMenu.addAction( embed::getIconPixmap( "piano" ), + contextMenu.addAction( embed::getIconPixmap( "automation" ), tr( "&Open in automation editor" ), getAutomationPattern(), SLOT( openInAutomationEditor() ) );