diff options
author | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-07-06 05:49:50 (GMT) |
---|---|---|
committer | Olliver Schinagl <o.schinagl@ultimaker.com> | 2015-07-06 12:07:31 (GMT) |
commit | 0ab6f4f9f4c2af88e4bbd10b0e11b1516577d319 (patch) | |
tree | be0e67637b190e5c930f93a80a343f8e0d5c8b44 /src/eulogium.h | |
parent | f217213dccab10e8af0953f48a7671855326c871 (diff) | |
download | eulogium-0ab6f4f9f4c2af88e4bbd10b0e11b1516577d319.zip eulogium-0ab6f4f9f4c2af88e4bbd10b0e11b1516577d319.tar.gz eulogium-0ab6f4f9f4c2af88e4bbd10b0e11b1516577d319.tar.bz2 |
Diffstat (limited to 'src/eulogium.h')
-rw-r--r-- | src/eulogium.h | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/src/eulogium.h b/src/eulogium.h index ea16cbd..6842250 100644 --- a/src/eulogium.h +++ b/src/eulogium.h @@ -16,11 +16,10 @@ #include <stdint.h> #include "eulogium_item_list.h" +#include "network.h" +#include "print_data.h" #include "procedures.h" - -#define IPV4_MAX_LEN 16 /* 255.255.255.255\0 */ -#define IPV6_MAX_LEN 40 /* ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff\0 */ -#define SSID_MAX_LEN 33 /* Section 7.3.2.1 SSID element of IEE802.11-2007 + \0 */ +#include "settings_data.h" #include "ui_widgets.h" enum screen_type { @@ -61,22 +60,6 @@ struct mount_data { Eina_List **mounts; }; -#define _TECH_ETHERNET "ethernet" -#define _TECH_WIFI "wifi" - -enum network_tech { - ETHERNET, - WIFI, -}; - -struct network_data { - char *obj_path; - enum network_tech tech; - char ipv4[IPV4_MAX_LEN]; - char ipv6[IPV6_MAX_LEN]; - char ssid[SSID_MAX_LEN]; -}; - struct eulogium_data { Evas_Object *navi; Evas_Object *time; @@ -85,6 +68,8 @@ struct eulogium_data { Evas_Object *progress; Ecore_Timer *progress_data_refresh; Evas_Object *footer; /* XXX this really shows why we need per window persistent data */ + Ecore_Event_Handler *event_inc; /* TODO put in seperate event struct and generally find a better place (seperate file etc) */ + Ecore_Event_Handler *event_dec; struct printer_data printer; struct print_data print; struct dbus_data dbus; @@ -115,7 +100,7 @@ struct multi_screen_data { struct multi_screen *screen; }; -Evas_Object *eulogium_generic_error(struct eulogium_data *eulogium, uint8_t eulogium_error); +Evas_Object *eulogium_generic_error(struct eulogium_data *eulogium, int_fast16_t eulogium_error); void eulogium_print_data_set(struct eulogium_data *eulogium, char *filepath); @@ -125,10 +110,14 @@ Evas_Object *eulogium_tripple_button_menu(Evas_Object *parent, const struct butt Evas_Object *eulogium_dual_button_add(Evas_Object *parent, const struct button_def *left, const struct button_def *right); Evas_Object *eulogium_print_menu(struct eulogium_data *eulogium, char *filepath); Evas_Object *eulogium_print_ignore(struct eulogium_data *eulogium); -Evas_Object *eulogium_print_progress(struct eulogium_data *eulogium); +Evas_Object *eulogium_print_progress(Evas_Object *parent, struct eulogium_data *eulogium, const struct print_data *print); +Evas_Object *eulogium_pre_print(Evas_Object *parent, struct eulogium_data *eulogium); +Evas_Object *eulogium_settings_dial(Evas_Object *parent, struct eulogium_data *eulogium, struct settings_dial_data *dial_data); Evas_Object *eulogium_multi_text_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct button_def *button, struct multi_text *data, const uint_fast8_t pagenum, Eina_Bool pageindex); Evas_Object *menu_widget_list(struct eulogium_data *eulogium, Evas_Object *parent, struct menu_def *menu); Evas_Object *eulogium_multi_screen_menu(struct eulogium_data *eulogium, Evas_Object *parent, struct multi_screen_data *screen_data, const uint_fast8_t pagenum, Eina_Bool pageindex); Evas_Object *eulogium_menu_confirm(Evas_Object *parent, const char *msg, const char *prev, const struct button_def *next); +Evas_Object *eulogium_clean_print_bed(struct eulogium_data *eulogium); +void eulogium_print_data_clear(struct eulogium_data *eulogium); #endif /* _EULOGIUM_H */ |