Cleaned up plugin repo dialog UI

Author: michaelrossherron

FEBioStudio/DlgPluginRepo.cpp

@@ -289,9 +289,9 @@ class Ui::CDlgPluginRepo
     QLabel* downloadNumberLabel;
     QLabel* errorLabel;
     QLabel* nameLabel;
-    QLabel* byLabel;
-    QLabel* ownerLabel;
+    // QLabel* byLabel;
     QLabel* descriptionLabel;
+    QLabel* ownerLabel;
     QLabel* tagLabel;
     CFrameButton* downloadButton;
     CFrameButton* downloadingButton;
@@ -445,32 +445,12 @@ class Ui::CDlgPluginRepo
         errorLabel->setWordWrap(true);
         pluginRightLayout->addWidget(errorLabel);
 
-        QHBoxLayout* nameLayout = new QHBoxLayout;
-        nameLayout->setContentsMargins(0, 0, 0, 0);
-
-        nameLayout->addWidget(nameLabel = new QLabel);
+        pluginRightLayout->addWidget(nameLabel = new QLabel);
         QFont nameFont = nameLabel->font();
         nameFont.setBold(true);
         nameFont.setPointSize(18);
         nameLabel->setFont(nameFont);
 
-        byLabel = new QLabel("by");
-        QFont byFont = byLabel->font();
-        byFont.setPointSize(18);
-        byLabel->setFont(byFont);
-
-        nameLayout->addWidget(byLabel);
-
-        nameLayout->addWidget(ownerLabel = new QLabel);
-        QFont font2 = ownerLabel->font();
-        font2.setItalic(true);
-        font2.setPointSize(18);
-        ownerLabel->setFont(font2);
-
-        nameLayout->addStretch();
-
-        pluginRightLayout->addLayout(nameLayout);
-
         QScrollArea* scrollArea = new QScrollArea;
         scrollArea->setWidgetResizable(true);
         scrollArea->setFrameShape(QFrame::NoFrame);
@@ -483,6 +463,9 @@ class Ui::CDlgPluginRepo
 
         scrollLayout->addWidget(publicationWidget = new ::CPublicationWidgetView(::CPublicationWidgetView::LIST, false));
 
+        scrollLayout->addWidget(ownerLabel = new QLabel);
+        ownerLabel->setWordWrap(true);
+
         scrollLayout->addWidget(tagLabel = new QLabel);
         tagLabel->setWordWrap(true);
 
@@ -522,15 +505,15 @@ class Ui::CDlgPluginRepo
         buttonBar->addWidget(loadLocalButton = new QPushButton("Load Local Plugin"));
         loadLocalButton->setFocusPolicy(Qt::NoFocus);
 
-        buttonBar->addWidget(submitPluginButton = new QPushButton("Sumbit a Plugin to the Repository"));
-        submitPluginButton->setFocusPolicy(Qt::NoFocus);
-
         buttonBar->addWidget(writeConfigButton = new QPushButton("Save FEBio Config File"));
         writeConfigButton->setFocusPolicy(Qt::NoFocus);
         writeConfigButton->setToolTip("Writes the current plugin configuration to an FEBio config file. "
             "This allows you to easily load these plugins into FEBio when launched from the command line by "
             "referencing the config file.");
 
+        buttonBar->addWidget(submitPluginButton = new QPushButton("Sumbit a Plugin to the Repository"));
+        submitPluginButton->setFocusPolicy(Qt::NoFocus);
+
         QWidget* spacer = new QWidget();
         spacer->setSizePolicy(QSizePolicy::Expanding,QSizePolicy::Preferred);
         buttonBar->addWidget(spacer);
