Skip to content

Commit a480302

Browse files
committed
обновлен UI, исправлна ошибка при сборке
1 parent fce2d02 commit a480302

File tree

21 files changed

+1028
-1010
lines changed

21 files changed

+1028
-1010
lines changed

bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/AssemblerView.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,19 @@ public AssemblerView(final GUI gui) {
3636
this.cmanager = gui.getComponentManager();
3737

3838
JPanel pane = new JPanel(new BorderLayout());
39+
pane.setBackground(COLOR_BACKGROUND);
3940

4041
text = new JTextArea();
4142
text.setFont(FONT_COURIER_BOLD_21);
43+
text.setBackground(COLOR_BACKGROUND);
44+
text.setForeground(COLOR_TEXT);
45+
text.setCaretColor(COLOR_TEXT);
4246
JScrollPane scroll = new JScrollPane(text);
4347
pane.add(scroll,BorderLayout.CENTER);
4448

4549
JButton button = new JButton(cmanager.getRes().getString("compile"));
4650
button.setForeground(COLOR_TEXT);
51+
button.setBackground(COLOR_VALUE);
4752
button.setFont(FONT_COURIER_PLAIN_12);
4853
button.setFocusable(false);
4954
button.addActionListener(this);
@@ -55,7 +60,10 @@ public AssemblerView(final GUI gui) {
5560
errorarea = new JTextArea();
5661
//errorarea.setRows(3);
5762
errorarea.setEditable(false);
63+
errorarea.setBackground(COLOR_BACKGROUND);
64+
errorarea.setForeground(COLOR_TEXT);
5865
JScrollPane errscroll = new JScrollPane(errorarea);
66+
errscroll.setBackground(COLOR_BACKGROUND);
5967
pane.add(errscroll,BorderLayout.SOUTH);
6068

6169
JSplitPane splitpane = new JSplitPane(JSplitPane.VERTICAL_SPLIT, pane, errscroll);

bcomp-ng-ui/src/main/java/ru/ifmo/cs/bcomp/ui/components/BasicView.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,11 @@ public void setValue(long value) {
371371
for (int i = 1; i < 10; i++) {
372372
ioButtons[i-1] = new JToggleButton(cmanager.getRes().getString("DEV-" + i));
373373
ioButtons[i-1].setFont(FONT_COURIER_PLAIN_12);
374+
ioButtons[i-1].setBackground(COLOR_VALUE);
375+
ioButtons[i-1].setForeground(COLOR_TEXT);
374376
ioButtons[i-1].setFocusable(false);
375377
ioButtons[i-1].addItemListener(actionListeners[i-1]);
378+
376379
buttonsPanel.add(ioButtons[i-1], constraintsButton);
377380
constraintsButton.gridx++;
378381
}

0 commit comments

Comments
 (0)