From 5fde7f4e99debd80db6e3fe0f5e57ee27484790a Mon Sep 17 00:00:00 2001 From: DonC Date: Wed, 26 May 2021 15:53:17 +0200 Subject: [PATCH 01/11] Measurements placed on clientdlg The values are not updated on the cleintsettings tab. I don't think this is too ugly, so it could be workable. Please test to see if it no longer has memory loss. The only problem I see is with the stream data rate which is now not shown. I could imagine to use a static variable to store the last value and only update when changed, which will be almost never. I will start now to clean this up with the accessibility stuff, etc. where it should be. Will not change the functioning. --- Jamulus.pro | 1 + src/clientdlg.cpp | 42 ++- src/clientdlg.h | 1 + src/clientdlgbase.ui | 705 ++++++++++++++++++----------------- src/clientsettingsdlg.cpp | 5 +- src/clientsettingsdlgbase.ui | 2 +- 6 files changed, 399 insertions(+), 357 deletions(-) diff --git a/Jamulus.pro b/Jamulus.pro index 39ce276416..32f0dab811 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -1130,3 +1130,4 @@ contains(CONFIG, "disable_version_check") { } ANDROID_ABIS = armeabi-v7a arm64-v8a x86 x86_64 + diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 25eb8b09f5..651f76095d 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -1035,7 +1035,7 @@ void CClientDlg::OnTimerBuffersLED() // update the buffer LED and the general settings dialog, too ledBuffers->SetLight ( eCurStatus ); - ClientSettingsDlg.SetStatus ( eCurStatus ); +// ClientSettingsDlg.SetStatus ( eCurStatus ); } void CClientDlg::OnTimerPing() @@ -1068,13 +1068,7 @@ void CClientDlg::OnPingTimeResult ( int iPingTime ) } } - // only update delay information on settings dialog if it is visible to - // avoid CPU load on working thread if not necessary - if ( ClientSettingsDlg.isVisible() ) - { - // set ping time result to general settings dialog - ClientSettingsDlg.SetPingTimeResult ( iPingTime, iOverallDelayMs, eOverallDelayLEDColor ); - } + SetPingTime ( iPingTime, iOverallDelayMs, eOverallDelayLEDColor ); // update delay LED on the main window ledDelay->SetLight ( eOverallDelayLEDColor ); @@ -1258,6 +1252,16 @@ void CClientDlg::UpdateDisplay() chbChat->setChecked ( true ); chbChat->blockSignals ( false ); } + if ( !pClient->IsRunning() ) + { + // clear text labels with client parameters + lblPingVal->setText ( "---" ); + lblPingUnit->setText ( "" ); + lblDelayVal->setText ( "---" ); + lblDelayUnit->setText ( "" ); +// lblUpstreamValue->setText ( "---" ); +// lblUpstreamUnit->setText ( "" ); + } } void CClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign ) @@ -1378,3 +1382,25 @@ void CClientDlg::SetMixerBoardDeco ( const ERecorderState newRecorderState, cons } } } + +void CClientDlg::SetPingTime ( const int iPingTime, const int iOverallDelayMs, const CMultiColorLED::ELightColor eOverallDelayLEDColor ) +{ + // apply values to GUI labels, take special care if ping time exceeds + // a certain value + if ( iPingTime > 500 ) + { + const QString sErrorText = ">500 ms"; + lblPingVal->setText ( sErrorText ); + lblDelayVal->setText ( sErrorText ); + } + else + { + lblPingVal->setText ( QString().setNum ( iPingTime ) ); + lblPingUnit->setText ( "ms" ); + lblDelayVal->setText ( QString().setNum ( iOverallDelayMs ) ); + lblDelayUnit->setText ( "ms" ); + } + + // set current LED status + ledDelay->SetLight ( eOverallDelayLEDColor ); +} diff --git a/src/clientdlg.h b/src/clientdlg.h index 479f07c072..4d2ce7e182 100644 --- a/src/clientdlg.h +++ b/src/clientdlg.h @@ -95,6 +95,7 @@ class CClientDlg : public CBaseDlg, private Ui_CClientDlgBase void Connect ( const QString& strSelectedAddress, const QString& strMixerBoardLabel ); void Disconnect(); void ManageDragNDrop ( QDropEvent* Event, const bool bCheckAccept ); + void SetPingTime ( const int iPingTime, const int iOverallDelayMs, const CMultiColorLED::ELightColor eOverallDelayLEDColor ); CClient* pClient; CClientSettings* pSettings; diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index 63d7f7062b..bd176f5d21 100644 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -17,7 +17,7 @@ - + :/png/main/res/fronticon.png:/png/main/res/fronticon.png @@ -53,437 +53,448 @@ QFrame::Plain - + - + - + - + - - - 3 - + - - - Qt::Vertical - - - - 20 - 10 - - - - - - - - - 0 - 0 - - - - :/png/main/res/fronticon.png - - - Qt::AlignCenter - - - false - - - - - - - Qt::Vertical - - - - 10 - 10 - - - - - - + - - - 3 + + + + 0 + 0 + + + + :/png/main/res/fronticon.png + + Qt::AlignCenter + + + false + + + + + + + Qt::Vertical + + + + 13 + 13 + + + + + + - - - Reverb + + + 3 - - Qt::AlignCenter - - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum + + + Reverb - - - 0 - 20 - + + Qt::AlignCenter - + - - - - 0 - 100 - - - - 1 - - - Qt::Vertical - - - QSlider::TicksBothSides + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 0 + 20 + + + + + + + + + 0 + 0 + + + + + 0 + 100 + + + + + 16777215 + 300 + + + + 1 + + + Qt::Vertical + + + QSlider::TicksBothSides + + + + + + + Qt::Horizontal + + + QSizePolicy::Minimum + + + + 0 + 20 + + + + + + + + + + + + 3 + + + + + Left - - - Qt::Horizontal - - - QSizePolicy::Minimum + + + Right - - - 0 - 20 - - - + - - - 3 + + + Qt::Vertical - - - - Left - - - - - - - Right - - - - - - - - - - - Qt::Vertical - - - - 10 - 0 - - - - - - - - - - Delay - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false - - - - - - - - 0 - 0 - - - + - 14 - 14 + 13 + 13 - - - 14 - 14 - - - + - + Qt::Vertical - - QSizePolicy::Fixed - - - - 10 - 5 - - - + - + - + - Buffers + Input - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - false + Qt::AlignCenter - - - - 0 - 0 - - - - - 14 - 14 - - - - - 14 - 14 - - - + + + + + + 0 + 0 + + + + + 19 + 88 + + + + + + + + + 0 + 0 + + + + + 19 + 88 + + + + + + + + + + + + L + + + Qt::AlignCenter + + + + + + + R + + + Qt::AlignCenter + + + + - - - - Qt::Vertical - - - - 10 - 0 - - - - - + - Qt::Vertical + Qt::Horizontal - - - + + + - Input + Jitter - Qt::AlignCenter + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false - - - - - - - 0 - 0 - - - - - 19 - 88 - - - - - - - - - 0 - 0 - - - - - 19 - 88 - - - - - + + + + Delay + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + - - - - - - L - - - Qt::AlignCenter - - - - - - - R - - - Qt::AlignCenter - - - - + + + + Ping + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + false + + + + + + + Qt::LeftToRight + + + --- + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + ms + + + + + + + Qt::LeftToRight + + + --- + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + ms + + + + + + + + 0 + 0 + + + + + 14 + 14 + + + + + 14 + 14 + + + + + + + + + 0 + 0 + + + + + 14 + 14 + + + + + 14 + 14 + + + - + Qt::Horizontal - - QSizePolicy::Minimum + + + + + + &Mute Myself + + + + + + + &Settings - + + + + + + &Chat + + + + + + 0 - 20 + 45 - + + C&onnect + + + false + + + false + + - + - Qt::Horizontal - - - - - - - &Mute Myself - - - - - - - &Settings - - - - - - - &Chat - - - - - - - - 0 - 45 - - - - C&onnect - - - false - - - false + Qt::Vertical - - - - Qt::Vertical - - - @@ -582,7 +593,7 @@ rbtReverbSelR - + diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 21cb0f8d28..a0da78c3ff 100644 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -1005,6 +1005,8 @@ void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton void CClientSettingsDlg::SetPingTimeResult ( const int iPingTime, const int iOverallDelayMs, const CMultiColorLED::ELightColor eOverallDelayLEDColor ) { + return; + // apply values to GUI labels, take special care if ping time exceeds // a certain value if ( iPingTime > 500 ) @@ -1036,7 +1038,7 @@ void CClientSettingsDlg::UpdateDisplay() // update slider controls (settings might have been changed) UpdateJitterBufferFrame(); UpdateSoundCardFrame(); - +/*** if ( !pClient->IsRunning() ) { // clear text labels with client parameters @@ -1047,6 +1049,7 @@ void CClientSettingsDlg::UpdateDisplay() lblUpstreamValue->setText ( "---" ); lblUpstreamUnit->setText ( "" ); } +***/ } void CClientSettingsDlg::UpdateCustomCentralServerComboBox() diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui index 2eff17d99b..e19c97faf2 100644 --- a/src/clientsettingsdlgbase.ui +++ b/src/clientsettingsdlgbase.ui @@ -30,7 +30,7 @@ - 0 + 1 true From 290e4ce1cb560455137d14afc174437f14c933bc Mon Sep 17 00:00:00 2001 From: DonC Date: Wed, 26 May 2021 17:36:35 +0200 Subject: [PATCH 02/11] Measurements in clientdlg 2 WhatsThis etc. updated for new positions. Measurement values removed from settingsdlg Audio data rate back in settingsdlg --- src/clientdlg.cpp | 45 ++++++++-- src/clientsettingsdlg.cpp | 64 ++------------ src/clientsettingsdlg.h | 11 +-- src/clientsettingsdlgbase.ui | 160 +++++------------------------------ 4 files changed, 66 insertions(+), 214 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 651f76095d..5b30f577f5 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -154,8 +154,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP, ledDelay->setAccessibleName ( tr ( "Delay status LED indicator" ) ); // buffers LED - QString strLEDBuffers = "" + tr ( "Buffers Status LED" ) + ": " + - tr ( "The buffers status LED shows the current audio/streaming " + QString strLEDBuffers = "" + tr ( "Jitter Buffers Status LED" ) + ": " + + tr ( "The jitter buffers status LED shows the current audio/streaming " "status. If the light is red, the audio stream is interrupted. " "This is caused by one of the following problems:" ) + "
    " @@ -179,7 +179,35 @@ CClientDlg::CClientDlg ( CClient* pNCliP, lblBuffers->setWhatsThis ( strLEDBuffers ); ledBuffers->setWhatsThis ( strLEDBuffers ); - ledBuffers->setAccessibleName ( tr ( "Buffers status LED indicator" ) ); + ledBuffers->setAccessibleName ( tr ( "Jitter buffer status LED indicator" ) ); + + // current connection status parameter + QString strConnStats = "" + + tr ( "Current Connection Status " + "Parameter" ) + + ": " + + tr ( "The Ping Time is the time required for the audio " + "stream to travel from the client to the server and back again. This " + "delay is introduced by the network and should be about " + "20-30 ms. If this delay is higher than about 50 ms, your distance to " + "the server is too large or your internet connection is not " + "sufficient." ) + + "
    " + + tr ( "Overall Delay is calculated from the current Ping Time and the " + "delay introduced by the current buffer settings." ) ; + + lblPing->setWhatsThis ( strConnStats ); + lblPingVal->setWhatsThis ( strConnStats ); + lblDelay->setWhatsThis ( strConnStats ); + lblDelayVal->setWhatsThis ( strConnStats ); + ledDelay->setWhatsThis ( strConnStats ); + ledDelay->setToolTip ( tr ( "If this LED indicator turns red, " + "you will not have much fun using the " ) + + APP_NAME + tr ( " software." ) + TOOLTIP_COM_END_TEXT ); + lblPingVal->setText ( "---" ); + lblPingUnit->setText ( "" ); + lblDelayVal->setText ( "---" ); + lblDelayUnit->setText ( "" ); // init GUI design SetGUIDesign ( pClient->GetGUIDesign() ); @@ -1035,7 +1063,6 @@ void CClientDlg::OnTimerBuffersLED() // update the buffer LED and the general settings dialog, too ledBuffers->SetLight ( eCurStatus ); -// ClientSettingsDlg.SetStatus ( eCurStatus ); } void CClientDlg::OnTimerPing() @@ -1068,6 +1095,13 @@ void CClientDlg::OnPingTimeResult ( int iPingTime ) } } + // only update delay information on settings dialog if it is visible to + // avoid CPU load on working thread if not necessary + if ( ClientSettingsDlg.isVisible() ) + { + // set ping time result to general settings dialog + ClientSettingsDlg.SetPingTimeResult (); + } SetPingTime ( iPingTime, iOverallDelayMs, eOverallDelayLEDColor ); // update delay LED on the main window @@ -1218,7 +1252,6 @@ OnTimerStatus(); // reset LEDs ledBuffers->Reset(); ledDelay->Reset(); - ClientSettingsDlg.ResetStatusAndPingLED(); // clear mixer board (remove all faders) MainMixerBoard->HideAll(); @@ -1259,8 +1292,6 @@ void CClientDlg::UpdateDisplay() lblPingUnit->setText ( "" ); lblDelayVal->setText ( "---" ); lblDelayUnit->setText ( "" ); -// lblUpstreamValue->setText ( "---" ); -// lblUpstreamUnit->setText ( "" ); } } diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index a0da78c3ff..174ce7bc15 100644 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -104,8 +104,6 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet sldNetBufServer->setToolTip ( strJitterBufferSizeTT ); chbAutoJitBuf->setAccessibleName ( tr ( "Auto jitter buffer switch" ) ); chbAutoJitBuf->setToolTip ( strJitterBufferSizeTT ); - ledNetw->setAccessibleName ( tr ( "Jitter buffer status LED indicator" ) ); - ledNetw->setToolTip ( strJitterBufferSizeTT ); // sound card device lblSoundcardDevice->setWhatsThis ( "" + tr ( "Sound Card Device" ) + ": " + tr ( "The ASIO driver (sound card) can be selected using " ) + @@ -338,34 +336,14 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet // current connection status parameter QString strConnStats = "" + - tr ( "Current Connection Status " - "Parameter" ) + + tr ( "Audio Upstream Rate" ) + ": " + - tr ( "The Ping Time is the time required for the audio " - "stream to travel from the client to the server and back again. This " - "delay is introduced by the network and should be about " - "20-30 ms. If this delay is higher than about 50 ms, your distance to " - "the server is too large or your internet connection is not " - "sufficient." ) + - "
    " + - tr ( "Overall Delay is calculated from the current Ping Time and the " - "delay introduced by the current buffer settings." ) + - "
    " + - tr ( "Audio Upstream Rate depends on the current audio packet size and " + tr ( " depends on the current audio packet size and " "compression setting. Make sure that the upstream rate is not " "higher than your available internet upload speed (check this with a " "service such as speedtest.net)." ); - lblPingTime->setWhatsThis ( strConnStats ); - lblPingTimeValue->setWhatsThis ( strConnStats ); - lblOverallDelay->setWhatsThis ( strConnStats ); - lblOverallDelayValue->setWhatsThis ( strConnStats ); - lblUpstream->setWhatsThis ( strConnStats ); lblUpstreamValue->setWhatsThis ( strConnStats ); - ledOverallDelay->setWhatsThis ( strConnStats ); - ledOverallDelay->setToolTip ( tr ( "If this LED indicator turns red, " - "you will not have much fun using the " ) + - APP_NAME + tr ( " software." ) + TOOLTIP_COM_END_TEXT ); QString strNumMixerPanelRows = "" + tr ( "Number of Mixer Panel Rows" ) + ": " + tr ( "Adjust the number of rows used to arrange the mixer panel." ); @@ -394,16 +372,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet UpdateAudioFaderSlider(); // init delay and other information controls - ledNetw->Reset(); - ledOverallDelay->Reset(); - ledNetw->SetType ( CMultiColorLED::MT_INDICATOR ); - ledOverallDelay->SetType ( CMultiColorLED::MT_INDICATOR ); lblUpstreamValue->setText ( "---" ); lblUpstreamUnit->setText ( "" ); - lblPingTimeValue->setText ( "---" ); - lblPingTimeUnit->setText ( "" ); - lblOverallDelayValue->setText ( "---" ); - lblOverallDelayUnit->setText ( "" ); edtNewClientLevel->setValidator ( new QIntValidator ( 0, 100, this ) ); // % range from 0-100 // init slider controls --- @@ -1003,34 +973,15 @@ void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton UpdateDisplay(); } -void CClientSettingsDlg::SetPingTimeResult ( const int iPingTime, const int iOverallDelayMs, const CMultiColorLED::ELightColor eOverallDelayLEDColor ) +void CClientSettingsDlg::SetPingTimeResult () { - return; - - // apply values to GUI labels, take special care if ping time exceeds - // a certain value - if ( iPingTime > 500 ) - { - const QString sErrorText = ">500 ms"; - lblPingTimeValue->setText ( sErrorText ); - lblOverallDelayValue->setText ( sErrorText ); - } - else - { - lblPingTimeValue->setText ( QString().setNum ( iPingTime ) ); - lblPingTimeUnit->setText ( "ms" ); - lblOverallDelayValue->setText ( QString().setNum ( iOverallDelayMs ) ); - lblOverallDelayUnit->setText ( "ms" ); - } + // ping and delay times now in clientdlg // update upstream rate information label (note that we update this together // with the ping time since the network packet sequence number feature might // be enabled at any time which has influence on the upstream rate) lblUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) ); lblUpstreamUnit->setText ( "kbps" ); - - // set current LED status - ledOverallDelay->SetLight ( eOverallDelayLEDColor ); } void CClientSettingsDlg::UpdateDisplay() @@ -1038,18 +989,13 @@ void CClientSettingsDlg::UpdateDisplay() // update slider controls (settings might have been changed) UpdateJitterBufferFrame(); UpdateSoundCardFrame(); -/*** + if ( !pClient->IsRunning() ) { // clear text labels with client parameters - lblPingTimeValue->setText ( "---" ); - lblPingTimeUnit->setText ( "" ); - lblOverallDelayValue->setText ( "---" ); - lblOverallDelayUnit->setText ( "" ); lblUpstreamValue->setText ( "---" ); lblUpstreamUnit->setText ( "" ); } -***/ } void CClientSettingsDlg::UpdateCustomCentralServerComboBox() diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index 555923d4d7..007f0f5e4f 100644 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -56,16 +56,7 @@ class CClientSettingsDlg : public CBaseDlg, private Ui_CClientSettingsDlgBase public: CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSetP, QWidget* parent = nullptr ); - void SetStatus ( const CMultiColorLED::ELightColor eStatus ) { ledNetw->SetLight ( eStatus ); } - - void ResetStatusAndPingLED() - { - ledNetw->Reset(); - ledOverallDelay->Reset(); - } - - void SetPingTimeResult ( const int iPingTime, const int iOverallDelayMs, const CMultiColorLED::ELightColor eOverallDelayLEDColor ); - + void SetPingTimeResult (); void UpdateDisplay(); void UpdateSoundDeviceChannelSelectionFrame(); diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui index e19c97faf2..683516121f 100644 --- a/src/clientsettingsdlgbase.ui +++ b/src/clientsettingsdlgbase.ui @@ -640,22 +640,6 @@ - - - - Qt::Vertical - - - QSizePolicy::Expanding - - - - 17 - 10 - - - - @@ -848,7 +832,7 @@ - Measurements + Audio Stream Rate @@ -856,30 +840,20 @@ - - - - Audio Stream Rate - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - val - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + Qt::Horizontal - - 2 + + + 1 + 5 + - + - + kbps @@ -889,45 +863,8 @@ - - - - Ping Time - - - - - - - val - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - 2 - - - - - - - ms - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - Overall Delay - - - - - + + val @@ -939,66 +876,18 @@ - - - - ms - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - - - - - - 0 - 0 - - - - - 20 - 20 - - - - - 20 - 20 - - - - - - - - Local Jitter Buffer - - - - - - - - 0 - 0 - - - - - 20 - 20 - + + + + Qt::Horizontal - + - 20 - 20 + 1 + 5 - + @@ -1368,11 +1257,6 @@ - - CMultiColorLED - QWidget -
    multicolorled.h
    -     CLanguageComboBox QComboBox From b30fd8cc14af6236e529fd9955450c53ace3de9b Mon Sep 17 00:00:00 2001 From: DonC Date: Wed, 26 May 2021 19:28:46 +0200 Subject: [PATCH 03/11] UI clean up --- src/clientdlg.cpp | 6 ++-- src/clientdlgbase.ui | 74 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 5b30f577f5..dc1070c271 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -1420,17 +1420,17 @@ void CClientDlg::SetPingTime ( const int iPingTime, const int iOverallDelayMs, c // a certain value if ( iPingTime > 500 ) { - const QString sErrorText = ">500 ms"; + const QString sErrorText = ">500"; lblPingVal->setText ( sErrorText ); lblDelayVal->setText ( sErrorText ); } else { lblPingVal->setText ( QString().setNum ( iPingTime ) ); - lblPingUnit->setText ( "ms" ); lblDelayVal->setText ( QString().setNum ( iOverallDelayMs ) ); - lblDelayUnit->setText ( "ms" ); } + lblPingUnit->setText ( "ms" ); + lblDelayUnit->setText ( "ms" ); // set current LED status ledDelay->SetLight ( eOverallDelayLEDColor ); diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index bd176f5d21..c1ec9ef360 100644 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -17,7 +17,7 @@ - + :/png/main/res/fronticon.png:/png/main/res/fronticon.png @@ -58,8 +58,14 @@ + + 6 + + + 3 + @@ -73,7 +79,7 @@ - :/png/main/res/fronticon.png + :/png/main/res/fronticon.png Qt::AlignCenter @@ -88,10 +94,13 @@ Qt::Vertical + + QSizePolicy::Expanding + 13 - 13 + 10 @@ -134,7 +143,7 @@ - + 0 0 @@ -142,7 +151,7 @@ 0 - 100 + 125 @@ -210,10 +219,13 @@ Qt::Vertical + + QSizePolicy::Expanding + 13 - 13 + 10 @@ -353,11 +365,17 @@ + + + 34 + 0 + + Qt::LeftToRight - --- + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -366,6 +384,18 @@ + + + 22 + 0 + + + + + 22 + 16777215 + + ms @@ -373,11 +403,17 @@ + + + 34 + 0 + + Qt::LeftToRight - --- + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -386,6 +422,18 @@ + + + 22 + 0 + + + + + 22 + 16777215 + + ms @@ -467,9 +515,15 @@ + + + 0 + 0 + + - 0 + 120 45 @@ -593,7 +647,7 @@ rbtReverbSelR - + From 2e0f762b7ffba33923da92c35e1f8ca903ac526f Mon Sep 17 00:00:00 2001 From: DonC Date: Wed, 26 May 2021 20:52:11 +0200 Subject: [PATCH 04/11] Changed LEDs to fancy from Henk's PR, thanks Henk ! --- Jamulus.pro | 2 ++ src/multicolorled.cpp | 4 ++-- src/res/IndicatorRedFancy.png | Bin 0 -> 678 bytes src/res/IndicatorYellowFancy.png | Bin 0 -> 631 bytes src/resources.qrc | 21 ++------------------- 5 files changed, 6 insertions(+), 21 deletions(-) create mode 100644 src/res/IndicatorRedFancy.png create mode 100644 src/res/IndicatorYellowFancy.png diff --git a/Jamulus.pro b/Jamulus.pro index 32f0dab811..78a8adf0ad 100644 --- a/Jamulus.pro +++ b/Jamulus.pro @@ -732,6 +732,8 @@ DISTFILES += ChangeLog \ src/res/IndicatorGreen.png \ src/res/IndicatorYellow.png \ src/res/IndicatorRed.png \ + src/res/IndicatorYellowFancy.png \ + src/res/IndicatorRedFancy.png \ src/res/faderbackground.png \ src/res/faderhandle.png \ src/res/faderhandlesmall.png \ diff --git a/src/multicolorled.cpp b/src/multicolorled.cpp index 2d21fb0270..aad3c4b090 100644 --- a/src/multicolorled.cpp +++ b/src/multicolorled.cpp @@ -33,8 +33,8 @@ CMultiColorLED::CMultiColorLED ( QWidget* parent ) : BitmCubeDisabled ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDDisabledSmall.png" ) ), BitmCubeGrey ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreySmall.png" ) ), BitmCubeGreen ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDGreenSmall.png" ) ), - BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDYellowSmall.png" ) ), - BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/CLEDRedSmall.png" ) ), + BitmCubeYellow ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorYellowFancy.png" ) ), + BitmCubeRed ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorRedFancy.png" ) ), BitmIndicatorGreen ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorGreen.png" ) ), BitmIndicatorYellow ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorYellow.png" ) ), BitmIndicatorRed ( QString::fromUtf8 ( ":/png/LEDs/res/IndicatorRed.png" ) ) diff --git a/src/res/IndicatorRedFancy.png b/src/res/IndicatorRedFancy.png new file mode 100644 index 0000000000000000000000000000000000000000..56154bc1f281564d53bb3b49c68ae31d363ff39c GIT binary patch literal 678 zcmV;X0$KfuP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vIQ7ytmK7y*8D$&CO20y{}WK~y+TRg%AN zQc)DgzmMO2FaXbI0yZxYho+$E=whl?+c04IVq6S$?b3z0CQkhWy6DigC0!cx2n-|| z2C0LEI;h136H2O2MFaypMIT(xebA~W`6lO{dp_sfA4kAHrfHhY7)z5>TE@mvR0ToM zNSmsvHYYKhfw^2RMZnf@I27CMHU@)%6?ePc2nK_&+wBIytI1?C!{ZiMC=@uf(`vOa zU9aO(C=9!m zp1TbFc?mCE4g>-L!)CKZY;=S)IihlKfN*>cn7#l+qQGI5^mgo1EHoR3Qm%mKT8z`_ zRC~Q1VwDQ;@G-Feik@W#Sh!AF0OI7A4uSPYn5~py7zQ|la=Fa1*{pRi=DW$5UuEpc zK3#cYdnLv^w;6NHTRHiBo^ghEgv;gPmj-&&wWkBaU*k15_8Txik*F&f&*cmUt3IC( z{p2#>@Bq8(z}*|bUSTZm?>?YC5&h*m;JKV}kZF=6#ZH!%Fq2xN#6<#%z`YHt1NER7 z6*Z^uv2$#F2|bV|)M_=EoO-w06_t0#@UwHkeR?EwIOZJm9ouX8ZvTdpSQK8b*P!o< zSOd^#G*UDbJN4BY4{7C@&m2wDw=LVri@)SAtvOmLd?-;fiakv3&no(wtg2P!c4HOl2a9{>OV M07*qoM6N<$f{P0#j{pDw literal 0 HcmV?d00001 diff --git a/src/res/IndicatorYellowFancy.png b/src/res/IndicatorYellowFancy.png new file mode 100644 index 0000000000000000000000000000000000000000..25d5fb6897e1608352d79574fe754c50601afcb4 GIT binary patch literal 631 zcmV--0*L*IP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vIQ7ytmK7y*8D$&CO20t`t+K~y+Tb&^47 zQgIx|zfXO-sT7)TB8luY*4AJ|(6Orr35n{mb=@tnYY=p(&b!2D*XAi2itpehqeBq7 z4vjJ#4wg{DL?nDZC#kRR@9(k|^o1|{-tYhY{NMlm-%rCC<#IX0ahwdD=Ht?&i>jt+ zIeIglPPa~bn1Y2uVU57{Xf*P7IvorK1J(EWd(AE)xyHUU9Ra8IHR99 zICz2m{c{L~Lbl80ns@OC85aI{yiDjeL;pe|oolxczgUK36{G8V+OjMxFYhtnr3Wz0 zT^L40*)(6V*QY(Wv{Z&|+YknoO2x_N^ZZ26FX?wqBy!$iQdw%pc}r(i#xzYw7S-dW-_WwgGchZSfYo3y2+O*`_DA|5wzgu3M7*@lI?CQ7`U{VF2a**= ztJP{x`0pNQ+G{K>-echZIy`)i;qba#&{M5muNy3my4|in8r?-S`izn3CrVza)w+-4 ztb+}wN2&Q=w0a?HZ Ri+2D3002ovPDHLkV1jf8Ezke} literal 0 HcmV?d00001 diff --git a/src/resources.qrc b/src/resources.qrc index bbc1d6f5ad..c9148e1f86 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,35 +1,16 @@ res/translation/translation_de_DE.qm - - res/translation/translation_fr_FR.qm - - res/translation/translation_pt_PT.qm - - res/translation/translation_pt_BR.qm - - res/translation/translation_es_ES.qm - - res/translation/translation_nl_NL.qm - - res/translation/translation_it_IT.qm - - res/translation/translation_pl_PL.qm - - res/translation/translation_sk_SK.qm - - res/translation/translation_sv_SE.qm - res/CLEDDisabledSmall.png res/CLEDGreenArrow.png @@ -45,6 +26,8 @@ res/HLEDBlackSmall.png res/HLEDRedSmall.png res/HLEDYellowSmall.png + res/IndicatorRedFancy.png + res/IndicatorYellowFancy.png res/faderbackground.png From a9ac7e6e4c90d22ff1f305ec6ed3953a89dafe07 Mon Sep 17 00:00:00 2001 From: DonC Date: Thu, 27 May 2021 09:11:45 +0200 Subject: [PATCH 05/11] Ran through clang-format --- src/clientdlg.cpp | 8 ++++---- src/clientsettingsdlg.cpp | 8 +++----- src/clientsettingsdlg.h | 2 +- src/main.cpp | 2 +- src/server.h | 2 +- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index dc1070c271..fbccc8d0c3 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -194,7 +194,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, "sufficient." ) + "
    " + tr ( "Overall Delay is calculated from the current Ping Time and the " - "delay introduced by the current buffer settings." ) ; + "delay introduced by the current buffer settings." ); lblPing->setWhatsThis ( strConnStats ); lblPingVal->setWhatsThis ( strConnStats ); @@ -202,8 +202,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP, lblDelayVal->setWhatsThis ( strConnStats ); ledDelay->setWhatsThis ( strConnStats ); ledDelay->setToolTip ( tr ( "If this LED indicator turns red, " - "you will not have much fun using the " ) + - APP_NAME + tr ( " software." ) + TOOLTIP_COM_END_TEXT ); + "you will not have much fun using the " ) + + APP_NAME + tr ( " software." ) + TOOLTIP_COM_END_TEXT ); lblPingVal->setText ( "---" ); lblPingUnit->setText ( "" ); lblDelayVal->setText ( "---" ); @@ -1100,7 +1100,7 @@ void CClientDlg::OnPingTimeResult ( int iPingTime ) if ( ClientSettingsDlg.isVisible() ) { // set ping time result to general settings dialog - ClientSettingsDlg.SetPingTimeResult (); + ClientSettingsDlg.SetPingTimeResult(); } SetPingTime ( iPingTime, iOverallDelayMs, eOverallDelayLEDColor ); diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 174ce7bc15..04761f086d 100644 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -335,10 +335,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet cbxCentralServerAddress->setAccessibleName ( tr ( "Directory server address combo box" ) ); // current connection status parameter - QString strConnStats = "" + - tr ( "Audio Upstream Rate" ) + - ": " + - tr ( " depends on the current audio packet size and " + QString strConnStats = "" + tr ( "Audio Upstream Rate" ) + ": " + + tr ( " depends on the current audio packet size and " "compression setting. Make sure that the upstream rate is not " "higher than your available internet upload speed (check this with a " "service such as speedtest.net)." ); @@ -973,7 +971,7 @@ void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton UpdateDisplay(); } -void CClientSettingsDlg::SetPingTimeResult () +void CClientSettingsDlg::SetPingTimeResult() { // ping and delay times now in clientdlg diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index 007f0f5e4f..e15bbfe7e2 100644 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -56,7 +56,7 @@ class CClientSettingsDlg : public CBaseDlg, private Ui_CClientSettingsDlgBase public: CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSetP, QWidget* parent = nullptr ); - void SetPingTimeResult (); + void SetPingTimeResult(); void UpdateDisplay(); void UpdateSoundDeviceChannelSelectionFrame(); diff --git a/src/main.cpp b/src/main.cpp index f1ea4f06f6..f31197ca34 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -538,7 +538,7 @@ int main ( int argc, char** argv ) QCoreApplication* pApp = new QCoreApplication ( argc, argv ); #else # if defined( Q_OS_IOS ) - bUseGUI = true; + bUseGUI = true; // bUseMultithreading = true; QApplication* pApp = new QApplication ( argc, argv ); diff --git a/src/server.h b/src/server.h index 749694bb4f..d735e11151 100644 --- a/src/server.h +++ b/src/server.h @@ -103,7 +103,7 @@ class CHighPrecisionTimer : public QThread protected: virtual void run(); - bool bRun; + bool bRun; # if defined( __APPLE__ ) || defined( __MACOSX ) uint64_t Delay; From 6e0c4ed9c88ca4d74f8387b7814d09c31907769a Mon Sep 17 00:00:00 2001 From: DonC Date: Thu, 27 May 2021 21:57:13 +0200 Subject: [PATCH 06/11] Small corrections - connect button expands to column width - jitter buffer whatsthis corrected --- src/clientdlg.cpp | 6 +++--- src/clientdlgbase.ui | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index fbccc8d0c3..2debee780e 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -154,8 +154,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP, ledDelay->setAccessibleName ( tr ( "Delay status LED indicator" ) ); // buffers LED - QString strLEDBuffers = "" + tr ( "Jitter Buffers Status LED" ) + ": " + - tr ( "The jitter buffers status LED shows the current audio/streaming " + QString strLEDBuffers = "" + tr ( "Local Jitter Buffer Status LED" ) + ": " + + tr ( "The local jitter buffer status LED shows the current audio/streaming " "status. If the light is red, the audio stream is interrupted. " "This is caused by one of the following problems:" ) + "
      " @@ -179,7 +179,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, lblBuffers->setWhatsThis ( strLEDBuffers ); ledBuffers->setWhatsThis ( strLEDBuffers ); - ledBuffers->setAccessibleName ( tr ( "Jitter buffer status LED indicator" ) ); + ledBuffers->setAccessibleName ( tr ( "Local Jitter Buffer status LED indicator" ) ); // current connection status parameter QString strConnStats = "" + diff --git a/src/clientdlgbase.ui b/src/clientdlgbase.ui index c1ec9ef360..0c652d7325 100644 --- a/src/clientdlgbase.ui +++ b/src/clientdlgbase.ui @@ -516,7 +516,7 @@ - + 0 0 From 08da823d7719192c486c948b0a226e348bf187bb Mon Sep 17 00:00:00 2001 From: DonC Date: Sat, 29 May 2021 10:12:08 +0200 Subject: [PATCH 07/11] More clean up -Renamed SetPingTimeResult -> UpdateUploadRate. -Audio rate whatsthis text & added whatsthis to audio rate groupbox. -Removed superfluous comment. --- src/clientdlg.cpp | 2 +- src/clientsettingsdlg.cpp | 11 ++++------- src/clientsettingsdlg.h | 2 +- src/clientsettingsdlgbase.ui | 2 +- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 2debee780e..030202e4c8 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -1100,7 +1100,7 @@ void CClientDlg::OnPingTimeResult ( int iPingTime ) if ( ClientSettingsDlg.isVisible() ) { // set ping time result to general settings dialog - ClientSettingsDlg.SetPingTimeResult(); + ClientSettingsDlg.UpdateUploadRate(); } SetPingTime ( iPingTime, iOverallDelayMs, eOverallDelayLEDColor ); diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 04761f086d..0c8deab8aa 100644 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -336,12 +336,13 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet // current connection status parameter QString strConnStats = "" + tr ( "Audio Upstream Rate" ) + ": " + - tr ( " depends on the current audio packet size and " + tr ( "Depends on the current audio packet size and " "compression setting. Make sure that the upstream rate is not " "higher than your available internet upload speed (check this with a " "service such as speedtest.net)." ); lblUpstreamValue->setWhatsThis ( strConnStats ); + grbUpstreamValue->setWhatsThis ( strConnStats ); QString strNumMixerPanelRows = "" + tr ( "Number of Mixer Panel Rows" ) + ": " + tr ( "Adjust the number of rows used to arrange the mixer panel." ); @@ -971,13 +972,9 @@ void CClientSettingsDlg::OnSndCrdBufferDelayButtonGroupClicked ( QAbstractButton UpdateDisplay(); } -void CClientSettingsDlg::SetPingTimeResult() +void CClientSettingsDlg::UpdateUploadRate() { - // ping and delay times now in clientdlg - - // update upstream rate information label (note that we update this together - // with the ping time since the network packet sequence number feature might - // be enabled at any time which has influence on the upstream rate) + // update upstream rate information label lblUpstreamValue->setText ( QString().setNum ( pClient->GetUploadRateKbps() ) ); lblUpstreamUnit->setText ( "kbps" ); } diff --git a/src/clientsettingsdlg.h b/src/clientsettingsdlg.h index e15bbfe7e2..53e05fd1bb 100644 --- a/src/clientsettingsdlg.h +++ b/src/clientsettingsdlg.h @@ -56,7 +56,7 @@ class CClientSettingsDlg : public CBaseDlg, private Ui_CClientSettingsDlgBase public: CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSetP, QWidget* parent = nullptr ); - void SetPingTimeResult(); + void UpdateUploadRate(); void UpdateDisplay(); void UpdateSoundDeviceChannelSelectionFrame(); diff --git a/src/clientsettingsdlgbase.ui b/src/clientsettingsdlgbase.ui index 683516121f..70e091f195 100644 --- a/src/clientsettingsdlgbase.ui +++ b/src/clientsettingsdlgbase.ui @@ -830,7 +830,7 @@ - + Audio Stream Rate From cf9910720096c1a0000caf114c2f8469f640316f Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Sat, 29 May 2021 13:56:28 +0100 Subject: [PATCH 08/11] Revert text changes for translations This reverts the affected texts back to the values that have already been translated, so we can release 3.8.0. The original improvements can be re-applied if required after the release. --- src/clientdlg.cpp | 6 +++--- src/clientsettingsdlg.cpp | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index 030202e4c8..e0aaf66a7b 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -154,8 +154,8 @@ CClientDlg::CClientDlg ( CClient* pNCliP, ledDelay->setAccessibleName ( tr ( "Delay status LED indicator" ) ); // buffers LED - QString strLEDBuffers = "" + tr ( "Local Jitter Buffer Status LED" ) + ": " + - tr ( "The local jitter buffer status LED shows the current audio/streaming " + QString strLEDBuffers = "" + tr ( "Buffers Status LED" ) + ": " + + tr ( "The buffers status LED shows the current audio/streaming " "status. If the light is red, the audio stream is interrupted. " "This is caused by one of the following problems:" ) + "
        " @@ -179,7 +179,7 @@ CClientDlg::CClientDlg ( CClient* pNCliP, lblBuffers->setWhatsThis ( strLEDBuffers ); ledBuffers->setWhatsThis ( strLEDBuffers ); - ledBuffers->setAccessibleName ( tr ( "Local Jitter Buffer status LED indicator" ) ); + ledBuffers->setAccessibleName ( tr ( "Buffers status LED indicator" ) ); // current connection status parameter QString strConnStats = "" + diff --git a/src/clientsettingsdlg.cpp b/src/clientsettingsdlg.cpp index 0c8deab8aa..4faf0b1884 100644 --- a/src/clientsettingsdlg.cpp +++ b/src/clientsettingsdlg.cpp @@ -335,8 +335,7 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet cbxCentralServerAddress->setAccessibleName ( tr ( "Directory server address combo box" ) ); // current connection status parameter - QString strConnStats = "" + tr ( "Audio Upstream Rate" ) + ": " + - tr ( "Depends on the current audio packet size and " + QString strConnStats = tr ( "Audio Upstream Rate depends on the current audio packet size and " "compression setting. Make sure that the upstream rate is not " "higher than your available internet upload speed (check this with a " "service such as speedtest.net)." ); From d43532bc7cf3082851904a9f24a8727dce5eec38 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Sat, 29 May 2021 14:50:30 +0100 Subject: [PATCH 09/11] Formatting for clang --- src/main.cpp | 2 +- src/server.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f31197ca34..f1ea4f06f6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -538,7 +538,7 @@ int main ( int argc, char** argv ) QCoreApplication* pApp = new QCoreApplication ( argc, argv ); #else # if defined( Q_OS_IOS ) - bUseGUI = true; + bUseGUI = true; // bUseMultithreading = true; QApplication* pApp = new QApplication ( argc, argv ); diff --git a/src/server.h b/src/server.h index d735e11151..749694bb4f 100644 --- a/src/server.h +++ b/src/server.h @@ -103,7 +103,7 @@ class CHighPrecisionTimer : public QThread protected: virtual void run(); - bool bRun; + bool bRun; # if defined( __APPLE__ ) || defined( __MACOSX ) uint64_t Delay; From 0516eb4d202934e61d33080a03688d1fef13cbf7 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Sat, 29 May 2021 14:58:12 +0100 Subject: [PATCH 10/11] Move clearing of ping and delay to Disconnect() --- src/clientdlg.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/clientdlg.cpp b/src/clientdlg.cpp index e0aaf66a7b..b34d9e741c 100644 --- a/src/clientdlg.cpp +++ b/src/clientdlg.cpp @@ -1253,6 +1253,12 @@ OnTimerStatus(); ledBuffers->Reset(); ledDelay->Reset(); + // clear text labels with client parameters + lblPingVal->setText ( "---" ); + lblPingUnit->setText ( "" ); + lblDelayVal->setText ( "---" ); + lblDelayUnit->setText ( "" ); + // clear mixer board (remove all faders) MainMixerBoard->HideAll(); } @@ -1285,14 +1291,6 @@ void CClientDlg::UpdateDisplay() chbChat->setChecked ( true ); chbChat->blockSignals ( false ); } - if ( !pClient->IsRunning() ) - { - // clear text labels with client parameters - lblPingVal->setText ( "---" ); - lblPingUnit->setText ( "" ); - lblDelayVal->setText ( "---" ); - lblDelayUnit->setText ( "" ); - } } void CClientDlg::SetGUIDesign ( const EGUIDesign eNewDesign ) From 34f653bcb0d8631f918edc1f7a7bfc09f0014181 Mon Sep 17 00:00:00 2001 From: Tony Mountifield Date: Sat, 29 May 2021 16:16:52 +0100 Subject: [PATCH 11/11] Revert unrelated changes --- src/resources.qrc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/resources.qrc b/src/resources.qrc index c9148e1f86..e6acbcba85 100644 --- a/src/resources.qrc +++ b/src/resources.qrc @@ -1,16 +1,35 @@ res/translation/translation_de_DE.qm + + res/translation/translation_fr_FR.qm + + res/translation/translation_pt_PT.qm + + res/translation/translation_pt_BR.qm + + res/translation/translation_es_ES.qm + + res/translation/translation_nl_NL.qm + + res/translation/translation_it_IT.qm + + res/translation/translation_pl_PL.qm + + res/translation/translation_sk_SK.qm + + res/translation/translation_sv_SE.qm + res/CLEDDisabledSmall.png res/CLEDGreenArrow.png