Extract TemplatesMenu class from MainWindow

include/MainWindow.h

@@ -32,6 +32,7 @@
 
 #include "ConfigManager.h"
 #include "SubWindow.h"
+#include "TemplatesMenu.h"
 
 class QAction;
 class QDomElement;
@@ -148,7 +149,6 @@ public slots:
 
 	void emptySlot();
 	void createNewProject();
-	void createNewProjectFromTemplate( QAction * _idx );
 	void openProject();
 	bool saveProject();
 	bool saveProjectAs();
@@ -204,9 +204,8 @@ private slots:
 	QWidget * m_toolBar;
 	QGridLayout * m_toolBarLayout;
 
-	QMenu * m_templatesMenu;
+	TemplatesMenu * m_templatesMenu;
 	QMenu * m_recentlyOpenedProjectsMenu;
-	int m_custom_templates_count;
 
 	struct keyModifiers
 	{
@@ -240,7 +239,6 @@ private slots:
 
 private slots:
 	void browseHelp();
-	void fillTemplatesMenu();
 	void openRecentlyOpenedProject( QAction * _action );
 	void showTool( QAction * _idx );
 	void updateRecentlyOpenedProjectsMenu();

include/TemplatesMenu.h

@@ -0,0 +1,23 @@
+#ifndef TEMPLATESMENU_H
+#define TEMPLATESMENU_H
+
+#include <QDir>
+#include <QMenu>
+
+class TemplatesMenu : public QMenu
+{
+	Q_OBJECT
+public:
+	TemplatesMenu(QWidget *parent = nullptr);
+	virtual ~TemplatesMenu() = default;
+
+private slots:
+	void createNewProjectFromTemplate( QAction * _idx );
+	void fillTemplatesMenu();
+	int addTemplatesFromDir( QDir dir );
+
+private:
+	int m_custom_templates_count;
+};
+
+#endif // TEMPLATESMENU_H

src/gui/CMakeLists.txt

@@ -43,6 +43,8 @@ SET(LMMS_SRCS
 	gui/editors/PianoRoll.cpp
 	gui/editors/SongEditor.cpp
 
+	gui/menus/TemplatesMenu.cpp
+
 	gui/widgets/AutomatableButton.cpp
 	gui/widgets/AutomatableSlider.cpp
 	gui/widgets/CaptionMenu.cpp

src/gui/MainWindow.cpp

@@ -277,11 +277,7 @@ void MainWindow::finalize()
 					this, SLOT( createNewProject() ),
 					QKeySequence::New );
 
-	m_templatesMenu = new QMenu( tr("New from template"), this );
-	connect( m_templatesMenu, SIGNAL( aboutToShow() ), SLOT( fillTemplatesMenu() ) );
-	connect( m_templatesMenu, SIGNAL( triggered( QAction * ) ),
-		 SLOT( createNewProjectFromTemplate( QAction * ) ) );
-
+	m_templatesMenu = new TemplatesMenu( this );
 	project_menu->addMenu(m_templatesMenu);
 
 	project_menu->addAction( embed::getIconPixmap( "project_open" ),
@@ -809,24 +805,6 @@ void MainWindow::createNewProject()
 
 
 
-void MainWindow::createNewProjectFromTemplate( QAction * _idx )
-{
-	if( m_templatesMenu && mayChangeProject(true) )
-	{
-		int indexOfTemplate = m_templatesMenu->actions().indexOf( _idx );
-		bool isFactoryTemplate = indexOfTemplate >= m_custom_templates_count;
-		QString dirBase =  isFactoryTemplate ?
-				ConfigManager::inst()->factoryTemplatesDir() :
-				ConfigManager::inst()->userTemplateDir();
-
-		const QString f = dirBase + _idx->text().replace("&&", "&") + ".mpt";
-		Engine::getSong()->createNewProjectFromTemplate(f);
-	}
-}
-
-
-
-
 void MainWindow::openProject()
 {
 	if( mayChangeProject(false) )
@@ -1448,40 +1426,6 @@ void MainWindow::timerEvent( QTimerEvent * _te)
 
 
 
-void MainWindow::fillTemplatesMenu()
-{
-	m_templatesMenu->clear();
-
-	auto addTemplatesFromDir = [this]( QDir dir ) {
-		QStringList templates = dir.entryList( QStringList( "*.mpt" ),
-							QDir::Files | QDir::Readable );
-
-		if ( templates.size() && ! m_templatesMenu->actions().isEmpty() )
-		{
-			m_templatesMenu->addSeparator();
-		}
-
-		for( QStringList::iterator it = templates.begin();
-							it != templates.end(); ++it )
-		{
-			m_templatesMenu->addAction(
-						embed::getIconPixmap( "project_file" ),
-						( *it ).left( ( *it ).length() - 4 ).replace("&", "&&") );
-#ifdef LMMS_BUILD_APPLE
-			m_templatesMenu->actions().last()->setIconVisibleInMenu(false); // QTBUG-44565 workaround
-			m_templatesMenu->actions().last()->setIconVisibleInMenu(true);
-#endif
-		}
-
-		return templates.size();
-	};
-
-	m_custom_templates_count = addTemplatesFromDir( ConfigManager::inst()->userTemplateDir() );
-	addTemplatesFromDir( ConfigManager::inst()->factoryProjectsDir() + "templates" );
-}
-
-
-
 
 void MainWindow::showTool( QAction * _idx )
 {

src/gui/menus/TemplatesMenu.cpp

@@ -0,0 +1,72 @@
+#include "TemplatesMenu.h"
+#include "GuiApplication.h"
+#include "ConfigManager.h"
+#include "Engine.h"
+#include "embed.h"
+#include "MainWindow.h"
+#include "Song.h"
+
+TemplatesMenu::TemplatesMenu(QWidget *parent) :
+	QMenu(tr("New from template"), parent)
+{
+	connect( this, SIGNAL( aboutToShow() ), SLOT( fillTemplatesMenu() ) );
+	connect( this, SIGNAL( triggered( QAction * ) ),
+		SLOT( createNewProjectFromTemplate( QAction * ) ) );
+}
+
+
+
+
+void TemplatesMenu::createNewProjectFromTemplate( QAction * _idx )
+{
+	if( gui->mainWindow()->mayChangeProject(true) )
+	{
+		int indexOfTemplate = actions().indexOf( _idx );
+		bool isFactoryTemplate = indexOfTemplate >= m_custom_templates_count;
+		QString dirBase =  isFactoryTemplate ?
+			ConfigManager::inst()->factoryTemplatesDir() :
+			ConfigManager::inst()->userTemplateDir();
+
+		const QString f = dirBase + _idx->text().replace("&&", "&") + ".mpt";
+		Engine::getSong()->createNewProjectFromTemplate(f);
+	}
+}
+
+
+
+
+
+void TemplatesMenu::fillTemplatesMenu()
+{
+	clear();
+
+	m_custom_templates_count = addTemplatesFromDir( ConfigManager::inst()->userTemplateDir() );
+	addTemplatesFromDir( ConfigManager::inst()->factoryProjectsDir() + "templates" );
+}
+
+
+
+
+int TemplatesMenu::addTemplatesFromDir( QDir dir ) {
+	QStringList templates = dir.entryList( QStringList( "*.mpt" ),
+		QDir::Files | QDir::Readable );
+
+	if ( templates.size() && ! actions().isEmpty() )
+	{
+		addSeparator();
+	}
+
+	for( QStringList::iterator it = templates.begin();
+		it != templates.end(); ++it )
+	{
+		addAction(
+			embed::getIconPixmap( "project_file" ),
+			( *it ).left( ( *it ).length() - 4 ).replace("&", "&&") );
+#ifdef LMMS_BUILD_APPLE
+		actions().last()->setIconVisibleInMenu(false); // QTBUG-44565 workaround
+		actions().last()->setIconVisibleInMenu(true);
+#endif
+	}
+
+	return templates.size();
+}