Skip to content

Commit c7a9552

Browse files
committed
Show installed version in Plugin Installer
1 parent 44fb1f1 commit c7a9552

2 files changed

Lines changed: 42 additions & 9 deletions

File tree

Source/UI/PluginInstaller.cpp

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -879,6 +879,16 @@ PluginInfoComponent::PluginInfoComponent() : ThreadWithProgressWindow("Plugin In
879879
versionMenu.setTextWhenNoChoicesAvailable("- N/A -");
880880
versionMenu.addListener(this);
881881

882+
addChildComponent(installedVerLabel);
883+
installedVerLabel.setFont(infoFontBold);
884+
installedVerLabel.setColour(Label::textColourId, Colours::white);
885+
installedVerLabel.setText("Installed: ", dontSendNotification);
886+
887+
addChildComponent(installedVerText);
888+
installedVerText.setFont(infoFont);
889+
installedVerText.setColour(Label::textColourId, Colours::white);
890+
installedVerText.setMinimumHorizontalScale(1.0f);
891+
882892
addChildComponent(lastUpdatedLabel);
883893
lastUpdatedLabel.setFont(infoFontBold);
884894
lastUpdatedLabel.setColour(Label::textColourId, Colours::white);
@@ -945,13 +955,16 @@ void PluginInfoComponent::resized()
945955
versionLabel.setBounds(10, 90, 140, 30);
946956
versionMenu.setBounds(150, 90, 110, 26);
947957

948-
lastUpdatedLabel.setBounds(10, 120, 140, 30);
949-
lastUpdatedText.setBounds(145, 120, getWidth() - 10, 30);
958+
installedVerLabel.setBounds(10, versionLabel.getBottom(), 140, 30);
959+
installedVerText.setBounds(145, versionLabel.getBottom(), 110, 30);
960+
961+
lastUpdatedLabel.setBounds(10, installedVerLabel.getBottom(), 140, 30);
962+
lastUpdatedText.setBounds(145, installedVerLabel.getBottom(), getWidth() - 10, 30);
950963

951-
descriptionLabel.setBounds(10, 150, 140, 30);
952-
descriptionText.setBounds(145, 155, getWidth() - 150, 75);
964+
descriptionLabel.setBounds(10, lastUpdatedLabel.getBottom(), 140, 30);
965+
descriptionText.setBounds(145, lastUpdatedLabel.getBottom() + 5, getWidth() - 150, 75);
953966

954-
dependencyLabel.setBounds(10, 160 + descriptionText.getHeight(), 140, 30);
967+
dependencyLabel.setBounds(10, descriptionText.getBottom() + 5, 140, 30);
955968
dependencyText.setBounds(145, dependencyLabel.getY(), getWidth() - 10, 30);
956969

957970
downloadButton.setBounds(getWidth() - (getWidth() * 0.25) - 20, getHeight() - 60, getWidth() * 0.25, 30);
@@ -1193,6 +1206,11 @@ void PluginInfoComponent::setPluginInfo(const SelectedPluginInfo& p, bool should
11931206

11941207
versionMenu.clear(dontSendNotification);
11951208

1209+
if(pInfo.installedVersion.isEmpty())
1210+
installedVerText.setText("No", dontSendNotification);
1211+
else
1212+
installedVerText.setText(pInfo.installedVersion, dontSendNotification);
1213+
11961214
if (pInfo.versions.isEmpty())
11971215
{
11981216
downloadButton.setEnabled(false);
@@ -1227,6 +1245,9 @@ void PluginInfoComponent::makeInfoVisible(bool isEnabled)
12271245
versionLabel.setVisible(isEnabled);
12281246
versionMenu.setVisible(isEnabled);
12291247

1248+
installedVerLabel.setVisible(isEnabled);
1249+
installedVerText.setVisible(isEnabled);
1250+
12301251
lastUpdatedLabel.setVisible(isEnabled);
12311252
lastUpdatedText.setVisible(isEnabled);
12321253

Source/UI/PluginInstaller.h

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,13 +106,25 @@ class PluginInfoComponent : public Component,
106106
String downloadURL;
107107
Font infoFont, infoFontBold;
108108

109-
Label pluginNameLabel, pluginNameText;
110-
Label developersLabel, developersText;
109+
Label pluginNameLabel;
110+
Label pluginNameText;
111+
112+
Label developersLabel;
113+
Label developersText;
114+
111115
Label versionLabel;
112-
Label lastUpdatedLabel, lastUpdatedText;
116+
Label installedVerLabel;
117+
Label installedVerText;
118+
119+
Label lastUpdatedLabel;
120+
Label lastUpdatedText;
121+
113122
Label descriptionLabel;
114123
Label descriptionText;
115-
Label dependencyLabel, dependencyText;
124+
125+
Label dependencyLabel;
126+
Label dependencyText;
127+
116128
Label statusLabel;
117129

118130
TextButton downloadButton;

0 commit comments

Comments
 (0)