From 29664e118a0dd43f0b25c30939e0cd5643e59f69 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 14 Oct 2016 23:25:10 +0300 Subject: [PATCH] Added new option "Invert selection" to context menu tool Detail. --HG-- branch : develop --- src/app/valentina/dialogs/vwidgetdetails.cpp | 134 ++++++++++++------- src/app/valentina/dialogs/vwidgetdetails.h | 1 + 2 files changed, 86 insertions(+), 49 deletions(-) diff --git a/src/app/valentina/dialogs/vwidgetdetails.cpp b/src/app/valentina/dialogs/vwidgetdetails.cpp index 23d8d68e1..afeed4185 100644 --- a/src/app/valentina/dialogs/vwidgetdetails.cpp +++ b/src/app/valentina/dialogs/vwidgetdetails.cpp @@ -156,68 +156,104 @@ void VWidgetDetails::FillTable(const QHash *details) } //--------------------------------------------------------------------------------------------------------------------- -void VWidgetDetails::ShowContextMenu(const QPoint &pos) +void VWidgetDetails::ToggleSectionDetails(bool select) { - QMenu *menu = new QMenu; - QAction *actionSelectAll = menu->addAction(tr("Select all")); - QAction *actionSelectNone = menu->addAction(tr("Select none")); - const QHash *allDetails = m_data->DataDetails(); - if (not allDetails->count() == 0) + if (allDetails->count() == 0) { - int selectedDetails = 0; + return; + } - QHash::const_iterator iter = allDetails->constBegin(); - while (iter != allDetails->constEnd()) + for (int i = 0; itableWidget->rowCount(); ++i) + { + QTableWidgetItem *item = ui->tableWidget->item(i, 0); + const quint32 id = item->data(Qt::UserRole).toUInt(); + if (allDetails->contains(id)) { - if(iter.value().IsInLayout()) - { - selectedDetails++; - } - ++iter; - } - if (selectedDetails == 0) - { - actionSelectNone->setDisabled(true); - } - else if (selectedDetails == allDetails->size()) - { - actionSelectAll->setDisabled(true); - } - - QAction *selectedAction = menu->exec(ui->tableWidget->viewport()->mapToGlobal(pos)); - - bool select; - if (selectedAction == actionSelectAll) - { - select = true; - qApp->getUndoStack()->beginMacro(tr("select all details")); - } - else if (selectedAction == actionSelectNone) - { - select = false; - qApp->getUndoStack()->beginMacro(tr("select none details")); - } - else - { - return; - } - - for (int i = 0; itableWidget->rowCount(); ++i) - { - QTableWidgetItem *item = ui->tableWidget->item(i, 0); - const quint32 id = item->data(Qt::UserRole).toUInt(); - if (not select == m_data->DataDetails()->value(id).IsInLayout()) + if (not select == allDetails->value(id).IsInLayout()) { ToggleDetailInLayout *togglePrint = new ToggleDetailInLayout(id, select, m_data, m_doc); connect(togglePrint, &ToggleDetailInLayout::UpdateList, this, &VWidgetDetails::UpdateList); qApp->getUndoStack()->push(togglePrint); } } - qApp->getUndoStack()->endMacro(); } - else +} + +//--------------------------------------------------------------------------------------------------------------------- +void VWidgetDetails::ShowContextMenu(const QPoint &pos) +{ + QMenu *menu = new QMenu(this); + QAction *actionSelectAll = menu->addAction(tr("Select all")); + QAction *actionSelectNone = menu->addAction(tr("Select none")); + + QAction *actionSeparator = new QAction(this); + actionSeparator->setSeparator(true); + menu->addAction(actionSeparator); + + QAction *actionInvertSelection = menu->addAction(tr("Invert selection")); + + const QHash *allDetails = m_data->DataDetails(); + if (allDetails->count() == 0) { return; } + + int selectedDetails = 0; + + QHash::const_iterator iter = allDetails->constBegin(); + while (iter != allDetails->constEnd()) + { + if(iter.value().IsInLayout()) + { + selectedDetails++; + } + ++iter; + } + + if (selectedDetails == 0) + { + actionSelectNone->setDisabled(true); + } + else if (selectedDetails == allDetails->size()) + { + actionSelectAll->setDisabled(true); + } + + + QAction *selectedAction = menu->exec(ui->tableWidget->viewport()->mapToGlobal(pos)); + + bool select; + if (selectedAction == actionSelectAll) + { + select = true; + qApp->getUndoStack()->beginMacro(tr("select all details")); + ToggleSectionDetails(select); + } + else if (selectedAction == actionSelectNone) + { + select = false; + qApp->getUndoStack()->beginMacro(tr("select none details")); + ToggleSectionDetails(select); + } + else if (selectedAction == actionInvertSelection) + { + qApp->getUndoStack()->beginMacro(tr("invert selection")); + + for (int i = 0; itableWidget->rowCount(); ++i) + { + QTableWidgetItem *item = ui->tableWidget->item(i, 0); + const quint32 id = item->data(Qt::UserRole).toUInt(); + if (allDetails->contains(id)) + { + select = not allDetails->value(id).IsInLayout(); + + ToggleDetailInLayout *togglePrint = new ToggleDetailInLayout(id, select, m_data, m_doc); + connect(togglePrint, &ToggleDetailInLayout::UpdateList, this, &VWidgetDetails::UpdateList); + qApp->getUndoStack()->push(togglePrint); + } + } + } + + qApp->getUndoStack()->endMacro(); } diff --git a/src/app/valentina/dialogs/vwidgetdetails.h b/src/app/valentina/dialogs/vwidgetdetails.h index 4f08445ea..987bb74d1 100644 --- a/src/app/valentina/dialogs/vwidgetdetails.h +++ b/src/app/valentina/dialogs/vwidgetdetails.h @@ -66,6 +66,7 @@ private: VContainer *m_data; void FillTable(const QHash *details); + void ToggleSectionDetails(bool select); }; #endif // VWIDGETDETAILS_H