andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Add selected device to ResizeVolumeDialog.

This commit is contained in:
Chantara Tith 2016-08-08 06:47:05 +07:00 committed by Andrius Štikonas
parent f863a15a72
commit 7f61e77eb5
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/mainwindow.cpp
View File

@ -1091,7 +1091,7 @@ void MainWindow::onResizeVolumeGroup()
QStringList* pvlist = new QStringList();
// *NOTE*: vgname & pvlist will be modified and validate by the dialog
QPointer<ResizeVolumeDialog> dlg = new ResizeVolumeDialog(this, *vgname, *pvlist);
QPointer<ResizeVolumeDialog> dlg = new ResizeVolumeDialog(this, *vgname, *pvlist, *tmpDev);
if (dlg->exec() == QDialog::Accepted) {
operationStack().push(new ResizeVolumeGroupOperation(*tmpDev, *pvlist));
}

14
src/gui/resizevolumedialog.cpp
View File

@ -20,6 +20,8 @@
#include "gui/resizevolumedialog.h"
#include <core/lvmdevice.h>
#include <core/volumemanagerdevice.h>
#include <core/partitiontable.h>
#include <fs/lvm2_pv.h>
#include <util/capacity.h>
@ -39,8 +41,9 @@
@param parent pointer to the parent widget
@param d the Device to show properties for
*/
ResizeVolumeDialog::ResizeVolumeDialog(QWidget* parent, QString& vgname, QStringList& partlist) :
VolumeDialog(parent, vgname, partlist)
ResizeVolumeDialog::ResizeVolumeDialog(QWidget* parent, QString& vgname, QStringList& partlist, VolumeManagerDevice& dev) :
VolumeDialog(parent, vgname, partlist),
m_Device(dev)
{
setWindowTitle(xi18nc("@title:window", "Resize Volume Group"));
@ -54,8 +57,10 @@ ResizeVolumeDialog::ResizeVolumeDialog(QWidget* parent, QString& vgname, QString
void ResizeVolumeDialog::setupDialog()
{
dialogWidget().partTableWidget().setVisible(false);
dialogWidget().listPV().addPartitionList(LvmDevice::getPVs(targetName()), true);
dialogWidget().listPV().addPartitionList(FS::lvm2_pv::getFreePV(), false);
if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) {
dialogWidget().listPV().addPartitionList(LvmDevice::getPVs(targetName()), true);
dialogWidget().listPV().addPartitionList(FS::lvm2_pv::getFreePV(), false);
}
}
void ResizeVolumeDialog::setupConstraints()
@ -71,4 +76,3 @@ void ResizeVolumeDialog::accept()
targetPVList() << dialogWidget().listPV().checkedItems();
QDialog::accept();
}

11
src/gui/resizevolumedialog.h
View File

@ -21,19 +21,26 @@
#include "gui/volumedialog.h"
class LvmDevice;
class VolumeManagerDevice;
class ResizeVolumeDialog : public VolumeDialog
{
Q_DISABLE_COPY(ResizeVolumeDialog)
public:
ResizeVolumeDialog(QWidget* parent, QString& vgname, QStringList& partlist);
ResizeVolumeDialog(QWidget* parent, QString& vgname, QStringList& partlist, VolumeManagerDevice& dev);
protected:
void accept() override;
void setupDialog() override;
void setupConstraints() override;
VolumeManagerDevice& device() const {
return m_Device;
}
private:
VolumeManagerDevice& m_Device;
};
#endif