@@ -602,8 +585,8 @@ class Ui::CDlgPluginRepo
         if(id > 0)
         {
             nameLabel->setText(plugin->name.c_str());
-            byLabel->show();
-            ownerLabel->setText(plugin->owner.c_str());
+            ownerLabel->setText(QString("Author: ") + plugin->owner.c_str());
+            ownerLabel->show();
             downloadLabel->show();
             downloadNumberLabel->setText(QString::number(plugin->downloads));
             downloadNumberLabel->show();
@@ -626,8 +609,7 @@ class Ui::CDlgPluginRepo
         else
         {
             nameLabel->setText(plugin->name.c_str());
-            byLabel->hide();
-            ownerLabel->setText("");
+            ownerLabel->hide();
             downloadLabel->hide();
             downloadNumberLabel->hide();
             descriptionLabel->setText(QString::fromStdString( plugin->description + "\n\nPath: " + plugin->files[0]));

FEBioStudio/PluginListWidget.cpp

@@ -35,16 +35,38 @@ SOFTWARE.*/
 #include <QResizeEvent>
 #include <QPixmap>
 #include <QPainter>
+#include <QScrollBar>
 #include "PluginListWidget.h"
 #include "PluginManager.h"
 #include "DlgPluginRepo.h"
 
+// A custom scroll area that only shows a vertical scrollbar, and resizes the viewport to fit the width of the contents
+class VerticalScrollArea : public QScrollArea
+{
+public:
+    explicit VerticalScrollArea(QWidget *parent = nullptr)
+    {
+        setWidgetResizable(true);
+        setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    }
+
+    bool eventFilter(QObject *o, QEvent *e) override
+    {
+        // This works because QScrollArea::setWidget installs an eventFilter on the widget
+        if(o && o == widget() && e->type() == QEvent::Resize)
+        setMinimumWidth(widget()->minimumSizeHint().width() + verticalScrollBar()->width());
+
+        return QScrollArea::eventFilter(o, e);
+    }
+};
+
 class Ui::PluginThumbnail
 {
 public:
     QLabel* imageLabel;
     QLabel* nameLabel;
-    QLabel* ownerLabel;
+    QLabel* centerLabel;
     QLabel* statusLabel;
 
 public:
@@ -75,11 +97,11 @@ class Ui::PluginThumbnail
             layout->setAlignment(Qt::AlignHCenter);
 
             nameLabel = new QLabel;
-            ownerLabel = new QLabel("<b>Connecting...</b>");
+            centerLabel = new QLabel("<b>Connecting...</b>");
             statusLabel = new QLabel;
 
             layout->addWidget(nameLabel, 0, Qt::AlignHCenter);
-            layout->addWidget(ownerLabel, 0, Qt::AlignHCenter);
+            layout->addWidget(centerLabel, 0, Qt::AlignHCenter);
             layout->addWidget(statusLabel, 0, Qt::AlignHCenter);
 
             m_parent->setLayout(layout);
@@ -101,18 +123,18 @@ class Ui::PluginThumbnail
         nameFont.setBold(true);
         nameLabel->setFont(nameFont);
 
-        ownerLabel = new QLabel(QString::fromStdString("<i>" + plugin->owner + "</i>"));
-        ownerLabel->setAlignment(Qt::AlignLeft);
-        QFont ownerFont = ownerLabel->font();
+        centerLabel = new QLabel;
+        centerLabel->setAlignment(Qt::AlignLeft);
+        QFont ownerFont = centerLabel->font();
         ownerFont.setItalic(true);
-        ownerLabel->setFont(ownerFont);
+        centerLabel->setFont(ownerFont);
 
         statusLabel = new QLabel(QString::fromStdString(plugin->description));
         statusLabel->setAlignment(Qt::AlignLeft);
         QFont statusFont = statusLabel->font();
 
         infoLayout->addWidget(nameLabel);
-        infoLayout->addWidget(ownerLabel);
+        infoLayout->addWidget(centerLabel);
         infoLayout->addWidget(statusLabel);
 
         // In order to get the appropriate size for the image label, we need
@@ -214,11 +236,14 @@ void PluginThumbnail::SetProgress(float progress)
 
 void PluginThumbnail::SetErrorText(const QString& text)
 {
-    ui->ownerLabel->setText(text);
+    ui->centerLabel->setText(text);
+    ui->centerLabel->show();
 }
 
 void PluginThumbnail::SetStatus(int status)
 {
+    ui->centerLabel->hide();
+
     ui->imageLabel->setPixmap(ui->pixmap);
 
     QPixmap pluginImg = ui->imageLabel->pixmap();
@@ -254,7 +279,6 @@ void PluginThumbnail::SetStatus(int status)
     case PLUGIN_LOCAL:
         setToolTip("This plugin in not part of the repository, but was loaded from a local file.");
         ui->statusLabel->setText("Local Plugin");
-        ui->ownerLabel->hide();
         break;
     case PLUGIN_DOWNLOADING:
         setToolTip("Downloading...");
@@ -339,7 +363,7 @@ class Ui::PluginListWidget
         QVBoxLayout* mainLayout = new QVBoxLayout;
         mainLayout->setContentsMargins(0, 0, 0, 0);
 
-        QScrollArea* scrollArea = new QScrollArea;
+        VerticalScrollArea* scrollArea = new VerticalScrollArea;
         QWidget* scrollWidget = new QWidget;
         QVBoxLayout* scrollLayout = new QVBoxLayout;
         scrollLayout->setContentsMargins(0,0,0,0);
@@ -380,8 +404,6 @@ class Ui::PluginListWidget
         mainLayout->addWidget(scrollArea);
 
         parent->setLayout(mainLayout);
-
-        parent->setMinimumWidth(250);
     }
 
     void updateUi(int repoStatus = CPluginManager::CONNECTED)