diff --git a/main.cpp b/main.cpp index 88f0a1488..3c8aaf3d9 100644 --- a/main.cpp +++ b/main.cpp @@ -14,10 +14,10 @@ int main(int argc, char *argv[]) { appName += GITHASH; #endif appName += ")"; - + bool launch_fullscreen = false; QString load_proj; - + if (argc > 1) { for (int i=1;iupdate(); } -MainWindow::MainWindow(QWidget *parent) : - QMainWindow(parent) +MainWindow::MainWindow(QWidget *parent, const QString &an) : + QMainWindow(parent), + appName(an) { enable_launch_with_project = false; @@ -245,10 +246,10 @@ void MainWindow::make_new_menu(QMenu *parent) { void MainWindow::make_inout_menu(QMenu *parent) { parent->addAction("Set In Point", this, SLOT(set_in_point()), QKeySequence("I")); parent->addAction("Set Out Point", this, SLOT(set_out_point()), QKeySequence("O")); - parent->addAction("Enable/Disable In/Out Point", this, SLOT(enable_inout())); - parent->addSeparator(); - parent->addAction("Reset In Point", this, SLOT(clear_in())); - parent->addAction("Reset Out Point", this, SLOT(clear_out())); + parent->addAction("Enable/Disable In/Out Point", this, SLOT(enable_inout())); + parent->addSeparator(); + parent->addAction("Reset In Point", this, SLOT(clear_in())); + parent->addAction("Reset Out Point", this, SLOT(clear_out())); parent->addAction("Clear In/Out Point", this, SLOT(clear_inout()), QKeySequence("G")); } @@ -1217,19 +1218,19 @@ void MainWindow::set_out_point() { } void MainWindow::clear_in() { - if (panel_timeline->focused() || panel_sequence_viewer->is_focused()) { - panel_sequence_viewer->clear_in(); - } else if (panel_footage_viewer->is_focused()) { - panel_footage_viewer->clear_in(); - } + if (panel_timeline->focused() || panel_sequence_viewer->is_focused()) { + panel_sequence_viewer->clear_in(); + } else if (panel_footage_viewer->is_focused()) { + panel_footage_viewer->clear_in(); + } } void MainWindow::clear_out() { - if (panel_timeline->focused() || panel_sequence_viewer->is_focused()) { - panel_sequence_viewer->clear_out(); - } else if (panel_footage_viewer->is_focused()) { - panel_footage_viewer->clear_out(); - } + if (panel_timeline->focused() || panel_sequence_viewer->is_focused()) { + panel_sequence_viewer->clear_out(); + } else if (panel_footage_viewer->is_focused()) { + panel_footage_viewer->clear_out(); + } } void MainWindow::clear_inout() { @@ -1259,15 +1260,15 @@ void MainWindow::ripple_delete_inout() { if (panel_timeline->focused()) { panel_timeline->delete_in_out(true); - } + } } void MainWindow::enable_inout() { - if (panel_timeline->focused() || panel_sequence_viewer->is_focused()) { - panel_sequence_viewer->toggle_enable_inout(); - } else if (panel_footage_viewer->is_focused()) { - panel_footage_viewer->toggle_enable_inout(); - } + if (panel_timeline->focused() || panel_sequence_viewer->is_focused()) { + panel_sequence_viewer->toggle_enable_inout(); + } else if (panel_footage_viewer->is_focused()) { + panel_footage_viewer->toggle_enable_inout(); + } } void MainWindow::set_tsa_default() { diff --git a/mainwindow.h b/mainwindow.h index ef8d2930a..7b1cd31b3 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -11,7 +11,7 @@ class Timeline; class MainWindow : public QMainWindow { Q_OBJECT public: - explicit MainWindow(QWidget *parent = 0); + explicit MainWindow(QWidget *parent, const QString& an); void updateTitle(const QString &url); ~MainWindow(); @@ -23,8 +23,6 @@ public: void load_shortcuts(const QString &fn, bool first = false); void save_shortcuts(const QString &fn); - QString appName; - public slots: void undo(); void redo(); @@ -98,12 +96,12 @@ private slots: void set_in_point(); void set_out_point(); - void clear_in(); - void clear_out(); + void clear_in(); + void clear_out(); void clear_inout(); void delete_inout(); void ripple_delete_inout(); - void enable_inout(); + void enable_inout(); // title safe area functions void set_tsa_disable(); @@ -193,6 +191,8 @@ private: void set_button_action_checked(QAction* a); bool enable_launch_with_project; + + QString appName; }; extern MainWindow* mainWindow;