diff --git a/plugins/samplesource/airspy/airspygui.ui b/plugins/samplesource/airspy/airspygui.ui index 71638eec5..62198c98f 100644 --- a/plugins/samplesource/airspy/airspygui.ui +++ b/plugins/samplesource/airspy/airspygui.ui @@ -6,8 +6,8 @@ 0 0 - 320 - 262 + 280 + 220 @@ -16,6 +16,12 @@ 0 + + + 280 + 220 + + Sans Serif @@ -66,7 +72,7 @@ :/record_off.png:/record_off.png - + @@ -84,9 +90,9 @@ - + - + @@ -596,6 +602,23 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/plugins/samplesource/bladerf/bladerfgui.ui b/plugins/samplesource/bladerf/bladerfgui.ui index f8ea50f34..1e4f237c0 100644 --- a/plugins/samplesource/bladerf/bladerfgui.ui +++ b/plugins/samplesource/bladerf/bladerfgui.ui @@ -7,7 +7,7 @@ 0 0 259 - 207 + 210 @@ -16,6 +16,12 @@ 0 + + + 0 + 210 + + Sans Serif @@ -653,6 +659,23 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/plugins/samplesource/fcdpro/fcdprogui.ui b/plugins/samplesource/fcdpro/fcdprogui.ui index 522627d63..1380e6a96 100644 --- a/plugins/samplesource/fcdpro/fcdprogui.ui +++ b/plugins/samplesource/fcdpro/fcdprogui.ui @@ -6,8 +6,8 @@ 0 0 - 318 - 400 + 270 + 335 @@ -16,6 +16,12 @@ 0 + + + 270 + 335 + + Sans Serif @@ -66,7 +72,7 @@ :/record_off.png:/record_off.png - + @@ -83,8 +89,8 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - + + @@ -432,6 +438,23 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/plugins/samplesource/fcdproplus/fcdproplusgui.ui b/plugins/samplesource/fcdproplus/fcdproplusgui.ui index de7401758..76c929402 100644 --- a/plugins/samplesource/fcdproplus/fcdproplusgui.ui +++ b/plugins/samplesource/fcdproplus/fcdproplusgui.ui @@ -6,8 +6,8 @@ 0 0 - 305 - 191 + 260 + 180 @@ -16,6 +16,12 @@ 0 + + + 260 + 180 + + Sans Serif @@ -66,7 +72,7 @@ :/record_off.png:/record_off.png - + @@ -83,7 +89,7 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - + @@ -339,6 +345,23 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/plugins/samplesource/filesource/filesourcegui.ui b/plugins/samplesource/filesource/filesourcegui.ui index 023821f02..03062f1b1 100644 --- a/plugins/samplesource/filesource/filesourcegui.ui +++ b/plugins/samplesource/filesource/filesourcegui.ui @@ -6,8 +6,8 @@ 0 0 - 289 - 227 + 246 + 190 @@ -16,6 +16,12 @@ 0 + + + 246 + 190 + + Sans Serif @@ -408,13 +414,6 @@ - - - - Qt::Horizontal - - - @@ -435,6 +434,30 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + Qt::Horizontal + + + diff --git a/plugins/samplesource/hackrf/hackrfgui.ui b/plugins/samplesource/hackrf/hackrfgui.ui index cd57eae29..55b7de973 100644 --- a/plugins/samplesource/hackrf/hackrfgui.ui +++ b/plugins/samplesource/hackrf/hackrfgui.ui @@ -7,7 +7,7 @@ 0 0 260 - 299 + 210 @@ -19,7 +19,7 @@ 260 - 0 + 210 @@ -41,58 +41,58 @@ - - - - - - - start/stop acquisition - - - - - - - :/play.png - :/stop.png:/play.png - - - - - - - Toggle record I/Q samples from device - - - - - - - :/record_off.png:/record_off.png - - - - - - - - - - - I/Q sample rate kS/s - - - 00000k - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - + + + + + + + start/stop acquisition + + + + + + + :/play.png + :/stop.png:/play.png + + + + + + + Toggle record I/Q samples from device + + + + + + + :/record_off.png:/record_off.png + + + + + + + + + + + I/Q sample rate kS/s + + + 00000k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + @@ -567,6 +567,23 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/plugins/samplesource/rtlsdr/rtlsdrgui.ui b/plugins/samplesource/rtlsdr/rtlsdrgui.ui index fa8ad07ce..a9f5abfad 100644 --- a/plugins/samplesource/rtlsdr/rtlsdrgui.ui +++ b/plugins/samplesource/rtlsdr/rtlsdrgui.ui @@ -6,8 +6,8 @@ 0 0 - 298 - 189 + 300 + 190 @@ -16,6 +16,12 @@ 0 + + + 300 + 190 + + Sans Serif @@ -456,13 +462,6 @@ - - - - Qt::Horizontal - - - @@ -490,6 +489,30 @@ + + + + Qt::Horizontal + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui index 05a3e1234..0b7d6c78e 100644 --- a/plugins/samplesource/sdrdaemon/sdrdaemongui.ui +++ b/plugins/samplesource/sdrdaemon/sdrdaemongui.ui @@ -7,13 +7,13 @@ 0 0 350 - 366 + 261 350 - 0 + 261 @@ -35,58 +35,58 @@ - + + + - - - - - start/stop acquisition - - - - - - - :/play.png - :/stop.png:/play.png - - - - - - - Toggle record I/Q samples from device - - - - - - - :/record_off.png:/record_off.png - - - - + + + start/stop acquisition + + + + + + + :/play.png + :/stop.png:/play.png + + - - - - - I/Q sample rate kS/s - - - 00000k - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - + + + Toggle record I/Q samples from device + + + + + + + :/record_off.png:/record_off.png + + - + + + + + + + + I/Q sample rate kS/s + + + 00000k + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + @@ -985,6 +985,23 @@ + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp index 6a9cc7900..4c859fd54 100644 --- a/sdrbase/mainwindow.cpp +++ b/sdrbase/mainwindow.cpp @@ -74,26 +74,31 @@ MainWindow::MainWindow(QWidget* parent) : setCorner(Qt::BottomRightCorner, Qt::RightDockWidgetArea); // work around broken Qt dock widget ordering - removeDockWidget(ui->inputDock); + removeDockWidget(ui->inputSelectDock); + removeDockWidget(ui->inputViewDock); removeDockWidget(ui->spectraDisplayDock); removeDockWidget(ui->presetDock); removeDockWidget(ui->channelDock); - addDockWidget(Qt::LeftDockWidgetArea, ui->inputDock); + addDockWidget(Qt::LeftDockWidgetArea, ui->inputSelectDock); + addDockWidget(Qt::LeftDockWidgetArea, ui->inputViewDock); addDockWidget(Qt::LeftDockWidgetArea, ui->spectraDisplayDock); addDockWidget(Qt::LeftDockWidgetArea, ui->presetDock); addDockWidget(Qt::RightDockWidgetArea, ui->channelDock); - ui->inputDock->show(); + ui->inputSelectDock->show(); + ui->inputSelectDock->show(); ui->spectraDisplayDock->show(); ui->presetDock->show(); ui->channelDock->show(); - ui->menu_Window->addAction(ui->inputDock->toggleViewAction()); + ui->menu_Window->addAction(ui->inputSelectDock->toggleViewAction()); + ui->menu_Window->addAction(ui->inputViewDock->toggleViewAction()); ui->menu_Window->addAction(ui->spectraDisplayDock->toggleViewAction()); ui->menu_Window->addAction(ui->presetDock->toggleViewAction()); ui->menu_Window->addAction(ui->channelDock->toggleViewAction()); //ui->tabInputsVoew->setStyleSheet("background-color: rgb(46,46,46)"); + ui->tabInputsView->setStyleSheet("QWidget { background: rgb(46,46,46); } "); connect(&m_inputMessageQueue, SIGNAL(messageEnqueued()), this, SLOT(handleMessages()), Qt::QueuedConnection); @@ -237,6 +242,11 @@ void MainWindow::removeLastDevice() lastDeviceEngine->stop(); m_dspEngine->removeLastDeviceEngine(); + if (ui->tabInputsView->count() == ui->tabInputsSelect->count()) + { + ui->tabInputsView->removeTab(ui->tabInputsView->count() - 1); + } + ui->tabInputsSelect->removeTab(ui->tabInputsSelect->count() - 1); delete m_deviceUIs.back(); @@ -322,7 +332,7 @@ void MainWindow::loadPresetSettings(const Preset* preset) qPrintable(preset->getDescription())); // Load into currently selected source tab - int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); + int currentSourceTabIndex = ui->tabInputsView->currentIndex(); if (currentSourceTabIndex >= 0) { @@ -356,7 +366,7 @@ void MainWindow::savePresetSettings(Preset* preset) preset->clearChannels(); // Save from currently selected source tab - int currentSourceTabIndex = ui->tabInputsSelect->currentIndex(); + int currentSourceTabIndex = ui->tabInputsView->currentIndex(); if (currentSourceTabIndex >= 0) { diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui index 9220e86f0..a582acb0e 100644 --- a/sdrbase/mainwindow.ui +++ b/sdrbase/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1012 - 635 + 767 @@ -398,14 +398,14 @@ - + - Sample Source + Select Sample Source 1 - + 0 @@ -432,422 +432,37 @@ + + + + + + Sample Source + + + 1 + + + + + 0 + 0 + + + + + 3 + + + 2 + - - - - - - - 255 - 255 - 255 - - - - - - - 53 - 52 - 50 - - - - - - - 79 - 78 - 75 - - - - - - - 66 - 65 - 62 - - - - - - - 26 - 26 - 25 - - - - - - - 35 - 34 - 33 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 53 - 52 - 50 - - - - - - - 0 - 0 - 0 - - - - - - - 26 - 26 - 25 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 53 - 52 - 50 - - - - - - - 79 - 78 - 75 - - - - - - - 66 - 65 - 62 - - - - - - - 26 - 26 - 25 - - - - - - - 35 - 34 - 33 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 255 - 255 - 255 - - - - - - - 0 - 0 - 0 - - - - - - - 53 - 52 - 50 - - - - - - - 0 - 0 - 0 - - - - - - - 26 - 26 - 25 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - - - - - 255 - 255 - 255 - - - - - - - 53 - 52 - 50 - - - - - - - 79 - 78 - 75 - - - - - - - 66 - 65 - 62 - - - - - - - 26 - 26 - 25 - - - - - - - 35 - 34 - 33 - - - - - - - 212 - 212 - 205 - - - - - - - 255 - 255 - 255 - - - - - - - 212 - 212 - 205 - - - - - - - 53 - 52 - 50 - - - - - - - 53 - 52 - 50 - - - - - - - 0 - 0 - 0 - - - - - - - 53 - 52 - 50 - - - - - - - 255 - 255 - 220 - - - - - - - 0 - 0 - 0 - - - - - + + + 0 + 200 +