From 6236819f67a9dda3f8a3f2845e1262f7ef21c4bc Mon Sep 17 00:00:00 2001 From: Summet-V Date: Wed, 29 Jul 2020 14:31:00 +0300 Subject: [PATCH 1/3] Bundles --- core/assets/bundles/bundle.properties | 2 ++ core/assets/bundles/bundle_ru.properties | 2 ++ 2 files changed, 4 insertions(+) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 90cfe73dcb..5f7c43731e 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -234,6 +234,8 @@ save.import.invalid = [accent]This save is invalid! save.import.fail = [scarlet]Failed to import save: [accent]{0} save.export.fail = [scarlet]Failed to export save: [accent]{0} save.import = Import Save +save.clear.confirm = Are you sure you want to clear all saves? +save.clear = Clear all saves save.newslot = Save name: save.rename = Rename save.rename.text = New name: diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 8642a0c26b..3ae9ef8256 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -234,6 +234,8 @@ save.import.invalid = [accent]Это сохранение недействите save.import.fail = [scarlet]Не удалось импортировать сохранение: [accent]{0} save.export.fail = [scarlet]Не удалось экспортировать сохранение: [accent]{0} save.import = Импортировать сохранение +save.clear.confirm = Вы уверены, что хотите удалить все сохранения? +save.clear = Удалить все сохранения save.newslot = Имя сохранения: save.rename = Переименовать save.rename.text = Новое название: From 8c310e38ff07a52cbbbd452da463d7e9f8e5f872 Mon Sep 17 00:00:00 2001 From: Summet-V Date: Wed, 29 Jul 2020 19:02:40 +0300 Subject: [PATCH 2/3] Add button --- core/src/mindustry/game/Saves.java | 7 +++++++ core/src/mindustry/ui/dialogs/LoadDialog.java | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/core/src/mindustry/game/Saves.java b/core/src/mindustry/game/Saves.java index 681887e685..561396d2bf 100644 --- a/core/src/mindustry/game/Saves.java +++ b/core/src/mindustry/game/Saves.java @@ -164,6 +164,13 @@ public class Saves{ return saves; } + public void deleteAll(){ + saves.clear(); + for(Fi file : saveDirectory.list()){ + file.delete(); + } + } + public class SaveSlot{ public final Fi file; boolean requestedPreview; diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java index e341a1b224..e5ac52ced6 100644 --- a/core/src/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadDialog.java @@ -164,6 +164,13 @@ public class LoadDialog extends BaseDialog{ } }); }).fillX().margin(10f); + + buttons.button("$save.clear", Icon.trash, () -> { + ui.showConfirm("$confirm", "$save.clear.confirm", () -> { + control.saves.deleteAll(); + setup(); + }); + }).fillX().margin(10f); } public void runLoadSave(SaveSlot slot){ From c34bf78ab644fbf65ce82a64a19d28c4d4d9c70e Mon Sep 17 00:00:00 2001 From: Summet-V Date: Wed, 29 Jul 2020 21:05:58 +0300 Subject: [PATCH 3/3] Moved to the game data section --- core/assets/bundles/bundle.properties | 4 ++-- core/assets/bundles/bundle_ru.properties | 4 ++-- core/src/mindustry/ui/dialogs/LoadDialog.java | 7 ------- core/src/mindustry/ui/dialogs/SettingsMenuDialog.java | 8 ++++++++ 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 5f7c43731e..3a4cc6ba7d 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -234,8 +234,6 @@ save.import.invalid = [accent]This save is invalid! save.import.fail = [scarlet]Failed to import save: [accent]{0} save.export.fail = [scarlet]Failed to export save: [accent]{0} save.import = Import Save -save.clear.confirm = Are you sure you want to clear all saves? -save.clear = Clear all saves save.newslot = Save name: save.rename = Rename save.rename.text = New name: @@ -547,6 +545,8 @@ settings.graphics = Graphics settings.cleardata = Clear Game Data... settings.clear.confirm = Are you sure you want to clear this data?\nWhat is done cannot be undone! settings.clearall.confirm = [scarlet]WARNING![]\nThis will clear all data, including saves, maps, unlocks and keybinds.\nOnce you press 'ok' the game will wipe all data and automatically exit. +settings.clearsaves.confirm = Are you sure you want to clear all saves? +settings.clearsaves = Clear all saves paused = [accent]< Paused > clear = Clear banned = [scarlet]Banned diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index 3ae9ef8256..b724f7df71 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -234,8 +234,6 @@ save.import.invalid = [accent]Это сохранение недействите save.import.fail = [scarlet]Не удалось импортировать сохранение: [accent]{0} save.export.fail = [scarlet]Не удалось экспортировать сохранение: [accent]{0} save.import = Импортировать сохранение -save.clear.confirm = Вы уверены, что хотите удалить все сохранения? -save.clear = Удалить все сохранения save.newslot = Имя сохранения: save.rename = Переименовать save.rename.text = Новое название: @@ -541,6 +539,8 @@ settings.graphics = Графика settings.cleardata = Очистить игровые данные… settings.clear.confirm = Вы действительно хотите очистить свои данные?\nЭто нельзя отменить! settings.clearall.confirm = [scarlet]ОСТОРОЖНО![]\nЭто сотрёт все данные, включая сохранения, карты, прогресс кампании и настройки управления.\nПосле того как вы нажмёте [accent][ОК][], игра уничтожит все данные и автоматически закроется. +settings.clearsaves.confirm = Вы уверены, что хотите удалить все сохранения? +settings.clearsaves = Удалить все сохранения paused = [accent]< Пауза > clear = Очистить banned = [scarlet]Запрещено diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java index e5ac52ced6..e341a1b224 100644 --- a/core/src/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadDialog.java @@ -164,13 +164,6 @@ public class LoadDialog extends BaseDialog{ } }); }).fillX().margin(10f); - - buttons.button("$save.clear", Icon.trash, () -> { - ui.showConfirm("$confirm", "$save.clear.confirm", () -> { - control.saves.deleteAll(); - setup(); - }); - }).fillX().margin(10f); } public void runLoadSave(SaveSlot slot){ diff --git a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java index ce843d1b67..21ee0faaf9 100644 --- a/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -108,6 +108,14 @@ public class SettingsMenuDialog extends SettingsDialog{ t.row(); + t.button("$settings.clearsaves", Icon.trash, style, () -> { + ui.showConfirm("$confirm", "$settings.clearsaves.confirm", () -> { + control.saves.deleteAll(); + }); + }); + + t.row(); + t.button("$data.export", Icon.upload, style, () -> { if(ios){ Fi file = Core.files.local("mindustry-data-export.zip");