Friendly hint of failing to rename game version
This commit is contained in:
@@ -31,6 +31,7 @@ import org.jackhuang.hmcl.ui.construct.InputDialogPane;
|
|||||||
import org.jackhuang.hmcl.ui.construct.MessageBox;
|
import org.jackhuang.hmcl.ui.construct.MessageBox;
|
||||||
import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
|
import org.jackhuang.hmcl.ui.construct.MessageDialogPane;
|
||||||
import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
|
import org.jackhuang.hmcl.ui.construct.TaskExecutorDialogPane;
|
||||||
|
import org.jackhuang.hmcl.util.FutureCallback;
|
||||||
import org.jackhuang.hmcl.util.JavaVersion;
|
import org.jackhuang.hmcl.util.JavaVersion;
|
||||||
|
|
||||||
import java.util.function.Consumer;
|
import java.util.function.Consumer;
|
||||||
@@ -140,8 +141,10 @@ public final class Controllers {
|
|||||||
dialog(new MessageDialogPane(text, title, onAccept, onCancel));
|
dialog(new MessageDialogPane(text, title, onAccept, onCancel));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void inputDialog(String text, Consumer<String> onResult) {
|
public static InputDialogPane inputDialog(String text, FutureCallback<String> onResult) {
|
||||||
dialog(new InputDialogPane(text, onResult));
|
InputDialogPane pane = new InputDialogPane(text, onResult);
|
||||||
|
dialog(pane);
|
||||||
|
return pane;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
|
public static Region taskDialog(TaskExecutor executor, String title, String subtitle) {
|
||||||
|
|||||||
@@ -195,12 +195,15 @@ public final class VersionPage extends StackPane implements DecoratorPage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static void renameVersion(Profile profile, String version) {
|
public static void renameVersion(Profile profile, String version) {
|
||||||
Controllers.inputDialog(i18n("version.manage.rename.message"), res -> {
|
Controllers.inputDialog(i18n("version.manage.rename.message"), (res, resolve, reject) -> {
|
||||||
if (profile.getRepository().renameVersion(version, res)) {
|
if (profile.getRepository().renameVersion(version, res)) {
|
||||||
profile.getRepository().refreshVersionsAsync().start();
|
profile.getRepository().refreshVersionsAsync().start();
|
||||||
Controllers.navigate(null);
|
Controllers.navigate(null);
|
||||||
|
resolve.run();
|
||||||
|
} else {
|
||||||
|
reject.accept(i18n("version.manage.rename.fail"));
|
||||||
}
|
}
|
||||||
});
|
}).setInitialText(version);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void exportVersion(Profile profile, String version) {
|
public static void exportVersion(Profile profile, String version) {
|
||||||
|
|||||||
@@ -19,12 +19,12 @@ package org.jackhuang.hmcl.ui.construct;
|
|||||||
|
|
||||||
import com.jfoenix.controls.JFXButton;
|
import com.jfoenix.controls.JFXButton;
|
||||||
import com.jfoenix.controls.JFXTextField;
|
import com.jfoenix.controls.JFXTextField;
|
||||||
|
import javafx.beans.binding.Bindings;
|
||||||
import javafx.fxml.FXML;
|
import javafx.fxml.FXML;
|
||||||
import javafx.scene.control.Label;
|
import javafx.scene.control.Label;
|
||||||
import javafx.scene.layout.StackPane;
|
import javafx.scene.layout.StackPane;
|
||||||
import org.jackhuang.hmcl.ui.FXUtils;
|
import org.jackhuang.hmcl.ui.FXUtils;
|
||||||
|
import org.jackhuang.hmcl.util.FutureCallback;
|
||||||
import java.util.function.Consumer;
|
|
||||||
|
|
||||||
public class InputDialogPane extends StackPane {
|
public class InputDialogPane extends StackPane {
|
||||||
|
|
||||||
@@ -36,14 +36,28 @@ public class InputDialogPane extends StackPane {
|
|||||||
private JFXTextField textField;
|
private JFXTextField textField;
|
||||||
@FXML
|
@FXML
|
||||||
private Label content;
|
private Label content;
|
||||||
|
@FXML
|
||||||
|
private Label lblCreationWarning;
|
||||||
|
|
||||||
public InputDialogPane(String text, Consumer<String> onResult) {
|
public InputDialogPane(String text, FutureCallback<String> onResult) {
|
||||||
FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
|
FXUtils.loadFXML(this, "/assets/fxml/input-dialog.fxml");
|
||||||
content.setText(text);
|
content.setText(text);
|
||||||
cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
|
cancelButton.setOnMouseClicked(e -> fireEvent(new DialogCloseEvent()));
|
||||||
acceptButton.setOnMouseClicked(e -> {
|
acceptButton.setOnMouseClicked(e -> {
|
||||||
onResult.accept(textField.getText());
|
onResult.call(textField.getText(), () -> {
|
||||||
fireEvent(new DialogCloseEvent());
|
fireEvent(new DialogCloseEvent());
|
||||||
|
}, msg -> {
|
||||||
|
lblCreationWarning.setText(msg);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
acceptButton.disableProperty().bind(Bindings.createBooleanBinding(
|
||||||
|
() -> !textField.validate(),
|
||||||
|
textField.textProperty()
|
||||||
|
));
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setInitialText(String text) {
|
||||||
|
textField.setText(text);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@
|
|||||||
<?import com.jfoenix.controls.JFXTextField?>
|
<?import com.jfoenix.controls.JFXTextField?>
|
||||||
<?import javafx.scene.control.Label?>
|
<?import javafx.scene.control.Label?>
|
||||||
<?import javafx.scene.layout.StackPane?>
|
<?import javafx.scene.layout.StackPane?>
|
||||||
|
<?import org.jackhuang.hmcl.ui.construct.SpinnerPane?>
|
||||||
<fx:root xmlns="http://javafx.com/javafx"
|
<fx:root xmlns="http://javafx.com/javafx"
|
||||||
xmlns:fx="http://javafx.com/fxml"
|
xmlns:fx="http://javafx.com/fxml"
|
||||||
type="StackPane">
|
type="StackPane">
|
||||||
@@ -16,8 +17,11 @@
|
|||||||
<JFXTextField fx:id="textField" />
|
<JFXTextField fx:id="textField" />
|
||||||
</body>
|
</body>
|
||||||
<actions>
|
<actions>
|
||||||
|
<Label fx:id="lblCreationWarning"/>
|
||||||
|
<SpinnerPane fx:id="acceptPane" styleClass="small-spinner-pane">
|
||||||
|
<JFXButton fx:id="acceptButton" text="%button.ok" styleClass="dialog-accept"/>
|
||||||
|
</SpinnerPane>
|
||||||
<JFXButton fx:id="cancelButton" styleClass="dialog-cancel" text="%button.cancel" />
|
<JFXButton fx:id="cancelButton" styleClass="dialog-cancel" text="%button.cancel" />
|
||||||
<JFXButton fx:id="acceptButton" styleClass="dialog-accept" text="%button.ok" />
|
|
||||||
</actions>
|
</actions>
|
||||||
</JFXDialogLayout>
|
</JFXDialogLayout>
|
||||||
</fx:root>
|
</fx:root>
|
||||||
|
|||||||
@@ -325,11 +325,12 @@ version.launch_script.failed=Unable to make launch script.
|
|||||||
version.launch_script.save=Save the launch script
|
version.launch_script.save=Save the launch script
|
||||||
version.launch_script.success=Finished script creation, %s.
|
version.launch_script.success=Finished script creation, %s.
|
||||||
version.manage.redownload_assets_index=Redownload Assets Index
|
version.manage.redownload_assets_index=Redownload Assets Index
|
||||||
version.manage.remove=Delete this version
|
version.manage.remove=Delete this game
|
||||||
version.manage.remove.confirm=Sure to remove version %s?
|
version.manage.remove.confirm=Sure to remove version %s?
|
||||||
version.manage.remove_libraries=Delete library files
|
version.manage.remove_libraries=Delete library files
|
||||||
version.manage.rename=Rename this version
|
version.manage.rename=Rename this game
|
||||||
version.manage.rename.message=Please enter the new name
|
version.manage.rename.message=Please enter the new name
|
||||||
|
version.manage.rename.fail=Failed to rename this game.
|
||||||
version.settings=Settings
|
version.settings=Settings
|
||||||
version.update=Update
|
version.update=Update
|
||||||
|
|
||||||
|
|||||||
@@ -330,6 +330,7 @@ version.manage.remove.confirm=真的要刪除版本 %s 嗎?
|
|||||||
version.manage.remove_libraries=刪除所有庫文件
|
version.manage.remove_libraries=刪除所有庫文件
|
||||||
version.manage.rename=重命名該版本
|
version.manage.rename=重命名該版本
|
||||||
version.manage.rename.message=請輸入要改成的名字
|
version.manage.rename.message=請輸入要改成的名字
|
||||||
|
version.manage.rename.fail=重命名版本失敗,可能文件被佔用或者名字有特殊字符
|
||||||
version.settings=遊戲設置
|
version.settings=遊戲設置
|
||||||
version.update=更新
|
version.update=更新
|
||||||
|
|
||||||
|
|||||||
@@ -330,6 +330,7 @@ version.manage.remove.confirm=真的要删除版本 %s 吗?
|
|||||||
version.manage.remove_libraries=删除所有库文件
|
version.manage.remove_libraries=删除所有库文件
|
||||||
version.manage.rename=重命名该版本
|
version.manage.rename=重命名该版本
|
||||||
version.manage.rename.message=请输入要改成的名字
|
version.manage.rename.message=请输入要改成的名字
|
||||||
|
version.manage.rename.fail=重命名版本失败,可能文件被占用或者名字有特殊字符
|
||||||
version.settings=游戏设置
|
version.settings=游戏设置
|
||||||
version.update=更新
|
version.update=更新
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,25 @@
|
|||||||
|
/*
|
||||||
|
* Hello Minecraft! Launcher.
|
||||||
|
* Copyright (C) 2017 huangyuhui <huanghongxun2008@126.com>
|
||||||
|
*
|
||||||
|
* This program is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program. If not, see {http://www.gnu.org/licenses/}.
|
||||||
|
*/
|
||||||
|
package org.jackhuang.hmcl.util;
|
||||||
|
|
||||||
|
import java.util.function.Consumer;
|
||||||
|
|
||||||
|
@FunctionalInterface
|
||||||
|
public interface FutureCallback<T> {
|
||||||
|
void call(T obj, Runnable resolve, Consumer<String> reject);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user