diff --git a/design/perfin-logo.svg b/design/perfin-logo.svg index a4d5e94..6bfcdd1 100644 --- a/design/perfin-logo.svg +++ b/design/perfin-logo.svg @@ -26,9 +26,9 @@ inkscape:pagecheckerboard="1" inkscape:deskcolor="#505050" inkscape:document-units="px" - inkscape:zoom="8" - inkscape:cx="25.125" - inkscape:cy="33.375" + inkscape:zoom="11.313709" + inkscape:cx="32.438524" + inkscape:cy="30.228815" inkscape:window-width="1920" inkscape:window-height="1025" inkscape:window-x="1080" @@ -66,13 +66,15 @@ d="M 15.696199 1.2371338 L 1.2371338 15.696199 C 2.002308 16.461373 3.0607012 16.933333 4.2333332 16.933333 L 12.7 16.933333 C 15.045264 16.933333 16.933333 15.045264 16.933333 12.7 L 16.933333 4.2333332 C 16.933333 3.0607012 16.461373 2.002308 15.696199 1.2371338 z " /> + style="display:inline;fill:#346b23;fill-opacity:1;stroke:none;stroke-width:0.79375;stroke-linecap:round" + d="M 9.537919,7.3954134 7.984009,8.9493237 V 13.384195 C 7.108943,13.339155 6.414126,13.117013 5.899382,12.718086 5.591151,12.475354 5.346639,12.158421 5.162993,11.77034 l -1.204061,1.204061 c 0.792283,1.097222 2.132722,1.678716 4.025077,1.741495 v 1.553911 h 1.235584 v -1.553911 c 1.441285,-0.05791 2.548094,-0.389429 3.320211,-0.994254 0.772117,-0.611259 1.158069,-1.437594 1.158069,-2.479952 0,-0.514745 -0.07422,-0.96528 -0.222209,-1.3513385 C 13.327675,9.4978588 13.10605,9.1533177 12.810072,8.8573396 12.514093,8.5613615 12.117989,8.2978085 11.622547,8.0661735 11.178148,7.8584026 10.474116,7.6342452 9.537919,7.3954134 Z M 9.219593,8.8573396 c 0.8815,0.2252008 1.482826,0.4314552 1.804541,0.6180501 0.321715,0.1801606 0.569381,0.4085543 0.743107,0.6852293 0.180161,0.276675 0.270268,0.627468 0.270268,1.052132 0,0.649865 -0.23803,1.164468 -0.714168,1.544092 -0.476139,0.37319 -1.177208,0.588563 -2.103748,0.646472 z" + sodipodi:nodetypes="cccccccccccccscssccccsccc" /> + style="font-size:8px;line-height:8.64px;font-family:'Liberation Mono';-inkscape-font-specification:'Liberation Mono';letter-spacing:0px;word-spacing:0px;white-space:pre;shape-inside:url(#rect3);display:inline;fill:#ca9c00;fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round" + d="m 25.689419,18.184344 v 0.507817 c -0.54427,0.01823 -0.959661,0.136597 -1.246119,0.355347 -0.283854,0.216146 -0.425622,0.518229 -0.425622,0.90625 0,0.244791 0.0468,0.455806 0.14055,0.632889 0.09635,0.177084 0.24613,0.32939 0.449255,0.456994 0.205729,0.125 0.527312,0.240838 0.964812,0.347609 l 0.117124,0.03137 v 0.115242 l 0.628916,-0.628916 c -0.04352,-0.0111 -0.08269,-0.02199 -0.128837,-0.03325 v -1.664003 c 0.283854,0.01823 0.509099,0.0976 0.675766,0.238223 0.158491,0.133727 0.2669,0.329437 0.326484,0.585622 l 0.527896,-0.527896 c -0.107669,-0.217411 -0.243902,-0.385244 -0.409099,-0.503008 -0.26302,-0.190104 -0.636672,-0.294241 -1.121047,-0.312471 v -0.507817 z m 0,1.0194 v 1.613387 c -0.309896,-0.08073 -0.523441,-0.153667 -0.640628,-0.218771 -0.117188,-0.06771 -0.207095,-0.150977 -0.269595,-0.249935 -0.0599,-0.101562 -0.08973,-0.22657 -0.08973,-0.375007 0,-0.236979 0.08464,-0.420695 0.253909,-0.550903 0.16927,-0.132812 0.417915,-0.20575 0.74604,-0.218771 z" + transform="matrix(2.4707763,0,0,2.4707763,-55.488799,-44.26592)" + sodipodi:nodetypes="cccscccccccccccccccccccscsc" /> diff --git a/design/perfin-logo_256.ico b/design/perfin-logo_256.ico index 389ecbf..82c2d02 100644 Binary files a/design/perfin-logo_256.ico and b/design/perfin-logo_256.ico differ diff --git a/design/perfin-logo_256.png b/design/perfin-logo_256.png index 3a97420..68474c1 100644 Binary files a/design/perfin-logo_256.png and b/design/perfin-logo_256.png differ diff --git a/design/splash-screen.svg b/design/splash-screen.svg index f86ba60..580ab2f 100644 --- a/design/splash-screen.svg +++ b/design/splash-screen.svg @@ -12,11 +12,11 @@ inkscape:export-filename="../src/main/resources/images/splash-screen.png" inkscape:export-xdpi="96" inkscape:export-ydpi="96" + xml:space="preserve" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns="http://www.w3.org/2000/svg" - xmlns:svg="http://www.w3.org/2000/svg"> - - - - - - - + sodipodi:nodetypes="ccczzzc" /> diff --git a/src/main/java/com/andrewlalis/perfin/PerfinApp.java b/src/main/java/com/andrewlalis/perfin/PerfinApp.java index 42e4d3f..8ec3dbc 100644 --- a/src/main/java/com/andrewlalis/perfin/PerfinApp.java +++ b/src/main/java/com/andrewlalis/perfin/PerfinApp.java @@ -15,7 +15,6 @@ import javafx.stage.Stage; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.io.IOException; import java.net.URL; import java.nio.file.Files; import java.nio.file.Path; @@ -66,7 +65,7 @@ public class PerfinApp extends Application { ); stage.setScene(mainViewScene); stage.setTitle("Perfin"); - stage.getIcons().add(ImageCache.getLogo64()); + stage.getIcons().add(ImageCache.getLogo256()); }); } diff --git a/src/main/java/com/andrewlalis/perfin/view/ImageCache.java b/src/main/java/com/andrewlalis/perfin/view/ImageCache.java index cd2051c..f3033be 100644 --- a/src/main/java/com/andrewlalis/perfin/view/ImageCache.java +++ b/src/main/java/com/andrewlalis/perfin/view/ImageCache.java @@ -34,7 +34,7 @@ public class ImageCache { "S-" + smooth; } - public static Image getLogo64() { - return instance.get("/images/perfin-logo_64.png", 64, 64, true, true); + public static Image getLogo256() { + return instance.get("/images/perfin-logo_256.png", 256, 256, true, true); } } diff --git a/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java b/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java index 7c9d55d..4714cb9 100644 --- a/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java +++ b/src/main/java/com/andrewlalis/perfin/view/StartupSplashScreen.java @@ -26,7 +26,7 @@ public class StartupSplashScreen extends Stage implements Consumer { setTitle("Starting Perfin..."); setResizable(false); initStyle(StageStyle.UNDECORATED); - getIcons().add(ImageCache.getLogo64()); + getIcons().add(ImageCache.getLogo256()); setScene(buildScene()); setOnShowing(event -> runTasks()); diff --git a/src/main/resources/images/perfin-logo_256.png b/src/main/resources/images/perfin-logo_256.png new file mode 100644 index 0000000..68474c1 Binary files /dev/null and b/src/main/resources/images/perfin-logo_256.png differ diff --git a/src/main/resources/images/perfin-logo_64.png b/src/main/resources/images/perfin-logo_64.png deleted file mode 100644 index f3cf99a..0000000 Binary files a/src/main/resources/images/perfin-logo_64.png and /dev/null differ diff --git a/src/main/resources/images/splash-screen.png b/src/main/resources/images/splash-screen.png index 3e9c1b8..76d1e27 100644 Binary files a/src/main/resources/images/splash-screen.png and b/src/main/resources/images/splash-screen.png differ