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

Fixed some conflicts

Browse Source
This commit is contained in:
Quentin Guidée
2020-02-12 18:24:13 +01:00
parent ab8f731515
commit 31cdd5bcc8
12 changed files with 27 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/apps_container.cpp
View File

@@ -364,8 +364,7 @@ void AppsContainer::redrawWindow(bool force) {
}
void AppsContainer::activateExamMode(GlobalPreferences::ExamMode examMode) {
<<<<<<< HEAD
assert(examMode == GlobalPreferences::ExamMode::Standard || examMode == GlobalPreferences::ExamMode::Dutch || examMode == GlobalPreferences::ExamMode::NoSym);
assert(examMode != GlobalPreferences::ExamMode::Off && examMode != GlobalPreferences::ExamMode::Unknown);
reset();
Preferences * preferences = Preferences::sharedPreferences();
switch ((int)preferences->colorOfLED()) {
@@ -399,11 +398,6 @@ void AppsContainer::activateExamMode(GlobalPreferences::ExamMode examMode) {
* confusing states when the battery is charging and states when the Dutch
* exam mode is on. */
// Ion::LED::setColor(examMode == GlobalPreferences::ExamMode::Dutch ? KDColorYellow : KDColorRed);
=======
assert(examMode != GlobalPreferences::ExamMode::Off && examMode != GlobalPreferences::ExamMode::Unknown);
reset();
Ion::LED::setColor(ExamModeConfiguration::examModeColor(examMode));
>>>>>>> upstream/master
Ion::LED::setBlinking(1000, 0.1f);
}