Add dialog to configure connman
By: Lucas De Marchi <lucas.demarchi@profusion.mobi> SVN revision: 45815
This commit is contained in:
Gustavo Sverzut Barbieri
parent
7d02d75954
commit
d3ac4a7f77
|
|
@ -22,7 +22,8 @@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
|
|||
pkg_LTLIBRARIES = module.la
|
||||
|
||||
module_la_SOURCES = e_mod_main.h \
|
||||
e_mod_main.c
|
||||
e_mod_main.c \
|
||||
e_mod_config.c
|
||||
|
||||
module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECONNMAN_LIBS@
|
||||
module_la_LDFLAGS = -module -avoid-version
|
||||
|
|
|
|||
|
|
@ -0,0 +1,572 @@
|
|||
#include "e_mod_main.h"
|
||||
|
||||
extern const char _e_connman_Name[];
|
||||
|
||||
struct connman_config_technologies
|
||||
{
|
||||
EINA_INLIST;
|
||||
Evas_Object *obj;
|
||||
E_Connman_Technology *technology;
|
||||
int val;
|
||||
};
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
E_Connman_Module_Context *ctxt;
|
||||
const char *selected_network;
|
||||
struct connman_config_network_ui
|
||||
{
|
||||
Evas_Object *hlayout;
|
||||
Evas_Object *netframe;
|
||||
Evas_Object *netlist;
|
||||
Evas_Object *o_up;
|
||||
Evas_Object *o_down;
|
||||
Evas_Object *o_add;
|
||||
Evas_Object *o_del;
|
||||
Evas_Object *setframe;
|
||||
struct connman_config_network_settings_ui
|
||||
{
|
||||
Evas_Object *settings_otb;
|
||||
Evas_Object *table_general;
|
||||
Evas_Object *lb_autoconn;
|
||||
Evas_Object *lb_autoconn_val;
|
||||
Evas_Object *lb_favorite;
|
||||
Evas_Object *lb_favorite_val;
|
||||
Evas_Object *lb_type;
|
||||
Evas_Object *lb_type_val;
|
||||
Evas_Object *lb_ipv4_method;
|
||||
Evas_Object *lb_ipv4_method_val;
|
||||
Evas_Object *lb_ipv4_address;
|
||||
Evas_Object *lb_ipv4_address_val;
|
||||
Evas_Object *lb_ipv4_netmask;
|
||||
Evas_Object *lb_ipv4_netmask_val;
|
||||
|
||||
Evas_Object *list_proxy;
|
||||
} settings_otb;
|
||||
} networks;
|
||||
struct connman_config_switch_ui
|
||||
{
|
||||
Evas_Object *vlayout;
|
||||
Evas_Object *type_frame;
|
||||
Evas_Object *off_frame;
|
||||
Eina_Inlist *technologies;
|
||||
Evas_Object *o_off;
|
||||
int offline_mode;
|
||||
} switches;
|
||||
};
|
||||
|
||||
/* Local Function Prototypes */
|
||||
static void *_create_data(E_Config_Dialog *dialog);
|
||||
static void _free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata);
|
||||
static void _fill_data(E_Config_Dialog_Data *cfdata, E_Connman_Module_Context *ctxt);
|
||||
static Evas_Object *_basic_create(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata);
|
||||
|
||||
struct connman_service_move_data
|
||||
{
|
||||
const char *service_path;
|
||||
const char *service_ref_path;
|
||||
E_Connman_Module_Context *ctxt;
|
||||
};
|
||||
|
||||
enum _Conmman_Move_Direction {
|
||||
SERVICE_MOVE_DOWN,
|
||||
SERVICE_MOVE_UP
|
||||
};
|
||||
|
||||
static void
|
||||
_connman_service_move_cb(void *data, DBusMessage *msg __UNUSED__, DBusError *error)
|
||||
{
|
||||
struct connman_service_move_data *d = data;
|
||||
if (error && dbus_error_is_set(error))
|
||||
{
|
||||
_connman_dbus_error_show(__func__, error);
|
||||
dbus_error_free(error);
|
||||
}
|
||||
else
|
||||
printf("Changed service order");
|
||||
|
||||
eina_stringshare_del(d->service_ref_path);
|
||||
eina_stringshare_del(d->service_path);
|
||||
E_FREE(d);
|
||||
}
|
||||
|
||||
static void
|
||||
_connman_service_move(E_Connman_Service *service, const E_Connman_Service *service_ref, enum _Conmman_Move_Direction direction)
|
||||
{
|
||||
struct connman_service_move_data *d;
|
||||
int ret;
|
||||
|
||||
d = E_NEW(struct connman_service_move_data, 1);
|
||||
if (!d)
|
||||
return;
|
||||
|
||||
d->service_ref_path = eina_stringshare_ref(service_ref->path);
|
||||
d->service_path = eina_stringshare_ref(service->path);
|
||||
d->ctxt = service->ctxt;
|
||||
|
||||
printf("DBG CONNMAN Move %s %s %s\n", d->service_path, direction==SERVICE_MOVE_UP?"before":"after", d->service_ref_path);
|
||||
|
||||
if (direction == SERVICE_MOVE_UP)
|
||||
ret = e_connman_service_move_before(service->element, d->service_ref_path, _connman_service_move_cb, d);
|
||||
else
|
||||
ret = e_connman_service_move_after(service->element, d->service_ref_path, _connman_service_move_cb, d);
|
||||
|
||||
if (!ret)
|
||||
{
|
||||
eina_stringshare_del(d->service_ref_path);
|
||||
eina_stringshare_del(d->service_path);
|
||||
E_FREE(d);
|
||||
_connman_operation_error_show(_("Re-order preferred services"));
|
||||
}
|
||||
}
|
||||
|
||||
struct _connman_technology_onoff_data
|
||||
{
|
||||
const char *name;
|
||||
E_Connman_Module_Context *ctxt;
|
||||
bool on;
|
||||
};
|
||||
|
||||
static void
|
||||
_connman_technology_onoff_cb(void *data, DBusMessage *msg __UNUSED__, DBusError *error)
|
||||
{
|
||||
struct _connman_technology_onoff_data *d = data;
|
||||
if (error && dbus_error_is_set(error))
|
||||
{
|
||||
_connman_dbus_error_show(__func__, error);
|
||||
dbus_error_free(error);
|
||||
}
|
||||
else
|
||||
{
|
||||
/* TODO: update config dialog */
|
||||
E_Connman_Technology *t;
|
||||
t = _connman_technology_find(d->ctxt, d->name);
|
||||
if (!t)
|
||||
{
|
||||
printf("DBG CONNMAN Technology does not exist anymore\n", d->name);
|
||||
return;
|
||||
}
|
||||
t->enabled = d->on;
|
||||
printf("Technology %s has been %s\n", d->name, d->on?"enabled":"disabled");
|
||||
}
|
||||
|
||||
eina_stringshare_del(d->name);
|
||||
E_FREE(d);
|
||||
}
|
||||
|
||||
static void
|
||||
_connman_technology_onoff(E_Connman_Module_Context *ctxt, const char *technology, bool on)
|
||||
{
|
||||
int ret;
|
||||
struct _connman_technology_onoff_data *d;
|
||||
|
||||
d = E_NEW(struct _connman_technology_onoff_data, 1);
|
||||
if (!d)
|
||||
{
|
||||
_connman_operation_error_show("No memory available");
|
||||
return;
|
||||
}
|
||||
|
||||
d->name = eina_stringshare_add(technology);
|
||||
d->ctxt = ctxt;
|
||||
d->on = on;
|
||||
|
||||
if(on)
|
||||
ret = e_connman_manager_technology_enable(technology, _connman_technology_onoff_cb, d);
|
||||
else
|
||||
ret = e_connman_manager_technology_disable(technology, _connman_technology_onoff_cb, d);
|
||||
|
||||
if(!ret)
|
||||
{
|
||||
eina_stringshare_del(d->name);
|
||||
E_FREE(d);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
E_Config_Dialog *
|
||||
e_connman_config_dialog_new(E_Container *con, E_Connman_Module_Context *ctxt)
|
||||
{
|
||||
E_Config_Dialog *dialog;
|
||||
E_Config_Dialog_View *view;
|
||||
|
||||
EINA_SAFETY_ON_TRUE_RETURN_VAL(ctxt->conf_dialog != NULL, ctxt->conf_dialog);
|
||||
|
||||
view = E_NEW(E_Config_Dialog_View, 1);
|
||||
if (!view)
|
||||
return NULL;
|
||||
|
||||
view->create_cfdata = _create_data;
|
||||
view->free_cfdata = _free_data;
|
||||
view->basic.create_widgets = _basic_create;
|
||||
view->basic.apply_cfdata = _basic_apply;
|
||||
|
||||
dialog = e_config_dialog_new(con, _("Connection Manager"),
|
||||
_e_connman_Name, "e_connman_config_dialog_new",
|
||||
e_connman_theme_path(), 0, view, ctxt);
|
||||
e_dialog_resizable_set(dialog->dia, 1);
|
||||
|
||||
return dialog;
|
||||
}
|
||||
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *dialog)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
if (!cfdata)
|
||||
return NULL;
|
||||
_fill_data(cfdata, dialog->data);
|
||||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Connman_Module_Context *ctxt = dialog->data;
|
||||
struct connman_config_switch_ui *ui = &cfdata->switches;
|
||||
|
||||
while(ui->technologies)
|
||||
{
|
||||
struct connman_config_technologies *t = (struct connman_config_technologies *) ui->technologies;
|
||||
ui->technologies = eina_inlist_remove(ui->technologies, EINA_INLIST_GET(t));
|
||||
E_FREE(t);
|
||||
}
|
||||
|
||||
ctxt->conf_dialog = NULL;
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static inline void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata, E_Connman_Module_Context *ctxt)
|
||||
{
|
||||
cfdata->ctxt = ctxt;
|
||||
cfdata->switches.technologies = NULL;
|
||||
}
|
||||
|
||||
void
|
||||
_cb_table_general_show(void *data, Evas *evas __UNUSED__, Evas_Object *obj, void *event_info __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata = data;
|
||||
struct connman_config_network_ui *ui;
|
||||
ui = &cfdata->networks;
|
||||
|
||||
if (e_widget_ilist_selected_get(ui->netlist) < 0)
|
||||
evas_object_hide(obj);
|
||||
}
|
||||
|
||||
static void _network_settings_general_page_create(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
struct connman_config_network_settings_ui *ui;
|
||||
ui = &cfdata->networks.settings_otb;
|
||||
int last_index=0;
|
||||
|
||||
ui->table_general = e_widget_table_add(evas, 1);
|
||||
#define _APPEND_ITEM(item, label, idx) \
|
||||
do \
|
||||
{ \
|
||||
ui->lb_##item = e_widget_label_add(evas, _(label)); \
|
||||
ui->lb_##item ## _val = e_widget_label_add(evas, NULL);\
|
||||
e_widget_table_object_append(ui->table_general, ui->lb_##item, 0, idx, 1, 1, 1, 0, 1, 0);\
|
||||
e_widget_table_object_append(ui->table_general, ui->lb_##item ## _val, 1, idx++, 1, 1, 1, 0, 1, 0);\
|
||||
} while(0)
|
||||
|
||||
_APPEND_ITEM(autoconn, "Auto-connect:", last_index);
|
||||
_APPEND_ITEM(favorite, "Favorite:", last_index);
|
||||
_APPEND_ITEM(type, "Type:", last_index);
|
||||
_APPEND_ITEM(ipv4_method, "IP method:", last_index);
|
||||
_APPEND_ITEM(ipv4_address, "IP address:", last_index);
|
||||
_APPEND_ITEM(ipv4_netmask, "Netmask:", last_index);
|
||||
#undef _APPEND_ITEM
|
||||
evas_object_event_callback_add(ui->table_general, EVAS_CALLBACK_SHOW, _cb_table_general_show, cfdata);
|
||||
}
|
||||
|
||||
static void _network_settings_proxy_page_create(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
struct connman_config_network_settings_ui *ui;
|
||||
Evas_Object *label_todo;
|
||||
ui = &cfdata->networks.settings_otb;
|
||||
|
||||
ui->list_proxy = e_widget_list_add(evas, 0, 0);
|
||||
|
||||
label_todo = e_widget_label_add(evas, "TODO");
|
||||
e_widget_list_object_append(ui->list_proxy, label_todo, 1, 1, 0.0);
|
||||
}
|
||||
|
||||
static void
|
||||
_network_settings_create(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
struct connman_config_network_ui *ui;
|
||||
Evas_Object *ot;
|
||||
Evas_Object *otb;
|
||||
|
||||
ui = &cfdata->networks;
|
||||
ui->setframe = e_widget_framelist_add(evas, _("Settings"), 0);
|
||||
|
||||
ui->settings_otb.settings_otb = e_widget_toolbook_add(evas, 24 * e_scale, 24 * e_scale);
|
||||
|
||||
_network_settings_general_page_create(evas, cfdata);
|
||||
e_widget_toolbook_page_append(ui->settings_otb.settings_otb, NULL, _("General"),
|
||||
ui->settings_otb.table_general, 1, 0, 1, 0, 0.5, 20.0);
|
||||
|
||||
_network_settings_proxy_page_create(evas, cfdata);
|
||||
e_widget_toolbook_page_append(ui->settings_otb.settings_otb, NULL, _("Proxy"),
|
||||
ui->settings_otb.list_proxy, 1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
e_widget_size_min_set(ui->settings_otb.settings_otb, 100, 100);
|
||||
e_widget_toolbook_page_show(ui->settings_otb.settings_otb, 0);
|
||||
e_widget_framelist_object_append(ui->setframe, ui->settings_otb.settings_otb);
|
||||
}
|
||||
|
||||
|
||||
|
||||
static inline void
|
||||
_networks_fill_details(E_Config_Dialog_Data *cfdata, Evas_Object *list, int sel)
|
||||
{
|
||||
E_Connman_Service *service;
|
||||
E_Connman_Module_Context *ctxt = cfdata->ctxt;
|
||||
struct connman_config_network_settings_ui *ui = &cfdata->networks.settings_otb;
|
||||
|
||||
service = _connman_ctxt_find_service_stringshare(ctxt, cfdata->selected_network);
|
||||
if (!service)
|
||||
{
|
||||
printf("ERROR: service not found: %s\n", cfdata->selected_network);
|
||||
return;
|
||||
}
|
||||
e_widget_label_text_set(ui->lb_autoconn_val, service->auto_connect?"True":"False");
|
||||
e_widget_label_text_set(ui->lb_favorite_val, service->favorite?"True":"False");
|
||||
e_widget_label_text_set(ui->lb_type_val, service->type);
|
||||
e_widget_label_text_set(ui->lb_ipv4_method_val, service->ipv4_method);
|
||||
e_widget_label_text_set(ui->lb_ipv4_address_val, service->ipv4_address);
|
||||
e_widget_label_text_set(ui->lb_ipv4_netmask_val, service->ipv4_netmask);
|
||||
|
||||
evas_object_show(ui->table_general);
|
||||
}
|
||||
|
||||
inline void
|
||||
_networks_disable_buttons(E_Config_Dialog_Data *cfdata, Evas_Object *list, int sel)
|
||||
{
|
||||
Evas_Object *o_up = cfdata->networks.o_up;
|
||||
Evas_Object *o_down = cfdata->networks.o_down;
|
||||
|
||||
if (sel >= 0)
|
||||
{
|
||||
int index = e_widget_ilist_selected_get(list);
|
||||
int count = e_widget_ilist_count(list);
|
||||
e_widget_disabled_set(o_up, !index);
|
||||
|
||||
e_widget_disabled_set(o_down, (count > index + 1)?0:1);
|
||||
}
|
||||
else
|
||||
{
|
||||
e_widget_disabled_set(o_up, 1);
|
||||
e_widget_disabled_set(o_down, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
_cb_service_selected(void *data)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata = data;
|
||||
Evas_Object *list = cfdata->networks.netlist;
|
||||
int sel;
|
||||
|
||||
sel = e_widget_ilist_selected_get(list);
|
||||
_networks_disable_buttons(cfdata, list, sel);
|
||||
_networks_fill_details(cfdata, list, sel);
|
||||
}
|
||||
|
||||
static unsigned int
|
||||
_networks_list_fill(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *list = cfdata->networks.netlist;
|
||||
E_Connman_Module_Context *ctxt = cfdata->ctxt;
|
||||
E_Connman_Service *service;
|
||||
|
||||
EINA_INLIST_FOREACH(ctxt->services, service)
|
||||
{
|
||||
Evas_Object *icon;
|
||||
icon = _connman_service_new_list_item(evas, service);
|
||||
|
||||
e_widget_ilist_append
|
||||
(list, icon, service->name, _cb_service_selected,
|
||||
cfdata, service->path);
|
||||
}
|
||||
|
||||
return eina_inlist_count(ctxt->services);
|
||||
}
|
||||
|
||||
static void
|
||||
_networks_button_up_cb(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata = data;
|
||||
Evas_Object *netlist = cfdata->networks.netlist;
|
||||
E_Connman_Module_Context *ctxt = cfdata->ctxt;
|
||||
E_Connman_Service *service, *service_ref;
|
||||
int sel;
|
||||
|
||||
sel = e_widget_ilist_selected_get(netlist);
|
||||
if (sel <= 0)
|
||||
return;
|
||||
|
||||
service = _connman_ctxt_find_service_stringshare(ctxt, cfdata->selected_network);
|
||||
e_widget_ilist_selected_set(netlist, sel-1);
|
||||
|
||||
service_ref = _connman_ctxt_find_service_stringshare(ctxt, cfdata->selected_network);
|
||||
|
||||
e_widget_ilist_selected_set(netlist, sel);
|
||||
|
||||
_connman_service_move(service, service_ref, SERVICE_MOVE_UP);
|
||||
}
|
||||
|
||||
static void
|
||||
_networks_button_down_cb(void *data, void *data2)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata = data;
|
||||
Evas_Object *netlist = cfdata->networks.netlist;
|
||||
E_Connman_Module_Context *ctxt = cfdata->ctxt;
|
||||
E_Connman_Service *service, *service_ref;
|
||||
int sel;
|
||||
int count;
|
||||
|
||||
sel = e_widget_ilist_selected_get(netlist);
|
||||
count = e_widget_ilist_count(netlist);
|
||||
if (sel < 0 || (count == sel+1))
|
||||
return;
|
||||
|
||||
service = _connman_ctxt_find_service_stringshare(ctxt, cfdata->selected_network);
|
||||
e_widget_ilist_selected_set(netlist, sel+1);
|
||||
service_ref = _connman_ctxt_find_service_stringshare(ctxt, cfdata->selected_network);
|
||||
e_widget_ilist_selected_set(netlist, sel);
|
||||
|
||||
_connman_service_move(service, service_ref, SERVICE_MOVE_DOWN);
|
||||
|
||||
}
|
||||
|
||||
static void
|
||||
_networks_list_create(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
struct connman_config_network_ui *ui;
|
||||
Evas_Object *ot;
|
||||
|
||||
ui = &cfdata->networks;
|
||||
ui->netframe = e_widget_framelist_add(evas, _("All networks"), 0);
|
||||
ui->netlist = e_widget_ilist_add(evas, 24, 24, &cfdata->selected_network);
|
||||
e_widget_ilist_multi_select_set(ui->netlist, 0);
|
||||
e_widget_on_change_hook_set(ui->netlist, NULL, cfdata);
|
||||
e_widget_size_min_set(ui->netlist, 100, 100);
|
||||
e_widget_ilist_selected_set(ui->netlist, 0);
|
||||
e_widget_framelist_object_append(ui->netframe, ui->netlist);
|
||||
|
||||
/* Buttons */
|
||||
ot = e_widget_table_add(evas, 0);
|
||||
ui->o_up = e_widget_button_add(evas, _("Up"), "go-up", _networks_button_up_cb, cfdata, NULL);
|
||||
e_widget_disabled_set(ui->o_up, 1);
|
||||
e_widget_table_object_append(ot, ui->o_up, 0, 0, 1, 1, 1, 0, 1, 0);
|
||||
ui->o_down = e_widget_button_add(evas, _("Down"), "go-down", _networks_button_down_cb, cfdata, NULL);
|
||||
e_widget_disabled_set(ui->o_down, 1);
|
||||
e_widget_table_object_append(ot, ui->o_down, 1, 0, 1, 1, 1, 0, 1, 0);
|
||||
e_widget_framelist_object_append(ui->netframe, ot);
|
||||
ui->o_add = e_widget_button_add(evas, _("Add"), "list-add", NULL, cfdata, NULL);
|
||||
e_widget_disabled_set(ui->o_add, 1);
|
||||
e_widget_framelist_object_append(ui->netframe, ui->o_add);
|
||||
}
|
||||
|
||||
static void
|
||||
_networks_page_create(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
struct connman_config_network_ui *ui;
|
||||
|
||||
ui = &cfdata->networks;
|
||||
ui->hlayout = e_widget_list_add(evas, 0, 1);
|
||||
_networks_list_create(evas, cfdata);
|
||||
e_widget_list_object_append(ui->hlayout, ui->netframe, 1, 1, 0.0);
|
||||
_network_settings_create(evas, cfdata);
|
||||
e_widget_list_object_append(ui->hlayout, ui->setframe, 1, 1, 0.0);
|
||||
|
||||
evas_object_hide(ui->settings_otb.table_general);
|
||||
}
|
||||
|
||||
static inline void
|
||||
_switches_page_create_technologies(Evas *evas, E_Connman_Module_Context *ctxt, struct connman_config_switch_ui *ui)
|
||||
{
|
||||
struct E_Connman_Technology *t;
|
||||
EINA_INLIST_FOREACH(ctxt->technologies, t)
|
||||
{
|
||||
struct connman_config_technologies *t_list = E_NEW(struct connman_config_technologies, 1);
|
||||
t_list->technology = t;
|
||||
t_list->val = t->enabled;
|
||||
t_list->obj = e_widget_check_add(evas, _(t->name), &t_list->val);
|
||||
|
||||
ui->technologies = eina_inlist_append(ui->technologies, EINA_INLIST_GET(t_list));
|
||||
e_widget_framelist_object_append(ui->type_frame, t_list->obj);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
_switches_page_create(Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
struct connman_config_switch_ui *ui;
|
||||
E_Connman_Module_Context *ctxt = cfdata->ctxt;
|
||||
|
||||
ui = &cfdata->switches;
|
||||
ui->vlayout = e_widget_list_add(evas, 0, 0);
|
||||
ui->type_frame = e_widget_framelist_add(evas, _("Network types"), 0);
|
||||
|
||||
_switches_page_create_technologies(evas, ctxt, ui);
|
||||
|
||||
e_widget_list_object_append(ui->vlayout, ui->type_frame, 1, 1, 0.0);
|
||||
ui->off_frame = e_widget_framelist_add(evas, _("Disable networking"), 0);
|
||||
ui->o_off = e_widget_check_add(evas, _("Offline mode"), &ui->offline_mode);
|
||||
e_widget_framelist_object_append(ui->off_frame, ui->o_off);
|
||||
e_widget_list_object_append(ui->vlayout, ui->off_frame, 1, 1, 0.0);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *dialog, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *otb;
|
||||
|
||||
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
|
||||
|
||||
_networks_page_create(evas, cfdata);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Networks Settings"),
|
||||
cfdata->networks.hlayout, 1, 0, 1, 0, 0.5, 0.0);
|
||||
_switches_page_create(evas, cfdata);
|
||||
e_widget_toolbook_page_append(otb, NULL, _("Network Switches"),
|
||||
cfdata->switches.vlayout, 1, 0, 1, 0, 0.5, 0.0);
|
||||
|
||||
_networks_list_fill(evas, cfdata);
|
||||
e_widget_toolbook_page_show(otb, 0);
|
||||
e_widget_size_min_resize(otb);
|
||||
|
||||
return otb;
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *dialog, E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_Connman_Module_Context *ctxt = cfdata->ctxt;
|
||||
struct connman_config_switch_ui *sw = &cfdata->switches;
|
||||
struct connman_config_technologies *t;
|
||||
|
||||
EINA_INLIST_FOREACH(sw->technologies, t)
|
||||
{
|
||||
if (t->val != t->technology->enabled)
|
||||
{
|
||||
_connman_technology_onoff(ctxt, t->technology->name, t->val);
|
||||
PRINT_VAR_NAME_VAL_INT ("DBG CONNMAN ", t->val);
|
||||
}
|
||||
}
|
||||
if (ctxt->offline_mode != sw->offline_mode)
|
||||
{
|
||||
_connman_toggle_offline_mode(ctxt);
|
||||
PRINT_VAR_NAME_VAL_INT ("DBG CONNMAN ", sw->offline_mode);
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -32,8 +32,8 @@
|
|||
static E_Module *connman_mod = NULL;
|
||||
static char tmpbuf[PATH_MAX]; /* general purpose buffer, just use immediately */
|
||||
|
||||
static const char _name[] = "connman";
|
||||
static const char _Name[] = "Connection Manager";
|
||||
const char _e_connman_name[] = "connman";
|
||||
const char _e_connman_Name[] = "Connection Manager";
|
||||
|
||||
static const char *e_str_idle = NULL;
|
||||
static const char *e_str_association = NULL;
|
||||
|
|
@ -56,7 +56,7 @@ static void _connman_default_service_changed_delayed(E_Connman_Module_Context *c
|
|||
static void _connman_gadget_update(E_Connman_Instance *inst);
|
||||
static void _connman_tip_update(E_Connman_Instance *inst);
|
||||
|
||||
static const char *
|
||||
const char *
|
||||
e_connman_theme_path(void)
|
||||
{
|
||||
#define TF "/e-module-connman.edj"
|
||||
|
|
@ -73,46 +73,6 @@ e_connman_theme_path(void)
|
|||
#undef TF
|
||||
}
|
||||
|
||||
static inline E_Connman_Service *
|
||||
_connman_ctxt_find_service_stringshare(const E_Connman_Module_Context *ctxt, const char *service_path)
|
||||
{
|
||||
E_Connman_Service *itr;
|
||||
|
||||
EINA_INLIST_FOREACH(ctxt->services, itr)
|
||||
if (itr->path == service_path)
|
||||
return itr;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static inline void
|
||||
_connman_dbus_error_show(const char *msg, const DBusError *error)
|
||||
{
|
||||
const char *name;
|
||||
|
||||
if ((!error) || (!dbus_error_is_set(error)))
|
||||
return;
|
||||
|
||||
name = error->name;
|
||||
if (strncmp(name, "org.moblin.connman.Error.",
|
||||
sizeof("org.moblin.connman.Error.") - 1) == 0)
|
||||
name += sizeof("org.moblin.connman.Error.") - 1;
|
||||
|
||||
e_util_dialog_show(_("Connman Server Operation Failed"),
|
||||
_("Could not execute remote operation:<br>"
|
||||
"%s<br>"
|
||||
"Server Error <hilight>%s:</hilight> %s"),
|
||||
msg, name, error->message);
|
||||
}
|
||||
|
||||
static inline void
|
||||
_connman_operation_error_show(const char *msg)
|
||||
{
|
||||
e_util_dialog_show(_("Connman Operation Failed"),
|
||||
_("Could not execute local operation:<br>%s"),
|
||||
msg);
|
||||
}
|
||||
|
||||
static void
|
||||
_connman_toggle_offline_mode_cb(void *data, DBusMessage *msg __UNUSED__, DBusError *error)
|
||||
{
|
||||
|
|
@ -128,7 +88,7 @@ _connman_toggle_offline_mode_cb(void *data, DBusMessage *msg __UNUSED__, DBusErr
|
|||
dbus_error_free(error);
|
||||
}
|
||||
|
||||
static void
|
||||
void
|
||||
_connman_toggle_offline_mode(E_Connman_Module_Context *ctxt)
|
||||
{
|
||||
bool offline;
|
||||
|
|
@ -1009,10 +969,18 @@ static void
|
|||
_connman_popup_cb_controls(void *data, void *data2 __UNUSED__)
|
||||
{
|
||||
E_Connman_Instance *inst = data;
|
||||
E_Container *con;
|
||||
|
||||
_connman_popup_del(inst);
|
||||
|
||||
e_util_dialog_show("TODO", "TODO!");
|
||||
if (!inst)
|
||||
return;
|
||||
if (inst->popup)
|
||||
_connman_popup_del(inst);
|
||||
if (inst->ctxt->conf_dialog)
|
||||
return;
|
||||
|
||||
inst->ctxt->conf_dialog = e_connman_config_dialog_new(NULL, inst->ctxt);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -1584,7 +1552,7 @@ _gc_orient(E_Gadcon_Client *gcc, E_Gadcon_Orient orient __UNUSED__)
|
|||
static char *
|
||||
_gc_label(E_Gadcon_Client_Class *client_class __UNUSED__)
|
||||
{
|
||||
return _(_Name);
|
||||
return _(_e_connman_Name);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
|
|
@ -1617,7 +1585,7 @@ _gc_id_new(E_Gadcon_Client_Class *client_class __UNUSED__)
|
|||
|
||||
static const E_Gadcon_Client_Class _gc_class =
|
||||
{
|
||||
GADCON_CLIENT_CLASS_VERSION, _name,
|
||||
GADCON_CLIENT_CLASS_VERSION, _e_connman_name,
|
||||
{
|
||||
_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new, NULL,
|
||||
e_gadcon_site_is_not_toolbar
|
||||
|
|
@ -1627,7 +1595,7 @@ static const E_Gadcon_Client_Class _gc_class =
|
|||
|
||||
|
||||
|
||||
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _Name};
|
||||
EAPI E_Module_Api e_modapi = {E_MODULE_API_VERSION, _e_connman_Name};
|
||||
|
||||
static const char _act_toggle_offline_mode[] = "toggle_offline_mode";
|
||||
static const char _lbl_toggle_offline_mode[] = "Toggle Offline Mode";
|
||||
|
|
@ -1641,7 +1609,7 @@ _connman_actions_register(E_Connman_Module_Context *ctxt)
|
|||
ctxt->actions.toggle_offline_mode->func.go =
|
||||
_connman_cb_toggle_offline_mode;
|
||||
e_action_predef_name_set
|
||||
(_(_Name), _(_lbl_toggle_offline_mode), _act_toggle_offline_mode,
|
||||
(_(_e_connman_Name), _(_lbl_toggle_offline_mode), _act_toggle_offline_mode,
|
||||
NULL, NULL, 0);
|
||||
}
|
||||
}
|
||||
|
|
@ -1651,7 +1619,7 @@ _connman_actions_unregister(E_Connman_Module_Context *ctxt)
|
|||
{
|
||||
if (ctxt->actions.toggle_offline_mode)
|
||||
{
|
||||
e_action_predef_name_del(_(_Name), _(_lbl_toggle_offline_mode));
|
||||
e_action_predef_name_del(_(_e_connman_Name), _(_lbl_toggle_offline_mode));
|
||||
e_action_del(_act_toggle_offline_mode);
|
||||
}
|
||||
}
|
||||
|
|
@ -1728,6 +1696,24 @@ _connman_event_mode_changed(void *data, int type __UNUSED__, void *event __UNUSE
|
|||
return 1;
|
||||
}
|
||||
|
||||
static E_Config_Dialog *
|
||||
_connman_config(E_Container *con, const char *params __UNUSED__)
|
||||
{
|
||||
E_Connman_Module_Context *ctxt;
|
||||
|
||||
if (!connman_mod)
|
||||
return NULL;
|
||||
|
||||
ctxt = connman_mod->data;
|
||||
if (!ctxt)
|
||||
return NULL;
|
||||
|
||||
if (!ctxt->conf_dialog)
|
||||
ctxt->conf_dialog = e_connman_config_dialog_new(con, ctxt);
|
||||
|
||||
return ctxt->conf_dialog;
|
||||
}
|
||||
|
||||
static void
|
||||
_connman_events_register(E_Connman_Module_Context *ctxt)
|
||||
{
|
||||
|
|
@ -1775,6 +1761,7 @@ e_modapi_init(E_Module *m)
|
|||
|
||||
ctxt->services = NULL;
|
||||
ctxt->technologies = NULL;
|
||||
ctxt->conf_dialog = NULL;
|
||||
|
||||
_connman_actions_register(ctxt);
|
||||
e_gadcon_provider_register(&_gc_class);
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@
|
|||
#include <E_Connman.h>
|
||||
|
||||
#define MOD_CONF_VERSION 2
|
||||
#define PRINT_VAR_NAME_VAL_INT(prefix, x) printf(prefix #x " = %d\n", x)
|
||||
|
||||
typedef struct E_Connman_Instance E_Connman_Instance;
|
||||
typedef struct E_Connman_Module_Context E_Connman_Module_Context;
|
||||
|
|
@ -77,6 +78,7 @@ struct E_Connman_Technology
|
|||
struct E_Connman_Module_Context
|
||||
{
|
||||
Eina_List *instances;
|
||||
E_Config_Dialog *conf_dialog;
|
||||
|
||||
struct st_connman_actions
|
||||
{
|
||||
|
|
@ -110,5 +112,49 @@ EAPI void *e_modapi_init (E_Module *m);
|
|||
EAPI int e_modapi_shutdown (E_Module *m);
|
||||
EAPI int e_modapi_save (E_Module *m);
|
||||
|
||||
const char *e_connman_theme_path(void);
|
||||
E_Config_Dialog *e_connman_config_dialog_new(E_Container *con, E_Connman_Module_Context *ctxt);
|
||||
void _connman_toggle_offline_mode(E_Connman_Module_Context *ctxt);
|
||||
E_Connman_Technology *_connman_technology_find(E_Connman_Module_Context *ctxt, const char* name);
|
||||
Evas_Object *_connman_service_new_list_item(Evas *evas, E_Connman_Service *service);
|
||||
|
||||
static inline void
|
||||
_connman_dbus_error_show(const char *msg, const DBusError *error)
|
||||
{
|
||||
const char *name;
|
||||
|
||||
if ((!error) || (!dbus_error_is_set(error)))
|
||||
return;
|
||||
|
||||
name = error->name;
|
||||
if (strncmp(name, "org.moblin.connman.Error.",
|
||||
sizeof("org.moblin.connman.Error.") - 1) == 0)
|
||||
name += sizeof("org.moblin.connman.Error.") - 1;
|
||||
|
||||
e_util_dialog_show(_("Connman Server Operation Failed"),
|
||||
_("Could not execute remote operation:<br>"
|
||||
"%s<br>"
|
||||
"Server Error <hilight>%s:</hilight> %s"),
|
||||
msg, name, error->message);
|
||||
}
|
||||
|
||||
static inline void
|
||||
_connman_operation_error_show(const char *msg)
|
||||
{
|
||||
e_util_dialog_show(_("Connman Operation Failed"),
|
||||
_("Could not execute local operation:<br>%s"),
|
||||
msg);
|
||||
}
|
||||
|
||||
static inline E_Connman_Service *
|
||||
_connman_ctxt_find_service_stringshare(const E_Connman_Module_Context *ctxt, const char *service_path)
|
||||
{
|
||||
E_Connman_Service *itr;
|
||||
|
||||
EINA_INLIST_FOREACH(ctxt->services, itr)
|
||||
if (itr->path == service_path)
|
||||
return itr;
|
||||
|
||||
return NULL;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue