Refactor ChoicePage workflow, use rescanned state for Preview widget.

src/modules/partition/gui/ChoicePage.cpp

@@ -238,12 +238,6 @@ ChoicePage::setupChoices()
 void
 ChoicePage::applyDeviceChoice()
 {
-    QMutexLocker locker( &m_previewsMutex );
-
-    cDebug() << "Updating partitioning preview widgets.";
-    qDeleteAll( m_previewFrame->children() );
-    m_previewFrame->layout()->deleteLater();
-
     if ( !compact() &&
          drivesList->selectionModel()->currentIndex() == QModelIndex() )
     {
@@ -251,51 +245,76 @@ ChoicePage::applyDeviceChoice()
         return;
     }
 
-    Device* dev = nullptr;
+    Device* currentDevice = nullptr;
     if ( compact() )
     {
-        dev = m_core->deviceModel()->deviceForIndex(
+        currentDevice = m_core->deviceModel()->deviceForIndex(
                   m_core->deviceModel()->index(
                       drivesCombo->currentIndex() ) );
     }
     else
     {
-        dev = m_core->deviceModel()->deviceForIndex(
+        currentDevice = m_core->deviceModel()->deviceForIndex(
                   drivesList->selectionModel()->currentIndex() );
     }
-    if ( !dev )
+    if ( !currentDevice )
         return;
 
+    updateDeviceStatePreview( currentDevice );
+    // Preview setup done. Now we show/hide choices as needed.
+
+    setupActions( currentDevice );
+}
+
+
+void
+ChoicePage::updateDeviceStatePreview( Device* currentDevice )
+{
+    Q_ASSERT( currentDevice );
+    QMutexLocker locker( &m_previewsMutex );
+
+    cDebug() << "Updating partitioning preview widgets.";
+    qDeleteAll( m_previewFrame->children() );
+    m_previewFrame->layout()->deleteLater();
+
     QVBoxLayout* layout = new QVBoxLayout;
     m_previewFrame->setLayout( layout );
     layout->setMargin( 0 );
 
     PartitionPreview* preview = new PartitionPreview( m_previewFrame );
     preview->setLabelsVisible( true );
-    PartitionModel* model = new PartitionModel( m_previewFrame );
+
-    model->init( dev );
+    Device* deviceBefore = m_core->createImmutableDeviceCopy( currentDevice );
+
+    PartitionModel* model = new PartitionModel( preview );
+    model->init( deviceBefore );
+
+    // The QObject parents tree is meaningful for memory management here,
+    // see qDeleteAll above.
+    deviceBefore->setParent( model );
+    model->setParent( preview );
+
     preview->setModel( model );
     layout->addWidget( preview );
+}
 
-    // Preview setup done. Now we show/hide choices as needed.
 
+void
+ChoicePage::setupActions( Device *currentDevice )
+{
     if ( m_osproberEntries.count() == 0 )
     {
         CALAMARES_RETRANSLATE(
             m_messageLabel->setText( tr( "This computer currently does not seem to have an operating system on it. "
                                          "What would you like to do?" ) );
 
-            if ( m_core->deviceModel()->rowCount() < 2 )
             m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
-                                            "<font color=\"red\">Warning: </font>This will delete all of your programs, "
+                                        "<font color=\"red\">Warning: </font>This will delete all the data "
-                                            "documents, photos, music, and any other files." )
+                                        "currently present on %2 (if any), including programs, "
+                                        "documents, photos, music, and other files." )
                                     .arg( Calamares::Branding::instance()->
-                                              string( Calamares::Branding::ShortVersionedName ) ) );
+                                          string( Calamares::Branding::ShortVersionedName ) )
-            else
+                                    .arg( currentDevice->deviceNode() ) );
-                m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
-                                            "You will be offered a choice of which disk to erase." )
-                                        .arg( Calamares::Branding::instance()->
-                                              string( Calamares::Branding::ShortVersionedName ) ) );
         )
 
         m_replaceButton->hide();
@@ -320,19 +339,14 @@ ChoicePage::applyDeviceChoice()
                                             .arg( Calamares::Branding::instance()->
                                                   string( Calamares::Branding::ShortVersionedName ) ) );
 
