SteamFrame/OpenVR-AdvancedSettings-frame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert m_alarmTime to new settings API

Browse Source
This commit is contained in:
Vasily
2019-12-10 08:28:41 +01:00
committed by username223
parent 09fcf79e8b
commit 71b8a336c2
1 changed files with 47 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/tabcontrollers/UtilitiesTabController.cpp
+47 -44
View File
@@ -12,12 +12,12 @@ namespace advsettings
{ {
void UtilitiesTabController::initStage1() void UtilitiesTabController::initStage1()
{ {
auto settings = OverlayController::appSettings(); auto qAlarmHour
settings->beginGroup( "utilitiesSettings" ); = settings::getSetting( settings::IntSetting::UTILITY_alarmHour );
auto qAlarmHour = settings->value( "alarmHour", 0 ); auto qAlarmMinute
auto qAlarmMinute = settings->value( "alarmMinute", 0 ); = settings::getSetting( settings::IntSetting::UTILITY_alarmMinute );
settings->endGroup();
m_alarmTime = QTime( qAlarmHour.toInt(), qAlarmMinute.toInt() ); m_alarmTime = QTime( qAlarmHour, qAlarmMinute );
m_k_utilitiesSettingsUpdateCounter m_k_utilitiesSettingsUpdateCounter
= utils::adjustUpdateRate( k_utilitiesSettingsUpdateCounter ); = utils::adjustUpdateRate( k_utilitiesSettingsUpdateCounter );
@@ -260,27 +260,30 @@ void UtilitiesTabController::setVrcDebug( bool value, bool notify )
void UtilitiesTabController::setAlarmTimeHour( int hour, bool notify ) void UtilitiesTabController::setAlarmTimeHour( int hour, bool notify )
{ {
if ( m_alarmTime.hour() != hour ) if ( m_alarmTime.hour() == hour )
{ {
if ( m_alarmTime.isValid() ) return;
{ }
m_alarmTime = QTime( hour, m_alarmTime.minute() );
} if ( m_alarmTime.isValid() )
else {
{ m_alarmTime = QTime( hour, m_alarmTime.minute() );
m_alarmTime = QTime( hour, 0 ); }
} else
auto settings = OverlayController::appSettings(); {
settings->beginGroup( "utilitiesSettings" ); m_alarmTime = QTime( hour, 0 );
settings->setValue( "alarmHour", m_alarmTime.hour() ); }
settings->setValue( "alarmMinute", m_alarmTime.minute() );
settings->endGroup(); settings::setSetting( settings::IntSetting::UTILITY_alarmHour,
settings->sync(); m_alarmTime.hour() );
m_alarmLastCheckTime = QTime(); settings::setSetting( settings::IntSetting::UTILITY_alarmMinute,
if ( notify ) m_alarmTime.minute() );
{
emit alarmTimeHourChanged( hour ); m_alarmLastCheckTime = QTime();
}
if ( notify )
{
emit alarmTimeHourChanged( hour );
} }
} }
@@ -296,12 +299,12 @@ void UtilitiesTabController::setAlarmTimeMinute( int min, bool notify )
{ {
m_alarmTime = QTime( 0, min ); m_alarmTime = QTime( 0, min );
} }
auto settings = OverlayController::appSettings();
settings->beginGroup( "utilitiesSettings" ); settings::setSetting( settings::IntSetting::UTILITY_alarmHour,
settings->setValue( "alarmHour", m_alarmTime.hour() ); m_alarmTime.hour() );
settings->setValue( "alarmMinute", m_alarmTime.minute() ); settings::setSetting( settings::IntSetting::UTILITY_alarmMinute,
settings->endGroup(); m_alarmTime.minute() );
settings->sync();
m_alarmLastCheckTime = QTime(); m_alarmLastCheckTime = QTime();
if ( notify ) if ( notify )
{ {
@@ -321,12 +324,12 @@ void UtilitiesTabController::modAlarmTimeHour( int value, bool notify )
{ {
auto h = m_alarmTime.hour(); auto h = m_alarmTime.hour();
m_alarmTime = m_alarmTime.addSecs( value * 60 * 60 ); m_alarmTime = m_alarmTime.addSecs( value * 60 * 60 );
auto settings = OverlayController::appSettings();
settings->beginGroup( "utilitiesSettings" ); settings::setSetting( settings::IntSetting::UTILITY_alarmHour,
settings->setValue( "alarmHour", m_alarmTime.hour() ); m_alarmTime.hour() );
settings->setValue( "alarmMinute", m_alarmTime.minute() ); settings::setSetting( settings::IntSetting::UTILITY_alarmMinute,
settings->endGroup(); m_alarmTime.minute() );
settings->sync();
if ( h != m_alarmTime.hour() ) if ( h != m_alarmTime.hour() )
{ {
m_alarmLastCheckTime = QTime(); m_alarmLastCheckTime = QTime();
@@ -342,12 +345,12 @@ void UtilitiesTabController::modAlarmTimeMinute( int value, bool notify )
auto h = m_alarmTime.hour(); auto h = m_alarmTime.hour();
auto m = m_alarmTime.minute(); auto m = m_alarmTime.minute();
m_alarmTime = m_alarmTime.addSecs( value * 60 ); m_alarmTime = m_alarmTime.addSecs( value * 60 );
auto settings = OverlayController::appSettings();
settings->beginGroup( "utilitiesSettings" ); settings::setSetting( settings::IntSetting::UTILITY_alarmHour,
settings->setValue( "alarmHour", m_alarmTime.hour() ); m_alarmTime.hour() );
settings->setValue( "alarmMinute", m_alarmTime.minute() ); settings::setSetting( settings::IntSetting::UTILITY_alarmMinute,
settings->endGroup(); m_alarmTime.minute() );
settings->sync();
if ( m != m_alarmTime.minute() || h != m_alarmTime.hour() ) if ( m != m_alarmTime.minute() || h != m_alarmTime.hour() )
{ {
m_alarmLastCheckTime = QTime(); m_alarmLastCheckTime = QTime();