added #69 (nice)

mainwindow.cpp

@@ -141,7 +141,9 @@ void MainWindow::on_actionDelete_triggered()
 {
 	if (panel_timeline->focused()) {
 		panel_timeline->delete_selection(false);
-	}
+    } else if (panel_effect_controls->is_focused()) {
+        panel_effect_controls->delete_clips();
+    }
 }
 
 void MainWindow::on_actionSelect_All_triggered()

olive.pro.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.6.2, 2018-06-24T23:38:38. -->
+<!-- Written by QtCreator 4.6.2, 2018-06-25T09:24:14. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

panels/effectcontrols.cpp

@@ -67,16 +67,39 @@ void EffectControls::clear_effects() {
     QVBoxLayout* video_layout = static_cast<QVBoxLayout*>(ui->video_effect_area->layout());
     QVBoxLayout* audio_layout = static_cast<QVBoxLayout*>(ui->audio_effect_area->layout());
     QLayoutItem* item;
-    while ((item = video_layout->takeAt(0))) {item->widget()->setParent(NULL);}
+    while ((item = video_layout->takeAt(0))) {
-    while ((item = audio_layout->takeAt(0))) {item->widget()->setParent(NULL);}
+        item->widget()->setParent(NULL);
+        disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
+    }
+    while ((item = audio_layout->takeAt(0))) {
+        item->widget()->setParent(NULL);
+        disconnect(static_cast<CollapsibleWidget*>(item->widget()), SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
+    }
     ui->vcontainer->setVisible(false);
     ui->acontainer->setVisible(false);
 }
 
+void EffectControls::deselect_all_effects(QWidget* sender) {
+    QVector<Effect*> delete_effects;
+    for (int i=0;i<selected_clips.size();i++) {
+        Clip* c = selected_clips.at(i);
+        for (int j=0;j<c->effects.size();j++) {
+            if (c->effects.at(j)->container != sender) {
+                c->effects.at(j)->container->header_click(false, false);
+            }
+        }
+    }
+}
+
 void EffectControls::load_effects() {
     // load in new clips
     for (int i=0;i<selected_clips.size();i++) {
         Clip* c = selected_clips.at(i);
+        if (c->track < 0) {
+            ui->vcontainer->setVisible(true);
+        } else {
+            ui->acontainer->setVisible(true);
+        }
         for (int j=0;j<c->effects.size();j++) {
             CollapsibleWidget* container = c->effects.at(j)->container;
             if (c->track < 0) {
@@ -86,12 +109,34 @@ void EffectControls::load_effects() {
                 static_cast<QVBoxLayout*>(ui->audio_effect_area->layout())->addWidget(container);
                 ui->acontainer->setVisible(true);
             }
+            connect(container, SIGNAL(deselect_others(QWidget*)), this, SLOT(deselect_all_effects(QWidget*)));
+        }
+    }
+}
+
+void EffectControls::delete_clips() {
+    // load in new clips
+    QVector<Effect*> delete_effects;
+    for (int i=0;i<selected_clips.size();i++) {
+        Clip* c = selected_clips.at(i);
+        for (int j=0;j<c->effects.size();j++) {
+            Effect* effect = c->effects.at(j);
+            if (effect->container->selected) {
+                c->effects.removeAt(j);
+                delete_effects.append(effect);
+            }
+        }
+    }
+    if (delete_effects.size() > 0) {
+        reload_clips();
+        for (int i=0;i<delete_effects.size();i++) {
+            delete delete_effects.at(i);
         }
     }
 }
 
 void EffectControls::reload_clips() {
-    // clear_effects();
+    clear_effects();
     load_effects();
 }
 
@@ -113,3 +158,16 @@ void EffectControls::on_add_audio_effect_button_clicked()
 {
     show_menu(false);
 }
+
+bool EffectControls::is_focused() {
+    if (this->hasFocus()) return true;
+    for (int i=0;i<selected_clips.size();i++) {
+        Clip* c = selected_clips.at(i);
+        for (int j=0;j<c->effects.size();j++) {
+            if (c->effects.at(j)->container->is_focused()) {
+                return true;
+            }
+        }
+    }
+    return false;
+}

panels/effectcontrols.h

@@ -20,6 +20,8 @@ public:
 	// void set_clip(Clip* c);
 	void set_clips(QVector<Clip*>& clips);
 	void clear_effects();
+    void delete_clips();
+    bool is_focused();
 
 private slots:
     void menu_select(QAction* q);
@@ -28,6 +30,8 @@ private slots:
 
     void on_add_audio_effect_button_clicked();
 
+    void deselect_all_effects(QWidget*);
+
 private:
     Ui::EffectControls *ui;
     QVector<Clip*> selected_clips;

panels/timeline.cpp

@@ -66,19 +66,18 @@ void Timeline::next_frame() {
 }
 
 void Timeline::previous_cut() {
-    bool seek_enabled = false;
+    if (playhead > 0) {
-    long p_cut = 0;
+        long p_cut = 0;
-    for (int i=0;i<sequence->clip_count();i++) {
+        for (int i=0;i<sequence->clip_count();i++) {
-        Clip* c = sequence->get_clip(i);
+            Clip* c = sequence->get_clip(i);
-        if (c->timeline_out > p_cut && c->timeline_out < playhead) {
+            if (c->timeline_out > p_cut && c->timeline_out < playhead) {
-            p_cut = c->timeline_out;
+                p_cut = c->timeline_out;
-            seek_enabled = true;
+            } else if (c->timeline_in > p_cut && c->timeline_in < playhead) {
-        } else if (c->timeline_in > p_cut && c->timeline_in < playhead) {
+                p_cut = c->timeline_in;
-            p_cut = c->timeline_in;
+            }
-            seek_enabled = true;
         }
+        seek(p_cut);
     }
-    if (seek_enabled) seek(p_cut);
 }
 
 void Timeline::next_cut() {

ui/collapsiblewidget.cpp

@@ -7,25 +7,34 @@
 #include <QHBoxLayout>
 #include <QVBoxLayout>
 #include <QPushButton>
+#include <QMouseEvent>
+#include <QWidget>
+
+CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) {
+    selected = false;
 
-CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent)
-{
 	layout = new QVBoxLayout(this);
 	layout->setMargin(0);
 
-	title_bar = new QHBoxLayout();
+    title_bar = new CollapsibleWidgetHeader();
-	title_bar->setMargin(0);
+    title_bar->setFocusPolicy(Qt::ClickFocus);
+    title_bar->setAutoFillBackground(true);
+    QHBoxLayout* title_bar_layout = new QHBoxLayout();
+    title_bar->setLayout(title_bar_layout);
+    title_bar_layout->setMargin(0);
 	enabled_check = new QCheckBox();
 	enabled_check->setChecked(true);
 	header = new QLabel();
 	collapse_button = new QPushButton("-");
 	collapse_button->setMaximumWidth(25);
 	setText("<untitled>");
-	title_bar->addWidget(collapse_button);
+    title_bar_layout->addWidget(collapse_button);
-	title_bar->addWidget(enabled_check);
+    title_bar_layout->addWidget(enabled_check);
-	title_bar->addWidget(header);
+    title_bar_layout->addWidget(header);
-	title_bar->addStretch();
+    title_bar_layout->addStretch();
-	layout->addLayout(title_bar);
+    layout->addWidget(title_bar);
+
+    connect(title_bar, SIGNAL(select(bool, bool)), this, SLOT(header_click(bool, bool)));
 
 	line = new QFrame();
 	line->setFrameShape(QFrame::HLine);
@@ -35,6 +44,24 @@ CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent)
 	contents = NULL;
 }
 
+void CollapsibleWidget::header_click(bool s, bool deselect) {
+    selected = s;
+    title_bar->selected = s;
+    if (s) {
+        QPalette p = palette();
+        p.setColor(QPalette::Background, QColor(255, 255, 255, 64));
+        title_bar->setPalette(p);
+    } else {
+        title_bar->setPalette(palette());
+    }
+    if (deselect) emit deselect_others(this);
+}
+
+bool CollapsibleWidget::is_focused() {
+    if (hasFocus()) return true;
+    return title_bar->hasFocus();
+}
+
 void CollapsibleWidget::setContents(QWidget* c) {
 	bool existing = (contents != NULL);
 	contents = c;
@@ -57,3 +84,19 @@ void CollapsibleWidget::on_visible_change() {
 	contents->setVisible(!contents->isVisible());
 	collapse_button->setText(contents->isVisible() ? "-" : "+");
 }
+
+CollapsibleWidgetHeader::CollapsibleWidgetHeader(QWidget* parent) : QWidget(parent) {
+    selected = false;
+}
+
+void CollapsibleWidgetHeader::mousePressEvent(QMouseEvent* event) {
+    if (selected) {
+        if ((event->modifiers() & Qt::ShiftModifier)) {
+            selected = false;
+            emit select(selected, false);
+        }
+    } else {
+        selected = true;
+        emit select(selected, !(event->modifiers() & Qt::ShiftModifier));
+    }
+}

ui/collapsiblewidget.h

@@ -9,6 +9,17 @@ class QVBoxLayout;
 class QPushButton;
 class QFrame;
 
+class CollapsibleWidgetHeader : public QWidget {
+    Q_OBJECT
+public:
+    CollapsibleWidgetHeader(QWidget* parent = 0);
+    bool selected = false;
+protected:
+    void mousePressEvent(QMouseEvent* event);
+signals:
+    void select(bool, bool);
+};
+
 class CollapsibleWidget : public QWidget
 {
 	Q_OBJECT
@@ -16,19 +27,27 @@ public:
 	CollapsibleWidget(QWidget* parent = 0);
 	void setContents(QWidget* c);
 	void setText(const QString &);
+    bool is_focused();
 
     QCheckBox* enabled_check;
+    bool selected;
 private:
 	QLabel* header;
-	QHBoxLayout* title_bar;
+    CollapsibleWidgetHeader* title_bar;
 	QVBoxLayout* layout;
 	QPushButton* collapse_button;
 	QWidget* contents;
 	QFrame* line;
 
+signals:
+    void deselect_others(QWidget*);
+
 private slots:
 	void on_enabled_change(bool b);
 	void on_visible_change();
+
+public slots:
+    void header_click(bool s, bool deselect);
 };
 
 #endif // COLLAPSIBLEWIDGET_H

ui/labelslider.cpp

@@ -1,6 +1,7 @@
 #include "labelslider.h"
 
 #include <QMouseEvent>
+#include <QInputDialog>
 #include <QApplication>
 
 LabelSlider::LabelSlider(QWidget* parent) : QLabel(parent)
@@ -15,15 +16,17 @@ LabelSlider::LabelSlider(QWidget* parent) : QLabel(parent)
 }
 
 void LabelSlider::set_value(float v) {
-    if (min_enabled && v < min_value) {
+    if (v != internal_value) {
-        internal_value = min_value;
+        if (min_enabled && v < min_value) {
-    } else if (max_enabled && v > max_value) {
+            internal_value = min_value;
-        internal_value = max_value;
+        } else if (max_enabled && v > max_value) {
-    } else {
+            internal_value = max_value;
-        internal_value = v;
+        } else {
+            internal_value = v;
+        }
+        setText(QString::number(v));
+        emit valueChanged();
     }
-    setText(QString::number(v));
-    emit valueChanged();
 }
 
 float LabelSlider::value() {
@@ -70,6 +73,8 @@ void LabelSlider::mouseReleaseEvent(QMouseEvent *ev) {
         drag_start = false;
         if (drag_proc) {
             drag_proc = false;
+        } else {
+            set_value(QInputDialog::getDouble(this, "Set Value", "New value:", internal_value));
         }
     }
 }

ui/viewerwidget.cpp

@@ -10,6 +10,7 @@
 #include "io/media.h"
 
 #include <QDebug>
+#include <QPainter>
 
 extern "C" {
 	#include <libavformat/avformat.h>
@@ -138,6 +139,10 @@ void ViewerWidget::paintGL()
         }
     }
 
+    /*QPainter p(this);
+    p.drawText({0, 0, 200, 200}, "text!");
+    p.end();*/
+
     cc_lock.unlock();
 
     if (texture_failed) {