diff --git a/src/main/java/nsusbloader/Controllers/FontSelector.java b/src/main/java/nsusbloader/Controllers/FontSettings.java similarity index 89% rename from src/main/java/nsusbloader/Controllers/FontSelector.java rename to src/main/java/nsusbloader/Controllers/FontSettings.java index 5f4a0dc..9f5fb15 100644 --- a/src/main/java/nsusbloader/Controllers/FontSelector.java +++ b/src/main/java/nsusbloader/Controllers/FontSettings.java @@ -27,11 +27,11 @@ import nsusbloader.AppPreferences; import java.util.ResourceBundle; -public class FontSelector { - public FontSelector(ResourceBundle resourceBundle) throws Exception{ +public class FontSettings { + public FontSettings(ResourceBundle resourceBundle) throws Exception{ Stage stage = new Stage(); - stage.setMinWidth(800); - stage.setMinHeight(800); + stage.setMinWidth(650); + stage.setMinHeight(450); FXMLLoader fxmlLoader = new FXMLLoader(getClass().getResource("/FontSettings.fxml")); fxmlLoader.setResources(resourceBundle); @@ -44,7 +44,7 @@ public class FontSelector { new Image("/res/app_icon128x128.png")); Parent parent = fxmlLoader.load(); - Scene fontScene = new Scene(parent, 550, 600); + Scene fontScene = new Scene(parent, 660, 525); fontScene.getStylesheets().add(AppPreferences.getInstance().getTheme()); parent.setStyle(AppPreferences.getInstance().getFontStyle()); diff --git a/src/main/java/nsusbloader/Controllers/SettingsBlockGenericController.java b/src/main/java/nsusbloader/Controllers/SettingsBlockGenericController.java index 3cf3e0f..c90f049 100644 --- a/src/main/java/nsusbloader/Controllers/SettingsBlockGenericController.java +++ b/src/main/java/nsusbloader/Controllers/SettingsBlockGenericController.java @@ -88,7 +88,7 @@ public class SettingsBlockGenericController implements Initializable { } private void openFontSettings() { try { - new FontSelector(resourceBundle); + new FontSettings(resourceBundle); } catch (Exception ex) { throw new RuntimeException(ex); } diff --git a/src/main/resources/FontSettings.fxml b/src/main/resources/FontSettings.fxml index b54ecae..0c7f322 100644 --- a/src/main/resources/FontSettings.fxml +++ b/src/main/resources/FontSettings.fxml @@ -11,7 +11,7 @@ - + diff --git a/src/main/resources/locale.properties b/src/main/resources/locale.properties index bcc7298..9622dfe 100644 --- a/src/main/resources/locale.properties +++ b/src/main/resources/locale.properties @@ -92,6 +92,6 @@ tabPatches_Btn_MakeAll=Make all tabPatches_ServiceWindowMessageEsFs=Both firmware and keys should be set to generate patches. Otherwise, it's not clear what to patch. tabPatches_ServiceWindowMessageLoader=Atmosphere folder should be defined to generate 'Loader' patch. tab2_Btn_ApplicationFont=Change application font -btn_ResetToDefaults=Reset to defaults +btn_ResetToDefaults=Reset fontPreviewText=Text preview fontSize=Font size: diff --git a/src/main/resources/locale_ru_RU.properties b/src/main/resources/locale_ru_RU.properties index abdfa80..abf6fe5 100644 --- a/src/main/resources/locale_ru_RU.properties +++ b/src/main/resources/locale_ru_RU.properties @@ -90,7 +90,7 @@ tabPatches_Lbl_Title=\u041F\u0430\u0442\u0447\u0438 tabPatches_ServiceWindowMessageEsFs=\u0414\u043B\u044F \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043F\u0430\u0442\u0447\u0435\u0439 \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u043A\u0430\u043A \u043F\u0443\u0442\u044C \u043A \u043F\u0440\u043E\u0448\u0438\u0432\u043A\u0435, \u0442\u0430\u043A \u0438 \u043F\u0443\u0442\u044C \u043A \u0444\u0430\u0439\u043B\u0443 \u043A\u043B\u044E\u0447\u0435\u0439. \u0418\u043D\u0430\u0447\u0435 \u043D\u0435 \u043F\u043E\u043D\u044F\u0442\u043D\u043E \u0447\u0442\u043E \u0436\u0435 \u043F\u0430\u0442\u0447\u0438\u0442\u044C. tabPatches_ServiceWindowMessageLoader=\u0414\u043B\u044F \u0441\u043E\u0437\u0434\u0430\u043D\u0438\u044F \u043F\u0430\u0442\u0447\u0430 \u00ABLoader\u00BB \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0443\u043A\u0430\u0437\u0430\u0442\u044C \u043F\u0443\u0442\u044C \u043A Atmosphere. tab2_Btn_ApplicationFont=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0448\u0440\u0438\u0444\u0442 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F -btn_ResetToDefaults=\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C \u043D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438 +btn_ResetToDefaults=\u0421\u0431\u0440\u043E\u0441\u0438\u0442\u044C fontPreviewText=\u041F\u0440\u0438\u043C\u0435\u0440 \u0442\u0435\u043A\u0441\u0442\u0430 fontSize=\u0420\u0430\u0437\u043C\u0435\u0440 \u0448\u0440\u0438\u0444\u0442\u043E\u0432: diff --git a/src/main/resources/locale_uk_RU.properties b/src/main/resources/locale_uk_RU.properties index 16b5ba7..3cf6da2 100644 --- a/src/main/resources/locale_uk_RU.properties +++ b/src/main/resources/locale_uk_RU.properties @@ -90,7 +90,7 @@ tabPatches_Lbl_Title=\u041F\u0430\u0442\u0447\u0438 tabPatches_ServiceWindowMessageEsFs=\u0414\u043B\u044F \u0441\u0442\u0432\u043E\u0440\u0435\u043D\u043D\u044F \u043F\u0430\u0442\u0447\u0456\u0432 \u043D\u0435\u043E\u0431\u0445\u0456\u0434\u043D\u043E \u0432\u043A\u0430\u0437\u0430\u0442\u0438 \u044F\u043A \u0448\u043B\u044F\u0445 \u0434\u043E \u043F\u0440\u043E\u0448\u0438\u0432\u043A\u0438, \u0442\u0430\u043A \u0456 \u0434\u043E \u0444\u0430\u0439\u043B\u0443 \u043A\u043B\u044E\u0447\u0456\u0432. \u0411\u043E \u0456\u043D\u0430\u043A\u0448\u0435 \u043D\u0435 \u0437\u0440\u043E\u0437\u0443\u043C\u0456\u043B\u043E \u0449\u043E \u0436 \u0442\u0440\u0435\u0431\u0430 \u043F\u0430\u0442\u0447\u0438\u0442\u0438. tabPatches_ServiceWindowMessageLoader=\u0414\u043B\u044F \u0433\u0435\u043D\u0435\u0440\u0430\u0446\u0456\u0457 "Loader"-\u043F\u0430\u0442\u0447\u0443 \u043D\u0435\u043E\u0431\u0445\u0456\u0434\u043D\u043E \u0432\u043A\u0430\u0437\u0430\u0442\u0438 \u0448\u043B\u044F\u0445 \u0434\u043E Atmosphere. tab2_Btn_ApplicationFont=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u0448\u0440\u0438\u0444\u0442 \u043F\u0440\u043E\u0433\u0440\u0430\u043C\u0438 -btn_ResetToDefaults=C\u043A\u0438\u043D\u0443\u0442\u0438 \u043D\u0430\u043B\u0430\u0448\u0442\u0443\u0432\u0430\u043D\u043D\u044F +btn_ResetToDefaults=C\u043A\u0438\u043D\u0443\u0442\u0438 fontPreviewText=\u041F\u0440\u0438\u043A\u043B\u0430\u0434 \u0442\u0435\u043A\u0441\u0442\u0443 fontSize=\u0420\u043E\u0437\u043C\u0456\u0440 \u0448\u0440\u0438\u0444\u0442\u0456\u0432: