summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorpacien2018-01-09 02:18:44 +0100
committerpacien2018-01-09 02:18:44 +0100
commit4efbfe206290ed847ea45c07c4968a74b265ba00 (patch)
tree32798591c665a3d82fd6df813ece0ff5215be230 /include
parent5beabe1a69e6dda3e139e95d24c3e9c8e027990a (diff)
parenta4aebd76d86745698ce89e8fa9a5160cddd290ac (diff)
downloadmorpher-4efbfe206290ed847ea45c07c4968a74b265ba00.tar.gz
Merge branch 'master' of https://git-etud.u-pem.fr/upem-c-morphing
Signed-off-by: pacien <pacien.trangirard@pacien.net> # Conflicts: # include/gui/component.h # include/gui/gui.h # include/gui/pictureframe.h
Diffstat (limited to 'include')
-rw-r--r--include/gui/component.h21
-rw-r--r--include/gui/gui.h1
-rw-r--r--include/gui/pictureframe.h1
3 files changed, 16 insertions, 7 deletions
diff --git a/include/gui/component.h b/include/gui/component.h
index 895e9ba..1a255e2 100644
--- a/include/gui/component.h
+++ b/include/gui/component.h
@@ -3,6 +3,7 @@
3 3
4/** 4/**
5 * File: component.h 5 * File: component.h
6 * Components implementation.
6 * 7 *
7 * Author: 8 * Author:
8 * Adam NAILI 9 * Adam NAILI
@@ -24,16 +25,22 @@ typedef enum {
24 WAITING_BUTTON_SHOW, WAITING_BUTTON_HIDE, INSERT_ORIGIN, INSERT_TARGET, PRINTING, EXITING, PRINTING_BUTTONS, RENDERING 25 WAITING_BUTTON_SHOW, WAITING_BUTTON_HIDE, INSERT_ORIGIN, INSERT_TARGET, PRINTING, EXITING, PRINTING_BUTTONS, RENDERING
25} Mode; 26} Mode;
26 27
28/**
29 * Mode is used for application status rotation. It is shared between our components. In OOP, this could have been a
30 * static attribute of the class.
31 **/
27extern Mode mode; 32extern Mode mode;
28extern int frame; 33
29extern char labelFrame[20];
30/** 34/**
31 * File: component.h 35 * Components have no access to exterior. They can access only to themselves due to the generic implementation. These
32 * Windows and components handling. 36 * variables are the easiest way to share memory between components.
33 * 37 * frame and labelFrame is used to frame management and printing this number of frame on one of the button. Button are
34 * See also: 38 * not designed to have a dynamic label, so this implementation is the fastest without breaking the code or creating
35 * The famous OS 39 * another type of components.
36 */ 40 */
41extern int frame;
42extern char labelFrame[20];
43
37struct Component; 44struct Component;
38 45
39/** 46/**
diff --git a/include/gui/gui.h b/include/gui/gui.h
index a8b7bd0..1e205ce 100644
--- a/include/gui/gui.h
+++ b/include/gui/gui.h
@@ -3,6 +3,7 @@
3 3
4/** 4/**
5 * File: gui.h 5 * File: gui.h
6 * Graphical user interface handling
6 * 7 *
7 * Author: 8 * Author:
8 * Adam NAILI 9 * Adam NAILI
diff --git a/include/gui/pictureframe.h b/include/gui/pictureframe.h
index 0432b1c..11eaf90 100644
--- a/include/gui/pictureframe.h
+++ b/include/gui/pictureframe.h
@@ -3,6 +3,7 @@
3 3
4/** 4/**
5 * File: pictureframe.h 5 * File: pictureframe.h
6 * Pictures handling.
6 * 7 *
7 * Author: 8 * Author:
8 * Adam NAILI 9 * Adam NAILI