Add option to attach VG

theCheeseboard · Aug 15, 2023 · 637d22f · 637d22f
1 parent c46eed4
commit 637d22f
Show file tree

Hide file tree

Showing 11 changed files with 159 additions and 32 deletions.
diff --git a/application/diskPanes/lvmdiskpane.cpp b/application/diskPanes/lvmdiskpane.cpp
@@ -2,8 +2,11 @@
 #include "ui_lvmdiskpane.h"
 
 #include <DriveObjects/diskobject.h>
+#include <DriveObjects/partitioninterface.h>
+#include <DriveObjects/partitiontableinterface.h>
 #include <DriveObjects/physicalvolumeinterface.h>
 #include <DriveObjects/volumegroup.h>
+#include <partitioninformation.h>
 
 struct LvmDiskPanePrivate {
         DiskObject* disk;
@@ -14,23 +17,52 @@ LvmDiskPane::LvmDiskPane(DiskObject* disk, QWidget* parent) :
     ui(new Ui::LvmDiskPane) {
     ui->setupUi(this);
     d = new LvmDiskPanePrivate();
+    d->disk = disk;
 
-    auto pv = disk->interface<PhysicalVolumeInterface>();
-    if (!pv) {
-        this->setVisible(false);
-        return;
-    }
+    connect(disk, &DiskObject::interfaceAdded, this, &LvmDiskPane::updateDetails);
+    connect(disk, &DiskObject::interfaceRemoved, this, &LvmDiskPane::updateDetails);
 
-    //    connect(pv->volumeGroup(), &VolumeGroup::)
-    ui->lvmDescription->setText(tr("This block is part of the %1 volume group").arg(QLocale().quoteString(pv->volumeGroup()->name())));
     ui->evictDataButton->setProperty("type", "destructive");
+
+    this->updateDetails();
 }
 
 LvmDiskPane::~LvmDiskPane() {
     delete ui;
     delete d;
 }
 
+void LvmDiskPane::updateDetails() {
+    auto partition = d->disk->interface<PartitionInterface>();
+    if (!partition) {
+        this->setVisible(false);
+        return;
+    }
+
+    auto partitionTable = partition->parentTable()->interface<PartitionTableInterface>();
+    if (partition->type() != PartitionInformation::partitionType("lvmpv", partitionTable->type())) {
+        this->setVisible(false);
+        return;
+    }
+
+    this->setVisible(true);
+    auto pv = d->disk->interface<PhysicalVolumeInterface>();
+    if (pv) {
+        ui->lvmDescription->setText(tr("This block is part of the %1 volume group.").arg(QLocale().quoteString(pv->volumeGroup()->name())));
+        ui->evictDataButton->setVisible(true);
+        ui->viewVgButton->setVisible(true);
+        ui->attachVgButton->setVisible(false);
+    } else {
+        ui->lvmDescription->setText(tr("This block is not part of a volume group."));
+        ui->evictDataButton->setVisible(false);
+        ui->viewVgButton->setVisible(false);
+        ui->attachVgButton->setVisible(true);
+    }
+}
+
 int LvmDiskPane::order() const {
     return 20;
 }
+
+void LvmDiskPane::on_attachVgButton_clicked() {
+}
diff --git a/application/diskPanes/lvmdiskpane.h b/application/diskPanes/lvmdiskpane.h
@@ -20,9 +20,13 @@ class LvmDiskPane : public DiskPaneComponent {
         Ui::LvmDiskPane* ui;
         LvmDiskPanePrivate* d;
 
+        void updateDetails();
+
         // DiskPaneComponent interface
     public:
         int order() const;
+    private slots:
+        void on_attachVgButton_clicked();
 };
 
 #endif // LVMDISKPANE_H
diff --git a/application/diskPanes/lvmdiskpane.ui b/application/diskPanes/lvmdiskpane.ui
@@ -84,7 +84,8 @@
           <string>Relocate Data</string>
          </property>
          <property name="icon">
-          <iconset theme="lvm-pv-evict"/>
+          <iconset theme="lvm-pv-evict">
+           <normaloff>.</normaloff>.</iconset>
          </property>
         </widget>
        </item>
@@ -95,6 +96,16 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QPushButton" name="attachVgButton">
+         <property name="text">
+          <string>Attach to Volume Group</string>
+         </property>
+         <property name="icon">
+          <iconset theme="list-add"/>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
     </layout>

diff --git a/application/translations/ar_SA.ts b/application/translations/ar_SA.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/da.ts b/application/translations/da.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/en_US.ts b/application/translations/en_US.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/he_IL.ts b/application/translations/he_IL.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/ja.ts b/application/translations/ja.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/pt_BR.ts b/application/translations/pt_BR.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/tr.ts b/application/translations/tr.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/application/translations/vi.ts b/application/translations/vi.ts
@@ -133,13 +133,23 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.ui" line="94"/>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="95"/>
         <source>View Volume Group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../diskPanes/lvmdiskpane.cpp" line="25"/>
-        <source>This block is part of the %1 volume group</source>
+        <location filename="../diskPanes/lvmdiskpane.ui" line="102"/>
+        <source>Attach to Volume Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="51"/>
+        <source>This block is part of the %1 volume group.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../diskPanes/lvmdiskpane.cpp" line="56"/>
+        <source>This block is not part of a volume group.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>