UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] GlobalPreferences: change name showUpdatePopUp --> showPopUp

Browse Source
This commit is contained in:
Émilie Feral
2018-10-12 13:58:51 +02:00
committed by LeaNumworks
parent 14b6ed5890
commit 0ee0e87637
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/apps_container.cpp
View File

@@ -71,7 +71,7 @@ VariableBoxController * AppsContainer::variableBoxController() {
void AppsContainer::suspend(bool checkIfPowerKeyReleased) {
resetShiftAlphaStatus();
#if EPSILON_SOFTWARE_UPDATE_PROMPT
if (activeApp()->snapshot()!= onBoardingAppSnapshot() && activeApp()->snapshot() != hardwareTestAppSnapshot() && GlobalPreferences::sharedGlobalPreferences()->showUpdatePopUp()) {
if (activeApp()->snapshot()!= onBoardingAppSnapshot() && activeApp()->snapshot() != hardwareTestAppSnapshot() && GlobalPreferences::sharedGlobalPreferences()->showPopUp()) {
activeApp()->displayModalViewController(&m_updateController, 0.f, 0.f);
}
#endif

12
apps/global_preferences.cpp
View File

@@ -4,7 +4,7 @@ GlobalPreferences::GlobalPreferences() :
m_language(I18n::Language::EN),
m_examMode(ExamMode::Desactivate),
#if EPSILON_SOFTWARE_UPDATE_PROMPT
m_showUpdatePopUp(true),
m_showPopUp(true),
#endif
m_brightnessLevel(Ion::Backlight::MaxBrightness)
{
@@ -36,13 +36,13 @@ void GlobalPreferences::setExamMode(ExamMode examMode) {
}
#if EPSILON_SOFTWARE_UPDATE_PROMPT
bool GlobalPreferences::showUpdatePopUp() const {
return m_showUpdatePopUp;
bool GlobalPreferences::showPopUp() const {
return m_showPopUp;
}
void GlobalPreferences::setShowUpdatePopUp(bool showUpdatePopUp) {
if (showUpdatePopUp != m_showUpdatePopUp) {
m_showUpdatePopUp = showUpdatePopUp;
void GlobalPreferences::setShowPopUp(bool showPopUp) {
if (showPopUp != m_showPopUp) {
m_showPopUp = showPopUp;
}
}
#endif

6
apps/global_preferences.h
View File

@@ -16,8 +16,8 @@ public:
ExamMode examMode() const;
void setExamMode(ExamMode examMode);
#if EPSILON_SOFTWARE_UPDATE_PROMPT
bool showUpdatePopUp() const;
void setShowUpdatePopUp(bool showUpdatePopUp);
bool showPopUp() const;
void setShowPopUp(bool showPopUp);
#endif
int brightnessLevel() const;
void setBrightnessLevel(int brightnessLevel);
@@ -26,7 +26,7 @@ private:
I18n::Language m_language;
ExamMode m_examMode;
#if EPSILON_SOFTWARE_UPDATE_PROMPT
bool m_showUpdatePopUp;
bool m_showPopUp;
#endif
int m_brightnessLevel;
};

4
apps/settings/main_controller.cpp
View File

@@ -71,7 +71,7 @@ bool MainController::handleEvent(Ion::Events::Event event) {
#if EPSILON_SOFTWARE_UPDATE_PROMPT
if (m_messageTreeModel->children(selectedRow())->label() == I18n::Message::UpdatePopUp) {
if (event == Ion::Events::OK || event == Ion::Events::EXE) {
GlobalPreferences::sharedGlobalPreferences()->setShowUpdatePopUp(!GlobalPreferences::sharedGlobalPreferences()->showUpdatePopUp());
GlobalPreferences::sharedGlobalPreferences()->setShowPopUp(!GlobalPreferences::sharedGlobalPreferences()->showPopUp());
m_selectableTableView.reloadCellAtLocation(m_selectableTableView.selectedColumn(), m_selectableTableView.selectedRow());
return true;
}
@@ -195,7 +195,7 @@ void MainController::willDisplayCellForIndex(HighlightCell * cell, int index) {
if (index == 7) {
MessageTableCellWithSwitch * mySwitchCell = (MessageTableCellWithSwitch *)cell;
SwitchView * mySwitch = (SwitchView *)mySwitchCell->accessoryView();
mySwitch->setState(GlobalPreferences::sharedGlobalPreferences()->showUpdatePopUp());
mySwitch->setState(GlobalPreferences::sharedGlobalPreferences()->showPopUp());
return;
}
#endif