summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--helper.cpp1
-rw-r--r--mappingtreewidget.cpp30
-rw-r--r--mappingtreewidget.h6
3 files changed, 17 insertions, 20 deletions
diff --git a/helper.cpp b/helper.cpp
index 6440945..48ce15c 100644
--- a/helper.cpp
+++ b/helper.cpp
@@ -460,7 +460,6 @@ namespace Helper {
p->setRenderHint(QPainter::Antialiasing);
p->setRenderHint(QPainter::TextAntialiasing);
p->setRenderHint(QPainter::SmoothPixmapTransform);
- //QFont f("Monospace");
QFont f(qApp->font());
f.setPixelSize(28);
f.setBold(bold);
diff --git a/mappingtreewidget.cpp b/mappingtreewidget.cpp
index c4872bc..b1a2b8b 100644
--- a/mappingtreewidget.cpp
+++ b/mappingtreewidget.cpp
@@ -84,13 +84,14 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
}
// filter + refresh
+ QIcon swordIcon(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2694), true, false));
mFilter = new QLineEdit;
connect(mFilter, &QLineEdit::returnPressed, this, &MappingTreeWidget::filter);
QToolBar *filterTB = new QToolBar;
QAction *doFilterA = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2245), true, false), tr("Filter"), this);
connect(doFilterA, &QAction::triggered, this, &MappingTreeWidget::filter);
filterTB->addAction(doFilterA);
- QAction *clearFilterA = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x2694), true, false), tr("Clear"), this);
+ QAction *clearFilterA = new QAction(swordIcon, tr("Clear"), this);
connect(clearFilterA, &QAction::triggered, this, &MappingTreeWidget::clearFilter);
filterTB->addAction(clearFilterA);
QAction *refreshA = new QAction(QIcon(":/refresh.png"), tr("Refresh"), this);
@@ -103,19 +104,20 @@ MappingTreeWidget::MappingTreeWidget(QWidget *parent) : QWidget(parent){
filterLayout->addWidget(filterTB);
//setup actions
- mAddChildA = new QAction(tr("Add child..."), this);
- connect(mAddChildA, &QAction::triggered, this, &MappingTreeWidget::addChild);
- mTree->addAction(mAddChildA);
- mAddActorA = new QAction(tr("Add actor..."), this);
- mAddActorA->setShortcut(Qt::CTRL + Qt::Key_A);
- connect(mAddActorA, &QAction::triggered, this, &MappingTreeWidget::addActor);
- mTree->addAction(mAddActorA);
- mDeleteChildA = new QAction(tr("Delete..."), this);
- connect(mDeleteChildA, &QAction::triggered, this, &MappingTreeWidget::deleteChild);
- mTree->addAction(mDeleteChildA);
- mEditChildA = new QAction(tr("Edit..."), this);
- connect(mEditChildA, &QAction::triggered, this, &MappingTreeWidget::editChild);
- mTree->addAction(mEditChildA);
+ QAction *addActorA = new QAction(QIcon(":/fire.png"), tr("Add actor..."), this);
+ addActorA->setShortcut(Qt::CTRL + Qt::Key_A);
+ connect(addActorA, &QAction::triggered, this, &MappingTreeWidget::addActor);
+ mTree->addAction(addActorA);
+ mTree->addAction(Helper::createSeparator(this));
+ QAction *addChildA = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x002b), true, false), tr("Add child..."), this);
+ connect(addChildA, &QAction::triggered, this, &MappingTreeWidget::addChild);
+ mTree->addAction(addChildA);
+ QAction *deleteChildA = new QAction(swordIcon, tr("Delete child..."), this);
+ connect(deleteChildA, &QAction::triggered, this, &MappingTreeWidget::deleteChild);
+ mTree->addAction(deleteChildA);
+ QAction *editChildA = new QAction(Helper::icon(Qt::transparent, qApp->palette().color(QPalette::Text), QChar(0x270e), true, false), tr("Edit..."), this);
+ connect(editChildA, &QAction::triggered, this, &MappingTreeWidget::editChild);
+ mTree->addAction(editChildA);
//widget layout and misc
QVBoxLayout *mainLayout = new QVBoxLayout;
diff --git a/mappingtreewidget.h b/mappingtreewidget.h
index b6bbd57..16581a2 100644
--- a/mappingtreewidget.h
+++ b/mappingtreewidget.h
@@ -26,7 +26,7 @@ struct MappingData;
class MappingTreeWidget : public QWidget {
Q_OBJECT
public:
- explicit MappingTreeWidget(QWidget *parent = 0);
+ explicit MappingTreeWidget(QWidget *parent = nullptr);
MappingData selectedItem() const;
QList<MappingData> selectedTree() const;
QList<MappingData> selectedTreeRecursive(const QModelIndex &start) const;
@@ -64,10 +64,6 @@ class MappingTreeWidget : public QWidget {
QLineEdit *mFilter;
QPushButton *mAddType;
QPushButton *mDeleteType;
- QAction *mAddChildA;
- QAction *mAddActorA;
- QAction *mDeleteChildA;
- QAction *mEditChildA;
};
#endif // MAPPINGTREEWIDGET_H