diff --git a/.gitignore b/.gitignore index d9e6dd2..d202f8d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ dependency-reduced-pom.xml config/ logs/ /Everest/BugReporter.jar +/RESTaurant.iml diff --git a/src/main/java/com/rohitawate/everest/main/Main.java b/src/main/java/com/rohitawate/everest/main/Main.java index 67b8ff1..a5f7eef 100644 --- a/src/main/java/com/rohitawate/everest/main/Main.java +++ b/src/main/java/com/rohitawate/everest/main/Main.java @@ -27,8 +27,6 @@ import javafx.scene.image.Image; import javafx.stage.Stage; public class Main extends Application { - public static final String applicationName = "Everest"; - @Override public void start(Stage primaryStage) throws Exception { Services.start(); @@ -43,9 +41,9 @@ public class Main extends Application { Stage dashboardStage = new Stage(); ThemeManager.setTheme(homeWindow); - dashboardStage.getIcons().add(new Image(getClass().getResource("/assets/LogoWithoutText.png").toExternalForm())); + dashboardStage.getIcons().add(new Image(getClass().getResource("/assets/Logo.png").toExternalForm())); dashboardStage.setScene(new Scene(homeWindow)); - dashboardStage.setTitle(applicationName); + dashboardStage.setTitle("Everest"); dashboardStage.show(); EverestUtilities.createBugReporter(); diff --git a/src/main/resources/assets/Logo.png b/src/main/resources/assets/Logo.png index b24561f..4ae3152 100644 Binary files a/src/main/resources/assets/Logo.png and b/src/main/resources/assets/Logo.png differ diff --git a/src/main/resources/assets/LogoWithoutText.png b/src/main/resources/assets/LogoWithoutText.png deleted file mode 100644 index 93d19c5..0000000 Binary files a/src/main/resources/assets/LogoWithoutText.png and /dev/null differ diff --git a/src/main/resources/assets/editables/Logo.svg b/src/main/resources/assets/editables/Logo.svg index ffc5b9a..b189703 100644 --- a/src/main/resources/assets/editables/Logo.svg +++ b/src/main/resources/assets/editables/Logo.svg @@ -13,11 +13,11 @@ viewBox="0 0 512 512" version="1.1" id="svg8" - inkscape:version="0.92.1 r15371" - sodipodi:docname="Logo.svg" inkscape:export-filename="D:\IntelliJ Projects\Everest\src\main\resources\assets\Logo.png" - inkscape:export-xdpi="6.3499999" - inkscape:export-ydpi="6.3499999"> + inkscape:export-xdpi="12.7" + inkscape:export-ydpi="12.7" + inkscape:version="0.92.1 r15371" + sodipodi:docname="Logo.svg"> image/svg+xml - + @@ -56,57 +56,40 @@ id="layer1" transform="translate(0,215)"> + inkscape:transform-center-y="-54.179678" + inkscape:transform-center-x="8.5501103e-006" + d="m 490.17284,188.75801 -233.9741,0 116.98705,-202.627509 z" + inkscape:randomized="0" + inkscape:rounded="0" + inkscape:flatsided="true" + sodipodi:arg2="1.5707963" + sodipodi:arg1="0.52359878" + sodipodi:r2="67.542503" + sodipodi:r1="135.08501" + sodipodi:cy="121.21551" + sodipodi:cx="373.18579" + sodipodi:sides="3" + id="path4493" + style="opacity:1;fill:#cccccc;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:9.09350967;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + sodipodi:type="star" + transform="matrix(1.2811389,0,0,1.6043135,-129.20475,-59.590329)"/> - - REST - aurant + sodipodi:type="star" + style="opacity:1;fill:#ff6600;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:13.29243469;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4491" + sodipodi:sides="3" + sodipodi:cx="192.83295" + sodipodi:cy="90.365112" + sodipodi:r1="197.46045" + sodipodi:r2="98.730225" + sodipodi:arg1="0.52359878" + sodipodi:arg2="1.5707963" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 363.83871,189.09534 -342.011529,0 171.005769,-296.19068 z" + inkscape:transform-center-x="9.7002362e-006" + inkscape:transform-center-y="-67.412235" + transform="matrix(1.0503018,0,0,1.3655845,-9.6998665,-14.988965)"/> diff --git a/src/main/resources/fxml/homewindow/Dashboard.fxml b/src/main/resources/fxml/homewindow/Dashboard.fxml index 139f30e..9dba320 100644 --- a/src/main/resources/fxml/homewindow/Dashboard.fxml +++ b/src/main/resources/fxml/homewindow/Dashboard.fxml @@ -23,7 +23,7 @@ @@ -32,7 +32,7 @@ - +