mirrors/ns-usbloader
1
0
Fork 0
mirror of https://github.com/developersu/ns-usbloader.git synced 2025-05-21 18:55:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update checkboxes representation in dark theme

Browse source 
Add icons to pop-up windows
Add NSZ, XCZ filters in addition to XCI while option in settings selected + updated translation strings for this option in all currently available locales (bad idea, should be validated by native-speakers once they get a chance)
This commit is contained in:
Dmitry Isaenko 2019-10-24 16:33:42 +03:00
parent ab6b3e0206
commit 077aa9b0d8
25 changed files with 73 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/nsusbloader/Controllers/NSLMainController.java
View file

@ -122,8 +122,8 @@ public class NSLMainController implements Initializable {
else
fileChooser.setInitialDirectory(new File(System.getProperty("user.home")));
if (FrontTabController.getSelectedProtocol().equals("TinFoil") && SettingsTabController.getTfXCISupport())
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NSP/XCI", "*.nsp", "*.xci"));
if (FrontTabController.getSelectedProtocol().equals("TinFoil") && SettingsTabController.getTfXciNszXczSupport())
fileChooser.getExtensionFilters().add(new FileChooser.ExtensionFilter("NSP/XCI/NSZ/XCZ", "*.nsp", "*.xci", "*.nsz", "*.xcz"));
else if (FrontTabController.getSelectedProtocol().equals("GoldLeaf") && (! SettingsTabController.getNSPFileFilterForGL()))
fileChooser.getExtensionFilters().addAll(new FileChooser.ExtensionFilter("Any file", "*.*"),
new FileChooser.ExtensionFilter("NSP ROM", "*.nsp")
@ -253,6 +253,7 @@ public class NSLMainController implements Initializable {
/**
* Drag-n-drop support (drop consumer)
* */
// TODO: DO SOMETHING WITH THIS
@FXML
private void handleDrop(DragEvent event){
if (MediatorControl.getInstance().getTransferActive()) {
@ -261,14 +262,18 @@ public class NSLMainController implements Initializable {
}
List<File> filesDropped = new ArrayList<>();
try {
if (FrontTabController.getSelectedProtocol().equals("TinFoil") && SettingsTabController.getTfXCISupport()){
if (FrontTabController.getSelectedProtocol().equals("TinFoil") && SettingsTabController.getTfXciNszXczSupport()){
for (File fileOrDir : event.getDragboard().getFiles()) {
if (fileOrDir.isDirectory()) {
for (File file : fileOrDir.listFiles())
if ((! file.isDirectory()) && (file.getName().toLowerCase().endsWith(".nsp") || file.getName().toLowerCase().endsWith(".xci")))
if ((! file.isDirectory()) && (file.getName().toLowerCase().endsWith(".nsp") ||
file.getName().toLowerCase().endsWith(".xci") ||
file.getName().toLowerCase().endsWith(".nsz") ||
file.getName().toLowerCase().endsWith(".xcz")))
filesDropped.add(file);
}
else if (fileOrDir.getName().toLowerCase().endsWith(".nsp") || fileOrDir.getName().toLowerCase().endsWith(".xci"))
else if (fileOrDir.getName().toLowerCase().endsWith(".nsp") || fileOrDir.getName().toLowerCase().endsWith(".xci") ||
fileOrDir.getName().toLowerCase().endsWith(".nsz") || fileOrDir.getName().toLowerCase().endsWith(".xcz") )
filesDropped.add(fileOrDir);
}
@ -322,7 +327,7 @@ public class NSLMainController implements Initializable {
SettingsTabController.getHostPort(),
SettingsTabController.getHostExtra(),
SettingsTabController.getAutoCheckForUpdates(),
SettingsTabController.getTfXCISupport(),
SettingsTabController.getTfXciNszXczSupport(),
SettingsTabController.getNSPFileFilterForGL(),
SettingsTabController.getGlOldVer()
);

7
src/main/java/nsusbloader/Controllers/NSTableViewController.java
View file

@ -213,8 +213,11 @@ public class NSTableViewController implements Initializable {
public void setNewProtocol(String newProtocol){
if (rowsObsLst.isEmpty())
return;
if (newProtocol.equals("GoldLeaf"))
rowsObsLst.removeIf(current -> current.getNspFileName().toLowerCase().endsWith("xci"));
if (newProtocol.equals("GoldLeaf")) {
rowsObsLst.removeIf(current -> current.getNspFileName().toLowerCase().endsWith("xci") ||
current.getNspFileName().toLowerCase().endsWith("nsz") ||
current.getNspFileName().toLowerCase().endsWith("xcz"));
}
else
rowsObsLst.removeIf(current -> ! current.getNspFileName().toLowerCase().endsWith("nsp"));
table.refresh();

2
src/main/java/nsusbloader/Controllers/SettingsController.java
View file

@ -276,7 +276,7 @@ public class SettingsController implements Initializable {
public String getHostPort(){ return pcPortTextField.getText(); }
public String getHostExtra(){ return pcExtraTextField.getText(); }
public boolean getAutoCheckForUpdates(){ return autoCheckUpdCb.isSelected(); }
public boolean getTfXCISupport(){ return tfXciSpprtCb.isSelected(); }
public boolean getTfXciNszXczSupport(){ return tfXciSpprtCb.isSelected(); } // Used also for NSZ/XCZ
public void registerHostServices(HostServices hostServices){this.hs = hostServices;}

18
src/main/java/nsusbloader/ServiceWindow.java
View file

@ -2,6 +2,7 @@ package nsusbloader;
import javafx.scene.control.Alert;
import javafx.scene.control.ButtonType;
import javafx.scene.image.Image;
import javafx.scene.layout.Region;
import javafx.stage.Stage;
@ -29,6 +30,12 @@ public class ServiceWindow {
Stage dialogStage = (Stage) alertBox.getDialogPane().getScene().getWindow();
dialogStage.setAlwaysOnTop(true);
dialogStage.getIcons().addAll(
new Image("/res/warn_ico32x32.png"),
new Image("/res/warn_ico48x48.png"),
new Image("/res/warn_ico64x64.png"),
new Image("/res/warn_ico128x128.png")
);
dialogStage.toFront();
alertBox.show();
@ -45,6 +52,17 @@ public class ServiceWindow {
alertBox.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
alertBox.setResizable(true); // Java bug workaround for JDR11/OpenJFX. TODO: nothing. really.
alertBox.getDialogPane().getStylesheets().add(AppPreferences.getInstance().getTheme());
Stage dialogStage = (Stage) alertBox.getDialogPane().getScene().getWindow();
dialogStage.setAlwaysOnTop(true);
dialogStage.getIcons().addAll(
new Image("/res/ask_ico32x32.png"),
new Image("/res/ask_ico48x48.png"),
new Image("/res/ask_ico64x64.png"),
new Image("/res/ask_ico128x128.png")
);
dialogStage.toFront();
Optional<ButtonType> result = alertBox.showAndWait();
return (result.isPresent() && result.get() == ButtonType.OK);