Skip to content

Commit

Permalink
Merge branch 'feature/loader-20years' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
paulosousadias committed Sep 4, 2024
2 parents 1cbd7ab + d5fc4cd commit 7cba5e0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/java/pt/lsts/neptus/gui/Loader.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public class Loader extends JFrame implements ActionListener {
private JLabel jLabel = null;
private JLabel jLabel2 = null;
private String imgFileName = "images/neptus_version1.png";
private String imgFileName20 = "images/neptus-loader-20years.png";
private String typedString = "";
private Color backColor = new Color(242, 251, 254);
private Color frontColor = Color.GRAY;
Expand All @@ -74,6 +75,9 @@ public class Loader extends JFrame implements ActionListener {
*/
public Loader() {
super();
this.imgFileName = this.imgFileName20;
backColor = new Color(39, 50, 81);
frontColor = Color.LIGHT_GRAY;
initialize();
}

Expand Down Expand Up @@ -112,7 +116,8 @@ private JLabel getJLabel2() {
jLabel2 = new JLabel();
jLabel2.setText("Neptus " + ConfigFetch.getNeptusVersion());
jLabel2.setFont(new Font("Arial", Font.PLAIN, 10));
jLabel2.setForeground(new Color(150, 150, 150));
// jLabel2.setForeground(new Color(150, 150, 150));
jLabel2.setForeground(frontColor);
jLabel2.setBackground(backColor);
jLabel2.setAutoscrolls(true);
}
Expand Down
Binary file added src/resources/images/neptus-loader-20years.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 7cba5e0

Please sign in to comment.