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

Add translate button and remove terminal tab option

Browse source
This commit is contained in:
crschnick 2024-04-03 07:09:12 +00:00
parent 6860feaa80
commit d8ce8ecf8c
5 changed files with 15 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/io/xpipe/app/comp/base/SideMenuBarComp.java
View file

@ -167,8 +167,19 @@ public class SideMenuBarComp extends Comp<CompStructure<VBox>> {
}
{
var b = new IconButtonComp("mdi2u-update", () -> UpdateAvailableAlert.showIfNeeded())
var b = new IconButtonComp("mdi2t-translate", () -> Hyperlinks.open(Hyperlinks.TRANSLATE))
.shortcut(new KeyCodeCombination(KeyCode.values()[KeyCode.DIGIT1.ordinal() + entries.size() + 3]))
.apply(new FancyTooltipAugment<>("translate"))
.apply(simpleBorders)
.accessibleTextKey("translate");
b.apply(struc -> {
AppFont.setSize(struc.get(), 2);
});
vbox.getChildren().add(b.createRegion());
}
{
var b = new IconButtonComp("mdi2u-update", () -> UpdateAvailableAlert.showIfNeeded())
.apply(new FancyTooltipAugment<>("updateAvailableTooltip"))
.accessibleTextKey("updateAvailableTooltip");
b.apply(struc -> {

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

@ -52,8 +52,6 @@ public class AppPrefs {
final DoubleProperty windowOpacity = map(new SimpleDoubleProperty(1.0), "windowOpacity", Double.class);
final StringProperty customTerminalCommand =
map(new SimpleStringProperty(""), "customTerminalCommand", String.class);
final BooleanProperty preferTerminalTabs =
map(new SimpleBooleanProperty(true), "preferTerminalTabs", Boolean.class);
final BooleanProperty clearTerminalOnInit =
map(new SimpleBooleanProperty(true), "clearTerminalOnInit", Boolean.class);
public final BooleanProperty disableCertutilUse =

16
app/src/main/java/io/xpipe/app/prefs/TerminalCategory.java
View file

@ -108,22 +108,6 @@ public class TerminalCategory extends AppPrefsCategory {
.apply(struc -> struc.get().setPromptText("myterminal -e $CMD"))
.hide(prefs.terminalType.isNotEqualTo(ExternalTerminalType.CUSTOM)))
.addComp(terminalTest)
.name("preferTerminalTabs")
.description(Bindings.createStringBinding(
() -> {
var disabled = prefs.terminalType().getValue() != null
&& !prefs.terminalType.get().supportsTabs();
return !disabled
? AppI18n.get("preferTerminalTabs")
: AppI18n.get(
"preferTerminalTabsDisabled",
prefs.terminalType()
.getValue()
.toTranslatedString()
.getValue());
},
prefs.terminalType()))
.addToggle(prefs.preferTerminalTabs)
.disable(Bindings.createBooleanBinding(
() -> {
return prefs.terminalType().getValue() != null

1
app/src/main/java/io/xpipe/app/util/Hyperlinks.java
View file

@ -9,6 +9,7 @@ public class Hyperlinks {
public static final String PRIVACY = "https://docs.xpipe.io/privacy-policy";
public static final String EULA = "https://docs.xpipe.io/end-user-license-agreement";
public static final String SECURITY = "https://docs.xpipe.io/security";
public static final String TRANSLATE = "https://github.com/xpipe-io/xpipe/lang";
public static final String DISCORD = "https://discord.gg/8y89vS8cRb";
public static final String SLACK =
"https://join.slack.com/t/XPipe/shared_invite/zt-1awjq0t5j-5i4UjNJfNe1VN4b_auu6Cg";

6
lang/app/strings/translations_en.properties
View file

@ -394,13 +394,10 @@ terminalEmulator=Terminal emulator
terminalConfiguration=Terminal configuration
editorConfiguration=Editor configuration
defaultApplication=Default application
terminalEmulatorDescription=The default terminal to use when opening any kind of shell connection. This application is only used for display purposes, the started shell program depends on the shell connection itself.
terminalEmulatorDescription=The default terminal to use when opening any kind of shell connection. This application is only used for display purposes, the started shell program depends on the shell connection itself.\n\nThe level of feature support varies by terminal, that is why each one is marked as either recommended or not recommended. All non-recommended terminals work with XPipe but might lack features like tabs, title colors, shell support, and more. Your user experience will be best when using a recommended terminal.
program=Program
customTerminalCommand=Custom terminal command
customTerminalCommandDescription=The command to execute to open the custom terminal with a given command.\n\nXPipe will create a temporary launcher shell script for your terminal to execute. The placeholder string $CMD in the command you supply will be replaced by the actual launcher script when called. Remember to quote your terminal executable path if it contains spaces.
preferTerminalTabs=Prefer to open new tabs
preferTerminalTabsDisabled=Prefer to open new tabs.\n\nThe currently selected terminal $TERM$ does not support opening tabs from the CLI.
preferTerminalTabsDescription=Controls whether XPipe will try to open new tabs in your chosen terminal instead of new windows.\n\nNote that not every terminal supports this.
clearTerminalOnInit=Clear terminal on init
clearTerminalOnInitDescription=When enabled, XPipe will run a clear command when a new terminal session is launched to remove any unnecessary output.
enableFastTerminalStartup=Enable fast terminal startup
@ -416,3 +413,4 @@ disableCertutilUseDescription=Due to several shortcomings and bugs in cmd.exe, t
disableTerminalRemotePasswordPreparation=Disable terminal remote password preparation
disableTerminalRemotePasswordPreparationDescription=In situations where a remote shell connection that goes through multiple intermediate systems should be established in the terminal, there might be a requirement to prepare any required passwords on one of the intermediate systems to allow for an automatic filling of any prompts.\n\nIf you don't want the passwords to ever be transferred to any intermediate system, you can disable this behavior. Any required intermediate password will then be queried in the terminal itself when opened.
more=More
translate=Translate