Display layout toolbar.

Related to #407

src/kdenliveui.rc

 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<kpartgui name="kdenlive" version="188" translationDomain="kdenlive">
+<kpartgui name="kdenlive" version="189" translationDomain="kdenlive">
   <MenuBar>
     <Menu name="file" >
       <Action name="file_save"/>
@@ -285,5 +285,13 @@
     <text>Extra Toolbar</text>
 	<Action name="project_render_button" />
   </ToolBar>
+  <ToolBar name="layoutsToolBar"  fullWidth="false" newline="true" noMerge="1" position="top">
+    <text>Layouts</text>
+	<Action name="load_layout1" />
+    <Action name="load_layout2" />
+    <Action name="load_layout3" />
+    <Action name="load_layout4" />
+    <Action name="load_layout5" />
+  </ToolBar>
 </kpartgui>
 

src/layoutmanagement.cpp

@@ -40,7 +40,12 @@ LayoutManagement::LayoutManagement(QObject *parent)
     QAction *manageLayout = new QAction(i18n("Manage Layouts"), pCore->window()->actionCollection());
     layoutActions->addAction(QStringLiteral("manage_layout"), manageLayout);
     connect(manageLayout, &QAction::triggered, this, &LayoutManagement::slotManageLayouts);
-    connect(pCore->window(), &MainWindow::GUISetupDone, this, &LayoutManagement::slotOnGUISetupDone);
+    // Create 9 layout actions
+    for (int i = 1; i < 10; i++) {
+        QAction *load = new QAction(QIcon(), QString(), this);
+        m_layoutActions <<layoutActions->addAction("load_layout" + QString::number(i), load);
+    }
+    initializeLayouts();
 }
 
 void LayoutManagement::initializeLayouts()
@@ -67,7 +72,7 @@ void LayoutManagement::initializeLayouts()
             layoutGroup2.copyTo(&layoutGroup);
         }
     }
-    m_loadLayout->clear();
+    m_loadLayout->removeAllActions();
     KConfigGroup layoutOrder(config, "Order");
     QStringList entries;
     if (!layoutOrder.exists()) {
@@ -99,14 +104,25 @@ void LayoutManagement::initializeLayouts()
             j++;
         }
     }
-    KActionCategory *layoutActions = new KActionCategory(i18n("Layouts"), pCore->window()->actionCollection());
-    int i = 1;
-    for (const QString &layoutName : entries) {
-        QAction *load = new QAction(QIcon(), i18n("Layout %1: %2", i, layoutName), this);
+    for (int i = 1; i < 10; i++) {
+        QString layoutName;
+        if (i <= entries.count()) {
+            layoutName = entries.at(i - 1);
+        }
+        QAction *load = m_layoutActions.at(i - 1);
+        if (layoutName.isEmpty()) {
+            load->setText(QString());
+            load->setIcon(QIcon());
+        } else {
+            load->setText(i18n("Layout %1: %2", i, layoutName));
+        }
         load->setData(layoutName);
-        layoutActions->addAction("load_layout" + QString::number(i), load);
-        m_loadLayout->addAction(load);
-        i++;
+        if (!layoutName.isEmpty()) {
+            load->setEnabled(true);
+            m_loadLayout->addAction(load);
+        } else {
+            load->setEnabled(false);
+        }
     }
 }
 
@@ -266,7 +282,7 @@ void LayoutManagement::slotManageLayouts()
     // Update order and new names
     for (int i = 0; i < list.count(); i++) {
         QListWidgetItem *item = list.item(i);
-        order.writeEntry(QString::number(i + 1), item->data(Qt::UserRole).toString());
+        order.writeEntry(QString::number(i + 1), item->text());
         if (item->text() != item->data(Qt::UserRole).toString() && !item->text().isEmpty()) {
             layouts.writeEntry(item->text(), layouts.readEntry(item->data(Qt::UserRole).toString()));
             layouts.deleteEntry(item->data(Qt::UserRole).toString());
@@ -275,8 +291,3 @@ void LayoutManagement::slotManageLayouts()
     config->reparseConfiguration();
     initializeLayouts();
 }
-
-void LayoutManagement::slotOnGUISetupDone()
-{
-    initializeLayouts();
-}

src/layoutmanagement.h

@@ -31,12 +31,12 @@ private slots:
     void slotLoadLayout(QAction *action);
     /** @brief Manage layout. */
     void slotManageLayouts();
-    void slotOnGUISetupDone();
 
 private:
     /** @brief Populates the "load layout" menu. */
     void initializeLayouts();
     KSelectAction *m_loadLayout;
+    QList <QAction *> m_layoutActions;
 };
 
 #endif

src/mainwindow.cpp

@@ -257,6 +257,7 @@ void MainWindow::init()
     fr->setLineWidth(1);
     ctnLay->addWidget(fr);
     setupActions();
+    new LayoutManagement(this);
 
     QDockWidget *libraryDock = addDock(i18n("Library"), QStringLiteral("library"), pCore->library());
 
@@ -451,7 +452,6 @@ void MainWindow::init()
 
     auto *scmanager = new ScopeManager(this);
 
-    new LayoutManagement(this);
     new HideTitleBars(this);
     new DockAreaOrientationManager(this);
     m_extraFactory = new KXMLGUIClient(this);