added #69 (nice)
This commit is contained in:
@@ -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->setMargin(0);
|
||||
title_bar = new CollapsibleWidgetHeader();
|
||||
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->addWidget(enabled_check);
|
||||
title_bar->addWidget(header);
|
||||
title_bar->addStretch();
|
||||
layout->addLayout(title_bar);
|
||||
title_bar_layout->addWidget(collapse_button);
|
||||
title_bar_layout->addWidget(enabled_check);
|
||||
title_bar_layout->addWidget(header);
|
||||
title_bar_layout->addStretch();
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
||||
+20
-1
@@ -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
|
||||
|
||||
+13
-8
@@ -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) {
|
||||
internal_value = min_value;
|
||||
} else if (max_enabled && v > max_value) {
|
||||
internal_value = max_value;
|
||||
} else {
|
||||
internal_value = v;
|
||||
if (v != internal_value) {
|
||||
if (min_enabled && v < min_value) {
|
||||
internal_value = min_value;
|
||||
} else if (max_enabled && v > max_value) {
|
||||
internal_value = max_value;
|
||||
} 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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user