From 67887b621baf0d62930c45b36e15d669b1a69b1c Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Sat, 28 Jun 2008 22:40:04 +0000 Subject: [PATCH] splitted "new project"-button and added "recently opened project"-button git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1191 0778d3d1-df1d-0410-868b-ea421aaaa00d --- ChangeLog | 13 + data/themes/default/edit_rename.png | Bin 0 -> 353 bytes data/themes/default/project_import.png | Bin 0 -> 1244 bytes data/themes/default/project_new.png | Bin 1826 -> 769 bytes .../default/project_new_from_template.png | Bin 0 -> 1410 bytes data/themes/default/project_open_recent.png | Bin 0 -> 1052 bytes data/themes/default/rename.png | Bin 1028 -> 0 bytes src/core/automation_pattern.cpp | 3 +- src/gui/main_window.cpp | 248 ++++++++++-------- src/tracks/bb_track.cpp | 3 +- src/tracks/pattern.cpp | 3 +- 11 files changed, 151 insertions(+), 119 deletions(-) create mode 100644 data/themes/default/edit_rename.png create mode 100644 data/themes/default/project_import.png create mode 100644 data/themes/default/project_new_from_template.png create mode 100644 data/themes/default/project_open_recent.png delete mode 100644 data/themes/default/rename.png diff --git a/ChangeLog b/ChangeLog index 90bca4b46..8d435bad0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2008-06-28 Tobias Doerffel + * src/gui/main_window.cpp: + * src/tracks/bb_track.cpp: + * src/tracks/pattern.cpp: + * src/core/automation_pattern.cpp: + * data/themes/default/project_new_from_template.png: + * data/themes/default/project_new.png: + * data/themes/default/project_import.png: + * data/themes/default/project_open_recent.png: + * data/themes/default/edit_rename.png: + * data/themes/default/rename.png: + splitted "new project"-button and added "recently opened + project"-button + * src/gui/main_window.cpp: * src/gui/song_editor.cpp: * src/tracks/instrument_track.cpp: diff --git a/data/themes/default/edit_rename.png b/data/themes/default/edit_rename.png new file mode 100644 index 0000000000000000000000000000000000000000..ea8872fea61ae20585a422020c907e57dbb364f3 GIT binary patch literal 353 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fEX7WqAsj$Z!;#Vf4nJ zFqeTaW9`+ZGeAMf64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq=1U;fk+p1}8$oO4U9J{M*|g*JgY|@JjTC6TDo;<`-reJkZwU>}i{1 z;qd9}_epB;5_S9@p`ivxk`)(ML>Tri%4n{1WpegwjM0!QlxVy2*+%)=B8?^$&m`4# zOV_<-N?tQP#Or3yoL38{-IF&z@tH^GHe3C}!ygNN9lc#?cx&H{-0u^X`4_11t(o?E zfH< literal 0 HcmV?d00001 diff --git a/data/themes/default/project_import.png b/data/themes/default/project_import.png new file mode 100644 index 0000000000000000000000000000000000000000..6680f2416ae06f6cc0206c059f143d52282f4767 GIT binary patch literal 1244 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 QD*ylh07*qoM6N<$f;iQC6#xJL literal 0 HcmV?d00001 diff --git a/data/themes/default/project_open_recent.png b/data/themes/default/project_open_recent.png new file mode 100644 index 0000000000000000000000000000000000000000..eb07bb20b0f48fe99a192030a3aad9fe8687f11b GIT binary patch literal 1052 zcmV+%1mpXOP)@kw8r8k2?^)MuZX`XEMQP1E>T z!$nC*`=)6$)p(B*?1Pq8YpL9XZ4q5|xdh7s%U)(-Z|v;2nJkRk0b~4Tnic0Izv=m{#hw+OMAd@flz}?;5FLrizp4N6J1p(t}Xn1Uq z3&YEh0@AB|D9vt&8X|$%PSL>d+@l|VXM2nG*RS$R&xQzwL_yS{`&CGZ^Xi9F zyz+c2r`lW`DVJDZ_7e}S;399~O{R8h)Rau4e zu#KOf7&4q1PN zmCLu5bIzlSOn*5i-w!roF*Z`lfuC-6(|%`yfziKE(yuA` zgce||m{k=V3 zlb2|6T;R@>zwRy;i{bP60gbx)I^yxIv3Jg&dwDY$+%SO;0s#dP?Ck6i3WeAVZR*g) z1^?ZizTT5lQ@;fO4hEZYHG>r;Ms-y+lamvZgBJ&n4}CkdV!C8ZTud^-5k-QV8#mtT z@9(;HZDbYTK(N>A-JG4By=iu8yk~RJcp}OC;?n&2vv0n!ytKT|0s4QJDX2h(f6?EN Wz9NQ>tyTDusafKnp$)T|b^igwa4Z8DRY%*=g!$Hl#wJiL<>J#gT1x%dA& z-#O;g z$+Fm5snr81uQufR@|s*c{f-0|5Ig<6*y2yJboP{t9x~qo_W+$hW|R&)n9&NW6-H}% z^%44?gF~9^mYVjtq3PZ@eX)U%z@*=N*7b5eja}51jinIkj3H^fMH-?R?2rQ zvNTq3y)R%j52B#z5Cksa6DRPE#)_Im~ZXc}W()4yy^zJ9Orx&FZTI=+l2%tQ0`oZ*r z>`g$4wzEYvwZ_yLazh0uJINQT9n4S7bNk49D5Y?WA&f$*)hhM1I-vZ-#RIFsDBv0p zwE)c^+87bRkEq@uxUvk|1$wCV?`QCi12ltxO1VO_5hR@^>zNP-tOr_vjx_kV1yGwh zES3RS^}sX$pR3aggoj_HR4NfgaguulcB9B@Q;RAPNp2-7vj$Pq1@{H$dX~T*VR~A~ z-#v^7D5YAi|Mk0s5H3S~F&%u82`HDtWFOSJ`Tm2i88|t%!>m%NaC8HjOAuCoAa$GB zrsER}=s(V}zxFo=-}pR9TP#~gxiREAbL2bnfHZ*SCb#PgC=(#{243wlx4klowOfT< z*QHSK@qHg_B|QNa2vd(TFWTldec;&B^gZ%aOI)lFgfSf*d9=~QkwrwX(kilSjyeaddAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ), this, SLOT( resetName() ) ); - _cm->addAction( embed::getIconPixmap( "rename" ), tr( "Change name" ), + _cm->addAction( embed::getIconPixmap( "edit_rename" ), + tr( "Change name" ), this, SLOT( changeName() ) ); if( !m_pat->m_objects.isEmpty() ) { diff --git a/src/gui/main_window.cpp b/src/gui/main_window.cpp index b9e47d27a..44e1672a2 100644 --- a/src/gui/main_window.cpp +++ b/src/gui/main_window.cpp @@ -174,6 +174,115 @@ void mainWindow::finalize( void ) setWindowIcon( embed::getIconPixmap( "icon" ) ); + // project-popup-menu + QMenu * project_menu = new QMenu( this ); + menuBar()->addMenu( project_menu )->setText( tr( "&Project" ) ); + project_menu->addAction( embed::getIconPixmap( "project_new" ), + tr( "&New" ), + this, SLOT( createNewProject() ), + Qt::CTRL + Qt::Key_N ); + + project_menu->addAction( embed::getIconPixmap( "project_open" ), + tr( "&Open..." ), + this, SLOT( openProject() ), + Qt::CTRL + Qt::Key_O ); + + m_recentlyOpenedProjectsMenu = project_menu->addMenu( + embed::getIconPixmap( "project_open_recent" ), + tr( "Recently opened projects" ) ); + connect( m_recentlyOpenedProjectsMenu, SIGNAL( aboutToShow() ), + this, SLOT( updateRecentlyOpenedProjectsMenu() ) ); + connect( m_recentlyOpenedProjectsMenu, SIGNAL( triggered( QAction * ) ), + this, SLOT( openRecentlyOpenedProject( QAction * ) ) ); + + project_menu->addAction( embed::getIconPixmap( "project_save" ), + tr( "&Save" ), + this, SLOT( saveProject() ), + Qt::CTRL + Qt::Key_S ); + + project_menu->addAction( embed::getIconPixmap( "project_saveas" ), + tr( "Save &As..." ), + this, SLOT( saveProjectAs() ), + Qt::CTRL + Qt::SHIFT + Qt::Key_S ); + project_menu->addSeparator(); + project_menu->addAction( embed::getIconPixmap( "project_import" ), + tr( "Import..." ), + engine::getSong(), + SLOT( importProject() ) ); + project_menu->addAction( embed::getIconPixmap( "project_export" ), + tr( "E&xport..." ), + engine::getSong(), + SLOT( exportProject() ), + Qt::CTRL + Qt::Key_E ); + project_menu->addSeparator(); + project_menu->addAction( embed::getIconPixmap( "exit" ), tr( "&Quit" ), + qApp, SLOT( closeAllWindows() ), + Qt::CTRL + Qt::Key_Q ); + + + QMenu * edit_menu = new QMenu( this ); + menuBar()->addMenu( edit_menu )->setText( tr( "&Edit" ) ); + edit_menu->addAction( embed::getIconPixmap( "edit_undo" ), + tr( "Undo" ), + this, SLOT( undo() ), + Qt::CTRL + Qt::Key_Z ); + edit_menu->addAction( embed::getIconPixmap( "edit_redo" ), + tr( "Redo" ), + this, SLOT( redo() ), + Qt::CTRL + Qt::Key_R ); + edit_menu->addSeparator(); + edit_menu->addAction( embed::getIconPixmap( "setup_general" ), + tr( "Settings" ), + this, SLOT( showSettingsDialog() ) ); + + + m_toolsMenu = new QMenu( this ); + QVector pluginDescriptors; + plugin::getDescriptorsOfAvailPlugins( pluginDescriptors ); + for( QVector::iterator it = + pluginDescriptors.begin(); + it != pluginDescriptors.end(); ++it ) + { + if( it->type == plugin::Tool ) + { + m_toolsMenu->addAction( it->logo->pixmap(), + it->publicName ); + m_tools.push_back( tool::instantiate( it->name, + /*this*/NULL )->createView( this ) ); + } + } + if( !m_toolsMenu->isEmpty() ) + { + menuBar()->addMenu( m_toolsMenu )->setText( tr( "&Tools" ) ); + connect( m_toolsMenu, SIGNAL( triggered( QAction * ) ), + this, SLOT( showTool( QAction * ) ) ); + } + + + // help-popup-menu + QMenu * help_menu = new QMenu( this ); + menuBar()->addMenu( help_menu )->setText( tr( "&Help" ) ); + // May use offline help + if( TRUE ) + { + help_menu->addAction( embed::getIconPixmap( "help" ), + tr( "Online help" ), + this, SLOT( browseHelp() ) ); + } + else + { + help_menu->addAction( embed::getIconPixmap( "help" ), + tr( "Help" ), + this, SLOT( help() ) ); + } + help_menu->addAction( embed::getIconPixmap( "whatsthis" ), + tr( "What's this?" ), + this, SLOT( enterWhatsThisMode() ) ); + + help_menu->addSeparator(); + help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ), + this, SLOT( aboutLMMS() ) ); + // create tool-buttons toolButton * project_new = new toolButton( embed::getIconPixmap( "project_new" ), @@ -181,13 +290,19 @@ void mainWindow::finalize( void ) this, SLOT( createNewProject() ), m_toolBar ); - m_templatesMenu = new QMenu( project_new ); + toolButton * project_new_from_template = new toolButton( + embed::getIconPixmap( "project_new_from_template" ), + tr( "Create new project from template" ), + this, SLOT( emptySlot() ), + m_toolBar ); + + m_templatesMenu = new QMenu( project_new_from_template ); connect( m_templatesMenu, SIGNAL( aboutToShow() ), this, SLOT( fillTemplatesMenu() ) ); connect( m_templatesMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( createNewProjectFromTemplate( QAction * ) ) ); - project_new->setMenu( m_templatesMenu ); - project_new->setPopupMode( toolButton::MenuButtonPopup ); + project_new_from_template->setMenu( m_templatesMenu ); + project_new_from_template->setPopupMode( toolButton::InstantPopup ); toolButton * project_open = new toolButton( embed::getIconPixmap( "project_open" ), @@ -196,6 +311,13 @@ void mainWindow::finalize( void ) m_toolBar ); + toolButton * project_open_recent = new toolButton( + embed::getIconPixmap( "project_open_recent" ), + tr( "Recently opened project" ), + this, SLOT( emptySlot() ), m_toolBar ); + project_open_recent->setMenu( m_recentlyOpenedProjectsMenu ); + project_open_recent->setPopupMode( toolButton::InstantPopup ); + toolButton * project_save = new toolButton( embed::getIconPixmap( "project_save" ), tr( "Save current project" ), @@ -213,9 +335,11 @@ void mainWindow::finalize( void ) m_toolBarLayout->setColumnMinimumWidth( 0, 5 ); m_toolBarLayout->addWidget( project_new, 0, 1 ); - m_toolBarLayout->addWidget( project_open, 0, 2 ); - m_toolBarLayout->addWidget( project_save, 0, 3 ); - m_toolBarLayout->addWidget( project_export, 0, 4 ); + m_toolBarLayout->addWidget( project_new_from_template, 0, 2 ); + m_toolBarLayout->addWidget( project_open, 0, 3 ); + m_toolBarLayout->addWidget( project_open_recent, 0, 4 ); + m_toolBarLayout->addWidget( project_save, 0, 5 ); + m_toolBarLayout->addWidget( project_export, 0, 6 ); @@ -313,115 +437,6 @@ void mainWindow::finalize( void ) m_toolBarLayout->setColumnStretch( 100, 1 ); - // project-popup-menu - QMenu * project_menu = new QMenu( this ); - menuBar()->addMenu( project_menu )->setText( tr( "&Project" ) ); - project_menu->addAction( embed::getIconPixmap( "project_new" ), - tr( "&New" ), - this, SLOT( createNewProject() ), - Qt::CTRL + Qt::Key_N ); - - project_menu->addAction( embed::getIconPixmap( "project_open" ), - tr( "&Open..." ), - this, SLOT( openProject() ), - Qt::CTRL + Qt::Key_O ); - - m_recentlyOpenedProjectsMenu = project_menu->addMenu( - embed::getIconPixmap( "project_open" ), - tr( "Recently opened projects" ) ); - connect( m_recentlyOpenedProjectsMenu, SIGNAL( aboutToShow() ), - this, SLOT( updateRecentlyOpenedProjectsMenu() ) ); - connect( m_recentlyOpenedProjectsMenu, SIGNAL( triggered( QAction * ) ), - this, SLOT( openRecentlyOpenedProject( QAction * ) ) ); - - project_menu->addAction( embed::getIconPixmap( "project_save" ), - tr( "&Save" ), - this, SLOT( saveProject() ), - Qt::CTRL + Qt::Key_S ); - - project_menu->addAction( embed::getIconPixmap( "project_saveas" ), - tr( "Save &As..." ), - this, SLOT( saveProjectAs() ), - Qt::CTRL + Qt::SHIFT + Qt::Key_S ); - project_menu->addSeparator(); - project_menu->addAction( /*embed::getIconPixmap( "project_import" ),*/ - tr( "Import..." ), - engine::getSong(), - SLOT( importProject() ) ); - project_menu->addAction( embed::getIconPixmap( "project_export" ), - tr( "E&xport..." ), - engine::getSong(), - SLOT( exportProject() ), - Qt::CTRL + Qt::Key_E ); - project_menu->addSeparator(); - project_menu->addAction( embed::getIconPixmap( "exit" ), tr( "&Quit" ), - qApp, SLOT( closeAllWindows() ), - Qt::CTRL + Qt::Key_Q ); - - - QMenu * edit_menu = new QMenu( this ); - menuBar()->addMenu( edit_menu )->setText( tr( "&Edit" ) ); - edit_menu->addAction( embed::getIconPixmap( "edit_undo" ), - tr( "Undo" ), - this, SLOT( undo() ), - Qt::CTRL + Qt::Key_Z ); - edit_menu->addAction( embed::getIconPixmap( "edit_redo" ), - tr( "Redo" ), - this, SLOT( redo() ), - Qt::CTRL + Qt::Key_R ); - edit_menu->addSeparator(); - edit_menu->addAction( embed::getIconPixmap( "setup_general" ), - tr( "Settings" ), - this, SLOT( showSettingsDialog() ) ); - - - m_toolsMenu = new QMenu( this ); - QVector pluginDescriptors; - plugin::getDescriptorsOfAvailPlugins( pluginDescriptors ); - for( QVector::iterator it = - pluginDescriptors.begin(); - it != pluginDescriptors.end(); ++it ) - { - if( it->type == plugin::Tool ) - { - m_toolsMenu->addAction( it->logo->pixmap(), - it->publicName ); - m_tools.push_back( tool::instantiate( it->name, - /*this*/NULL )->createView( this ) ); - } - } - if( !m_toolsMenu->isEmpty() ) - { - menuBar()->addMenu( m_toolsMenu )->setText( tr( "&Tools" ) ); - connect( m_toolsMenu, SIGNAL( triggered( QAction * ) ), - this, SLOT( showTool( QAction * ) ) ); - } - - - // help-popup-menu - QMenu * help_menu = new QMenu( this ); - menuBar()->addMenu( help_menu )->setText( tr( "&Help" ) ); - // May use offline help - if( TRUE ) - { - help_menu->addAction( embed::getIconPixmap( "help" ), - tr( "Online help" ), - this, SLOT( browseHelp() ) ); - } - else - { - help_menu->addAction( embed::getIconPixmap( "help" ), - tr( "Help" ), - this, SLOT( help() ) ); - } - help_menu->addAction( embed::getIconPixmap( "whatsthis" ), - tr( "What's this?" ), - this, SLOT( enterWhatsThisMode() ) ); - - help_menu->addSeparator(); - help_menu->addAction( embed::getIconPixmap( "icon" ), tr( "About" ), - this, SLOT( aboutLMMS() ) ); - // setup-dialog opened before? if( !configManager::inst()->value( "app", "configured" ).toInt() ) { @@ -629,7 +644,8 @@ void mainWindow::updateRecentlyOpenedProjectsMenu( void ) QStringList rup = configManager::inst()->recentlyOpenedProjects(); for( QStringList::iterator it = rup.begin(); it != rup.end(); ++it ) { - m_recentlyOpenedProjectsMenu->addAction( *it ); + m_recentlyOpenedProjectsMenu->addAction( + embed::getIconPixmap( "project_file" ), *it ); } } diff --git a/src/tracks/bb_track.cpp b/src/tracks/bb_track.cpp index 01733eff9..2778247e3 100644 --- a/src/tracks/bb_track.cpp +++ b/src/tracks/bb_track.cpp @@ -156,7 +156,8 @@ void bbTCOView::constructContextMenu( QMenu * _cm ) _cm->addSeparator(); _cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ), this, SLOT( resetName() ) ); - _cm->addAction( embed::getIconPixmap( "rename" ), tr( "Change name" ), + _cm->addAction( embed::getIconPixmap( "edit_rename" ), + tr( "Change name" ), this, SLOT( changeName() ) ); _cm->addAction( embed::getIconPixmap( "colorize" ), tr( "Change color" ), this, SLOT( changeColor() ) ); diff --git a/src/tracks/pattern.cpp b/src/tracks/pattern.cpp index d9f1a009d..60eb9586a 100644 --- a/src/tracks/pattern.cpp +++ b/src/tracks/pattern.cpp @@ -918,7 +918,8 @@ void patternView::constructContextMenu( QMenu * _cm ) _cm->addAction( embed::getIconPixmap( "reload" ), tr( "Reset name" ), this, SLOT( resetName() ) ); - _cm->addAction( embed::getIconPixmap( "rename" ), tr( "Change name" ), + _cm->addAction( embed::getIconPixmap( "edit_rename" ), + tr( "Change name" ), this, SLOT( changeName() ) ); _cm->addSeparator();