From 84c254ced25d722efa6c8bd0a43f44cd6e66f911 Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 27 Nov 2015 17:25:47 +0100 Subject: [PATCH] Use DeviceInfoWidget in ChoicePage. --- src/modules/partition/gui/ChoicePage.cpp | 9 +++++++++ src/modules/partition/gui/ChoicePage.h | 3 +++ 2 files changed, 12 insertions(+) diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp index 56f9aaea5..4b0ab26a7 100644 --- a/src/modules/partition/gui/ChoicePage.cpp +++ b/src/modules/partition/gui/ChoicePage.cpp @@ -29,6 +29,7 @@ #include "PrettyRadioButton.h" #include "ExpandableRadioButton.h" #include "PartitionPreview.h" +#include "DeviceInfoWidget.h" #include "utils/CalamaresUtilsGui.h" #include "utils/Logger.h" @@ -62,6 +63,7 @@ ChoicePage::ChoicePage( QWidget* parent ) , m_eraseButton( nullptr ) , m_replaceButton( nullptr ) , m_somethingElseButton( nullptr ) + , m_deviceInfoWidget( nullptr ) , m_lastSelectedDeviceIndex( -1 ) , m_isEfi( false ) { @@ -78,6 +80,8 @@ ChoicePage::ChoicePage( QWidget* parent ) m_drivesLayout->addWidget( m_drivesCombo ); m_drivesLayout->addStretch(); + m_deviceInfoWidget = new DeviceInfoWidget; + m_drivesLayout->addWidget( m_deviceInfoWidget ); m_messageLabel->setWordWrap( true ); @@ -561,6 +565,11 @@ ChoicePage::setupActions( Device *currentDevice ) OsproberEntryList osproberEntriesForCurrentDevice = getOsproberEntriesForDevice( currentDevice ); + if ( currentDevice->partitionTable() ) + m_deviceInfoWidget->setPartitionTableType( currentDevice->partitionTable()->type() ); + else + m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType ); + if ( osproberEntriesForCurrentDevice.count() == 0 ) { CALAMARES_RETRANSLATE( diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h index 154074050..a68364306 100644 --- a/src/modules/partition/gui/ChoicePage.h +++ b/src/modules/partition/gui/ChoicePage.h @@ -35,6 +35,7 @@ class QListView; class ExpandableRadioButton; class PartitionCoreModule; class PrettyRadioButton; +class DeviceInfoWidget; class Device; @@ -96,6 +97,8 @@ private: ExpandableRadioButton* m_replaceButton; PrettyRadioButton* m_somethingElseButton; + DeviceInfoWidget* m_deviceInfoWidget; + int m_lastSelectedDeviceIndex; };