eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-13 18:35:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Progress bar is working Yipppegit add app/src/processing/app/contrib/ContributionPanel.java app/src/processing/app/contrib/StatusPanel.java

Browse Source
This commit is contained in:
Akarshit Wal
2015-07-01 23:14:57 +05:30
parent fbfaab084e
commit 3fa158075d
2 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/processing/app/contrib/ContributionPanel.java
View File

@@ -98,7 +98,7 @@ class ContributionPanel extends JPanel {
private JTextPane descriptionPane;
private JLabel notificationLabel;
private JButton updateButton;
private JProgressBar installProgressBar;
JProgressBar installProgressBar;
private JButton installRemoveButton;
private JPopupMenu contextMenu;
private JMenuItem openFolder;
@@ -114,7 +114,6 @@ class ContributionPanel extends JPanel {
StringBuilder description;
ContributionPanel(ContributionListPanel contributionListPanel) {
listPanel = contributionListPanel;
barButtonCardPane = new JPanel();
@@ -316,7 +315,7 @@ class ContributionPanel extends JPanel {
JPanel barPane = new JPanel();
barPane.setOpaque(false);
barPane.add(installProgressBar);
// barPane.add(installProgressBar);
JPanel buttonPane = new JPanel();
buttonPane.setOpaque(false);
@@ -373,7 +372,7 @@ class ContributionPanel extends JPanel {
JPanel barPane = new JPanel();
barPane.setOpaque(false);
barPane.setInheritsPopupMenu(true);
barPane.add(installProgressBar);
// barPane.add(installProgressBar);
rightPane.add(barPane);
if (isUpdateInProgress)
@@ -387,7 +386,7 @@ class ContributionPanel extends JPanel {
JPanel barPane = new JPanel();
barPane.setOpaque(false);
barPane.setInheritsPopupMenu(true);
barPane.add(installProgressBar);
// barPane.add(installProgressBar);
JPanel buttonPane = new JPanel();
buttonPane.setOpaque(false);

44
app/src/processing/app/contrib/StatusPanel.java
View File

@@ -21,6 +21,7 @@
*/
package processing.app.contrib;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@ -45,10 +46,11 @@ class StatusPanel extends JPanel {
JTextPane label;
JButton installButton;
JProgressBar installProgressBar;
JPanel progressBarPanel;
JLabel updateLabel;
JButton updateButton;
JButton removeButton;
GroupLayout layout;
ContributionListing contributionListing = ContributionListing.getInstance();
ContributionManagerDialog contributionManagerDialog;
@@ -76,18 +78,24 @@ class StatusPanel extends JPanel {
@Override
public void actionPerformed(ActionEvent e) {
StatusPanel.this.contributionManagerDialog.getActiveTab().contributionListPanel
.getSelectedPanel().install();
ContributionPanel currentPanel = StatusPanel.this.contributionManagerDialog.getActiveTab().contributionListPanel
.getSelectedPanel();
currentPanel.install();
StatusPanel.this.update(currentPanel);
}
});
installProgressBar = new JProgressBar();
progressBarPanel = new JPanel();
progressBarPanel.setLayout(new BorderLayout());;
updateLabel = new JLabel(" ");
updateButton = new JButton("Update");
updateButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
StatusPanel.this.contributionManagerDialog.getActiveTab().contributionListPanel.getSelectedPanel().update();
ContributionPanel currentPanel = StatusPanel.this.contributionManagerDialog.getActiveTab().contributionListPanel
.getSelectedPanel();
currentPanel.update();
StatusPanel.this.update(currentPanel);
}
});
@@ -96,12 +104,15 @@ class StatusPanel extends JPanel {
@Override
public void actionPerformed(ActionEvent e) {
StatusPanel.this.contributionManagerDialog.getActiveTab().contributionListPanel.getSelectedPanel().remove();
ContributionPanel currentPanel = StatusPanel.this.contributionManagerDialog.getActiveTab().contributionListPanel
.getSelectedPanel();
currentPanel.remove();
StatusPanel.this.update(currentPanel);
}
});
int labelWidth = width != 0 ? width * 3 / 4 : GroupLayout.PREFERRED_SIZE;
GroupLayout layout = new GroupLayout(this);
layout = new GroupLayout(this);
this.setLayout(layout);
layout.setAutoCreateContainerGaps(true);
@@ -115,7 +126,7 @@ class StatusPanel extends JPanel {
.addGroup(layout
.createParallelGroup(GroupLayout.Alignment.CENTER)
.addComponent(installButton, BUTTON_WIDTH, BUTTON_WIDTH,
BUTTON_WIDTH).addComponent(installProgressBar)
BUTTON_WIDTH).addComponent(progressBarPanel)
.addComponent(updateLabel).addComponent(updateButton)
.addComponent(removeButton)));
@@ -126,14 +137,14 @@ class StatusPanel extends JPanel {
.createSequentialGroup()
.addComponent(installButton)
.addGroup(layout.createParallelGroup()
.addComponent(installProgressBar)
.addComponent(progressBarPanel)
.addComponent(updateLabel))
.addComponent(updateButton).addComponent(removeButton)));
layout
.linkSize(SwingConstants.HORIZONTAL, installButton, installProgressBar, updateButton, removeButton);
.linkSize(SwingConstants.HORIZONTAL, installButton, progressBarPanel, updateButton, removeButton);
installProgressBar.setVisible(false);
progressBarPanel.setVisible(false);
updateLabel.setVisible(false);
installButton.setEnabled(false);
@@ -163,6 +174,8 @@ class StatusPanel extends JPanel {
}
public void update(ContributionPanel panel) {
progressBarPanel.removeAll();
label.setText(panel.description.toString());
@@ -200,10 +213,13 @@ class StatusPanel extends JPanel {
updateLabel.setText(currentVersion + " installed");
}
updateLabel.setVisible(true);
removeButton.setEnabled(panel.getContrib().isInstalled());
progressBarPanel.add(panel.installProgressBar);
if (panel.installProgressBar.isEnabled()) {
progressBarPanel.setVisible(true);
updateLabel.setVisible(false);
progressBarPanel.repaint();
}
}
}