add menu to hide/show dock widgets

svn path=/branches/KDE4/; revision=2308

diff --git a/src/kdenliveui.rc b/src/kdenliveui.rc
index b1d660cced819887d8fdb41993552542d01c1f6a..a3d1799abee53a166e6e68febd54f5193f5d94a2 100644 (file)
--- a/src/kdenliveui.rc
+++ b/src/kdenliveui.rc
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
-<gui name="kdenlive" version="20">
+<gui name="kdenlive" version="21">
   <ToolBar name="extraToolBar" >
     <text>Extra Toolbar</text>
        <Action name="project_render" />
@@ -65,8 +65,9 @@
       <Action name="seek_clip_end" />
       <Action name="monitor_seek_snap_forward" />
       <Action name="seek_end" />
-</Menu>
-
+    </Menu>
+    <Menu name="dockwindows" ><text>View</text>
+    </Menu>
     <Menu name="settings" >
       <Action name="manage_profiles" />
     </Menu>

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e48e413e84bf0628be61360787c9c1700ff3f1a6..10f1b4c8ac2f9048ae483be1dc099923428acbc2 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -191,21 +191,21 @@ MainWindow::MainWindow(QWidget *parent)
 
     // build effects menus
     QAction *action;
-    QMenu *videoEffectsMenu = (QMenu*)(factory()->container("video_effects_menu", this));
+    QMenu *videoEffectsMenu = static_cast<QMenu*>(factory()->container("video_effects_menu", this));
     QStringList effects = videoEffects.effectNames();
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
         videoEffectsMenu->addAction(action);
     }
-    QMenu *audioEffectsMenu = (QMenu*)(factory()->container("audio_effects_menu", this));
+    QMenu *audioEffectsMenu = static_cast<QMenu*>(factory()->container("audio_effects_menu", this));
     effects = audioEffects.effectNames();
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
         action->setData(name);
         audioEffectsMenu->addAction(action);
     }
-    QMenu *customEffectsMenu = (QMenu*)(factory()->container("custom_effects_menu", this));
+    QMenu *customEffectsMenu = static_cast<QMenu*>(factory()->container("custom_effects_menu", this));
     effects = customEffects.effectNames();
     foreach(const QString &name, effects) {
         action = new QAction(name, this);
@@ -213,6 +213,10 @@ MainWindow::MainWindow(QWidget *parent)
         customEffectsMenu->addAction(action);
     }
 
+    QMenu *viewMenu = static_cast<QMenu*> (factory()->container("dockwindows", this));
+    const QList<QAction *> viewActions = createPopupMenu()->actions();
+    viewMenu->insertActions(NULL, viewActions);
+
     connect(videoEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddVideoEffect(QAction *)));
     connect(audioEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddAudioEffect(QAction *)));
     connect(customEffectsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddCustomEffect(QAction *)));