oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

overrode menus

Browse Source
This commit is contained in:
itsmattkc
2019-03-16 22:27:57 +11:00
parent d5c488867f
commit 791bc0c9b8
24 changed files with 172 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/effectui.cpp
+2 -2
View File
@@ -1,12 +1,12 @@
#include "effectui.h"
#include <QPoint>
#include <QMenu>
#include "timeline/clip.h"
#include "ui/menuhelper.h"
#include "ui/keyframenavigator.h"
#include "ui/clickablelabel.h"
#include "ui/menu.h"
#include "panels/panels.h"
EffectUI::EffectUI(Effect* e) :
@@ -273,7 +273,7 @@ void EffectUI::AttachKeyframeNavigationToRow(EffectRow *row, KeyframeNavigator *
void EffectUI::show_context_menu(const QPoint& pos) {
if (effect_->meta->type == EFFECT_TYPE_EFFECT) {
QMenu menu;
Menu menu;
Clip* c = effect_->parent_clip;
ui/graphview.cpp
+2 -2
View File
@@ -23,7 +23,6 @@
#include <QPainter>
#include <QMouseEvent>
#include <QtMath>
#include <QMenu>
#include <cfloat>
#include "global/config.h"
@@ -37,6 +36,7 @@
#include "effects/effect.h"
#include "timeline/clip.h"
#include "ui/rectangleselect.h"
#include "ui/menu.h"
#include "global/debug.h"
const double kGraphZoomSpeed = 0.05;
@@ -75,7 +75,7 @@ GraphView::GraphView(QWidget* parent) : QWidget(parent) {
}
void GraphView::show_context_menu(const QPoint& pos) {
QMenu menu(this);
Menu menu(this);
QAction* zoom_to_selection = menu.addAction(tr("Zoom to Selection"));
if (selected_keys.size() == 0 || row == nullptr) {
ui/keyframeview.cpp
+2 -2
View File
@@ -22,7 +22,6 @@
#include <QMouseEvent>
#include <QtMath>
#include <QMenu>
#include "effects/effect.h"
#include "ui/collapsiblewidget.h"
@@ -42,6 +41,7 @@
#include "ui/rectangleselect.h"
#include "effects/keyframe.h"
#include "ui/graphview.h"
#include "ui/menu.h"
KeyframeView::KeyframeView(QWidget *parent) :
QWidget(parent),
@@ -69,7 +69,7 @@ void KeyframeView::SetEffects(const QVector<EffectUI *> &open_effects)
void KeyframeView::show_context_menu(const QPoint& pos) {
if (selected_fields.size() > 0) {
QMenu menu(this);
Menu menu(this);
QAction* linear = menu.addAction(tr("Linear"));
linear->setData(EFFECT_KEYFRAME_LINEAR);
ui/labelslider.cpp
+7 -6
View File
@@ -20,17 +20,18 @@
#include "labelslider.h"
#include <QMouseEvent>
#include <QInputDialog>
#include <QApplication>
#include <QMenu>
#include "undo/undo.h"
#include "panels/viewer.h"
#include "global/config.h"
#include "global/math.h"
#include "global/debug.h"
#include "ui/styling.h"
#include <QMouseEvent>
#include <QInputDialog>
#include <QApplication>
#include <QMenu>
#include "ui/menu.h"
LabelSlider::LabelSlider(QWidget* parent) : QLabel(parent) {
// set a default frame rate - fallback, shouldn't ever really be used
@@ -265,7 +266,7 @@ void LabelSlider::SetActiveCursor() {
void LabelSlider::ShowContextMenu(const QPoint &pos)
{
QMenu menu(this);
Menu menu(this);
menu.addAction(tr("&Edit"), this, SLOT(ShowDialog()));
ui/mainwindow.cpp
+3 -5
View File
@@ -438,11 +438,9 @@ void MainWindow::editMenu_About_To_Be_Shown() {
void MainWindow::setup_menus() {
QMenuBar* menuBar = new QMenuBar(this);
/*
menuBar->setStyle(QStyleFactory::create("windowsvista"));
menuBar->setPalette(menuBar->style()->standardPalette());
menuBar->setStyleSheet("");
*/
if (olive::CurrentConfig.use_native_menu_styling) {
OliveGlobal::SetNativeStyling(menuBar);
}
setMenuBar(menuBar);
ui/menu.cpp
+20
View File
@@ -0,0 +1,20 @@
#include "menu.h"
#include "global/global.h"
#include "global/config.h"
Menu::Menu(QWidget *parent) :
QMenu(parent)
{
if (olive::CurrentConfig.use_native_menu_styling) {
OliveGlobal::SetNativeStyling(this);
}
}
Menu::Menu(const QString &title, QWidget *parent) :
QMenu(title, parent)
{
if (olive::CurrentConfig.use_native_menu_styling) {
OliveGlobal::SetNativeStyling(this);
}
}
ui/menu.h
+13
View File
@@ -0,0 +1,13 @@
#ifndef MENU_H
#define MENU_H
#include <QMenu>
class Menu : public QMenu
{
public:
Menu(QWidget* parent = nullptr);
Menu(const QString &title, QWidget *parent = nullptr);
};
#endif // MENU_H
ui/menuhelper.cpp
+4 -4
View File
@@ -271,10 +271,10 @@ void MenuHelper::create_effect_paste_action(QMenu *menu)
paste_action->setEnabled(clipboard.size() > 0 && clipboard_type == CLIPBOARD_TYPE_EFFECT);
}
QMenu* MenuHelper::create_submenu(QMenuBar* parent,
Menu* MenuHelper::create_submenu(QMenuBar* parent,
const QObject *receiver,
const char *member) {
QMenu* menu = new QMenu(parent);
Menu* menu = new Menu(parent);
/*
menu->setStyle(QStyleFactory::create("windowsvista"));
@@ -291,8 +291,8 @@ QMenu* MenuHelper::create_submenu(QMenuBar* parent,
return menu;
}
QMenu* MenuHelper::create_submenu(QMenu* parent) {
QMenu* menu = new QMenu(parent);
Menu* MenuHelper::create_submenu(QMenu* parent) {
Menu* menu = new Menu(parent);
/*
menu->setStyle(QStyleFactory::create("windowsvista"));
ui/menuhelper.h
+4 -3
View File
@@ -22,9 +22,10 @@
#define MENUHELPER_H
#include <QObject>
#include <QMenu>
#include <QMenuBar>
#include "ui/menu.h"
class MenuHelper : public QObject {
Q_OBJECT
public:
@@ -126,10 +127,10 @@ public:
void Retranslate();
static QMenu* create_submenu(QMenuBar* parent,
static Menu *create_submenu(QMenuBar* parent,
const QObject *receiver = nullptr,
const char *member = nullptr);
static QMenu* create_submenu(QMenu* parent);
static Menu* create_submenu(QMenu* parent);
static QAction* create_menu_action(QWidget *parent,
const char* id,
const QObject *receiver = nullptr,
ui/texteditex.cpp
+2 -2
View File
@@ -21,9 +21,9 @@
#include "texteditex.h"
#include <QDebug>
#include <QMenu>
#include "dialogs/texteditdialog.h"
#include "ui/menu.h"
#include "mainwindow.h"
TextEditEx::TextEditEx(QWidget *parent, bool enable_rich_text) :
@@ -37,7 +37,7 @@ TextEditEx::TextEditEx(QWidget *parent, bool enable_rich_text) :
}
void TextEditEx::text_edit_menu() {
QMenu menu;
Menu menu;
menu.addAction(tr("&Edit Text"), this, SLOT(open_text_edit()));
ui/timelineheader.cpp
+2 -2
View File
@@ -24,7 +24,6 @@
#include <QMouseEvent>
#include <QScrollBar>
#include <QtMath>
#include <QMenu>
#include <QAction>
#include "mainwindow.h"
@@ -36,6 +35,7 @@
#include "panels/viewer.h"
#include "global/config.h"
#include "global/global.h"
#include "ui/menu.h"
#include "ui/menuhelper.h"
#include "global/debug.h"
#include "undo/undostack.h"
@@ -457,7 +457,7 @@ void TimelineHeader::paintEvent(QPaintEvent*) {
}
void TimelineHeader::show_context_menu(const QPoint &pos) {
QMenu menu(this);
Menu menu(this);
// Add items for setting the in/out points of a QMenu
olive::MenuHelper.make_inout_menu(&menu);
ui/timelinewidget.cpp
+2 -2
View File
@@ -26,7 +26,6 @@
#include <QObject>
#include <QVariant>
#include <QPoint>
#include <QMenu>
#include <QMessageBox>
#include <QtMath>
#include <QScrollBar>
@@ -52,6 +51,7 @@
#include "rendering/renderfunctions.h"
#include "ui/cursors.h"
#include "ui/menuhelper.h"
#include "ui/menu.h"
#include "ui/focusfilter.h"
#include "dialogs/clippropertiesdialog.h"
#include "global/debug.h"
@@ -86,7 +86,7 @@ void TimelineWidget::show_context_menu(const QPoint& pos) {
panel_timeline->rect_select_init = false;
panel_timeline->rect_select_proc = false;
QMenu menu(this);
Menu menu(this);
QAction* undoAction = menu.addAction(tr("&Undo"));
QAction* redoAction = menu.addAction(tr("&Redo"));
ui/viewerwidget.cpp
+5 -4
View File
@@ -32,7 +32,6 @@ extern "C" {
#include <QMouseEvent>
#include <QMimeData>
#include <QDrag>
#include <QMenu>
#include <QOffscreenSurface>
#include <QFileDialog>
#include <QPolygon>
@@ -58,6 +57,7 @@ extern "C" {
#include "rendering/renderfunctions.h"
#include "rendering/renderthread.h"
#include "ui/viewerwindow.h"
#include "ui/menu.h"
#include "mainwindow.h"
ViewerWidget::ViewerWidget(QWidget *parent) :
@@ -112,12 +112,13 @@ void ViewerWidget::set_fullscreen(int screen) {
}
void ViewerWidget::show_context_menu() {
QMenu menu(this);
Menu menu(this);
QAction* save_frame_as_image = menu.addAction(tr("Save Frame as Image..."));
connect(save_frame_as_image, SIGNAL(triggered(bool)), this, SLOT(save_frame()));
QMenu* fullscreen_menu = menu.addMenu(tr("Show Fullscreen"));
Menu* fullscreen_menu = new Menu(tr("Show Fullscreen"));
menu.addMenu(fullscreen_menu);
QList<QScreen*> screens = QGuiApplication::screens();
if (window->isVisible()) {
fullscreen_menu->addAction(tr("Disable"));
@@ -131,7 +132,7 @@ void ViewerWidget::show_context_menu() {
}
connect(fullscreen_menu, SIGNAL(triggered(QAction*)), this, SLOT(fullscreen_menu_action(QAction*)));
QMenu zoom_menu(tr("Zoom"));
Menu zoom_menu(tr("Zoom"));
QAction* fit_zoom = zoom_menu.addAction(tr("Fit"));
connect(fit_zoom, SIGNAL(triggered(bool)), this, SLOT(set_fit_zoom()));
zoom_menu.addAction("10%")->setData(0.1);