Skip to content

Commit a11b825

Browse files
atarwatarw
authored
Revert "add support jprogressbar"
1 parent 472d611 commit a11b825

17 files changed

+365
-808
lines changed

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
*.java~
22
*.class
3-
out/
4-
/bin/
3+
out/

‎.idea/workspace.xml

Lines changed: 2 additions & 310 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.project

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎README.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,7 @@ public class MaterialUISwingDemo {
3636
frame.add (content, BorderLayout.CENTER);
3737

3838
// on hover, button will change to a light blue
39-
<<<<<<< refs/remotes/upstream/master
4039
MaterialUIMovement.add (button, MaterialColors.LIGHT_BLUE_500);
41-
=======
42-
MaterialUIMovement.add (button, MaterialColors.BLUE_400);
43-
>>>>>>> fix support for jscrollbar
4440

4541
frame.pack ();
4642
frame.setVisible (true);

‎lib/material-ui-swing.jar

1.46 KB
Binary file not shown.

‎src/MaterialUISwingDemo.java

Lines changed: 48 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,28 @@
33
import mdlaf.resources.MaterialColors;
44

55
import javax.swing.JButton;
6+
import javax.swing.JCheckBox;
67
import javax.swing.JComboBox;
78
import javax.swing.JFrame;
89
import javax.swing.JLabel;
910
import javax.swing.JMenu;
1011
import javax.swing.JMenuBar;
1112
import javax.swing.JMenuItem;
1213
import javax.swing.JPanel;
13-
import javax.swing.JProgressBar;
14+
import javax.swing.JPasswordField;
15+
import javax.swing.JRadioButton;
16+
import javax.swing.JScrollPane;
1417
import javax.swing.JSlider;
18+
import javax.swing.JSpinner;
19+
import javax.swing.JTabbedPane;
20+
import javax.swing.JTable;
21+
import javax.swing.JTextField;
22+
import javax.swing.JToggleButton;
1523
import javax.swing.JToolBar;
24+
import javax.swing.JTree;
25+
import javax.swing.SpinnerListModel;
1626
import javax.swing.UIManager;
1727
import javax.swing.UnsupportedLookAndFeelException;
18-
19-
import com.sun.xml.internal.ws.org.objectweb.asm.Label;
20-
2128
import java.awt.BorderLayout;
2229
import java.awt.Dimension;
2330

@@ -56,41 +63,10 @@ public static void main (String[] args) {
5663

5764
JPanel content = new JPanel ();
5865
content.add (button);
59-
60-
//configure JToolBar
61-
JToolBar toolBar = new JToolBar();
62-
toolBar.setRollover(true);
63-
JButton buttonOne = new JButton("button");
64-
toolBar.add(buttonOne);
65-
toolBar.addSeparator();
66-
toolBar.add(new JButton("button 2"));
67-
toolBar.add(new JComboBox(new String[]{"A","B","C"}));
68-
content.add(toolBar);
69-
70-
//Setting comboBox only
71-
JLabel labelCombo = new JLabel();
72-
labelCombo.setText("Combo");
73-
JComboBox<String> comboTest = new JComboBox<String>();
74-
comboTest.addItem("Prova uno");
75-
comboTest.addItem("Prova due");
76-
content.add(labelCombo);
77-
content.add(comboTest);
78-
79-
//settin Slider
80-
JSlider slider = new JSlider();
81-
JSlider sliderVertical = new JSlider(JSlider.VERTICAL);
82-
content.add(slider);
83-
content.add(sliderVertical);
84-
85-
//test Progressbar
86-
JProgressBar progressBar = new JProgressBar();
87-
progressBar.setMaximum(5);
88-
progressBar.setValue(2);
89-
content.add(progressBar);
9066

9167
// add everything to the frame
9268
frame.add (bar, BorderLayout.PAGE_START);
93-
frame.add (content, BorderLayout.CENTER);
69+
// frame.add (content, BorderLayout.CENTER);
9470

9571
// start animating!
9672
// here, 'gray' is the color that the JComponent will transition to when the user hovers over it
@@ -101,7 +77,42 @@ public static void main (String[] args) {
10177
// there will be 5 intermediate colors displayed in the transition from the original components color to the new one specified
10278
// the "frame rate" of the transition will be 1000 / 30, or 30 FPS
10379
// the animation will take 5 * 1000 / 30 = 166.666... milliseconds to complete
104-
MaterialUIMovement.add (button, MaterialColors.BLUE_400, 5, 1000 / 30);
80+
MaterialUIMovement.add (button, MaterialColors.LIGHT_BLUE_500, 5, 1000 / 30);
81+
82+
//
83+
content.add (new JCheckBox ("checkbox"));
84+
content.add (new JComboBox<String> (new String[]{"a", "b", "c"}));
85+
content.add (new JLabel ("label"));
86+
content.add (new JPasswordField ("password"));
87+
content.add (new JRadioButton ("radio button"));
88+
content.add (new JSlider (JSlider.HORIZONTAL, 0, 5, 2));
89+
content.add (new JSpinner (new SpinnerListModel (new String[]{"d", "e", "f"})));
90+
content.add (new JTable (new String[][]{{"a", "b", "c"}, {"d", "e", "f"}}, new String[]{"r", "e"}));
91+
content.add (new JTextField ("text field"));
92+
content.add (new JToggleButton ("toggle"));
93+
94+
JToolBar tb = new JToolBar ("toolbar");
95+
tb.add (new JButton ("f"));
96+
tb.addSeparator ();
97+
tb.add (new JButton ("e"));
98+
tb.setFloatable (true);
99+
content.add (tb);
100+
101+
JTree tree = new JTree (new String[]{"a", "b"});
102+
tree.setEditable (true);
103+
104+
content.add (tree);
105+
106+
JScrollPane sp = new JScrollPane (content);
107+
sp.setHorizontalScrollBarPolicy (JScrollPane.HORIZONTAL_SCROLLBAR_ALWAYS);
108+
sp.setVerticalScrollBarPolicy (JScrollPane.VERTICAL_SCROLLBAR_ALWAYS);
109+
110+
JTabbedPane tp = new JTabbedPane ();
111+
tp.addTab ("bleh1", new JPanel ());
112+
tp.addTab ("bleh", sp);
113+
114+
frame.add (tp, BorderLayout.CENTER);
115+
//
105116

106117
// make everything visible to the world
107118
frame.pack ();

‎src/imgs/lefth_arrow.png

-147 Bytes
Binary file not shown.

‎src/imgs/slider_point.png

-516 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)