GH-2552 Make the filter part of the version widget

application/dialogs/VersionSelectDialog.cpp

@@ -14,14 +14,9 @@
  */
 
 #include "VersionSelectDialog.h"
+#include "ui_VersionSelectDialog.h"
 
-#include <QtWidgets/QButtonGroup>
-#include <QtWidgets/QDialogButtonBox>
-#include <QtWidgets/QHBoxLayout>
-#include <QtWidgets/QPushButton>
-#include <QtWidgets/QVBoxLayout>
-
-#include <dialogs/ProgressDialog.h>
+#include "dialogs/ProgressDialog.h"
 #include "CustomMessageBox.h"
 
 #include <BaseVersion.h>
@@ -31,72 +26,42 @@
 #include "MultiMC.h"
 #include <VersionProxyModel.h>
 #include <widgets/VersionSelectWidget.h>
+#include <QPushButton>
 
 VersionSelectDialog::VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent, bool cancelable)
-    : QDialog(parent)
+    : QDialog(parent), ui(new Ui::VersionSelectDialog), m_vlist(vlist)
 {
     setObjectName(QStringLiteral("VersionSelectDialog"));
-    resize(400, 347);
-    m_verticalLayout = new QVBoxLayout(this);
-    m_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
 
-    m_versionWidget = new VersionSelectWidget(parent);
-    m_verticalLayout->addWidget(m_versionWidget);
+    ui->setupUi(this);
 
-    m_horizontalLayout = new QHBoxLayout();
-    m_horizontalLayout->setObjectName(QStringLiteral("horizontalLayout"));
-
-    m_refreshButton = new QPushButton(this);
-    m_refreshButton->setObjectName(QStringLiteral("refreshButton"));
-    m_horizontalLayout->addWidget(m_refreshButton);
-
-    m_buttonBox = new QDialogButtonBox(this);
-    m_buttonBox->setObjectName(QStringLiteral("buttonBox"));
-    m_buttonBox->setOrientation(Qt::Horizontal);
-    m_buttonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);
-    m_horizontalLayout->addWidget(m_buttonBox);
-
-    m_verticalLayout->addLayout(m_horizontalLayout);
-
-    retranslate();
-
-    QObject::connect(m_buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
-    QObject::connect(m_buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
-
-    QMetaObject::connectSlotsByName(this);
     setWindowModality(Qt::WindowModal);
     setWindowTitle(title);
 
-    m_vlist = vlist;
-
     if (!cancelable)
     {
-        m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
+        ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(false);
     }
 }
 
-void VersionSelectDialog::retranslate()
+VersionSelectDialog::~VersionSelectDialog()
 {
-    // FIXME: overrides custom title given in constructor!
-    setWindowTitle(tr("Choose Version"));
-    m_refreshButton->setToolTip(tr("Reloads the version list."));
-    m_refreshButton->setText(tr("&Refresh"));
+    delete ui;
 }
 
 void VersionSelectDialog::setCurrentVersion(const QString& version)
 {
-    m_currentVersion = version;
-    m_versionWidget->setCurrentVersion(version);
+    ui->versionSelect->setCurrentVersion(version);
 }
 
 void VersionSelectDialog::setEmptyString(QString emptyString)
 {
-    m_versionWidget->setEmptyString(emptyString);
+    ui->versionSelect->setEmptyString(emptyString);
 }
 
 void VersionSelectDialog::setEmptyErrorString(QString emptyErrorString)
 {
-    m_versionWidget->setEmptyErrorString(emptyErrorString);
+    ui->versionSelect->setEmptyErrorString(emptyErrorString);
 }
 
 void VersionSelectDialog::setResizeOn(int column)
@@ -107,35 +72,30 @@ void VersionSelectDialog::setResizeOn(int column)
 int VersionSelectDialog::exec()
 {
     QDialog::open();
-    m_versionWidget->initialize(m_vlist);
+    ui->versionSelect->initialize(m_vlist);
     if(resizeOnColumn != -1)
     {
-        m_versionWidget->setResizeOn(resizeOnColumn);
+        ui->versionSelect->setResizeOn(resizeOnColumn);
     }
     return QDialog::exec();
 }
 
-void VersionSelectDialog::selectRecommended()
-{
-    m_versionWidget->selectRecommended();
-}
-
 BaseVersionPtr VersionSelectDialog::selectedVersion() const
 {
-    return m_versionWidget->selectedVersion();
-}
-
-void VersionSelectDialog::on_refreshButton_clicked()
-{
-    m_versionWidget->loadList();
+    return ui->versionSelect->selectedVersion();
 }
 
 void VersionSelectDialog::setExactFilter(BaseVersionList::ModelRoles role, QString filter)
 {
-    m_versionWidget->setExactFilter(role, filter);
+    ui->versionSelect->setExactFilter(role, filter);
 }
 
 void VersionSelectDialog::setFuzzyFilter(BaseVersionList::ModelRoles role, QString filter)
 {
-    m_versionWidget->setFuzzyFilter(role, filter);
+    ui->versionSelect->setFuzzyFilter(role, filter);
 }
+
+void VersionSelectDialog::setFilterBoxVisible(bool visible)
+{
+    ui->versionSelect->setFilterBoxVisible(visible);
+}

application/dialogs/VersionSelectDialog.h

@@ -40,7 +40,7 @@ class VersionSelectDialog : public QDialog
 
 public:
     explicit VersionSelectDialog(BaseVersionList *vlist, QString title, QWidget *parent = 0, bool cancelable = true);
-    virtual ~VersionSelectDialog() {};
+    virtual ~VersionSelectDialog();
 
     int exec() override;
 
@@ -53,23 +53,12 @@ public:
     void setEmptyErrorString(QString emptyErrorString);
     void setResizeOn(int column);
 
-private slots:
-    void on_refreshButton_clicked();
+    void setFilterBoxVisible(bool visible);
 
 private:
-    void retranslate();
-    void selectRecommended();
-
-private:
-    QString m_currentVersion;
-    VersionSelectWidget *m_versionWidget = nullptr;
-    QVBoxLayout *m_verticalLayout = nullptr;
-    QHBoxLayout *m_horizontalLayout = nullptr;
-    QPushButton *m_refreshButton = nullptr;
-    QDialogButtonBox *m_buttonBox = nullptr;
+    Ui::VersionSelectDialog *ui;
 
     BaseVersionList *m_vlist = nullptr;
-
     VersionProxyModel *m_proxyModel = nullptr;
 
     int resizeOnColumn = -1;

application/dialogs/VersionSelectDialog.ui

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>VersionSelectDialog</class>
+ <widget class="QDialog" name="VersionSelectDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="VersionSelectWidget" name="versionSelect" native="true"/>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>VersionSelectWidget</class>
+   <extends>QWidget</extends>
+   <header>widgets/VersionSelectWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>VersionSelectDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>VersionSelectDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>