Compare commits
No commits in common. "master" and "experimental" have entirely different histories.
master
...
experiment
7 changed files with 9 additions and 49 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -1,3 +1,2 @@
|
|||
offsets.txt
|
||||
environment.txt
|
||||
/target
|
||||
environment.txt
|
||||
|
|
@ -18,16 +18,13 @@
|
|||
*/
|
||||
package nsusbloader.Controllers;
|
||||
|
||||
import nsusbloader.AppPreferences;
|
||||
import nsusbloader.NSLDataTypes.EFileStatus;
|
||||
|
||||
import java.io.File;
|
||||
import java.util.Locale;
|
||||
import java.util.ResourceBundle;
|
||||
import java.io.FilenameFilter;
|
||||
|
||||
public class NSLRowModel {
|
||||
private Locale userLocale = AppPreferences.getInstance().getLocale();
|
||||
private ResourceBundle rb = ResourceBundle.getBundle("locale", userLocale);
|
||||
|
||||
private String status;
|
||||
private File nspFile;
|
||||
private String nspFileName;
|
||||
|
|
@ -68,23 +65,23 @@ public class NSLRowModel {
|
|||
markForUpload = value;
|
||||
}
|
||||
public File getNspFile(){ return nspFile; }
|
||||
public void setStatus(EFileStatus status){
|
||||
public void setStatus(EFileStatus status){ // TODO: Localization
|
||||
switch (status){
|
||||
case UPLOADED:
|
||||
this.status = rb.getString("tab1_table_Lbl_Success");
|
||||
this.status = "Success";
|
||||
markForUpload = false;
|
||||
break;
|
||||
case FAILED:
|
||||
this.status = rb.getString("tab1_table_Lbl_Failed");
|
||||
this.status = "Failed";
|
||||
break;
|
||||
case INDETERMINATE:
|
||||
this.status = "...";
|
||||
break;
|
||||
case UNKNOWN:
|
||||
this.status = rb.getString("tab1_table_Lbl_Unknown");
|
||||
this.status = "Unknown";
|
||||
break;
|
||||
case INCORRECT_FILE_FAILED:
|
||||
this.status = rb.getString("tab1_table_Lbl_BadFile");
|
||||
this.status = "Failed: Bad file";
|
||||
markForUpload = false;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -184,19 +184,7 @@ public class NSTableViewController implements Initializable {
|
|||
gamesController.disableUploadStopBtn(true);
|
||||
table.refresh();
|
||||
});
|
||||
MenuItem selectAllMenuItem = new MenuItem(resourceBundle.getString("tab1_table_contextMenu_Btn_SelectAll"));
|
||||
selectAllMenuItem.setOnAction(actionEvent -> {
|
||||
for (NSLRowModel model : rowsObsLst)
|
||||
model.setMarkForUpload(true);
|
||||
table.refresh();
|
||||
});
|
||||
MenuItem deselectAllMenuItem = new MenuItem(resourceBundle.getString("tab1_table_contextMenu_Btn_DeselectAll"));
|
||||
deselectAllMenuItem.setOnAction(actionEvent -> {
|
||||
for (NSLRowModel model : rowsObsLst)
|
||||
model.setMarkForUpload(false);
|
||||
table.refresh();
|
||||
});
|
||||
contextMenu.getItems().addAll(deleteMenuItem, deleteAllMenuItem, selectAllMenuItem, deselectAllMenuItem);
|
||||
contextMenu.getItems().addAll(deleteMenuItem, deleteAllMenuItem);
|
||||
|
||||
row.setContextMenu(contextMenu);
|
||||
row.contextMenuProperty().bind(
|
||||
|
|
|
|||
|
|
@ -19,14 +19,8 @@ tab1_table_Lbl_Status=Status
|
|||
tab1_table_Lbl_FileName=File name
|
||||
tab1_table_Lbl_Size=Size
|
||||
tab1_table_Lbl_Upload=Upload?
|
||||
tab1_table_Lbl_Success=Success
|
||||
tab1_table_Lbl_Failed=Failed
|
||||
tab1_table_Lbl_Unknown=Unknown
|
||||
tab1_table_Lbl_BadFile=Failed: Bad file
|
||||
tab1_table_contextMenu_Btn_BtnDelete=Remove
|
||||
tab1_table_contextMenu_Btn_DeleteAll=Remove all
|
||||
tab1_table_contextMenu_Btn_SelectAll=Select all
|
||||
tab1_table_contextMenu_Btn_DeselectAll=Deselect all
|
||||
tab2_Lbl_HostIP=Host IP
|
||||
tab1_Lbl_NSIP=NS IP:
|
||||
tab2_Cb_ValidateNSHostName=Always validate NS IP input.
|
||||
|
|
|
|||
|
|
@ -93,11 +93,5 @@ tab2_Btn_ApplicationFont=\u0418\u0437\u043C\u0435\u043D\u0438\u0442\u044C \u0448
|
|||
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:
|
||||
tab1_table_Lbl_Success=\u0423\u0441\u043F\u0435\u0445
|
||||
tab1_table_Lbl_Unknown=\u041D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u043E
|
||||
tab1_table_Lbl_Failed=\u041D\u0435\u0443\u0434\u0430\u0447\u0430
|
||||
tab1_table_Lbl_BadFile=\u041E\u0448\u0438\u0431\u043A\u0430 \u0444\u0430\u0439\u043B\u0430
|
||||
tab1_table_contextMenu_Btn_SelectAll=\u0412\u044B\u0434\u0435\u043B\u0438\u0442\u044C \u0432\u0441\u0451
|
||||
tab1_table_contextMenu_Btn_DeselectAll=\u0421\u043D\u044F\u0442\u044C \u0432\u044B\u0434\u0435\u043B\u0435\u043D\u0438\u0435 \u0443 \u0432\u0441\u0435\u0445
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -93,10 +93,4 @@ tab2_Btn_ApplicationFont=\u0417\u043C\u0456\u043D\u0438\u0442\u0438 \u0448\u0440
|
|||
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:
|
||||
tab1_table_Lbl_Success=\u0423\u0441\u043F\u0456\u0445
|
||||
tab1_table_Lbl_Unknown=\u041D\u0435\u0432\u0456\u0434\u043E\u043C\u043E
|
||||
tab1_table_Lbl_Failed=\u041D\u0435 \u0432\u0434\u0430\u043B\u043E\u0441\u044F
|
||||
tab1_table_Lbl_BadFile=\u041F\u043E\u043C\u0438\u043B\u043A\u0430 \u0444\u0430\u0439\u043B\u0443
|
||||
tab1_table_contextMenu_Btn_SelectAll=\u0412\u0438\u0434\u0456\u043B\u0438\u0442\u0438 \u0432\u0441\u0435
|
||||
tab1_table_contextMenu_Btn_DeselectAll=\u0417\u043D\u044F\u0442\u0438 \u0432\u0456\u0431\u0438\u0440 \u0437 \u0443\u0441\u0456\u0445
|
||||
|
||||
|
|
|
|||
|
|
@ -19,14 +19,8 @@ tab1_table_Lbl_Status=\u72B6\u6001
|
|||
tab1_table_Lbl_FileName=\u6587\u4EF6\u540D
|
||||
tab1_table_Lbl_Size=\u5927\u5C0F
|
||||
tab1_table_Lbl_Upload=\u4E0A\u4F20?
|
||||
tab1_table_Lbl_Success=\u6210\u529F
|
||||
tab1_table_Lbl_Failed=\u5931\u8D25
|
||||
tab1_table_Lbl_Unknown=\u672A\u77E5
|
||||
tab1_table_Lbl_BadFile=\u5931\u8D25: \u6587\u4EF6\u5F02\u5E38
|
||||
tab1_table_contextMenu_Btn_BtnDelete=\u79FB\u9664
|
||||
tab1_table_contextMenu_Btn_DeleteAll=\u79FB\u9664\u6240\u6709
|
||||
tab1_table_contextMenu_Btn_SelectAll=\u9009\u62E9\u5168\u90E8
|
||||
tab1_table_contextMenu_Btn_DeselectAll=\u53CD\u9009\u5168\u90E8
|
||||
tab2_Lbl_HostIP=Host IP
|
||||
tab1_Lbl_NSIP=NS IP:
|
||||
tab2_Cb_ValidateNSHostName=\u603B\u662F\u9A8C\u8BC1 NS IP \u8F93\u5165\u3002
|
||||
|
|
|
|||
Loading…
Reference in a new issue