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

v0.3 ready

Browse source
This commit is contained in:
Dmitry Isaenko 2019-03-20 15:51:18 +03:00
parent c3c07b7216
commit 256b1f7d37
5 changed files with 32 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -184,22 +184,24 @@ public class NSLMainController implements Initializable {
* */
private void uploadBtnAction(){
if ((workThread == null || !workThread.isAlive())){
// Collect files
List<File> nspToUpload;
if ((nspToUpload = tableFilesListController.getFilesForUpload()) == null) {
logArea.setText(resourceBundle.getString("logsNoFolderFileSelected"));
return;
}
else {
logArea.setText(resourceBundle.getString("logsFilesToUploadTitle")+"\n");
for (File item: nspToUpload)
logArea.appendText(" "+item.getAbsolutePath()+"\n");
}
// If USB selected
if (choiceProtocol.getSelectionModel().getSelectedItem().equals("GoldLeaf") ||
(
choiceProtocol.getSelectionModel().getSelectedItem().equals("TinFoil")
&& choiceNetUsb.getSelectionModel().getSelectedItem().equals("USB")
)
){
List<File> nspToUpload;
if ((nspToUpload = tableFilesListController.getFilesForUpload()) == null) {
logArea.setText(resourceBundle.getString("logsNoFolderFileSelected"));
return;
}
else {
logArea.setText(resourceBundle.getString("logsFilesToUploadTitle")+"\n");
for (File item: nspToUpload)
logArea.appendText(" "+item.getAbsolutePath()+"\n");
}
usbNetCommunications = new UsbCommunications(nspToUpload, choiceProtocol.getSelectionModel().getSelectedItem());
workThread = new Thread(usbNetCommunications);
workThread.setDaemon(true);
@ -209,18 +211,9 @@ public class NSLMainController implements Initializable {
if (SettingsTabController.isNsIpValidate() && !nsIpTextField.getText().matches("^([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])\\.([01]?\\d\\d?|2[0-4]\\d|25[0-5])$"))
if (!ServiceWindow.getConfirmationWindow(resourceBundle.getString("windowTitleBadIp"),resourceBundle.getString("windowBodyBadIp")))
return;
String nsIP = nsIpTextField.getText();
List<File> nspToUpload;
if ((nspToUpload = tableFilesListController.getFilesForUpload()) == null) {
logArea.setText(resourceBundle.getString("logsNoFolderFileSelected"));
return;
}
else {
logArea.setText(resourceBundle.getString("logsFilesToUploadTitle")+"\n");
for (File item: nspToUpload)
logArea.appendText(" "+item.getAbsolutePath()+"\n");
}
if (!SettingsTabController.getExpertModeSelected())
usbNetCommunications = new NETCommunications(nspToUpload, nsIP, false, "", "", "");
else {

2
src/main/resources/locale.properties
View file

@ -34,4 +34,4 @@ netTabDontServeRequestsCb=Don't serve requests
netTabDontServeRequestsDescription=If selected, this computer won't reply to NSP files requests coming from NS (over the net) and use defined host settings to tell TinFoil where should it look for files.
netTabHostExtraLbl=extra
windowTitleErrorPort=Port set incorrectly!
windowBodyErrorPort=Port can't be 0 or greater then 65535.
windowBodyErrorPort=Port can't be 0 or greater than 65535.

28
src/main/resources/locale_fra.properties
View file

@ -20,18 +20,18 @@ tableFileNameLbl=Nom de fichier
tableStatusLbl=Statut
contextMenuBtnDelete=Supprimer
contextMenuBtnDeleteAll=Supprimer tout
netTabHostIPLbl=IP de l'ordinateur <-FIX?
NSIPlable=IP de NS: <-FIX?
netTabValidateNSHostNameCb=Always validate NS IP input. <-FIX
windowTitleBadIp=IP address of NS most likely incorrect <-FIX
windowBodyBadIp=Are you sure that you entered NS IP address correctly? <-FIX
netTabExpertModeCb=Expert mode<- FIX
netTabHostPortLbl=port <- fix
netTabAutoDetectIpCb=Auto-detect IP <- FIX
netTabRandSelectPortCb=Randomly get port <- FIX
netTabDontServeRequestsCb=Don't serve requests <- FIX
netTabDontServeRequestsDescription=If selected, this computer won't reply to NSP files requests coming from NS (over the net) and use defined host settings to tell TinFoil where should it look for files. <- Fix
netTabHostExtraLbl=extra <- FIX
windowTitleErrorPort=Port set incorrectly! <- FIX
windowBodyErrorPort=Port can't be 0 or greater then 65535. <- FIX
netTabHostIPLbl=IP de l'ordinateur
NSIPlable=IP de NS:
netTabValidateNSHostNameCb=Toujours v\u00E9rifier que l'adresse IP de NS entr\u00E9e est correcte
windowTitleBadIp=L'adresse IP de NS est probablement incorrecte
windowBodyBadIp=\u00CAtes-vous s\u00FBr que l'adresse IP de NS entr\u00E9e est correcte ?
netTabExpertModeCb=Mode expert
netTabHostPortLbl=port
netTabAutoDetectIpCb=D\u00E9tection automatique d'IP
netTabRandSelectPortCb=Obtenir un port al\u00E9atoire
netTabDontServeRequestsCb=Ne pas servir les demandes
netTabDontServeRequestsDescription=Si cette option est s\u00E9lectionn\u00E9e, cet ordinateur ne r\u00E9pond pas aux demandes de fichiers NSP provenant de NS (par le r\u00E9seau) et utilise les param\u00E8tres d\u2019h\u00F4te d\u00E9finis pour indiquer \u00E0 TinFoil o\u00F9 il doit rechercher les fichiers.
netTabHostExtraLbl=extra
windowTitleErrorPort=Port mal configur\u00E9!
windowBodyErrorPort=V\u00E9rifiez que le port est sup\u00E9rieur \u00E0 0 et inf\u00E9rieur ou \u00E9gal \u00E0 65535.