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

switched png icons to svgs

Browse Source
This commit is contained in:
itsmattkc
2019-02-27 11:45:47 -08:00
parent d3487086c7
commit d9e95d3350
84 changed files with 168 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/collapsiblewidget.cpp
+6 -4
View File
@@ -59,6 +59,9 @@ CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) {
title_bar_layout->addStretch();
layout->addWidget(title_bar);
tri_down_ = QIcon(":/icons/tri-down.svg");
tri_right_ = QIcon(":/icons/tri-right.svg");
connect(title_bar, SIGNAL(select(bool, bool)), this, SLOT(header_click(bool, bool)));
set_button_icon(true);
@@ -89,7 +92,7 @@ bool CollapsibleWidget::is_expanded() {
}
void CollapsibleWidget::set_button_icon(bool open) {
collapse_button->setIcon(open ? QIcon(":/icons/tri-down.png") : QIcon(":/icons/tri-right.png"));
collapse_button->setIcon(open ? tri_down_ : tri_right_);
}
void CollapsibleWidget::setContents(QWidget* c) {
@@ -135,8 +138,7 @@ void CollapsibleWidgetHeader::mousePressEvent(QMouseEvent* event) {
void CollapsibleWidgetHeader::paintEvent(QPaintEvent *event) {
QWidget::paintEvent(event);
QPainter p(this);
p.setPen(Qt::white);
int line_x = width() * 0.01;
p.setPen(Qt::white);
int line_y = height() - 1;
p.drawLine(line_x, line_y, width() - line_x - line_x, line_y);
p.drawLine(0, line_y, width(), line_y);
}
ui/collapsiblewidget.h
+39 -34
View File
@@ -22,58 +22,63 @@
#define COLLAPSIBLEWIDGET_H
#include <QWidget>
class QLabel;
class QCheckBox;
class QHBoxLayout;
class QVBoxLayout;
class QPushButton;
class QFrame;
class CheckboxEx;
#include <QLabel>
#include <QCheckBox>
#include <QHBoxLayout>
#include <QVBoxLayout>
#include <QPushButton>
#include <QFrame>
#include <QIcon>
#include "ui/checkboxex.h"
class CollapsibleWidgetHeader : public QWidget {
Q_OBJECT
Q_OBJECT
public:
CollapsibleWidgetHeader(QWidget* parent = 0);
bool selected;
CollapsibleWidgetHeader(QWidget* parent = 0);
bool selected;
protected:
void mousePressEvent(QMouseEvent* event);
void paintEvent(QPaintEvent *event);
void mousePressEvent(QMouseEvent* event);
void paintEvent(QPaintEvent *event);
signals:
void select(bool, bool);
void select(bool, bool);
};
class CollapsibleWidget : public QWidget
{
Q_OBJECT
Q_OBJECT
public:
CollapsibleWidget(QWidget* parent = 0);
void setContents(QWidget* c);
void setText(const QString &);
bool is_focused();
bool is_expanded();
CollapsibleWidget(QWidget* parent = 0);
void setContents(QWidget* c);
void setText(const QString &);
bool is_focused();
bool is_expanded();
CheckboxEx* enabled_check;
bool selected;
QWidget* contents;
CollapsibleWidgetHeader* title_bar;
CheckboxEx* enabled_check;
bool selected;
QWidget* contents;
CollapsibleWidgetHeader* title_bar;
private:
QLabel* header;
QVBoxLayout* layout;
QPushButton* collapse_button;
QFrame* line;
QHBoxLayout* title_bar_layout;
void set_button_icon(bool open);
QLabel* header;
QVBoxLayout* layout;
QPushButton* collapse_button;
QFrame* line;
QHBoxLayout* title_bar_layout;
void set_button_icon(bool open);
QIcon tri_right_;
QIcon tri_down_;
signals:
void deselect_others(QWidget*);
void visibleChanged();
void deselect_others(QWidget*);
void visibleChanged();
private slots:
void on_enabled_change(bool b);
void on_visible_change();
void on_enabled_change(bool b);
void on_visible_change();
public slots:
void header_click(bool s, bool deselect);
void header_click(bool s, bool deselect);
};
#endif // COLLAPSIBLEWIDGET_H
ui/keyframenavigator.cpp
+4 -4
View File
@@ -35,7 +35,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget
}
left_key_nav = new QPushButton(this);
left_key_nav->setIcon(QIcon(":/icons/tri-left.png"));
left_key_nav->setIcon(QIcon(":/icons/tri-left.svg"));
left_key_nav->setIconSize(left_key_nav->iconSize()*0.5);
left_key_nav->setVisible(false);
key_controls->addWidget(left_key_nav);
@@ -43,7 +43,7 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget
connect(left_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked()));
key_addremove = new QPushButton(this);
key_addremove->setIcon(QIcon(":/icons/diamond.png"));
key_addremove->setIcon(QIcon(":/icons/diamond.svg"));
key_addremove->setIconSize(key_addremove->iconSize()*0.5);
key_addremove->setVisible(false);
key_controls->addWidget(key_addremove);
@@ -51,14 +51,14 @@ KeyframeNavigator::KeyframeNavigator(QWidget *parent, bool addLeftPad) : QWidget
connect(key_addremove, SIGNAL(clicked(bool)), this, SIGNAL(clicked()));
right_key_nav = new QPushButton(this);
right_key_nav->setIcon(QIcon(":/icons/tri-right.png"));
right_key_nav->setIcon(QIcon(":/icons/tri-right.svg"));
right_key_nav->setIconSize(right_key_nav->iconSize()*0.5);
right_key_nav->setVisible(false);
key_controls->addWidget(right_key_nav);
connect(right_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(goto_next_key()));
connect(right_key_nav, SIGNAL(clicked(bool)), this, SIGNAL(clicked()));
keyframe_enable = new QPushButton(QIcon(":/icons/clock.png"), "", this);
keyframe_enable = new QPushButton(QIcon(":/icons/clock.svg"), "", this);
keyframe_enable->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
keyframe_enable->setIconSize(keyframe_enable->iconSize()*0.75);
keyframe_enable->setCheckable(true);
ui/mediaiconservice.cpp
+4 -4
View File
@@ -54,13 +54,13 @@ void MediaIconService::SetMediaIcon(Media *media, int icon_type) {
switch (icon_type) {
case ICON_TYPE_VIDEO:
olive::project_model.set_icon(media, QIcon(":/icons/videosource.png"));
olive::project_model.set_icon(media, QIcon(":/icons/videosource.svg"));
break;
case ICON_TYPE_AUDIO:
olive::project_model.set_icon(media, QIcon(":/icons/audiosource.png"));
olive::project_model.set_icon(media, QIcon(":/icons/audiosource.svg"));
break;
case ICON_TYPE_IMAGE:
olive::project_model.set_icon(media, QIcon(":/icons/imagesource.png"));
olive::project_model.set_icon(media, QIcon(":/icons/imagesource.svg"));
break;
case ICON_TYPE_LOADING:
throbber_items_.append(media);
@@ -75,7 +75,7 @@ void MediaIconService::SetMediaIcon(Media *media, int icon_type) {
}
break;
case ICON_TYPE_ERROR:
olive::project_model.set_icon(media, QIcon(":/icons/error.png"));
olive::project_model.set_icon(media, QIcon(":/icons/error.svg"));
break;
}