Update src/main/java/dev/sillyangel/calc/Calculator.java
Some checks failed
Build the Jar / build (push) Failing after 9s
Some checks failed
Build the Jar / build (push) Failing after 9s
This commit is contained in:
@@ -23,7 +23,6 @@ import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
|
|||||||
import com.formdev.flatlaf.FlatClientProperties;
|
import com.formdev.flatlaf.FlatClientProperties;
|
||||||
import com.formdev.flatlaf.util.SystemInfo;
|
import com.formdev.flatlaf.util.SystemInfo;
|
||||||
import dev.sillyangel.calc.themes.*;
|
import dev.sillyangel.calc.themes.*;
|
||||||
import dev.sillyangel.calc.CalculatorModes;
|
|
||||||
|
|
||||||
public class Calculator extends JFrame implements KeyListener {
|
public class Calculator extends JFrame implements KeyListener {
|
||||||
|
|
||||||
@@ -46,7 +45,8 @@ public class Calculator extends JFrame implements KeyListener {
|
|||||||
protected double result;
|
protected double result;
|
||||||
private String[] Modes = new String[] {"Standard", "Scientific", "Data calculation"};
|
private String[] Modes = new String[] {"Standard", "Scientific", "Data calculation"};
|
||||||
private JComboBox<String> modeselect;
|
private JComboBox<String> modeselect;
|
||||||
|
private final CalculatorHistory history;
|
||||||
|
|
||||||
public static final String getVersion() {
|
public static final String getVersion() {
|
||||||
return APPILCATION_VERSION;
|
return APPILCATION_VERSION;
|
||||||
}
|
}
|
||||||
@@ -85,6 +85,8 @@ public class Calculator extends JFrame implements KeyListener {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
public Calculator() {
|
public Calculator() {
|
||||||
|
history = new CalculatorHistory();
|
||||||
|
|
||||||
setBackground(new Color(32, 32, 32));
|
setBackground(new Color(32, 32, 32));
|
||||||
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
|
||||||
//setIconImage(Toolkit.getDefaultToolkit().getImage(Calculator.class.getResource("/images/appIcon.png")));
|
//setIconImage(Toolkit.getDefaultToolkit().getImage(Calculator.class.getResource("/images/appIcon.png")));
|
||||||
|
|||||||
Reference in New Issue
Block a user