Skip to content

Commit d361dc6

Browse files
authored
Merge pull request #67 from NicoKiaru/master
Adds swing ui which monitors scijava's tasks
2 parents 7bde4b2 + beb0b23 commit d361dc6

File tree

4 files changed

+728
-4
lines changed

4 files changed

+728
-4
lines changed

pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@
6969
<url>https://imagej.net/people/maarzt</url>
7070
<properties><id>maarzt</id></properties>
7171
</contributor>
72+
<contributor>
73+
<name>Nicolas Chiaruttini</name>
74+
<url>https://imagej.net/people/NicoKiaru</url>
75+
<properties><id>NicoKiaru</id></properties>
76+
</contributor>
7277
</contributors>
7378

7479
<mailingLists>
@@ -109,6 +114,7 @@
109114
<object-inspector.version>0.1</object-inspector.version>
110115
<scijava-plot.version>0.2.0</scijava-plot.version>
111116
<jfreesvg.version>3.2</jfreesvg.version>
117+
<scijava-common.version>2.88.0</scijava-common.version>
112118
</properties>
113119

114120
<repositories>

src/main/java/org/scijava/ui/swing/SwingStatusBar.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929

3030
package org.scijava.ui.swing;
3131

32-
import java.awt.BorderLayout;
33-
32+
import javax.swing.JComponent;
3433
import javax.swing.JLabel;
3534
import javax.swing.JPanel;
3635
import javax.swing.JProgressBar;
@@ -47,6 +46,10 @@
4746
import org.scijava.ui.StatusBar;
4847
import org.scijava.ui.UIService;
4948
import org.scijava.ui.awt.AWTInputEventDispatcher;
49+
import org.scijava.ui.swing.task.SwingTaskMonitorComponent;
50+
51+
import java.awt.BorderLayout;
52+
import java.awt.Dimension;
5053

5154
/**
5255
* Swing implementation of {@link StatusBar}.
@@ -72,14 +75,17 @@ public class SwingStatusBar extends JPanel implements StatusBar {
7275

7376
public SwingStatusBar(final Context context) {
7477
context.inject(this);
75-
7678
statusText = new JLabel(appService.getApp().getInfo(false));
7779
statusText.setBorder(new BevelBorder(BevelBorder.LOWERED));
7880
progressBar = new JProgressBar();
7981
progressBar.setVisible(false);
8082
setLayout(new BorderLayout());
8183
add(statusText, BorderLayout.CENTER);
82-
add(progressBar, BorderLayout.EAST);
84+
add(progressBar, BorderLayout.WEST);
85+
JComponent progress = new SwingTaskMonitorComponent(context, true, true,300, false).getComponent();
86+
int h = getPreferredSize().height;
87+
progress.setPreferredSize(new Dimension(h,h));
88+
add(progress, BorderLayout.EAST);
8389
}
8490

8591
// -- SwingStatusBar methods --

0 commit comments

Comments
 (0)