beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Small fixes [release]

Browse source
This commit is contained in:
crschnick 2023-02-01 18:18:42 +00:00
parent 76c78d9d78
commit c1cafcfced
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/java/io/xpipe/app/prefs/AppPrefs.java
View file

@ -7,6 +7,7 @@ import com.dlsc.preferencesfx.formsfx.view.controls.ToggleControl;
import com.dlsc.preferencesfx.model.Category;
import com.dlsc.preferencesfx.model.Group;
import com.dlsc.preferencesfx.model.Setting;
import com.dlsc.preferencesfx.util.VisibilityProperty;
import io.xpipe.app.core.AppDistributionType;
import io.xpipe.app.core.AppProperties;
import io.xpipe.app.core.AppStyle;
@ -104,6 +105,9 @@ public class AppPrefs {
? ExternalStartupBehaviour.TRAY
: ExternalStartupBehaviour.BACKGROUND),
ExternalStartupBehaviour.class);
private final SingleSelectionField<ExternalStartupBehaviour> externalStartupBehaviourControl =
Field.ofSingleSelectionType(externalStartupBehaviourList, externalStartupBehaviour)
.render(() -> new TranslatableComboBoxControl<>());
@ -395,7 +399,7 @@ public class AppPrefs {
Group.of(
"editor",
Setting.of("defaultProgram", externalEditorControl, externalEditor),
Setting.of("customEditorCommand", customEditorCommandControl, customEditorCommand),
Setting.of("customEditorCommand", customEditorCommandControl, customEditorCommand).applyVisibility( VisibilityProperty.of(externalEditor.isEqualTo(ExternalEditorType.CUSTOM))),
Setting.of(
"editorReloadTimeout",
editorReloadTimeout,

8
core/src/main/java/io/xpipe/core/util/CoreJacksonModule.java
View file

@ -23,6 +23,7 @@ import io.xpipe.core.dialog.BusyElement;
import io.xpipe.core.dialog.ChoiceElement;
import io.xpipe.core.dialog.HeaderElement;
import io.xpipe.core.impl.*;
import io.xpipe.core.process.ShellType;
import io.xpipe.core.process.ShellTypes;
import io.xpipe.core.source.DataSource;
import io.xpipe.core.source.DataSourceReference;
@ -46,15 +47,16 @@ public class CoreJacksonModule extends SimpleModule {
new NamedType(TupleType.class),
new NamedType(ArrayType.class),
new NamedType(WildcardType.class),
new NamedType(ShellTypes.Cmd.class),
new NamedType(ShellTypes.PowerShell.class),
new NamedType(ShellTypes.PosixBase.class),
new NamedType(BaseQueryElement.class),
new NamedType(ChoiceElement.class),
new NamedType(BusyElement.class),
new NamedType(HeaderElement.class)
);
for (ShellType t : ShellTypes.getAllShellTypes()) {
context.registerSubtypes(new NamedType(t.getClass()));
}
addSerializer(Charset.class, new CharsetSerializer());
addDeserializer(Charset.class, new CharsetDeserializer());

1
dist/changelogs/0.4.24.md vendored Normal file
View file

@ -0,0 +1 @@
- Fix UI issues

1
extension/src/main/java/io/xpipe/extension/fxcomps/impl/IconButtonComp.java
View file

@ -44,6 +44,7 @@ public class IconButtonComp extends Comp<CompStructure<JFXButton>> {
fi.iconColorProperty().bind(button.textFillProperty());
button.setGraphic(fi);
button.setOnAction(e -> {
e.consume();
if (listener != null) {
listener.run();
}

2
version
View file

@ -1 +1 @@
0.4.23
0.4.24