pom timer show/hide entry window
This commit is contained in:
@@ -7,6 +7,7 @@
|
|||||||
(prop :FlxSound dingSound)
|
(prop :FlxSound dingSound)
|
||||||
|
|
||||||
(prop &mut :Void->Void onFinishedPom)
|
(prop &mut :Void->Void onFinishedPom)
|
||||||
|
(prop &mut :Void->Void onStartPom)
|
||||||
|
|
||||||
(method getText []
|
(method getText []
|
||||||
"$(if workMode "FOCUS ON WORK FOR " "TAKE A BREAK FOR ")$(Std.int (/ timerValue 60)):$(.lpad (Std.string (Std.int (% timerValue 60))) "0" 2)")
|
"$(if workMode "FOCUS ON WORK FOR " "TAKE A BREAK FOR ")$(Std.int (/ timerValue 60)):$(.lpad (Std.string (Std.int (% timerValue 60))) "0" 2)")
|
||||||
@@ -20,7 +21,7 @@
|
|||||||
(super.update elapsed)
|
(super.update elapsed)
|
||||||
(-= timerValue elapsed)
|
(-= timerValue elapsed)
|
||||||
(#when debug
|
(#when debug
|
||||||
(when FlxG.keys.justPressed.P
|
(when (and FlxG.keys.pressed.CONTROL FlxG.keys.justPressed.P)
|
||||||
(set timerValue 0)))
|
(set timerValue 0)))
|
||||||
(when (<= timerValue 0)
|
(when (<= timerValue 0)
|
||||||
(when workMode
|
(when workMode
|
||||||
@@ -29,5 +30,14 @@
|
|||||||
(onFinishedPom)))
|
(onFinishedPom)))
|
||||||
(set workMode !workMode)
|
(set workMode !workMode)
|
||||||
(dingSound.play)
|
(dingSound.play)
|
||||||
(set timerValue (* 60 (if workMode workMin (if (= 0 (% totalPoms 4)) longBreakMin breakMin)))))
|
(set timerValue
|
||||||
|
(* 60
|
||||||
|
(if workMode
|
||||||
|
{
|
||||||
|
(when onStartPom (onStartPom))
|
||||||
|
workMin
|
||||||
|
}
|
||||||
|
(if (= 0 (% totalPoms 4))
|
||||||
|
longBreakMin
|
||||||
|
breakMin)))))
|
||||||
(set text (getText)))
|
(set text (getText)))
|
@@ -71,8 +71,9 @@
|
|||||||
(when entryNameText (set entryNameText.hasFocus true))
|
(when entryNameText (set entryNameText.hasFocus true))
|
||||||
(super.update elapsed)
|
(super.update elapsed)
|
||||||
|
|
||||||
(when (and pomWasRunning !pomResumeWindow)
|
(when (and pomWasRunning !pomResumeWindow !pomStartCheck)
|
||||||
(entryWindow.hide)
|
(entryWindow.hide)
|
||||||
|
(set pomStartCheck true)
|
||||||
(set pomResumeWindow
|
(set pomResumeWindow
|
||||||
(SimpleWindow.promptForChoice "A pomodoro timer was interrupted. Resume it now?"
|
(SimpleWindow.promptForChoice "A pomodoro timer was interrupted. Resume it now?"
|
||||||
[
|
[
|
||||||
@@ -287,7 +288,8 @@
|
|||||||
|
|
||||||
(method :Void setModel [m &opt :RewardFile currentRewardFile]
|
(method :Void setModel [m &opt :RewardFile currentRewardFile]
|
||||||
(set model m)
|
(set model m)
|
||||||
(set pomTimer.onFinishedPom ->:Void {(model.addPomPoint) (refreshModel)})
|
(set pomTimer.onFinishedPom ->:Void {(model.addPomPoint) (refreshModel) (entryWindow.hide)})
|
||||||
|
(set pomTimer.onStartPom ->:Void (entryWindow.show))
|
||||||
|
|
||||||
(let [p (m.totalPoints)
|
(let [p (m.totalPoints)
|
||||||
&mut i 0
|
&mut i 0
|
||||||
@@ -401,6 +403,7 @@
|
|||||||
(set model.showLowerPriority !model.showLowerPriority)
|
(set model.showLowerPriority !model.showLowerPriority)
|
||||||
(refreshModel))))
|
(refreshModel))))
|
||||||
(prop &mut pomRunning false)
|
(prop &mut pomRunning false)
|
||||||
|
(prop &mut pomStartCheck false)
|
||||||
(savedVar :Bool pomWasRunning false)
|
(savedVar :Bool pomWasRunning false)
|
||||||
(if pomRunning
|
(if pomRunning
|
||||||
(_makeText "Stop Pomodoro Timer Mode" m.pomodoroPoints
|
(_makeText "Stop Pomodoro Timer Mode" m.pomodoroPoints
|
||||||
@@ -415,8 +418,11 @@
|
|||||||
(defAndCall method startPomodoros
|
(defAndCall method startPomodoros
|
||||||
(set pomRunning true)
|
(set pomRunning true)
|
||||||
(set pomWasRunning true)
|
(set pomWasRunning true)
|
||||||
|
(if FlxPomTimer.workMode
|
||||||
|
(entryWindow.show)
|
||||||
|
(entryWindow.hide))
|
||||||
(add pomTimer)
|
(add pomTimer)
|
||||||
(refreshModel))) )
|
(refreshModel))))
|
||||||
(set entryWindow.textColor (FlxColor.RED.getDarkened))
|
(set entryWindow.textColor (FlxColor.RED.getDarkened))
|
||||||
(_makeText "Delete a habit or task" 0
|
(_makeText "Delete a habit or task" 0
|
||||||
->_
|
->_
|
||||||
|
Reference in New Issue
Block a user