forked from enlightenment/enlightenment
display current device detect/mount mode in fileman config
SVN revision: 72855
This commit is contained in:
parent
045eeee554
commit
f8e53aca00
|
@ -259,6 +259,7 @@ struct _E_Config
|
||||||
int device_desktop; // GUI
|
int device_desktop; // GUI
|
||||||
int device_auto_mount; // GUI
|
int device_auto_mount; // GUI
|
||||||
int device_auto_open; // GUI
|
int device_auto_open; // GUI
|
||||||
|
Efm_Mode device_detect_mode; /* not saved, display-only */
|
||||||
|
|
||||||
struct
|
struct
|
||||||
{
|
{
|
||||||
|
|
|
@ -2828,6 +2828,7 @@ e_fm2_client_data(Ecore_Ipc_Event_Client_Data *e)
|
||||||
v = _e_fm_shared_codec_volume_decode(e->data, e->size);
|
v = _e_fm_shared_codec_volume_decode(e->data, e->size);
|
||||||
if (v)
|
if (v)
|
||||||
{
|
{
|
||||||
|
e_config->device_detect_mode = v->efm_mode;
|
||||||
e_fm2_device_volume_add(v);
|
e_fm2_device_volume_add(v);
|
||||||
if (e_config->device_auto_mount && !v->mounted && !v->first_time)
|
if (e_config->device_auto_mount && !v->mounted && !v->first_time)
|
||||||
_e_fm2_client_mount(v->udi, v->mount_point);
|
_e_fm2_client_mount(v->udi, v->mount_point);
|
||||||
|
|
|
@ -278,11 +278,27 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__,
|
||||||
e_widget_toolbook_page_append(otb, NULL, _("Behavior"), o, 0, 0, 0, 0, 0.5, 0.0);
|
e_widget_toolbook_page_append(otb, NULL, _("Behavior"), o, 0, 0, 0, 0, 0.5, 0.0);
|
||||||
|
|
||||||
o = e_widget_list_add(evas, 2, 0);
|
o = e_widget_list_add(evas, 2, 0);
|
||||||
#ifdef HAVE_EUKIT
|
{
|
||||||
ob = e_widget_check_add(evas, _("Show UDisks icons on desktop"),
|
char buf[32];
|
||||||
#else
|
switch (e_config->device_detect_mode)
|
||||||
|
{
|
||||||
|
case EFM_MODE_USING_HAL_MOUNT:
|
||||||
|
snprintf(buf, sizeof(buf), "%s: HAL", _("Mode"));
|
||||||
|
break;
|
||||||
|
case EFM_MODE_USING_UDISKS_MOUNT:
|
||||||
|
snprintf(buf, sizeof(buf), "%s: UDISKS", _("Mode"));
|
||||||
|
break;
|
||||||
|
case EFM_MODE_USING_EEZE_MOUNT:
|
||||||
|
snprintf(buf, sizeof(buf), "%s: EEZE", _("Mode"));
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
snprintf(buf, sizeof(buf), "%s: RASTER", _("Mode"));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
ob = e_widget_label_add(evas, buf);
|
||||||
|
e_widget_list_object_append(o, ob, 0, 1, 0.5);
|
||||||
|
}
|
||||||
ob = e_widget_check_add(evas, _("Show device icons on desktop"),
|
ob = e_widget_check_add(evas, _("Show device icons on desktop"),
|
||||||
#endif
|
|
||||||
&(cfdata->dbus.desktop));
|
&(cfdata->dbus.desktop));
|
||||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||||
ob = e_widget_check_add(evas, _("Mount volumes on insert"),
|
ob = e_widget_check_add(evas, _("Mount volumes on insert"),
|
||||||
|
|
Loading…
Reference in New Issue