napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use DeviceInfoWidget in ChoicePage.

Browse Source
This commit is contained in:
Teo Mrnjavac 2015-11-27 17:25:47 +01:00
parent 17f1f5f61f
commit 84c254ced2
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/partition/gui/ChoicePage.cpp
View File

@ -29,6 +29,7 @@
#include "PrettyRadioButton.h" #include "PrettyRadioButton.h"
#include "ExpandableRadioButton.h" #include "ExpandableRadioButton.h"
#include "PartitionPreview.h" #include "PartitionPreview.h"
#include "DeviceInfoWidget.h"
#include "utils/CalamaresUtilsGui.h" #include "utils/CalamaresUtilsGui.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@ -62,6 +63,7 @@ ChoicePage::ChoicePage( QWidget* parent )
, m_eraseButton( nullptr ) , m_eraseButton( nullptr )
, m_replaceButton( nullptr ) , m_replaceButton( nullptr )
, m_somethingElseButton( nullptr ) , m_somethingElseButton( nullptr )
, m_deviceInfoWidget( nullptr )
, m_lastSelectedDeviceIndex( -1 ) , m_lastSelectedDeviceIndex( -1 )
, m_isEfi( false ) , m_isEfi( false )
{ {
@ -78,6 +80,8 @@ ChoicePage::ChoicePage( QWidget* parent )
m_drivesLayout->addWidget( m_drivesCombo ); m_drivesLayout->addWidget( m_drivesCombo );
m_drivesLayout->addStretch(); m_drivesLayout->addStretch();
m_deviceInfoWidget = new DeviceInfoWidget;
m_drivesLayout->addWidget( m_deviceInfoWidget );
m_messageLabel->setWordWrap( true ); m_messageLabel->setWordWrap( true );
@ -561,6 +565,11 @@ ChoicePage::setupActions( Device *currentDevice )
OsproberEntryList osproberEntriesForCurrentDevice = OsproberEntryList osproberEntriesForCurrentDevice =
getOsproberEntriesForDevice( currentDevice ); getOsproberEntriesForDevice( currentDevice );
if ( currentDevice->partitionTable() )
m_deviceInfoWidget->setPartitionTableType( currentDevice->partitionTable()->type() );
else
m_deviceInfoWidget->setPartitionTableType( PartitionTable::unknownTableType );
if ( osproberEntriesForCurrentDevice.count() == 0 ) if ( osproberEntriesForCurrentDevice.count() == 0 )
{ {
CALAMARES_RETRANSLATE( CALAMARES_RETRANSLATE(

3
src/modules/partition/gui/ChoicePage.h
View File

@ -35,6 +35,7 @@ class QListView;
class ExpandableRadioButton; class ExpandableRadioButton;
class PartitionCoreModule; class PartitionCoreModule;
class PrettyRadioButton; class PrettyRadioButton;
class DeviceInfoWidget;
class Device; class Device;
@ -96,6 +97,8 @@ private:
ExpandableRadioButton* m_replaceButton; ExpandableRadioButton* m_replaceButton;
PrettyRadioButton* m_somethingElseButton; PrettyRadioButton* m_somethingElseButton;
DeviceInfoWidget* m_deviceInfoWidget;
int m_lastSelectedDeviceIndex; int m_lastSelectedDeviceIndex;
}; };