GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1190 Tuner management redesign. Updates all tuners with direct threaded support. Incorporates USB Hotplug support. Adds black/white listing of tuners. Updates all tuner editors to have a common look and feel. Changes location of tuner configuration file and changes format to JSON. (#1208)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2022-04-18 07:30:58 -04:00
committed by GitHub
parent 0fb148d31e
commit 96d3996bec
259 changed files with 11974 additions and 12454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/io/github/dsheirer/gui/preference/ViewUserPreferenceEditorRequest.java
View File

@@ -1,18 +1,21 @@
/*******************************************************************************
* sdr-trunk
* Copyright (C) 2014-2018 Dennis Sheirer
/*
* *****************************************************************************
* Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public
* License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any
* later version.
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along with this program.
* If not, see <http://www.gnu.org/licenses/>
*
******************************************************************************/
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
* ****************************************************************************
*/
package io.github.dsheirer.gui.preference;

90
src/main/java/io/github/dsheirer/gui/preference/directory/DirectoryPreferenceEditor.java
View File

@@ -1,7 +1,6 @@
/*
* ******************************************************************************
* sdrtrunk
* Copyright (C) 2014-2018 Dennis Sheirer
* *****************************************************************************
* Copyright (C) 2014-2022 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -15,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>
* *****************************************************************************
* ****************************************************************************
*/
package io.github.dsheirer.gui.preference.directory;
@@ -63,6 +62,11 @@ public class DirectoryPreferenceEditor extends HBox
private Button mResetApplicationLogsButton;
private Label mApplicationLogsPathLabel;
private Label mConfigurationLabel;
private Button mChangeConfigurationButton;
private Button mResetConfigurationButton;
private Label mConfigurationPathLabel;
private Label mEventLogsLabel;
private Button mChangeEventLogsButton;
private Button mResetEventLogsButton;
@@ -154,6 +158,19 @@ public class DirectoryPreferenceEditor extends HBox
mEditorPane.add(getResetApplicationLogsButton(), 3, row++);
GridPane.setMargin(getConfigurationLabel(), new Insets(0, 10, 0, 0));
mEditorPane.add(getConfigurationLabel(), 0, row);
GridPane.setMargin(getConfigurationPathLabel(), new Insets(0, 10, 0, 0));
mEditorPane.add(getConfigurationPathLabel(), 1, row);
GridPane.setMargin(getChangeConfigurationButton(), new Insets(2, 10, 2, 0));
mEditorPane.add(getChangeConfigurationButton(), 2, row);
GridPane.setMargin(getResetConfigurationButton(), new Insets(2, 0, 2, 0));
mEditorPane.add(getResetConfigurationButton(), 3, row++);
GridPane.setMargin(getEventLogsLabel(), new Insets(0, 10, 0, 0));
mEditorPane.add(getEventLogsLabel(), 0, row);
@@ -365,6 +382,71 @@ public class DirectoryPreferenceEditor extends HBox
return mApplicationLogsPathLabel;
}
private Label getConfigurationLabel()
{
if(mConfigurationLabel == null)
{
mConfigurationLabel = new Label("Configuration");
}
return mConfigurationLabel;
}
private Button getChangeConfigurationButton()
{
if(mChangeConfigurationButton == null)
{
mChangeConfigurationButton = new Button("Change...");
mChangeConfigurationButton.setOnAction(new EventHandler<ActionEvent>()
{
@Override
public void handle(ActionEvent event)
{
DirectoryChooser directoryChooser = new DirectoryChooser();
directoryChooser.setTitle("Select Configuration Folder");
directoryChooser.setInitialDirectory(mDirectoryPreference.getDirectoryConfiguration().toFile());
Stage stage = (Stage)getChangeConfigurationButton().getScene().getWindow();
File selected = directoryChooser.showDialog(stage);
if(selected != null)
{
mDirectoryPreference.setDirectoryConfiguration(selected.toPath());
}
}
});
}
return mChangeConfigurationButton;
}
private Button getResetConfigurationButton()
{
if(mResetConfigurationButton == null)
{
mResetConfigurationButton = new Button("Reset");
mResetConfigurationButton.setOnAction(new EventHandler<ActionEvent>()
{
@Override
public void handle(ActionEvent event)
{
mDirectoryPreference.resetDirectoryConfiguration();
}
});
}
return mResetConfigurationButton;
}
private Label getConfigurationPathLabel()
{
if(mConfigurationPathLabel == null)
{
mConfigurationPathLabel = new Label(mDirectoryPreference.getDirectoryConfiguration().toString());
}
return mConfigurationPathLabel;
}
private Label getEventLogsLabel()
{
if(mEventLogsLabel == null)