Skip to content

Update unit of measure display in settings dialog #1755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
henkdegroot wants to merge 1 commit into from
Closed

Update unit of measure display in settings dialog #1755

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions src/clientsettingsdlg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,11 +399,8 @@ CClientSettingsDlg::CClientSettingsDlg ( CClient* pNCliP, CClientSettings* pNSet
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 ---
Expand Down Expand Up @@ -1009,23 +1006,20 @@ void CClientSettingsDlg::SetPingTimeResult ( const int iPingTime, const int iOve
// a certain value
if ( iPingTime > 500 )
{
const QString sErrorText = "<font color=\"red\"><b>&#62;500 ms</b></font>";
const QString sErrorText = "<font color=\"red\"><b>&#62;500</b></font>";
Copy link
Copy Markdown
Collaborator

@pljones pljones May 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops! :) I missed that...

lblPingTimeValue->setText ( sErrorText );
lblOverallDelayValue->setText ( sErrorText );
}
else
{
lblPingTimeValue->setText ( QString().setNum ( iPingTime ) );
lblPingTimeUnit->setText ( "ms" );
lblOverallDelayValue->setText ( QString().setNum ( iOverallDelayMs ) );
lblOverallDelayUnit->setText ( "ms" );
}

// 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 );
Expand All @@ -1041,11 +1035,8 @@ void CClientSettingsDlg::UpdateDisplay()
{
// clear text labels with client parameters
lblPingTimeValue->setText ( "---" );
lblPingTimeUnit->setText ( "" );
lblOverallDelayValue->setText ( "---" );
lblOverallDelayUnit->setText ( "" );
lblUpstreamValue->setText ( "---" );
lblUpstreamUnit->setText ( "" );
}
}

Expand Down