mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-26 23:28:14 +03:00
Code Issues Projects Releases Packages Wiki Activity

Network Settings: Adjust the bandwidth limit option with old Qt

Browse source 
- Disable the whole group box
- Add a tooltip explaining why it is disabled
- Make sure it is disabled in the settings in case of upgrade
- Do a runtime check in case the running Qt is greater
This commit is contained in:
Olivier Goffart 2015-10-22 17:57:34 +02:00
parent c8590c4468
commit 6a0633083d
2 changed files with 26 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/gui/networksettings.cpp
View file

@ -117,23 +117,29 @@ void NetworkSettings::loadProxySettings()
void NetworkSettings::loadBWLimitSettings()
{
#if QT_VERSION < QT_VERSION_CHECK(5,3,3)
// QNAM bandwith limiting only works with versions of Qt greater or equal to 5.3.3
// (It needs Qt commits 097b641 and b99fa32)
_ui->noDownloadLimitRadioButton->setChecked(true);
_ui->downloadLimitRadioButton->setEnabled(false);
_ui->noDownloadLimitRadioButton->setEnabled(false);
_ui->autoDownloadLimitRadioButton->setEnabled(false);
_ui->noUploadLimitRadioButton->setChecked(true);
_ui->uploadLimitRadioButton->setEnabled(false);
_ui->noUploadLimitRadioButton->setEnabled(false);
_ui->autoUploadLimitRadioButton->setEnabled(false);
return;
#endif
ConfigFile cfgFile;
#if QT_VERSION < QT_VERSION_CHECK(5,3,3)
// QNAM bandwidth limiting only works with versions of Qt greater or equal to 5.3.3
// (It needs Qt commits 097b641 and b99fa32)
const char *v = qVersion(); // "x.y.z";
if (QLatin1String(v) < QLatin1String("5.3.3")) {
QString tooltip = tr("Qt >= 5.4 is required in order to use the bandwidth limit");
_ui->downloadBox->setEnabled(false);
_ui->uploadBox->setEnabled(false);
_ui->downloadBox->setToolTip(tooltip);
_ui->uploadBox->setToolTip(tooltip);
_ui->noDownloadLimitRadioButton->setChecked(true);
_ui->noUploadLimitRadioButton->setChecked(true);
if (cfgFile.useUploadLimit() != 0 || cfgFile.useDownloadLimit() != 0) {
// Update from old mirall that was using neon propagator jobs.
saveBWLimitSettings();
}
return;
}
#endif
int useDownloadLimit = cfgFile.useDownloadLimit();
if ( useDownloadLimit >= 1 ) {
_ui->downloadLimitRadioButton->setChecked(true);

10
src/gui/networksettings.ui
View file

@ -179,7 +179,7 @@
<item row="1" column="0">
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<widget class="QGroupBox" name="groupBox">
<widget class="QGroupBox" name="downloadBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@ -258,7 +258,7 @@
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2">
<widget class="QGroupBox" name="uploadBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
@ -284,9 +284,6 @@
<property name="text">
<string>Limit automatically</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
@ -294,6 +291,9 @@
<property name="text">
<string>No limit</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="2" column="1">