mirror of
https://github.com/xpipe-io/xpipe.git
synced 2024-09-15 16:59:00 +12:00
Small fixes [release]
This commit is contained in:
parent
0576fc22ec
commit
ba60355e98
7 changed files with 14 additions and 7 deletions
|
@ -7,6 +7,7 @@ import com.dlsc.preferencesfx.formsfx.view.controls.ToggleControl;
|
||||||
import com.dlsc.preferencesfx.model.Category;
|
import com.dlsc.preferencesfx.model.Category;
|
||||||
import com.dlsc.preferencesfx.model.Group;
|
import com.dlsc.preferencesfx.model.Group;
|
||||||
import com.dlsc.preferencesfx.model.Setting;
|
import com.dlsc.preferencesfx.model.Setting;
|
||||||
|
import com.dlsc.preferencesfx.util.VisibilityProperty;
|
||||||
import io.xpipe.app.core.AppDistributionType;
|
import io.xpipe.app.core.AppDistributionType;
|
||||||
import io.xpipe.app.core.AppProperties;
|
import io.xpipe.app.core.AppProperties;
|
||||||
import io.xpipe.app.core.AppStyle;
|
import io.xpipe.app.core.AppStyle;
|
||||||
|
@ -104,6 +105,9 @@ public class AppPrefs {
|
||||||
? ExternalStartupBehaviour.TRAY
|
? ExternalStartupBehaviour.TRAY
|
||||||
: ExternalStartupBehaviour.BACKGROUND),
|
: ExternalStartupBehaviour.BACKGROUND),
|
||||||
ExternalStartupBehaviour.class);
|
ExternalStartupBehaviour.class);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private final SingleSelectionField<ExternalStartupBehaviour> externalStartupBehaviourControl =
|
private final SingleSelectionField<ExternalStartupBehaviour> externalStartupBehaviourControl =
|
||||||
Field.ofSingleSelectionType(externalStartupBehaviourList, externalStartupBehaviour)
|
Field.ofSingleSelectionType(externalStartupBehaviourList, externalStartupBehaviour)
|
||||||
.render(() -> new TranslatableComboBoxControl<>());
|
.render(() -> new TranslatableComboBoxControl<>());
|
||||||
|
@ -395,7 +399,7 @@ public class AppPrefs {
|
||||||
Group.of(
|
Group.of(
|
||||||
"editor",
|
"editor",
|
||||||
Setting.of("defaultProgram", externalEditorControl, externalEditor),
|
Setting.of("defaultProgram", externalEditorControl, externalEditor),
|
||||||
Setting.of("customEditorCommand", customEditorCommandControl, customEditorCommand),
|
Setting.of("customEditorCommand", customEditorCommandControl, customEditorCommand).applyVisibility( VisibilityProperty.of(externalEditor.isEqualTo(ExternalEditorType.CUSTOM))),
|
||||||
Setting.of(
|
Setting.of(
|
||||||
"editorReloadTimeout",
|
"editorReloadTimeout",
|
||||||
editorReloadTimeout,
|
editorReloadTimeout,
|
||||||
|
|
|
@ -423,7 +423,7 @@ public class ShellTypes {
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String getTextFileWriteCommand(String content, String file) {
|
public String getTextFileWriteCommand(String content, String file) {
|
||||||
return "echo -e '" + content.replaceAll("\n", "\\\\n").replaceAll("'","\\\\'") + "' > \"" + file + "\"";
|
return "echo -e '" + content.replaceAll("\n", "\\\\n").replaceAll("'","'\\\\''") + "' > \"" + file + "\"";
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -23,6 +23,7 @@ import io.xpipe.core.dialog.BusyElement;
|
||||||
import io.xpipe.core.dialog.ChoiceElement;
|
import io.xpipe.core.dialog.ChoiceElement;
|
||||||
import io.xpipe.core.dialog.HeaderElement;
|
import io.xpipe.core.dialog.HeaderElement;
|
||||||
import io.xpipe.core.impl.*;
|
import io.xpipe.core.impl.*;
|
||||||
|
import io.xpipe.core.process.ShellType;
|
||||||
import io.xpipe.core.process.ShellTypes;
|
import io.xpipe.core.process.ShellTypes;
|
||||||
import io.xpipe.core.source.DataSource;
|
import io.xpipe.core.source.DataSource;
|
||||||
import io.xpipe.core.source.DataSourceReference;
|
import io.xpipe.core.source.DataSourceReference;
|
||||||
|
@ -46,15 +47,16 @@ public class CoreJacksonModule extends SimpleModule {
|
||||||
new NamedType(TupleType.class),
|
new NamedType(TupleType.class),
|
||||||
new NamedType(ArrayType.class),
|
new NamedType(ArrayType.class),
|
||||||
new NamedType(WildcardType.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(BaseQueryElement.class),
|
||||||
new NamedType(ChoiceElement.class),
|
new NamedType(ChoiceElement.class),
|
||||||
new NamedType(BusyElement.class),
|
new NamedType(BusyElement.class),
|
||||||
new NamedType(HeaderElement.class)
|
new NamedType(HeaderElement.class)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
for (ShellType t : ShellTypes.getAllShellTypes()) {
|
||||||
|
context.registerSubtypes(new NamedType(t.getClass()));
|
||||||
|
}
|
||||||
|
|
||||||
addSerializer(Charset.class, new CharsetSerializer());
|
addSerializer(Charset.class, new CharsetSerializer());
|
||||||
addDeserializer(Charset.class, new CharsetDeserializer());
|
addDeserializer(Charset.class, new CharsetDeserializer());
|
||||||
|
|
||||||
|
|
1
dist/changelogs/0.4.24.md
vendored
Normal file
1
dist/changelogs/0.4.24.md
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
- Fix UI issues
|
|
@ -66,7 +66,6 @@ public class ShellEnvironmentStoreProvider implements DataStoreProvider {
|
||||||
@Override
|
@Override
|
||||||
public String toSummaryString(DataStore store, int length) {
|
public String toSummaryString(DataStore store, int length) {
|
||||||
ShellEnvironmentStore s = store.asNeeded();
|
ShellEnvironmentStore s = store.asNeeded();
|
||||||
var local = ShellStore.isLocal(s.getHost());
|
|
||||||
var commandSummary = "<" + s.getCommands().lines().count() + " commands>";
|
var commandSummary = "<" + s.getCommands().lines().count() + " commands>";
|
||||||
return commandSummary;
|
return commandSummary;
|
||||||
}
|
}
|
||||||
|
|
|
@ -44,6 +44,7 @@ public class IconButtonComp extends Comp<CompStructure<JFXButton>> {
|
||||||
fi.iconColorProperty().bind(button.textFillProperty());
|
fi.iconColorProperty().bind(button.textFillProperty());
|
||||||
button.setGraphic(fi);
|
button.setGraphic(fi);
|
||||||
button.setOnAction(e -> {
|
button.setOnAction(e -> {
|
||||||
|
e.consume();
|
||||||
if (listener != null) {
|
if (listener != null) {
|
||||||
listener.run();
|
listener.run();
|
||||||
}
|
}
|
||||||
|
|
2
version
2
version
|
@ -1 +1 @@
|
||||||
0.4.23
|
0.4.24
|
Loading…
Reference in a new issue