DanilaFe
/
Abacus
mirror of https://github.com/DanilaFe/abacus
1
0
Fork 0
Code Issues Releases Wiki Activity

Make some adjustments to the UI.

This commit is contained in:
Danila Fedorin 2017-07-25 22:08:12 -07:00
parent 31b6adecd9
commit ade4eb1035
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/org/nwapw/abacus/window/Window.java
View File

@ -38,8 +38,8 @@ public class Window extends JFrame {
inputPanel = new JPanel(); inputPanel = new JPanel();
inputPanel.setLayout(new BorderLayout()); inputPanel.setLayout(new BorderLayout());
inputPanel.add(inputField); inputPanel.add(inputField, BorderLayout.CENTER);
inputPanel.add(inputEnterButton, BorderLayout.LINE_END); inputPanel.add(inputEnterButton, BorderLayout.EAST);
historyArea = new JTextArea(history); historyArea = new JTextArea(history);
historyAreaScroll = new JScrollPane(historyArea); historyAreaScroll = new JScrollPane(historyArea);
@ -49,29 +49,29 @@ public class Window extends JFrame {
outputPanel = new JPanel(); outputPanel = new JPanel();
outputPanel.setLayout(new BorderLayout()); outputPanel.setLayout(new BorderLayout());
outputPanel.add(historyAreaScroll); outputPanel.add(historyAreaScroll, BorderLayout.CENTER);
outputPanel.add(lastOutputArea, BorderLayout.PAGE_END); outputPanel.add(lastOutputArea, BorderLayout.SOUTH);
numberSystemList = new JComboBox<>(); numberSystemList = new JComboBox<>();
numberSystemPanel = new JPanel(); numberSystemPanel = new JPanel();
numberSystemPanel.setLayout(new BorderLayout()); numberSystemPanel.setLayout(new BorderLayout());
numberSystemPanel.add(new JLabel("Number Type:")); numberSystemPanel.add(new JLabel("Number Type:"), BorderLayout.NORTH);
numberSystemPanel.add(numberSystemList, BorderLayout.PAGE_END); numberSystemPanel.add(numberSystemList, BorderLayout.CENTER);
functionList = new JComboBox<>(); functionList = new JComboBox<>();
functionSelectButton = new JButton("Select"); functionSelectButton = new JButton("Select");
functionSelectPanel = new JPanel(); functionSelectPanel = new JPanel();
functionSelectPanel.setLayout(new BorderLayout()); functionSelectPanel.setLayout(new BorderLayout());
functionSelectPanel.add(new JLabel("Functions:")); functionSelectPanel.add(new JLabel("Functions:"), BorderLayout.NORTH);
functionSelectPanel.add(functionList, BorderLayout.LINE_END); functionSelectPanel.add(functionList, BorderLayout.CENTER);
functionSelectPanel.add(functionSelectButton, BorderLayout.LINE_END); functionSelectPanel.add(functionSelectButton, BorderLayout.SOUTH);
sidePanel = new JPanel(); sidePanel = new JPanel();
sidePanel.setLayout(new BorderLayout()); sidePanel.setLayout(new BorderLayout());
sidePanel.add(numberSystemPanel); sidePanel.add(numberSystemPanel, BorderLayout.NORTH);
sidePanel.add(functionSelectPanel, BorderLayout.PAGE_END); sidePanel.add(functionSelectPanel, BorderLayout.SOUTH);
add(outputPanel, BorderLayout.CENTER); add(outputPanel, BorderLayout.CENTER);
add(sidePanel, BorderLayout.EAST); add(sidePanel, BorderLayout.EAST);