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

Continue converting LVM away from QStrings to Partition objects.

This commit is contained in:
Andrius Štikonas 2016-09-11 00:19:58 +01:00
parent 280ba106e8
commit 007c2faf11
6 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/createvolumegroupdialog.cpp
View File

@ -48,11 +48,9 @@ CreateVolumeGroupDialog::CreateVolumeGroupDialog(QWidget* parent, FS::lvm2_pv::P
void CreateVolumeGroupDialog::setupDialog()
{
for (const auto &p : m_PhysicalVolumes) {
if (!LvmDevice::s_DirtyPVs.contains(p.second->deviceNode())) {
dialogWidget().listPV().addPartition(p.second->deviceNode(), false);
}
}
for (const auto &p : m_PhysicalVolumes)
if (p.first == QString() && !LvmDevice::s_DirtyPVs.contains(p.second->deviceNode()))
dialogWidget().listPV().addPartition(*p.second, false);
}
void CreateVolumeGroupDialog::setupConnections()

2
src/gui/createvolumegroupdialog.h
View File

@ -49,7 +49,7 @@ protected:
private:
QStringList m_SystemVGList;
FS::lvm2_pv::PhysicalVolumes m_PhysicalVolumes; // List of all devices found on the system
const FS::lvm2_pv::PhysicalVolumes m_PhysicalVolumes; // List of all devices found on the system
};
#endif

17
src/gui/listphysicalvolumes.cpp
View File

@ -24,10 +24,10 @@
class ListPhysicalVolumeWidgetItem : public QListWidgetItem
{
public:
ListPhysicalVolumeWidgetItem(const QString& pvnode, bool checked) :
QListWidgetItem(pvnode + QStringLiteral(" | ") + Capacity::formatByteSize(FS::lvm2_pv::getPVSize(pvnode)))
ListPhysicalVolumeWidgetItem(const Partition& p, bool checked) :
QListWidgetItem(p.deviceNode() + QStringLiteral(" | ") + Capacity::formatByteSize(p.capacity()))
{
setToolTip(pvnode);
setToolTip(p.deviceNode());
setSizeHint(QSize(0, 32));
setCheckState( checked ? Qt::Checked : Qt::Unchecked);
}
@ -40,16 +40,9 @@ ListPhysicalVolumes::ListPhysicalVolumes(QWidget* parent) :
setupUi(this);
}
void ListPhysicalVolumes::addPartitionList(const QStringList& partlist, bool checked)
void ListPhysicalVolumes::addPartition(const Partition& p, bool checked)
{
for (auto const &part : partlist) {
addPartition(part, checked);
}
}
void ListPhysicalVolumes::addPartition(const QString& part, bool checked)
{
ListPhysicalVolumeWidgetItem *item = new ListPhysicalVolumeWidgetItem(part, checked);
ListPhysicalVolumeWidgetItem *item = new ListPhysicalVolumeWidgetItem(p, checked);
listPhysicalVolumes().addItem(item);
}

5
src/gui/listphysicalvolumes.h
View File

@ -21,6 +21,8 @@
#include "ui_listphysicalvolumesbase.h"
#include <core/partition.h>
#include <QWidget>
class Device;
@ -34,8 +36,7 @@ class ListPhysicalVolumes : public QWidget, public Ui::ListPhysicalVolumesBase
public:
ListPhysicalVolumes(QWidget* parent = nullptr);
void addPartitionList(const QStringList& partlist, bool checked);
void addPartition(const QString& part, bool checked);
void addPartition(const Partition& p, bool checked);
QStringList checkedItems();

8
src/gui/resizevolumegroupdialog.cpp
View File

@ -51,11 +51,11 @@ ResizeVolumeGroupDialog::ResizeVolumeGroupDialog(QWidget* parent, FS::lvm2_pv::P
void ResizeVolumeGroupDialog::setupDialog()
{
if (dialogWidget().volumeType().currentText() == QStringLiteral("LVM")) {
dialogWidget().listPV().addPartitionList(device().deviceNodes(), true);
for (const auto &p : m_PhysicalVolumes) {
if (!LvmDevice::s_DirtyPVs.contains(p.second->deviceNode())) {
dialogWidget().listPV().addPartition(p.second->deviceNode(), false);
}
if (p.first == device().name())
dialogWidget().listPV().addPartition(*p.second, true);
else if (p.first == QString() && !LvmDevice::s_DirtyPVs.contains(p.second->deviceNode())) // TODO: Remove LVM PVs in current VG
dialogWidget().listPV().addPartition(*p.second, false);
}
}
}

2
src/gui/resizevolumegroupdialog.h
View File

@ -44,7 +44,7 @@ protected:
private:
VolumeManagerDevice& m_Device;
FS::lvm2_pv::PhysicalVolumes m_PhysicalVolumes; // List of all devices found on the system
const FS::lvm2_pv::PhysicalVolumes m_PhysicalVolumes; // List of all devices found on the system
};
#endif