From 8777c17ad4278f4e24c7210f827f10408731a55f Mon Sep 17 00:00:00 2001 From: Olliver Schinagl Date: Thu, 25 Jun 2015 07:20:54 +0200 Subject: rename generic widget_data to ui_widgets Signed-off-by: Olliver Schinagl --- src/eulogium.c | 2 +- src/eulogium.h | 2 +- src/ui_widgets.h | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/widget_data.h | 75 ------------------------------------------------------- 4 files changed, 77 insertions(+), 77 deletions(-) create mode 100644 src/ui_widgets.h delete mode 100644 src/widget_data.h diff --git a/src/eulogium.c b/src/eulogium.c index f24ad73..606743d 100644 --- a/src/eulogium.c +++ b/src/eulogium.c @@ -19,7 +19,7 @@ #include "eulogium_private.h" #include "gettext.h" #include "procedures.h" -#include "widget_data.h" +#include "ui_widgets.h" #define COPYRIGHT "Copyright © 2015 Olliver Schinagl and various contributors (see AUTHORS)." diff --git a/src/eulogium.h b/src/eulogium.h index 8c3540b..ea16cbd 100644 --- a/src/eulogium.h +++ b/src/eulogium.h @@ -17,11 +17,11 @@ #include "eulogium_item_list.h" #include "procedures.h" -#include "widget_data.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 "ui_widgets.h" enum screen_type { NONE, diff --git a/src/ui_widgets.h b/src/ui_widgets.h new file mode 100644 index 0000000..2cab4bc --- /dev/null +++ b/src/ui_widgets.h @@ -0,0 +1,75 @@ +/* + * function and data types for widgets + * + * Copyright (c) 2015 Ultimaker B.V. + * Author: Olliver Schinagl + * + * SPDX-License-Identifier: AGPL-3.0+ + */ + +#ifndef _WIDGET_DATA_H +#define _WIDGET_DATA_H + +#include +#include +#include +#include + +#include "dbus_common.h" +#include "eulogium_item_list.h" + +struct button_cb { + void (*func)(void *data, Evas_Object *object, void *event_info); + void *data; + const char *info; +}; + +struct button_def { + const char *text; + struct button_cb cb; + void *data; +}; + +struct dir_entry_def { + void *data; + char *path; +}; + +struct wifi_entry_def { + void *data; + char *ssid; +}; + +struct menu_entry_def { + const char *icon; + const char *label; + struct list_item item; + struct dbus_handle dbus; + Eina_Bool *end; /* remove me */ + const char *footer; /* Primary footer */ + const char *footer_alt; /* Alternating footer */ + Ecore_Timer *toggle_timer; + void (*func)(void *data, Evas_Object *object, void *event_info); + void *data; +}; + +enum list_type { + LIST_MENU, + LIST_FILE, + LIST_WIFI, +}; + +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 menu_entry_def entry[]; +}; + +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 */ diff --git a/src/widget_data.h b/src/widget_data.h deleted file mode 100644 index 2cab4bc..0000000 --- a/src/widget_data.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * function and data types for widgets - * - * Copyright (c) 2015 Ultimaker B.V. - * Author: Olliver Schinagl - * - * SPDX-License-Identifier: AGPL-3.0+ - */ - -#ifndef _WIDGET_DATA_H -#define _WIDGET_DATA_H - -#include -#include -#include -#include - -#include "dbus_common.h" -#include "eulogium_item_list.h" - -struct button_cb { - void (*func)(void *data, Evas_Object *object, void *event_info); - void *data; - const char *info; -}; - -struct button_def { - const char *text; - struct button_cb cb; - void *data; -}; - -struct dir_entry_def { - void *data; - char *path; -}; - -struct wifi_entry_def { - void *data; - char *ssid; -}; - -struct menu_entry_def { - const char *icon; - const char *label; - struct list_item item; - struct dbus_handle dbus; - Eina_Bool *end; /* remove me */ - const char *footer; /* Primary footer */ - const char *footer_alt; /* Alternating footer */ - Ecore_Timer *toggle_timer; - void (*func)(void *data, Evas_Object *object, void *event_info); - void *data; -}; - -enum list_type { - LIST_MENU, - LIST_FILE, - LIST_WIFI, -}; - -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 menu_entry_def entry[]; -}; - -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 */ -- cgit v0.12