From f32f012298f01f0f3e874cd964cd80eeeb91b418 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 26 Dec 2018 19:12:34 +1100 Subject: [PATCH] added icons to effect controls --- icons/diamond.png | Bin 0 -> 1269 bytes icons/icons.qrc | 5 +++++ icons/tri-down.png | Bin 0 -> 1180 bytes icons/tri-left.png | Bin 0 -> 1200 bytes icons/tri-right.png | Bin 0 -> 1173 bytes icons/tri-up.png | Bin 0 -> 1120 bytes project/effectrow.cpp | 20 +++++++++++++------- ui/collapsiblewidget.cpp | 15 ++++++++++----- ui/collapsiblewidget.h | 1 + 9 files changed, 29 insertions(+), 12 deletions(-) create mode 100644 icons/diamond.png create mode 100644 icons/tri-down.png create mode 100644 icons/tri-left.png create mode 100644 icons/tri-right.png create mode 100644 icons/tri-up.png diff --git a/icons/diamond.png b/icons/diamond.png new file mode 100644 index 0000000000000000000000000000000000000000..aa3e74a835235601445f508f404c5d0d08af06db GIT binary patch literal 1269 zcmVU8P*7-ZbZ>KLZ*U+lnSp_Ufq@}0xwybFAi#%#fq@|}KQEO56)-X|e7nZL z$iTqBa9P*U#mSX{G{Bl%P*lRez;J+pfx##xwK$o9f#C}S14DXwNkIt%17i#W1A|CX zc0maP17iUL1A|C*NRTrF17iyV0~1e4YDEbH0|SF|enDkXW_m`6f}y3QrGjHhep0GJ zaAk2xYHqQDXI^rCQ9*uDVo7QW0|Nup4h9AW240u^5(W3f%sd4n162kpgNVo|1qcff zJ_s=cNG>fZg9jx8g8+j9g8_pBLjXe}Lp{R+hNBE`7{wV~7)u#fFy3PlV+vxLz;uCG zm^qSpA@ds+OO_6nTdaDlt*rOhEZL^9ePa)2-_4=K(Z%tFGm-NGmm}8}ZcXk5JW@PU zd4+f<@d@)yL(o<5icqT158+-B6_LH7;i6x}CW#w~Uy-Pgl#@Irl`kzV zeL|*8R$ca%T%Wv){2zs_iiJvgN^h0dsuZZ2sQy$tsNSU!s;Q*;LF<6_B%M@UD?LHI zSNcZ`78uqV#TeU~$eS{ozBIdFzSClfs*^S+dw;4dus<{M;#|MXC)T}S9v!D zcV!QCPhBq)ZyO(X-(bH4|NMaZz==UigLj2o41F2S6d@OB6%`R(5i>J(Puzn9wnW{e zu;hl6HK{k#IWjCVGqdJqU(99Cv(K+6*i`tgSi2;vbXD1#3jNBGs$DgVwO(~o>mN4i zHPtkqZIx>)Y(Ls5-Br|mx>vQYvH$Kwn@O`L|D75??eGkZnfg$5<;Xeg_o%+-I&+-3%01W^SH2RkDT>t<8AY({UO#lFTB>(_`g8%^e z{{R4h=>PzAFaQARU;qF*m;eA5Z<1fdMgRZ-S4l)cRCwCN*~@OjFbqUdD(Gk16Er_Q z-4sRQT2FE)d+&2smP8er>p891%k>3%-jgH=&o}(MGa-U^CB*QKgeZPFA&w`>Gb5nR zFD1nC3klKubV58onV{gO5;Xiof{Gtb(D8!_N`5Fo%MT=|`EG)q?<8dK&4e7jk&wlc zb|Cz(s}?cV6R93z*%+mIlWzu%G}kFRY?k;T`y zerror.png dirup.png dirup-disabled.png + diamond.png + tri-down.png + tri-left.png + tri-right.png + tri-up.png diff --git a/icons/tri-down.png b/icons/tri-down.png new file mode 100644 index 0000000000000000000000000000000000000000..e2b953eb4df6dcc3be6f5ab4f741b29858ae34fa GIT binary patch literal 1180 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, row, 0); if (parent_effect->meta->type != EFFECT_TYPE_TRANSITION) { - QSize button_size(20, 20); QSize icon_size(12, 12); + QSize button_size(20, 20); key_controls = new QHBoxLayout(); key_controls->setSpacing(0); key_controls->setMargin(0); key_controls->addStretch(); - left_key_nav = new QPushButton("<"); - left_key_nav->setVisible(false); + left_key_nav = new QPushButton(); + left_key_nav->setIcon(QIcon(":/icons/tri-left.png")); left_key_nav->setMaximumSize(button_size); + left_key_nav->setIconSize(icon_size); + left_key_nav->setVisible(false); key_controls->addWidget(left_key_nav); connect(left_key_nav, SIGNAL(clicked(bool)), this, SLOT(goto_previous_key())); - key_addremove = new QPushButton("."); - key_addremove->setVisible(false); + key_addremove = new QPushButton(); + key_addremove->setIcon(QIcon(":/icons/diamond.png")); key_addremove->setMaximumSize(button_size); + key_addremove->setIconSize(QSize(8, 8)); + key_addremove->setVisible(false); key_controls->addWidget(key_addremove); connect(key_addremove, SIGNAL(clicked(bool)), this, SLOT(toggle_key())); - right_key_nav = new QPushButton(">"); - right_key_nav->setVisible(false); + right_key_nav = new QPushButton(); + right_key_nav->setIcon(QIcon(":/icons/tri-right.png")); right_key_nav->setMaximumSize(button_size); + right_key_nav->setIconSize(icon_size); + right_key_nav->setVisible(false); key_controls->addWidget(right_key_nav); connect(right_key_nav, SIGNAL(clicked(bool)), this, SLOT(goto_next_key())); diff --git a/ui/collapsiblewidget.cpp b/ui/collapsiblewidget.cpp index 910cf0ef2..fddebc040 100644 --- a/ui/collapsiblewidget.cpp +++ b/ui/collapsiblewidget.cpp @@ -30,9 +30,9 @@ CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) { enabled_check = new CheckboxEx(); enabled_check->setChecked(true); header = new QLabel(); - collapse_button = new QPushButton("[-]"); - collapse_button->setStyleSheet("QPushButton { border: none; } QPushButton:hover { text-decoration: underline; }"); - collapse_button->setMaximumWidth(25); + collapse_button = new QPushButton(); + collapse_button->setIconSize(QSize(8, 8)); + collapse_button->setStyleSheet("QPushButton { border: none; }"); setText(""); title_bar_layout->addWidget(collapse_button); title_bar_layout->addWidget(enabled_check); @@ -42,6 +42,7 @@ CollapsibleWidget::CollapsibleWidget(QWidget* parent) : QWidget(parent) { connect(title_bar, SIGNAL(select(bool, bool)), this, SLOT(header_click(bool, bool))); + set_button_icon(true); contents = NULL; } @@ -65,7 +66,11 @@ bool CollapsibleWidget::is_focused() { } bool CollapsibleWidget::is_expanded() { - return contents->isVisible(); + return contents->isVisible(); +} + +void CollapsibleWidget::set_button_icon(bool open) { + collapse_button->setIcon(open ? QIcon(":/icons/tri-down.png") : QIcon(":/icons/tri-right.png")); } void CollapsibleWidget::setContents(QWidget* c) { @@ -88,7 +93,7 @@ void CollapsibleWidget::on_enabled_change(bool b) { void CollapsibleWidget::on_visible_change() { contents->setVisible(!contents->isVisible()); - collapse_button->setText(contents->isVisible() ? "[-]" : "[+]"); + set_button_icon(contents->isVisible()); emit visibleChanged(); } diff --git a/ui/collapsiblewidget.h b/ui/collapsiblewidget.h index b944c208a..148080b03 100644 --- a/ui/collapsiblewidget.h +++ b/ui/collapsiblewidget.h @@ -42,6 +42,7 @@ private: QPushButton* collapse_button; QFrame* line; QHBoxLayout* title_bar_layout; + void set_button_icon(bool open); signals: void deselect_others(QWidget*);