projects
/
kitchenalert
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sticky2'
[kitchenalert]
/
src
/
kitchenalertmainwindow.h
diff --git
a/src/kitchenalertmainwindow.h
b/src/kitchenalertmainwindow.h
index
392d05b
..
d80e6c8
100644
(file)
--- a/
src/kitchenalertmainwindow.h
+++ b/
src/kitchenalertmainwindow.h
@@
-123,6
+123,8
@@
public slots:
*/
void loadTimer();
*/
void loadTimer();
+ /*! Opens a dialog for choosing which timers to preload at start */
+ void openStickyDialog();
signals:
signals:
@@
-144,6
+146,10
@@
protected:
*/
void disableSelectionDependentButtons();
*/
void disableSelectionDependentButtons();
+ bool loadStickies();
+
+
+
private:
Ui::KitchenAlertMainWindow *ui;
private:
Ui::KitchenAlertMainWindow *ui;
@@
-163,9
+169,10
@@
private:
*/
void initializeAlertSound();
*/
void initializeAlertSound();
- void initializeTimer(Timer * p_timer);
-
+ void initializeTimer(Timer * p_timer, bool startImmediately = true);
+ //Adds the timer to the model and optionally starts it on success, gives an error message on failure
+ bool loadTimer(QString filename, bool startImmediately);
};
#endif // KITCHENALERTMAINWINDOW_H
};
#endif // KITCHENALERTMAINWINDOW_H