summaryrefslogtreecommitdiffstats
path: root/src/ui_widgets.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui_widgets.h')
-rw-r--r--src/ui_widgets.h56
1 files changed, 27 insertions, 29 deletions
diff --git a/src/ui_widgets.h b/src/ui_widgets.h
index a32eea3..a184f4a 100644
--- a/src/ui_widgets.h
+++ b/src/ui_widgets.h
@@ -1,5 +1,5 @@
/*
- * function and data types for widgets
+ * functions, callbacks and data types for widgets
*
* Copyright (c) 2015 Ultimaker B.V.
* Author: Olliver Schinagl <o.schinagl@ultimaker.com>
@@ -7,8 +7,8 @@
* SPDX-License-Identifier: AGPL-3.0+
*/
-#ifndef _WIDGET_DATA_H
-#define _WIDGET_DATA_H
+#ifndef _UI_WIDGETS_H
+#define _UI_WIDGETS_H
#include <Ecore.h>
#include <Eina.h>
@@ -17,6 +17,9 @@
#include "dbus_common.h"
#include "eulogium_item_list.h"
+#include "settings_data.h"
+
+#define DIAL_MAX_FORMAT_SIZE 10 /* Maximally allowed characters on a dial, inc comma and \0 */
struct button_cb {
void (*func)(void *data, Evas_Object *object, void *event_info);
@@ -25,7 +28,8 @@ struct button_cb {
};
struct button_def {
- const char *text;
+ const char *label;
+ const char *text; /* TODO remove */
struct button_cb cb;
void *data;
};
@@ -35,11 +39,6 @@ struct dir_entry_def {
char *path;
};
-struct wifi_entry_def {
- void *data;
- char *ssid;
-};
-
struct menu_entry_def {
const char *icon;
const char *label;
@@ -48,7 +47,7 @@ struct menu_entry_def {
Eina_Bool *end; /* remove me */
const char *footer; /* Primary footer */
const char *footer_alt; /* Alternating footer */
- Ecore_Timer *toggle_timer;
+ Ecore_Timer *toggle_timer; /*TODO, this may better go one level up into the menu */
void (*func)(void *data, Evas_Object *object, void *event_info);
void *data;
};
@@ -63,35 +62,34 @@ struct menu_def {
const char *title;
enum list_type type;
void *data;
- struct dir_entry_def dir;
- struct wifi_entry_def wifi; /* TODO see if we can put this into a union somehow */
+ struct dir_entry_def dir; /* TODO check if we need this here at all */
struct menu_entry_def entry[];
};
-struct settings_dial_data {
- const char *label;
- double step;
- double min;
- double max;
- double value;
- double value_actual;
- char *(*indicator_func)(double value);
- void (*free_func)(char *str);
- const char *format;
- Evas_Object *slider;
-};
-
struct screen_def {
const char *title;
Evas_Object *widget;
- struct settings_dial_data screen[];
};
-extern int INPUT_MOUSE_WHEEL_UP;
-extern int INPUT_MOUSE_WHEEL_UP;
+/* WARNING! This enum is stored in a void * via an (uintptr_t) typecast.
+ * Always make sure that it fits into that. At birth, this enum was intended
+ * to never have more then a handful of states.
+ */
+enum navi_page_state {
+ PAGE_NORMAL,
+ PAGE_BOTTOM,
+ PAGE_PRINTING,
+ PAGE_INVALID,
+};
void eulogium_button_cb_set(struct button_def *button, struct button_cb *cb);
void eulogium_button_cb_data_set(struct button_def *button, void *data);
void eulogium_button_data_set(struct button_def *button, void *data);
-#endif /* _WIDGET_DATA_H */
+struct eulogium_data; /* XXX remove when we pass a navi */
+Elm_Object_Item *ui_stack_push(const struct eulogium_data *eulogium, Evas_Object *content, const enum navi_page_state page_state);
+Eina_Bool ui_stack_pop(const struct eulogium_data *eulogium);
+void ui_stack_pop_cb(void *data, Evas_Object *eo EINA_UNUSED, void *event_info EINA_UNUSED);
+Evas_Object *ui_widget_dial(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data);
+
+#endif /* _UI_WIDGETS_H */