-                if ( m_core->deviceModel()->rowCount() < 2 )
+                m_eraseButton->setText( tr( "<strong>Erase disk with %3 and install %1</strong><br/>"
-                    m_eraseButton->setText( tr( "<strong>Erase entire disk with %1 and install %2</strong><br/>"
+                                            "<font color=\"red\">Warning: </font>This will delete all the data "
-                                                "<font color=\"red\">Warning: </font>This will erase the whole disk and "
+                                            "currently present on %2 (if any), including programs, "
-                                                "delete all of your %1 programs, "
+                                            "documents, photos, music, and other files." )
-                                                "documents, photos, music, and any other files." )
-                                            .arg( osName )
                                         .arg( Calamares::Branding::instance()->
-                                                  string( Calamares::Branding::ShortVersionedName ) ) );
+                                              string( Calamares::Branding::ShortVersionedName ) )
-                else
+                                        .arg( currentDevice->deviceNode() )
-                    m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
+                                        .arg( osName ) );
-                                                "You will be offered a choice of which disk to erase." )
-                                            .arg( Calamares::Branding::instance()->
-                                                  string( Calamares::Branding::ShortVersionedName ) ) );
 
                 m_replaceButton->setText( tr( "<strong>Replace a partition with %1</strong><br/>"
                                               "You will be offered a choice of which partition to erase." )
@@ -355,17 +369,13 @@ ChoicePage::applyDeviceChoice()
                                             .arg( Calamares::Branding::instance()->
                                                   string( Calamares::Branding::ShortProductName ) ) );
 
-                if ( m_core->deviceModel()->rowCount() < 2 )
                 m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
-                                                "<font color=\"red\">Warning: </font>This will delete all of your programs, "
+                                            "<font color=\"red\">Warning: </font>This will delete all the data "
-                                                "documents, photos, music, and any other files." )
+                                            "currently present on %2 (if any), including programs, "
+                                            "documents, photos, music, and other files." )
                                         .arg( Calamares::Branding::instance()->
-                                                  string( Calamares::Branding::ShortVersionedName ) ) );
+                                              string( Calamares::Branding::ShortVersionedName ) )
-                else
+                                        .arg( currentDevice->deviceNode() ) );
-                    m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
-                                                "You will be offered a choice of which disk to erase." )
-                                            .arg( Calamares::Branding::instance()->
-                                                  string( Calamares::Branding::ShortVersionedName ) ) );
 
                 m_replaceButton->setText( tr( "<strong>Replace a partition with %1</strong><br/>"
                                               "You will be offered a choice of which partition to erase." )
@@ -404,17 +414,13 @@ ChoicePage::applyDeviceChoice()
                                         .arg( Calamares::Branding::instance()->
                                               string( Calamares::Branding::ShortProductName ) ) );
 
-            if ( m_core->deviceModel()->rowCount() < 2 )
             m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
-                                            "<font color=\"red\">Warning: </font>This will delete all of your programs, "
+                                        "<font color=\"red\">Warning: </font>This will delete all the data "
-                                            "documents, photos, music, and any other files." )
+                                        "currently present on %2 (if any), including programs, "
+                                        "documents, photos, music, and other files." )
                                     .arg( Calamares::Branding::instance()->
-                                              string( Calamares::Branding::ShortVersionedName ) ) );
+                                          string( Calamares::Branding::ShortVersionedName ) )
-            else
+                                    .arg( currentDevice->deviceNode() ) );
-                m_eraseButton->setText( tr( "<strong>Erase disk and install %1</strong><br/>"
-                                            "You will be offered a choice of which disk to erase." )
-                                        .arg( Calamares::Branding::instance()->
-                                              string( Calamares::Branding::ShortVersionedName ) ) );
 
             m_replaceButton->setText( tr( "<strong>Replace a partition with %1</strong><br/>"
                                           "You will be offered a choice of which partition to erase." )

src/modules/partition/gui/ChoicePage.h

@@ -34,6 +34,8 @@ class QListView;
 class PartitionCoreModule;
 class PrettyRadioButton;
 
+class Device;
+
 class ChoicePage : public QWidget, private Ui::ChoicePage
 {
     Q_OBJECT
@@ -65,6 +67,8 @@ private:
     void setNextEnabled( bool enabled );
     void setupChoices();
     void applyDeviceChoice();
+    void updateDeviceStatePreview( Device* currentDevice );
+    void setupActions( Device* currentDevice );
 
     bool m_nextEnabled;
     PartitionCoreModule* m_core;