- Passing list of pending operations as argument to ResizeOperation::canGrow.

- Access LVM::pvList through static list attribute.
This commit is contained in:
Caio Carvalho 2018-05-09 04:15:28 -03:00
parent 556a5a22ba
commit dfca46250e
3 changed files with 3 additions and 3 deletions

View File

@ -58,7 +58,7 @@ CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, QString& vgNam
void CreateVolumeGroupDialog::setupDialog()
{
for (const auto &p : qAsConst(LVM::pvList)) {
for (const auto &p : qAsConst(LVM::pvList::list())) {
bool toBeDeleted = false;
// Ignore partitions that are going to be deleted

View File

@ -535,7 +535,7 @@ void MainWindow::enableActions()
actionCollection()->action(QStringLiteral("newPartition"))
->setEnabled(!readOnly && NewOperation::canCreateNew(part));
const bool canResize = ResizeOperation::canGrow(part) ||
const bool canResize = ResizeOperation::canGrow(part, m_OperationStack->operations()) ||
ResizeOperation::canShrink(part, m_OperationStack->operations()) ||
ResizeOperation::canMove(part, m_OperationStack->operations());
actionCollection()->action(QStringLiteral("resizePartition"))

View File

@ -51,7 +51,7 @@ ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, VolumeManagerD
void ResizeVolumeGroupDialog::setupDialog()
{
if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) {
for (const auto &p : qAsConst(LVM::pvList)) {
for (const auto &p : qAsConst(LVM::pvList::list())) {
if (p.isLuks())
continue;
if (p.vgName() == device()->name())