diff --git a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java index a80836d6..aec1add5 100644 --- a/app/src/main/java/io/xpipe/app/issue/UserReportComp.java +++ b/app/src/main/java/io/xpipe/app/issue/UserReportComp.java @@ -1,5 +1,7 @@ package io.xpipe.app.issue; +import atlantafx.base.controls.Popover; +import atlantafx.base.controls.Spacer; import io.xpipe.app.comp.base.ButtonComp; import io.xpipe.app.comp.base.ListSelectorComp; import io.xpipe.app.comp.base.MarkdownComp; @@ -7,7 +9,6 @@ import io.xpipe.app.comp.base.TitledPaneComp; import io.xpipe.app.core.*; import io.xpipe.app.fxcomps.Comp; import io.xpipe.app.fxcomps.SimpleComp; - import javafx.beans.property.ListProperty; import javafx.beans.property.SimpleListProperty; import javafx.beans.property.SimpleStringProperty; @@ -22,15 +23,9 @@ import javafx.scene.control.TextField; import javafx.scene.layout.*; import javafx.stage.Stage; -import atlantafx.base.controls.Popover; -import atlantafx.base.controls.Spacer; - import java.nio.file.Files; import java.nio.file.Path; -import static atlantafx.base.theme.Styles.ACCENT; -import static atlantafx.base.theme.Styles.BUTTON_OUTLINED; - public class UserReportComp extends SimpleComp { private final StringProperty email = new SimpleStringProperty(); @@ -130,7 +125,7 @@ public class UserReportComp extends SimpleComp { event1.consume(); }); var sendButton = new ButtonComp(AppI18n.observable("sendReport"), null, this::send) - .apply(struc -> struc.get().getStyleClass().addAll(BUTTON_OUTLINED, ACCENT)) + .apply(struc -> struc.get().setDefaultButton(true)) .createRegion(); var spacer = new Region(); var agree = new Label("Note the issue reporter "); diff --git a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java index fe7ab0c7..8ad5f611 100644 --- a/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/terminal/ExternalTerminalType.java @@ -630,16 +630,16 @@ public interface ExternalTerminalType extends PrefsChoiceValue { @Override public TerminalInitFunction additionalInitCommands() { return TerminalInitFunction.of(sc -> { - if (sc.getShellDialect() == ShellDialects.ZSH) { - return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"zsh\"}}\\x9c'"; - } - if (sc.getShellDialect() == ShellDialects.BASH) { - return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"bash\"}}\\x9c'"; - } - if (sc.getShellDialect() == ShellDialects.FISH) { - return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"fish\"}}\\x9c'"; - } - return null; + if (sc.getShellDialect() == ShellDialects.ZSH) { + return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"zsh\"}}\\x9c'"; + } + if (sc.getShellDialect() == ShellDialects.BASH) { + return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"bash\"}}\\x9c'"; + } + if (sc.getShellDialect() == ShellDialects.FISH) { + return "printf '\\eP$f{\"hook\": \"SourcedRcFileForWarp\", \"value\": { \"shell\": \"fish\"}}\\x9c'"; + } + return null; }); } }; diff --git a/dist/logo/ico/logo_40x40.png b/dist/logo/ico/logo_40x40.png new file mode 100644 index 00000000..5a7b848e Binary files /dev/null and b/dist/logo/ico/logo_40x40.png differ diff --git a/dist/logo/ico/logo_90x90.png b/dist/logo/ico/logo_90x90.png new file mode 100644 index 00000000..eda732d5 Binary files /dev/null and b/dist/logo/ico/logo_90x90.png differ diff --git a/dist/logo/logo.ico b/dist/logo/logo.ico index e684d9d6..1f6aa5a2 100644 Binary files a/dist/logo/logo.ico and b/dist/logo/logo.ico differ