Update logo
|
@ -51,12 +51,14 @@ public class AppWindowHelper {
|
||||||
stage.getIcons().clear();
|
stage.getIcons().clear();
|
||||||
|
|
||||||
// This allows for assigning logos even if AppImages has not been initialized yet
|
// This allows for assigning logos even if AppImages has not been initialized yet
|
||||||
AppResources.with(AppResources.XPIPE_MODULE, "img/logo", path -> {
|
var dir = OsType.getLocal() == OsType.MACOS ? "img/logo/padded" : "img/logo/full";
|
||||||
|
AppResources.with(AppResources.XPIPE_MODULE, dir, path -> {
|
||||||
for (String s : List.of(
|
for (String s : List.of(
|
||||||
"logo_16x16.png",
|
"logo_16x16.png",
|
||||||
"logo_24x24.png",
|
"logo_24x24.png",
|
||||||
"logo_32x32.png",
|
"logo_32x32.png",
|
||||||
"logo_48x48.png",
|
"logo_48x48.png",
|
||||||
|
"logo_64x64.png",
|
||||||
"logo_128x128.png",
|
"logo_128x128.png",
|
||||||
"logo_256x256.png")) {
|
"logo_256x256.png")) {
|
||||||
stage.getIcons().add(AppImages.loadImage(path.resolve(s)));
|
stage.getIcons().add(AppImages.loadImage(path.resolve(s)));
|
||||||
|
|
|
@ -134,7 +134,7 @@ public abstract class OperationMode {
|
||||||
public static void postInit(String[] args) {
|
public static void postInit(String[] args) {
|
||||||
try {
|
try {
|
||||||
// This will initialize the toolkit on macos and create the dock icon
|
// This will initialize the toolkit on macos and create the dock icon
|
||||||
// macOS it does not like applications that run fully in the background, so do it always
|
// macOS does not like applications that run fully in the background, so always do it
|
||||||
if (OsType.getLocal().equals(OsType.MACOS)) {
|
if (OsType.getLocal().equals(OsType.MACOS)) {
|
||||||
// URL open operations have to be handled in a special way on macOS!
|
// URL open operations have to be handled in a special way on macOS!
|
||||||
Desktop.getDesktop().setOpenURIHandler(e -> {
|
Desktop.getDesktop().setOpenURIHandler(e -> {
|
||||||
|
@ -156,7 +156,7 @@ public abstract class OperationMode {
|
||||||
// This is necessary in case XPipe was started through a script as it will have no icon otherwise
|
// This is necessary in case XPipe was started through a script as it will have no icon otherwise
|
||||||
if (AppProperties.get().isDeveloperMode() && AppLogs.get().isWriteToSysout()) {
|
if (AppProperties.get().isDeveloperMode() && AppLogs.get().isWriteToSysout()) {
|
||||||
try {
|
try {
|
||||||
var iconUrl = Main.class.getResourceAsStream("resources/img/logo/logo_macos_128x128.png");
|
var iconUrl = Main.class.getResourceAsStream("resources/img/logo/padded/logo_128x128.png");
|
||||||
if (iconUrl != null) {
|
if (iconUrl != null) {
|
||||||
var awtIcon = ImageIO.read(iconUrl);
|
var awtIcon = ImageIO.read(iconUrl);
|
||||||
Taskbar.getTaskbar().setIconImage(awtIcon);
|
Taskbar.getTaskbar().setIconImage(awtIcon);
|
||||||
|
|
|
@ -104,7 +104,7 @@ public class AboutCategory extends AppPrefsCategory {
|
||||||
AppI18n.get("xPipeClient"),
|
AppI18n.get("xPipeClient"),
|
||||||
"Version " + AppProperties.get().getVersion() + " ("
|
"Version " + AppProperties.get().getVersion() + " ("
|
||||||
+ AppProperties.get().getArch() + ")",
|
+ AppProperties.get().getArch() + ")",
|
||||||
"logo/logo_48x48.png");
|
"logo.png");
|
||||||
})
|
})
|
||||||
.styleClass(Styles.TEXT_BOLD);
|
.styleClass(Styles.TEXT_BOLD);
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,5 @@
|
||||||
package io.xpipe.app.prefs;
|
package io.xpipe.app.prefs;
|
||||||
|
|
||||||
import atlantafx.base.theme.Styles;
|
|
||||||
import io.xpipe.app.comp.base.TileButtonComp;
|
import io.xpipe.app.comp.base.TileButtonComp;
|
||||||
import io.xpipe.app.core.AppI18n;
|
import io.xpipe.app.core.AppI18n;
|
||||||
import io.xpipe.app.fxcomps.SimpleComp;
|
import io.xpipe.app.fxcomps.SimpleComp;
|
||||||
|
@ -89,8 +88,6 @@ public class UpdateCheckComp extends SimpleComp {
|
||||||
|
|
||||||
refresh();
|
refresh();
|
||||||
})
|
})
|
||||||
.styleClass(Styles.ACCENT)
|
|
||||||
.styleClass("button-comp")
|
|
||||||
.styleClass("update-button")
|
.styleClass("update-button")
|
||||||
.grow(true, false)
|
.grow(true, false)
|
||||||
.disable(PlatformThread.sync(
|
.disable(PlatformThread.sync(
|
||||||
|
|
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 2 KiB |
After Width: | Height: | Size: 11 KiB |
After Width: | Height: | Size: 859 B |
After Width: | Height: | Size: 1.3 KiB |
After Width: | Height: | Size: 25 KiB |
After Width: | Height: | Size: 1.9 KiB |
After Width: | Height: | Size: 3.1 KiB |
After Width: | Height: | Size: 4.2 KiB |
Before Width: | Height: | Size: 7 KiB |
Before Width: | Height: | Size: 647 B |
Before Width: | Height: | Size: 914 B |
Before Width: | Height: | Size: 992 B |
Before Width: | Height: | Size: 15 KiB |
Before Width: | Height: | Size: 1.3 KiB |
Before Width: | Height: | Size: 2 KiB |
Before Width: | Height: | Size: 7.6 KiB |
After Width: | Height: | Size: 8.3 KiB |
BIN
dist/logo/ico/logo_128x128.png
vendored
Before Width: | Height: | Size: 7 KiB After Width: | Height: | Size: 11 KiB |
BIN
dist/logo/ico/logo_16x16.png
vendored
Before Width: | Height: | Size: 647 B After Width: | Height: | Size: 859 B |
BIN
dist/logo/ico/logo_24x24.png
vendored
Before Width: | Height: | Size: 992 B After Width: | Height: | Size: 1.3 KiB |
BIN
dist/logo/ico/logo_256x256.png
vendored
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 25 KiB |
BIN
dist/logo/ico/logo_32x32.png
vendored
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.9 KiB |
BIN
dist/logo/ico/logo_48x48.png
vendored
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 3.1 KiB |
BIN
dist/logo/ico/logo_64x64.png
vendored
Normal file
After Width: | Height: | Size: 4.2 KiB |
BIN
dist/logo/logo.ico
vendored
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 115 KiB |
BIN
dist/logo/logo.png
vendored
Before Width: | Height: | Size: 5.9 KiB After Width: | Height: | Size: 11 KiB |