Commit 76d6e327 authored by Edric Milaret's avatar Edric Milaret

settings: suppress framerate combobox

- Not relevant anymore cf patchset in daemon 3128

Change-Id: I4658afed090e322f548a7bf89411f9d44b3dafe5
Tuleap: #132
parent fb5b4384
......@@ -145,32 +145,11 @@ ConfigurationWidget::on_sizeBox_currentIndexChanged(int index)
{
auto device = deviceModel_->activeDevice();
ui->rateBox->clear();
if (index < 0)
return;
if (!isLoading_)
device->channelList()[0]->setActiveResolution(
device->channelList()[0]->validResolutions()[index]);
isLoading_ = true;
for (auto rate
: device->channelList()[0]->validResolutions()[index]->validRates()) {
ui->rateBox->addItem(rate->name());
}
ui->rateBox->setCurrentIndex(
device->channelList()[0]->
activeResolution()->activeRate()->relativeIndex());
isLoading_ = false;
}
void
ConfigurationWidget::on_rateBox_currentIndexChanged(int index)
{
if (index < 0 || isLoading_)
return;
auto device = deviceModel_->activeDevice();
device->channelList()[0]->activeResolution()->setActiveRate(index);
}
void
......
......@@ -50,7 +50,6 @@ protected:
private slots:
void on_deviceBox_currentIndexChanged(int index);
void on_sizeBox_currentIndexChanged(int index);
void on_rateBox_currentIndexChanged(int index);
void on_deleteAccountButton_clicked();
void on_addAccountButton_clicked();
void on_startupBox_toggled(bool checked);
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>558</width>
<height>342</height>
<height>391</height>
</rect>
</property>
<property name="sizePolicy">
......@@ -305,29 +305,6 @@
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="framerateLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Framerate</string>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QComboBox" name="rateBox">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
</layout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment