Skip to content

Commit 0d591a5

Browse files
CiiLuGlavo
andauthored
优化删除垃圾桶图标 (#5664)
Co-authored-by: Glavo <zjx001202@gmail.com>
1 parent 900d759 commit 0d591a5

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

HMCL/src/main/java/org/jackhuang/hmcl/ui/account/AccountListItemSkin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ public AccountListItemSkin(AccountListItem skinnable) {
173173
spinnerCopyUUID.setContent(btnCopyUUID);
174174
right.getChildren().add(spinnerCopyUUID);
175175

176-
JFXButton btnRemove = FXUtils.newToggleButton4(SVG.DELETE);
176+
JFXButton btnRemove = FXUtils.newToggleButton4(SVG.DELETE_FOREVER);
177177
btnRemove.setOnAction(e -> Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), skinnable::remove, null));
178178
BorderPane.setAlignment(btnRemove, Pos.CENTER);
179179
FXUtils.installFastTooltip(btnRemove, i18n("button.delete"));

HMCL/src/main/java/org/jackhuang/hmcl/ui/main/JavaRestorePage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ private static final class DisabledJavaItemSkin extends SkinBase<DisabledJavaIte
164164
if (skinnable.realPath == null) {
165165
revealButton.setDisable(true);
166166

167-
JFXButton removeButton = FXUtils.newToggleButton4(SVG.DELETE);
167+
JFXButton removeButton = FXUtils.newToggleButton4(SVG.DELETE_FOREVER);
168168
removeButton.setOnAction(e -> skinnable.onRemove());
169169
FXUtils.installFastTooltip(removeButton, i18n("java.disabled.management.remove"));
170170

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/DatapackListPageSkin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ final class DatapackListPageSkin extends SkinBase<DatapackListPage> {
110110
createToolbarButton2(i18n("search"), SVG.SEARCH, () -> isSearching.set(true))
111111
);
112112

113-
JFXButton removeButton = createToolbarButton2(i18n("button.remove"), SVG.DELETE, () -> {
113+
JFXButton removeButton = createToolbarButton2(i18n("button.remove"), SVG.DELETE_FOREVER, () -> {
114114
Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), () -> {
115115
skinnable.removeSelected(listView.getSelectionModel().getSelectedItems());
116116
}, null);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/ModListPageSkin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ final class ModListPageSkin extends SkinBase<ModListPage> {
154154

155155
// Toolbar Selecting
156156
toolbarSelecting.getChildren().setAll(
157-
createToolbarButton2(i18n("button.remove"), SVG.DELETE, () -> {
157+
createToolbarButton2(i18n("button.remove"), SVG.DELETE_FOREVER, () -> {
158158
Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), () -> {
159159
skinnable.removeSelected(listView.getSelectionModel().getSelectedItems());
160160
}, null);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldBackupsPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private static final class BackupInfoSkin extends SkinBase<BackupInfo> {
259259
FXUtils.installFastTooltip(btnReveal, i18n("reveal.in_file_manager"));
260260
btnReveal.setOnAction(event -> skinnable.onReveal());
261261

262-
JFXButton btnDelete = FXUtils.newToggleButton4(SVG.DELETE);
262+
JFXButton btnDelete = FXUtils.newToggleButton4(SVG.DELETE_FOREVER);
263263
right.getChildren().add(btnDelete);
264264
FXUtils.installFastTooltip(btnDelete, i18n("world.backup.delete"));
265265
btnDelete.setOnAction(event -> Controllers.confirm(i18n("button.remove.confirm"), i18n("button.remove"), skinnable::onDelete, null));

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldListPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ public void showPopupMenu(World world, boolean supportQuickPlay, JFXPopup.PopupH
382382
IconedMenuItem exportMenuItem = new IconedMenuItem(SVG.OUTPUT, i18n("world.export"), () -> page.export(world), popup);
383383
exportMenuItem.setDisable(worldLocked);
384384

385-
IconedMenuItem deleteMenuItem = new IconedMenuItem(SVG.DELETE, i18n("world.delete"), () -> page.delete(world), popup);
385+
IconedMenuItem deleteMenuItem = new IconedMenuItem(SVG.DELETE_FOREVER, i18n("world.delete"), () -> page.delete(world), popup);
386386
deleteMenuItem.setDisable(worldLocked);
387387

388388
IconedMenuItem duplicateMenuItem = new IconedMenuItem(SVG.CONTENT_COPY, i18n("world.duplicate"), () -> page.copy(world), popup);

HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/WorldManagePage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ private AdvancedListBox getToolBar() {
273273

274274
managePopupMenu.getContent().addAll(
275275
new IconedMenuItem(SVG.OUTPUT, i18n("world.export"), () -> WorldManageUIUtils.export(getSkinnable().world, getSkinnable().sessionLockChannel), managePopup),
276-
new IconedMenuItem(SVG.DELETE, i18n("world.delete"), () -> WorldManageUIUtils.delete(getSkinnable().world, () -> getSkinnable().fireEvent(new PageCloseEvent()), getSkinnable().sessionLockChannel), managePopup),
276+
new IconedMenuItem(SVG.DELETE_FOREVER, i18n("world.delete"), () -> WorldManageUIUtils.delete(getSkinnable().world, () -> getSkinnable().fireEvent(new PageCloseEvent()), getSkinnable().sessionLockChannel), managePopup),
277277
new IconedMenuItem(SVG.CONTENT_COPY, i18n("world.duplicate"), () -> WorldManageUIUtils.copyWorld(getSkinnable().world, null), managePopup)
278278
);
279279

0 commit comments

Comments
 (0)