From dc492b301ce48e7cf0d28073debce7bc3056a9f9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 12 Sep 2018 08:42:21 -0400
Subject: [PATCH] [partition] Drop label on swap-options box

---
 src/modules/partition/gui/ChoicePage.cpp        | 2 +-
 src/modules/partition/gui/PrettyRadioButton.cpp | 5 ++---
 src/modules/partition/gui/PrettyRadioButton.h   | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index b921941c2..4dd214382 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -228,7 +228,7 @@ ChoicePage::setupChoices()
     m_eraseButton->setIcon( CalamaresUtils::defaultPixmap( CalamaresUtils::PartitionEraseAuto,
                                                            CalamaresUtils::Original,
                                                            iconSize ) );
-    m_eraseButton->addOptionsComboBox( tr( "Swap" ), swapSelectionCombo() );
+    m_eraseButton->addOptionsComboBox( swapSelectionCombo() );
     m_grp->addButton( m_eraseButton->buttonWidget(), Erase );
 
     m_replaceButton = new PrettyRadioButton;
diff --git a/src/modules/partition/gui/PrettyRadioButton.cpp b/src/modules/partition/gui/PrettyRadioButton.cpp
index be09f5753..9be49fb82 100644
--- a/src/modules/partition/gui/PrettyRadioButton.cpp
+++ b/src/modules/partition/gui/PrettyRadioButton.cpp
@@ -83,9 +83,8 @@ PrettyRadioButton::buttonWidget() const
 }
 
 void
-PrettyRadioButton::addOptionsComboBox( const QString& label, QComboBox* box )
+PrettyRadioButton::addOptionsComboBox( QComboBox* box )
 {
     int row = m_mainLayout->rowCount();  // Rows index from 0, count from 1
-    m_mainLayout->addWidget( new QLabel( label ), row, 1 );
-    m_mainLayout->addWidget( box, row, 2 );
+    m_mainLayout->addWidget( box, row, 1 );
 }
diff --git a/src/modules/partition/gui/PrettyRadioButton.h b/src/modules/partition/gui/PrettyRadioButton.h
index c5ed6b336..1cb94c1a0 100644
--- a/src/modules/partition/gui/PrettyRadioButton.h
+++ b/src/modules/partition/gui/PrettyRadioButton.h
@@ -50,7 +50,7 @@ public:
     virtual QRadioButton* buttonWidget() const;
 
     /** @brief Add an options drop-down to this button. */
-    void addOptionsComboBox( const QString& label, QComboBox* );
+    void addOptionsComboBox( QComboBox* );
 
 protected:
     ClickableLabel* m_label;