overrode menus

panels/effectcontrols.cpp

@@ -20,7 +20,6 @@
 
 #include "effectcontrols.h"
 
-#include <QMenu>
 #include <QVBoxLayout>
 #include <QResizeEvent>
 #include <QScrollBar>
@@ -52,6 +51,7 @@
 #include "ui/keyframeview.h"
 #include "ui/resizablescrollbar.h"
 #include "global/debug.h"
+#include "ui/menu.h"
 
 EffectControls::EffectControls(QWidget *parent) :
   Panel(parent),
@@ -198,7 +198,7 @@ void EffectControls::show_effect_menu(int type, int subtype) {
 
   effects_loaded.lock();
 
-  QMenu effects_menu(this);
+  Menu effects_menu(this);
   effects_menu.setToolTipsVisible(true);
 
   for (int i=0;i<effects.size();i++) {
@@ -226,7 +226,7 @@ void EffectControls::show_effect_menu(int type, int subtype) {
           }
         }
         if (!found) {
-          parent = new QMenu(&effects_menu);
+          parent = new Menu(&effects_menu);
           parent->setToolTipsVisible(true);
           parent->setTitle(em.category);
 
@@ -536,7 +536,7 @@ void EffectControls::queue_post_update() {
 }
 
 void EffectControls::effects_area_context_menu() {
-  QMenu menu(this);
+  Menu menu(this);
 
   olive::MenuHelper.create_effect_paste_action(&menu);
 

panels/project.cpp

@@ -20,6 +20,26 @@
 
 #include "project.h"
 
+extern "C" {
+#include <libavformat/avformat.h>
+#include <libavcodec/avcodec.h>
+}
+
+#include <QApplication>
+#include <QFileDialog>
+#include <QString>
+#include <QVariant>
+#include <QCharRef>
+#include <QMessageBox>
+#include <QDropEvent>
+#include <QMimeData>
+#include <QPushButton>
+#include <QInputDialog>
+#include <QXmlStreamReader>
+#include <QXmlStreamWriter>
+#include <QSizePolicy>
+#include <QVBoxLayout>
+
 #include "global/global.h"
 #include "panels.h"
 #include "rendering/renderfunctions.h"
@@ -43,27 +63,7 @@
 #include "project/sourcescommon.h"
 #include "project/projectfilter.h"
 #include "global/debug.h"
-
-#include <QApplication>
-#include <QFileDialog>
-#include <QString>
-#include <QVariant>
-#include <QCharRef>
-#include <QMessageBox>
-#include <QDropEvent>
-#include <QMimeData>
-#include <QPushButton>
-#include <QInputDialog>
-#include <QXmlStreamReader>
-#include <QXmlStreamWriter>
-#include <QSizePolicy>
-#include <QVBoxLayout>
-#include <QMenu>
-
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-}
+#include "ui/menu.h"
 
 // TODO make these configurable
 const int kDefaultSequenceWidth = 1920;
@@ -1374,7 +1374,7 @@ void Project::go_up_dir() {
 }
 
 void Project::make_new_menu() {
-  QMenu new_menu(this);
+  Menu new_menu(this);
   olive::MenuHelper.make_new_menu(&new_menu);
   new_menu.exec(QCursor::pos());
 }

panels/timeline.cpp

@@ -20,6 +20,20 @@
 
 #include "timeline.h"
 
+#include <QTime>
+#include <QScrollBar>
+#include <QtMath>
+#include <QGuiApplication>
+#include <QScreen>
+#include <QPainter>
+#include <QInputDialog>
+#include <QMessageBox>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QSplitter>
+#include <QStatusBar>
+
 #include "global/global.h"
 #include "panels/panels.h"
 #include "project/projectelements.h"
@@ -39,21 +53,7 @@
 #include "ui/mainwindow.h"
 #include "undo/undostack.h"
 #include "global/debug.h"
-
-#include <QTime>
-#include <QScrollBar>
-#include <QtMath>
-#include <QGuiApplication>
-#include <QScreen>
-#include <QPainter>
-#include <QMenu>
-#include <QInputDialog>
-#include <QMessageBox>
-#include <QCheckBox>
-#include <QPushButton>
-#include <QHBoxLayout>
-#include <QSplitter>
-#include <QStatusBar>
+#include "ui/menu.h"
 
 int olive::timeline::kTrackDefaultHeight = 40;
 int olive::timeline::kTrackMinHeight = 30;
@@ -1730,7 +1730,7 @@ int Timeline::getTimelineScreenPointFromFrame(long frame) {
 }
 
 void Timeline::add_btn_click() {
-  QMenu add_menu(this);
+  Menu add_menu(this);
 
   QAction* titleMenuItem = new QAction(&add_menu);
   titleMenuItem->setText(tr("Title..."));
@@ -1793,7 +1793,7 @@ void Timeline::record_btn_click() {
 void Timeline::transition_tool_click() {
   creating = false;
 
-  QMenu transition_menu(this);
+  Menu transition_menu(this);
 
   for (int i=0;i<effects.size();i++) {
     const EffectMeta& em = effects.at(i);