Minor adjustments of update time UI, allow to reset values

Follow up of refs #814
This commit is contained in:
Klaus Basan
2016-12-10 16:50:07 +01:00
parent c90ae32c7e
commit fd5f82f1f1
3 changed files with 109 additions and 95 deletions

View File

@@ -26,6 +26,8 @@ namespace BlackGui
connect(ui->hs_AircraftUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged); connect(ui->hs_AircraftUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged);
connect(ui->hs_AtcUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged); connect(ui->hs_AtcUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged);
connect(ui->hs_UserUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged); connect(ui->hs_UserUpdateTime, &QSlider::sliderReleased, this, &CSettingsViewUpdateTimes::ps_sliderChanged);
connect(ui->tb_ResetUser, &QToolButton::clicked, this, &CSettingsViewUpdateTimes::ps_resetUpdateTimes);
this->ps_settingsChanged(); this->ps_settingsChanged();
} }
@@ -50,5 +52,12 @@ namespace BlackGui
ui->hs_RenderingUpdateTime->setValue(settings.getRenderingUpdateTime().toSeconds()); ui->hs_RenderingUpdateTime->setValue(settings.getRenderingUpdateTime().toSeconds());
ui->hs_UserUpdateTime->setValue(settings.getUserUpdateTime().toSeconds()); ui->hs_UserUpdateTime->setValue(settings.getUserUpdateTime().toSeconds());
} }
void CSettingsViewUpdateTimes::ps_resetUpdateTimes()
{
CViewUpdateSettings settings;
m_settings.setAndSave(settings);
this->ps_settingsChanged();
}
} // ns } // ns
} // ns } // ns

View File

@@ -32,7 +32,7 @@ namespace BlackGui
explicit CSettingsViewUpdateTimes(QWidget *parent = nullptr); explicit CSettingsViewUpdateTimes(QWidget *parent = nullptr);
//! Destructor //! Destructor
~CSettingsViewUpdateTimes(); virtual ~CSettingsViewUpdateTimes();
private slots: private slots:
//! Slider changed //! Slider changed
@@ -41,6 +41,9 @@ namespace BlackGui
//! Settings have been changed //! Settings have been changed
void ps_settingsChanged(); void ps_settingsChanged();
//! Reset all update times
void ps_resetUpdateTimes();
private: private:
QScopedPointer<Ui::CSettingsViewUpdateTimes> ui; QScopedPointer<Ui::CSettingsViewUpdateTimes> ui;
BlackMisc::CSetting<BlackGui::Settings::TViewUpdateSettings> m_settings { this, &CSettingsViewUpdateTimes::ps_settingsChanged }; //!< settings changed BlackMisc::CSetting<BlackGui::Settings::TViewUpdateSettings> m_settings { this, &CSettingsViewUpdateTimes::ps_settingsChanged }; //!< settings changed

View File

@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>168</width> <width>282</width>
<height>123</height> <height>100</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -37,7 +37,84 @@
<property name="title"> <property name="title">
<string>View update times</string> <string>View update times</string>
</property> </property>
<layout class="QFormLayout" name="fl_ViewRefreshTimes"> <layout class="QGridLayout" name="gl_ViewUpdateTimes">
<property name="leftMargin">
<number>4</number>
</property>
<property name="topMargin">
<number>4</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>4</number>
</property>
<item row="0" column="3">
<widget class="QSlider" name="hs_AtcUpdateTime">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="4">
<widget class="QToolButton" name="tb_ResetUser">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../blackmisc/blackmisc.qrc">
<normaloff>:/pastel/icons/pastel/16/arrow-refresh-small.png</normaloff>:/pastel/icons/pastel/16/arrow-refresh-small.png</iconset>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="lbl_UserUpdateTime">
<property name="toolTip">
<string>User update time (5-30s)</string>
</property>
<property name="text">
<string>User</string>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QSlider" name="hs_UserUpdateTime">
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="lbl_AircraftUpdateTime"> <widget class="QLabel" name="lbl_AircraftUpdateTime">
<property name="toolTip"> <property name="toolTip">
@@ -50,12 +127,6 @@
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="hs_AircraftUpdateTime"> <widget class="QSlider" name="hs_AircraftUpdateTime">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimum"> <property name="minimum">
<number>5</number> <number>5</number>
</property> </property>
@@ -76,62 +147,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="1" column="1">
<widget class="QLabel" name="lbl_AtcUpdateTime"> <widget class="QSlider" name="hs_RenderingUpdateTime">
<property name="toolTip">
<string>ATC update time (5-30s)</string>
</property>
<property name="text">
<string>ATC</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QSlider" name="hs_AtcUpdateTime">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimum">
<number>5</number>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="lbl_UserUpdateTime">
<property name="toolTip">
<string>User update time (5-30s)</string>
</property>
<property name="text">
<string>User</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QSlider" name="hs_UserUpdateTime">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimum"> <property name="minimum">
<number>5</number> <number>5</number>
</property> </property>
@@ -162,47 +179,32 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="2">
<widget class="QSlider" name="hs_RenderingUpdateTime"> <widget class="QLabel" name="lbl_AtcUpdateTime">
<property name="sizePolicy"> <property name="toolTip">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <string>ATC update time (5-30s)</string>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimum"> <property name="text">
<number>5</number> <string>ATC</string>
</property>
<property name="maximum">
<number>30</number>
</property>
<property name="singleStep">
<number>5</number>
</property>
<property name="pageStep">
<number>5</number>
</property>
<property name="value">
<number>10</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
<zorder>lbl_UserUpdateTime</zorder>
<zorder>lbl_AtcUpdateTime</zorder>
<zorder>lbl_AircraftUpdateTime</zorder> <zorder>lbl_AircraftUpdateTime</zorder>
<zorder>hs_UserUpdateTime</zorder>
<zorder>hs_AtcUpdateTime</zorder>
<zorder>hs_AircraftUpdateTime</zorder> <zorder>hs_AircraftUpdateTime</zorder>
<zorder>lbl_RenderingUpdateTime</zorder> <zorder>lbl_RenderingUpdateTime</zorder>
<zorder>hs_RenderingUpdateTime</zorder> <zorder>hs_RenderingUpdateTime</zorder>
<zorder>lbl_AtcUpdateTime</zorder>
<zorder>hs_AtcUpdateTime</zorder>
<zorder>lbl_UserUpdateTime</zorder>
<zorder>hs_UserUpdateTime</zorder>
<zorder>tb_ResetUser</zorder>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="../../blackmisc/blackmisc.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>