don't call updatePartitions() any more after pushing operations on the stack,
the push method itself emits a signal that will lead to updateOperations() being called now. svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1098237
This commit is contained in:
parent
dd9d20345d
commit
55a9af5a8d
6
TODO
6
TODO
|
@ -19,12 +19,6 @@ Random plans and ideas for 1.1 and beyond:
|
||||||
|
|
||||||
* save msdos mbr?
|
* save msdos mbr?
|
||||||
|
|
||||||
* don't call updatePartitions() or anything after pushing an operation to the
|
|
||||||
stack: MainWindow::on_m_OperationStack_operationsChanged() will be called and
|
|
||||||
will deal with all that. warning: this might cause problems, it calls
|
|
||||||
PartitionManagerWidget::updatePartitions() which currently clears the
|
|
||||||
selection -- maybe it shouldn't...
|
|
||||||
|
|
||||||
* let the user specify extern command locations and options in the settings
|
* let the user specify extern command locations and options in the settings
|
||||||
|
|
||||||
Bugs:
|
Bugs:
|
||||||
|
|
|
@ -399,8 +399,6 @@ void PartitionManagerWidget::onPropertiesPartition()
|
||||||
|
|
||||||
if (dlg->newFlags() != p.activeFlags())
|
if (dlg->newFlags() != p.activeFlags())
|
||||||
operationStack().push(new SetPartFlagsOperation(*selectedDevice(), p, dlg->newFlags()));
|
operationStack().push(new SetPartFlagsOperation(*selectedDevice(), p, dlg->newFlags()));
|
||||||
|
|
||||||
updatePartitions();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
delete dlg;
|
delete dlg;
|
||||||
|
@ -502,7 +500,6 @@ void PartitionManagerWidget::onNewPartition()
|
||||||
{
|
{
|
||||||
PartitionTable::alignPartition(*selectedDevice(), *newPartition);
|
PartitionTable::alignPartition(*selectedDevice(), *newPartition);
|
||||||
operationStack().push(new NewOperation(*selectedDevice(), newPartition));
|
operationStack().push(new NewOperation(*selectedDevice(), newPartition));
|
||||||
updatePartitions();
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
delete newPartition;
|
delete newPartition;
|
||||||
|
@ -559,7 +556,6 @@ void PartitionManagerWidget::onDeletePartition(bool shred)
|
||||||
}
|
}
|
||||||
|
|
||||||
operationStack().push(new DeleteOperation(*selectedDevice(), selectedPartition(), shred));
|
operationStack().push(new DeleteOperation(*selectedDevice(), selectedPartition(), shred));
|
||||||
updatePartitions();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PartitionManagerWidget::onShredPartition()
|
void PartitionManagerWidget::onShredPartition()
|
||||||
|
@ -599,11 +595,7 @@ void PartitionManagerWidget::onResizePartition()
|
||||||
if (resizedPartition.firstSector() == selectedPartition()->firstSector() && resizedPartition.lastSector() == selectedPartition()->lastSector())
|
if (resizedPartition.firstSector() == selectedPartition()->firstSector() && resizedPartition.lastSector() == selectedPartition()->lastSector())
|
||||||
Log(Log::information) << i18nc("@info/plain", "Partition <filename>%1</filename> has the same position and size after resize/move. Ignoring operation.", selectedPartition()->deviceNode());
|
Log(Log::information) << i18nc("@info/plain", "Partition <filename>%1</filename> has the same position and size after resize/move. Ignoring operation.", selectedPartition()->deviceNode());
|
||||||
else
|
else
|
||||||
{
|
|
||||||
operationStack().push(new ResizeOperation(*selectedDevice(), *selectedPartition(), resizedPartition.firstSector(), resizedPartition.lastSector()));
|
operationStack().push(new ResizeOperation(*selectedDevice(), *selectedPartition(), resizedPartition.firstSector(), resizedPartition.lastSector()));
|
||||||
|
|
||||||
updatePartitions();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
delete dlg;
|
delete dlg;
|
||||||
|
@ -656,10 +648,7 @@ void PartitionManagerWidget::onPastePartition()
|
||||||
Partition* copiedPartition = CopyOperation::createCopy(*selectedPartition(), *clipboardPartition());
|
Partition* copiedPartition = CopyOperation::createCopy(*selectedPartition(), *clipboardPartition());
|
||||||
|
|
||||||
if (showInsertDialog(*copiedPartition, clipboardPartition()->length()))
|
if (showInsertDialog(*copiedPartition, clipboardPartition()->length()))
|
||||||
{
|
|
||||||
operationStack().push(new CopyOperation(*selectedDevice(), copiedPartition, *dSource, clipboardPartition()));
|
operationStack().push(new CopyOperation(*selectedDevice(), copiedPartition, *dSource, clipboardPartition()));
|
||||||
updatePartitions();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
delete copiedPartition;
|
delete copiedPartition;
|
||||||
}
|
}
|
||||||
|
@ -724,8 +713,6 @@ void PartitionManagerWidget::onCheckPartition()
|
||||||
}
|
}
|
||||||
|
|
||||||
operationStack().push(new CheckOperation(*selectedDevice(), *selectedPartition()));
|
operationStack().push(new CheckOperation(*selectedDevice(), *selectedPartition()));
|
||||||
|
|
||||||
updatePartitions();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PartitionManagerWidget::onBackupPartition()
|
void PartitionManagerWidget::onBackupPartition()
|
||||||
|
@ -746,10 +733,7 @@ void PartitionManagerWidget::onBackupPartition()
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file <filename>%1</filename>?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "&Overwrite File")), KStandardGuiItem::cancel()) == KMessageBox::Continue)
|
if (!QFile::exists(fileName) || KMessageBox::warningContinueCancel(this, i18nc("@info", "Do you want to overwrite the existing file <filename>%1</filename>?", fileName), i18nc("@title:window", "Overwrite Existing File?"), KGuiItem(i18nc("@action:button", "&Overwrite File")), KStandardGuiItem::cancel()) == KMessageBox::Continue)
|
||||||
{
|
|
||||||
operationStack().push(new BackupOperation(*selectedDevice(), *selectedPartition(), fileName));
|
operationStack().push(new BackupOperation(*selectedDevice(), *selectedPartition(), fileName));
|
||||||
updatePartitions();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void PartitionManagerWidget::onRestorePartition()
|
void PartitionManagerWidget::onRestorePartition()
|
||||||
|
@ -781,12 +765,8 @@ void PartitionManagerWidget::onRestorePartition()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (showInsertDialog(*restorePartition, restorePartition->length()))
|
if (showInsertDialog(*restorePartition, restorePartition->length()))
|
||||||
{
|
|
||||||
operationStack().push(new RestoreOperation(*selectedDevice(), restorePartition, fileName));
|
operationStack().push(new RestoreOperation(*selectedDevice(), restorePartition, fileName));
|
||||||
updatePartitions();
|
|
||||||
}
|
|
||||||
else
|
else
|
||||||
delete restorePartition;
|
delete restorePartition;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue