eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-04 06:09:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Try Again is working

Browse Source
This commit is contained in:
Akarshit Wal
2015-07-11 01:51:19 +05:30
parent 38a2e5a993
commit 428b8afd2c
2 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
app/src/processing/app/contrib/ContributionManagerDialog.java
View File

@@ -122,26 +122,22 @@ public class ContributionManagerDialog {
tabbedPane = new JTabbedPane();
toolsContributionTab.showFrame(editor,false, true);
makeAndShowTab(false, true);
tabbedPane.addTab("Tools", null, toolsContributionTab.panel, "Tools");
tabbedPane.setMnemonicAt(0, KeyEvent.VK_1);
librariesContributionTab.showFrame(editor,false, true);
tabbedPane.addTab("Libraries", null, librariesContributionTab.panel,
"Libraries");
tabbedPane.setMnemonicAt(1, KeyEvent.VK_2);
modesContributionTab.showFrame(editor,false, true);
tabbedPane.addTab("Modes", null, modesContributionTab.panel, "Modes");
tabbedPane.setMnemonicAt(2, KeyEvent.VK_3);
examplesContributionTab.showFrame(editor,false, true);
tabbedPane.addTab("Examples", null, examplesContributionTab.panel,
"Examples");
tabbedPane.setMnemonicAt(3, KeyEvent.VK_4);
updatesContributionTab.showFrame(editor,false, true);
tabbedPane.addTab("Updates", null, updatesContributionTab.panel, "Updates");
tabbedPane.setMnemonicAt(3, KeyEvent.VK_5);
tabbedPane.setUI(new SpacedTabbedPaneUI());
@@ -586,24 +582,25 @@ public class ContributionManagerDialog {
.text("contrib.errors.list_download"));
}
exception.printStackTrace();
toolsContributionTab.showFrame(editor, true, false);
librariesContributionTab.showFrame(editor, true, false);
modesContributionTab.showFrame(editor, true, false);
examplesContributionTab.showFrame(editor, true, false);
updatesContributionTab.showFrame(editor, true, false);
makeAndShowTab(true,false);
} else {
toolsContributionTab.showFrame(editor, false, false);
librariesContributionTab.showFrame(editor, false, false);
modesContributionTab.showFrame(editor, false, false);
examplesContributionTab.showFrame(editor, false, false);
updatesContributionTab.showFrame(editor, false, false);
makeAndShowTab(false, false);
activeTab.statusPanel.setMessage(Language.text("contrib.status.done"));
}
}
});
}
void makeAndShowTab(boolean activateErrorPanel, boolean isLoading) {
toolsContributionTab.showFrame(editor, activateErrorPanel, isLoading);
librariesContributionTab.showFrame(editor, activateErrorPanel, isLoading);
modesContributionTab.showFrame(editor, activateErrorPanel, isLoading);
examplesContributionTab.showFrame(editor, activateErrorPanel, isLoading);
updatesContributionTab.showFrame(editor, activateErrorPanel, isLoading);
}
/**
*
@@ -721,12 +718,4 @@ public class ContributionManagerDialog {
public boolean hasAlreadyBeenOpened() {
return dialog != null;
}
public void removeErrorPanel(boolean isLoading) {
toolsContributionTab.showFrame(editor, false, isLoading);
librariesContributionTab.showFrame(editor, false, isLoading);
modesContributionTab.showFrame(editor, false, isLoading);
examplesContributionTab.showFrame(editor, false, isLoading);
updatesContributionTab.showFrame(editor, false, isLoading);
}
}

11
app/src/processing/app/contrib/ContributionTab.java
View File

@@ -116,7 +116,8 @@ public class ContributionTab {
public void showFrame(final Editor editor, boolean activateErrorPanel, final boolean isLoading) {
public void showFrame(final Editor editor, boolean activateErrorPanel,
final boolean isLoading) {
this.editor = editor;
if (panel == null) {
setLayout(editor, activateErrorPanel, isLoading);
@@ -126,7 +127,6 @@ public class ContributionTab {
errorPanel.setVisible(activateErrorPanel);
panel.validate();
panel.repaint();
panel.setVisible(true);
}
@@ -135,7 +135,7 @@ public class ContributionTab {
progressBar = new JProgressBar();
progressBar.setVisible(false);
createComponents();
panel = new JPanel(true);
panel = new JPanel(false);
loaderLabel = new JLabel(Toolkit.getLibIcon("icons/loader.gif"));
loaderLabel.setOpaque(false);
loaderLabel.setBackground(Color.WHITE);
@@ -267,7 +267,7 @@ public class ContributionTab {
@Override
public void actionPerformed(ActionEvent e) {
contributionManagerDialog.removeErrorPanel(false);
contributionManagerDialog.makeAndShowTab(false, false);
}
});
tryAgainButton = new JButton("Try Again");
@@ -275,8 +275,7 @@ public class ContributionTab {
@Override
public void actionPerformed(ActionEvent e) {
// TODO see if this is complete
closeButton.doClick();
contributionManagerDialog.makeAndShowTab(false, true);
contributionManagerDialog.downloadAndUpdateContributionListing(editor.getBase());
}
});