Commit 0801c5f1 authored by Marian Dovgialo's avatar Marian Dovgialo

#46094 Merge branch...

#46094 Merge branch 'dev/46094_svarog_loses_signal_after_stopping_long_recording' into 'development'

Dev/46094 svarog loses signal after stopping long recording

See merge request brain/svarog2!180
parents 36a219a5 b3ecaeb8
...@@ -45,7 +45,17 @@ public ViewerFileChooser() { ...@@ -45,7 +45,17 @@ public ViewerFileChooser() {
getFileChooserPanel().setViewType(FileChooserViewType.table); getFileChooserPanel().setViewType(FileChooserViewType.table);
this.setPreferredSize(new Dimension(500, 380)); this.setPreferredSize(new Dimension(500, 380));
} }
public void setSelectedFile(File file)
{
if (file!=null)
{
super.setSelectedFile(file);
}
else
{
super.setSelectedFile(new File(""));
}
}
public void initialize() { public void initialize() {
FileNameExtensionFilter text = new FileNameExtensionFilter(_("Text (*.txt)"), "txt"); FileNameExtensionFilter text = new FileNameExtensionFilter(_("Text (*.txt)"), "txt");
FileNameExtensionFilter csv = new FileNameExtensionFilter(_("CSV (*.csv)"), "csv"); FileNameExtensionFilter csv = new FileNameExtensionFilter(_("CSV (*.csv)"), "csv");
...@@ -476,7 +486,7 @@ public File fixExtensionIfNecessary(JFileChooser fileChooser, File file) { ...@@ -476,7 +486,7 @@ public File fixExtensionIfNecessary(JFileChooser fileChooser, File file) {
execute = new Execute(), execute = new Execute(),
usedir = new UseDirectory(); usedir = new UseDirectory();
} }
protected enum OptionSet { protected enum OptionSet {
consoleSaveAsText(Operation.save, _("Choose text file to save"), consoleSaveAsText(Operation.save, _("Choose text file to save"),
null, _("Save")), null, _("Save")),
...@@ -592,10 +602,12 @@ void use(ViewerFileChooser chooser) { ...@@ -592,10 +602,12 @@ void use(ViewerFileChooser chooser) {
chooser.addChoosableFileFilter(this.fileFilters[i]); chooser.addChoosableFileFilter(this.fileFilters[i]);
if (fileFilters.length > 0) if (fileFilters.length > 0)
chooser.setFileFilter(fileFilters[0]); {
} chooser.setFileFilter(fileFilters[0]);
}
}
} }
void setFilters(FileNameExtensionFilter ... fileFilters) { void setFilters(FileNameExtensionFilter ... fileFilters) {
this.fileFilters = fileFilters; this.fileFilters = fileFilters;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment