From 098c1a2d6e73a7f4800a22e9a77782e24c153419 Mon Sep 17 00:00:00 2001 From: mrbesen Date: Tue, 21 Dec 2021 16:02:04 +0100 Subject: [PATCH] downButton Working --- src/buttonmanager.cpp | 3 ++- src/buttonmanageritems.cpp | 18 +++++++++--------- ui/buttonmanager.ui | 2 +- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/buttonmanager.cpp b/src/buttonmanager.cpp index 83d3d5a..9fb50bc 100644 --- a/src/buttonmanager.cpp +++ b/src/buttonmanager.cpp @@ -51,7 +51,9 @@ void ButtonManager::upButton() { } void ButtonManager::downButton() { + QTreeWidgetItem* currentSelectedItem = getSelectedItem(); perform<&ButtonManagerItem::moveDown>(); + select(currentSelectedItem); } void ButtonManager::itemSelected() { @@ -78,7 +80,6 @@ void ButtonManager::itemSelected() { void ButtonManager::dialogButtonPressed(QAbstractButton* btn) { QDialogButtonBox::ButtonRole role = ui->buttonBox->buttonRole(btn); - Log::trace << "btn: " << (int) role; if(role == QDialogButtonBox::ButtonRole::ResetRole) { // reset loadConfig(); diff --git a/src/buttonmanageritems.cpp b/src/buttonmanageritems.cpp index 25d0666..fd5fe60 100644 --- a/src/buttonmanageritems.cpp +++ b/src/buttonmanageritems.cpp @@ -92,16 +92,10 @@ void RowItem::moveUp() { Log::error << "row above could not be updated"; } - QTreeWidgetItem* myparent = mparent; - Log::debug << "parent: " << myparent; - - int index = myparent->indexOfChild(this); - Log::debug << "index: " << index; - bool wasexpanded = isExpanded(); - myparent->removeChild(this); + mparent->removeChild(this); - myparent->insertChild(index-1, this); + mparent->insertChild(pos-1, this); setExpanded(wasexpanded); pos--; @@ -109,7 +103,13 @@ void RowItem::moveUp() { } void RowItem::moveDown() { - + // moving down is the same as moving the item below up + RowItem* rowbelow = dynamic_cast(mparent->child(pos+1)); + if(rowbelow) { + rowbelow->moveUp(); + } else { + Log::error << "no item below"; + } } void RowItem::updatePosition() { diff --git a/ui/buttonmanager.ui b/ui/buttonmanager.ui index a4104de..5289212 100644 --- a/ui/buttonmanager.ui +++ b/ui/buttonmanager.ui @@ -170,7 +170,7 @@ moveDownButton clicked() ButtonManager - deleteButton() + downButton() 867