From 8317dc22764a6a9ca331b2bb24473085b1bd36e6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 8 Jan 2019 09:30:36 -0600 Subject: [PATCH] Add expand-all and collapse-all buttons for map list --- forms/mainwindow.ui | 105 +++++++++++++++++++++++++++---- include/mainwindow.h | 4 ++ resources/icons/collapse_all.ico | Bin 0 -> 318 bytes resources/icons/expand_all.ico | Bin 0 -> 318 bytes resources/images.qrc | 2 + src/mainwindow.cpp | 14 +++++ 6 files changed, 112 insertions(+), 13 deletions(-) create mode 100644 resources/icons/collapse_all.ico create mode 100644 resources/icons/expand_all.ico diff --git a/forms/mainwindow.ui b/forms/mainwindow.ui index cc52867b..6e9c7450 100644 --- a/forms/mainwindow.ui +++ b/forms/mainwindow.ui @@ -65,6 +65,9 @@ true + + <html><head/><body><p>Sort map list</p></body></html> + :/icons/sort_alphabet.ico:/icons/sort_alphabet.ico @@ -89,6 +92,82 @@ + + + + + 0 + 0 + + + + + 0 + 0 + + + + + 16777215 + 16777215 + + + + <html><head/><body><p>Expand all map folders</p></body></html> + + + + + + + :/icons/expand_all.ico:/icons/expand_all.ico + + + QToolButton::InstantPopup + + + true + + + + + + + + 0 + 0 + + + + + 23 + 22 + + + + + 23 + 22 + + + + <html><head/><body><p>Collapse all map list folders</p></body></html> + + + + + + + :/icons/collapse_all.ico:/icons/collapse_all.ico + + + QToolButton::InstantPopup + + + true + + + @@ -482,8 +561,8 @@ 0 0 - 545 - 587 + 469 + 608 @@ -797,8 +876,8 @@ 0 0 - 256 - 74 + 324 + 77 @@ -907,10 +986,10 @@ - 8 + 0 0 - 222 - 353 + 307 + 387 @@ -1249,8 +1328,8 @@ 0 0 - 371 - 643 + 381 + 657 @@ -1523,7 +1602,7 @@ 0 0 430 - 534 + 568 @@ -2308,8 +2387,8 @@ 0 0 - 818 - 539 + 826 + 557 @@ -2481,7 +2560,7 @@ 0 0 1117 - 22 + 21 diff --git a/include/mainwindow.h b/include/mainwindow.h index e7e753a3..8a679e34 100644 --- a/include/mainwindow.h +++ b/include/mainwindow.h @@ -151,6 +151,10 @@ private slots: void on_horizontalSlider_CollisionTransparency_valueChanged(int value); + void on_toolButton_ExpandAll_clicked(); + + void on_toolButton_CollapseAll_clicked(); + private: Ui::MainWindow *ui; TilesetEditor *tilesetEditor = nullptr; diff --git a/resources/icons/collapse_all.ico b/resources/icons/collapse_all.ico new file mode 100644 index 0000000000000000000000000000000000000000..f6c7f315826bdea6dc03fe387720105362368e68 GIT binary patch literal 318 zcmah@$qm3D40C7)2%o+yUW~!$9jO~oheYLtFmfys=KzFHRT)oI0WJWQRPrV*zd~yb yz4ujln=i#JAt>BG5Gqq8XWqzTL)|v(i+?txuq8GV`mcN0^#sR&U9dsM!}$R)WC;%d literal 0 HcmV?d00001 diff --git a/resources/icons/expand_all.ico b/resources/icons/expand_all.ico new file mode 100644 index 0000000000000000000000000000000000000000..0707936c59da83addeb3911acd285a97cf4119dd GIT binary patch literal 318 zcmah@TMmFA4C~MXj32)ZUmSy@dn9iFom(_9A(V8@UaWxdsVd`+D!>7tl1iSW)n{m} zq4z#(FYBfFNC*n=KcET?$fuGsJ<@FGzwc|YZ+iyeG?5}rp6Yw<=FAnOtYIG+H|GFW CWC>FM literal 0 HcmV?d00001 diff --git a/resources/images.qrc b/resources/images.qrc index 8f1a09aa..2955b156 100644 --- a/resources/images.qrc +++ b/resources/images.qrc @@ -28,5 +28,7 @@ icons/sort_alphabet.ico icons/sort_map.ico icons/sort_number.ico + icons/collapse_all.ico + icons/expand_all.ico diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index fb775f42..2cc0f2e3 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -1845,6 +1845,20 @@ void MainWindow::on_actionTileset_Editor_triggered() } } +void MainWindow::on_toolButton_ExpandAll_clicked() +{ + if (ui->mapList) { + ui->mapList->expandToDepth(0); + } +} + +void MainWindow::on_toolButton_CollapseAll_clicked() +{ + if (ui->mapList) { + ui->mapList->collapseAll(); + } +} + void MainWindow::closeEvent(QCloseEvent *event) { porymapConfig.setGeometry( this->saveGeometry(),