mirror
/
wfview
kopia lustrzana https://gitlab.com/eliggett/wfview
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'master' into shuttle

half-duplex
Phil Taylor 2022-10-25 10:19:56 +01:00
rodzic eb363db09c 103dc9c86a
commit 5ffbfc0f1d
3 zmienionych plików z 50 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
CHANGELOG
Wyświetl plik

@ -1,6 +1,22 @@
# CHANGELOG
- 20221025
combobox: Stop it cutting off some devices
Resize according to boundingrect
Resize based on font size
Try new universal resize code
- 20221022
added qt xml dev lib for suse
- 20221014
bands page reorganized
- 20221010
bumped to version 1.52

5
WHATSNEW
Wyświetl plik

@ -19,6 +19,11 @@ The following highlights are in this 1.51-release ince v1.50:
+ 1.52 added cluster spotting including color picker suport
optional SQLITE in memory for spots (disabled)
+ 1.xx modified band buttons to look more alike the layut on the rigs
audio selction combobox shows full devicenames
Notes:
- We know about high CPU usage on RPi.

36
wfmain.cpp
Wyświetl plik

@ -6730,6 +6730,9 @@ void wfmain::setAudioDevicesUI()
int defaultAudioInputIndex = 0;
int defaultAudioOutputIndex = 0;
int numCharsIn = 0;
int numCharsOut = 0;
QFontMetrics fm(ui->audioInputCombo->font());
ui->audioInputCombo->setCurrentIndex(-1);
ui->audioOutputCombo->setCurrentIndex(-1);
@ -6754,6 +6757,8 @@ void wfmain::setAudioDevicesUI()
#endif
ui->audioInputCombo->addItem(deviceInfo.deviceName().toLocal8Bit(), QVariant::fromValue(deviceInfo));
ui->serverRXAudioInputCombo->addItem(deviceInfo.deviceName().toLocal8Bit(), QVariant::fromValue(deviceInfo));
if (fm.boundingRect(deviceInfo.deviceName()).width() > numCharsIn)
numCharsIn = fm.boundingRect(deviceInfo.deviceName()).width();
#ifdef Q_OS_WIN
}
#endif
@ -6770,6 +6775,9 @@ void wfmain::setAudioDevicesUI()
#endif
ui->audioOutputCombo->addItem(deviceInfo.deviceName().toLocal8Bit(), QVariant::fromValue(deviceInfo));
ui->serverTXAudioOutputCombo->addItem(deviceInfo.deviceName().toLocal8Bit(), QVariant::fromValue(deviceInfo));
if (fm.boundingRect(deviceInfo.deviceName()).width() > numCharsOut)
numCharsOut = fm.boundingRect(deviceInfo.deviceName()).width();
#ifdef Q_OS_WIN
}
#endif
@ -6803,6 +6811,10 @@ void wfmain::setAudioDevicesUI()
ui->audioInputCombo->addItem(QString(info->name).toLocal8Bit(), i);
ui->serverRXAudioInputCombo->addItem(QString(info->name).toLocal8Bit(), i);
if (fm.boundingRect(QString(info->name)).width() > numCharsIn)
numCharsIn = fm.boundingRect(QString(info->name)).width();
if (i == Pa_GetDefaultInputDevice()) {
defaultAudioInputName = info->name;
}
@ -6811,6 +6823,10 @@ void wfmain::setAudioDevicesUI()
qDebug(logAudio()) << (i == Pa_GetDefaultOutputDevice() ? "*" : " ") << "(" << i << ") Output Device : " << QString(info->name).toLocal8Bit();
ui->audioOutputCombo->addItem(QString(info->name).toLocal8Bit(), i);
ui->serverTXAudioOutputCombo->addItem(QString(info->name).toLocal8Bit(), i);
if (fm.boundingRect(QString(info->name)).width() > numCharsOut)
numCharsOut = fm.boundingRect(QString(info->name)).width();
if (i == Pa_GetDefaultOutputDevice()) {
defaultAudioOutputName = info->name;
}
@ -6866,6 +6882,10 @@ void wfmain::setAudioDevicesUI()
qInfo(logAudio()) << (info.isDefaultInput ? "*" : " ") << "(" << i << ") Input Device : " << QString::fromStdString(info.name).toLocal8Bit();
ui->audioInputCombo->addItem(QString::fromStdString(info.name).toLocal8Bit(), i);
ui->serverRXAudioInputCombo->addItem(QString::fromStdString(info.name).toLocal8Bit(), i);
if (fm.boundingRect(QString::fromStdString(info.name)).width() > numCharsIn)
numCharsIn = fm.boundingRect(QString::fromStdString(info.name)).width();
if (info.isDefaultInput) {
defaultAudioInputName = QString::fromStdString(info.name).toLocal8Bit();
}
@ -6874,6 +6894,10 @@ void wfmain::setAudioDevicesUI()
qInfo(logAudio()) << (info.isDefaultOutput ? "*" : " ") << "(" << i << ") Output Device : " << QString::fromStdString(info.name).toLocal8Bit();
ui->audioOutputCombo->addItem(QString::fromStdString(info.name).toLocal8Bit(), i);
ui->serverTXAudioOutputCombo->addItem(QString::fromStdString(info.name).toLocal8Bit(), i);
if (fm.boundingRect(QString::fromStdString(info.name)).width() > numCharsOut)
numCharsOut = fm.boundingRect(QString::fromStdString(info.name)).width();
if (info.isDefaultOutput) {
defaultAudioOutputName = QString::fromStdString(info.name).toLocal8Bit();
}
@ -6885,15 +6909,13 @@ void wfmain::setAudioDevicesUI()
}
}
// Make the audio comboboxes expand when clicked (only needed for Windows)
#ifdef Q_OS_WIN
ui->audioInputCombo->setStyleSheet("QComboBox QAbstractItemView {min-width: 300px;}");
ui->audioOutputCombo->setStyleSheet("QComboBox QAbstractItemView {min-width: 300px;}");
ui->serverTXAudioOutputCombo->setStyleSheet("QComboBox QAbstractItemView {min-width: 300px;}");
ui->serverRXAudioInputCombo->setStyleSheet("QComboBox QAbstractItemView {min-width: 300px;}");
#endif
ui->audioInputCombo->setStyleSheet(QString("QComboBox QAbstractItemView {min-width: %1px;}").arg(numCharsIn+30));
ui->audioOutputCombo->setStyleSheet(QString("QComboBox QAbstractItemView {min-width: %1px;}").arg(numCharsOut+30));
ui->serverTXAudioOutputCombo->setStyleSheet(QString("QComboBox QAbstractItemView {min-width: %1px;}").arg(numCharsOut+30));
ui->serverRXAudioInputCombo->setStyleSheet(QString("QComboBox QAbstractItemView {min-width: %1px;}").arg(numCharsIn+30));
// Stop blocking signals so we can set the current values
ui->audioInputCombo->blockSignals(false);