Revert "Merge remote-tracking branch 'Tainfante_origin/master'"

This reverts commit a01f16f.
tainfante · Jan 24, 2018 · cb8ab65 · cb8ab65
1 parent a01f16f
commit cb8ab65
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 0 deletions.
diff --git a/.idea/artifacts/RealTimeSerialPlotter_jar.xml b/.idea/artifacts/RealTimeSerialPlotter_jar.xml
diff --git a/src/META-INF/MANIFEST.MF b/src/META-INF/MANIFEST.MF
@@ -0,0 +1,4 @@
+Manifest-Version: 1.0
+Class-Path: purejavacomm-1.0.2.RELEASE.jar
+Main-Class: application.Main
+
diff --git a/src/application/Main.java b/src/application/Main.java
@@ -4,6 +4,7 @@
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
+import javafx.scene.image.Image;
 import javafx.stage.Stage;
 import mainwindow.CaptureController;
 import plot.Plot;
@@ -22,6 +23,9 @@ public void start(Stage primaryStage) throws Exception
         primaryStage.setMinHeight(450.0);
         primaryStage.setMinWidth(620.0);
 
+        Image applicationIcon = new Image(getClass().getResourceAsStream("icon.png"));
+        primaryStage.getIcons().add(applicationIcon);
+
         primaryStage.setOnCloseRequest(event ->
         {
             CaptureController.isActiveExport = false;

diff --git a/src/application/RealTimeSerialPlotter_box.png b/src/application/RealTimeSerialPlotter_box.png
diff --git a/src/application/icon.png b/src/application/icon.png