forked from enlightenment/enlightenment
parent
7aff5821e4
commit
346e271e07
File diff suppressed because it is too large
Load Diff
|
@ -3,87 +3,93 @@
|
|||
#include "e_mod_config.h"
|
||||
#include "e_fm_device.h"
|
||||
|
||||
struct _E_Config_Dialog_Data
|
||||
struct _E_Config_Dialog_Data
|
||||
{
|
||||
/* general view mode */
|
||||
struct
|
||||
{
|
||||
int mode;
|
||||
int open_dirs_in_place;
|
||||
int selector;
|
||||
int single_click;
|
||||
int no_subdir_jump;
|
||||
int no_subdir_drop;
|
||||
int always_order;
|
||||
int link_drop;
|
||||
int fit_custom_pos;
|
||||
int show_full_path;
|
||||
int show_desktop_icons;
|
||||
int show_toolbar;
|
||||
} view;
|
||||
/* display of icons */
|
||||
struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
int w, h;
|
||||
} icon, list, fixed;
|
||||
struct
|
||||
{
|
||||
int show;
|
||||
} extension;
|
||||
const char *key_hint;
|
||||
} icon;
|
||||
/* how to sort files */
|
||||
struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
int case_sen;
|
||||
struct
|
||||
{
|
||||
int first, last;
|
||||
} dirs;
|
||||
} sort;
|
||||
} list;
|
||||
/* control how you can select files */
|
||||
struct
|
||||
{
|
||||
int single;
|
||||
int windows_modifiers;
|
||||
} selection;
|
||||
/* the background - if any, and how to handle it */
|
||||
/* FIXME: not implemented yet */
|
||||
struct
|
||||
{
|
||||
const char *background;
|
||||
const char *frame, *icons;
|
||||
int fixed;
|
||||
} theme;
|
||||
struct
|
||||
{
|
||||
int mode;
|
||||
int open_dirs_in_place;
|
||||
int selector;
|
||||
int single_click;
|
||||
int no_subdir_jump;
|
||||
int no_subdir_drop;
|
||||
int always_order;
|
||||
int link_drop;
|
||||
int fit_custom_pos;
|
||||
int show_full_path;
|
||||
int show_desktop_icons;
|
||||
int show_toolbar;
|
||||
} view;
|
||||
/* display of icons */
|
||||
struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
int w, h;
|
||||
} icon, list, fixed;
|
||||
struct
|
||||
{
|
||||
int show;
|
||||
} extension;
|
||||
const char *key_hint;
|
||||
} icon;
|
||||
/* how to sort files */
|
||||
struct
|
||||
{
|
||||
struct
|
||||
{
|
||||
int case_sen;
|
||||
struct
|
||||
{
|
||||
int first, last;
|
||||
} dirs;
|
||||
} sort;
|
||||
} list;
|
||||
/* control how you can select files */
|
||||
struct
|
||||
{
|
||||
int single;
|
||||
int windows_modifiers;
|
||||
} selection;
|
||||
/* the background - if any, and how to handle it */
|
||||
/* FIXME: not implemented yet */
|
||||
struct
|
||||
{
|
||||
const char *background;
|
||||
const char *frame, *icons;
|
||||
int fixed;
|
||||
} theme;
|
||||
|
||||
struct
|
||||
{
|
||||
int desktop;
|
||||
int auto_mount;
|
||||
int auto_open;
|
||||
} dbus;
|
||||
struct
|
||||
{
|
||||
int desktop;
|
||||
int auto_mount;
|
||||
int auto_open;
|
||||
} dbus;
|
||||
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog *cfd;
|
||||
};
|
||||
|
||||
static void *_create_data(E_Config_Dialog *cfd);
|
||||
static void _fill_data(E_Config_Dialog_Data *cfdata);
|
||||
static void _free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_check_changed(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata);
|
||||
static void *_create_data(E_Config_Dialog *cfd);
|
||||
static void _fill_data(E_Config_Dialog_Data *cfdata);
|
||||
static void _free_data(E_Config_Dialog *cfd,
|
||||
E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_apply(E_Config_Dialog *cfd,
|
||||
E_Config_Dialog_Data *cfdata);
|
||||
static int _basic_check_changed(E_Config_Dialog *cfd,
|
||||
E_Config_Dialog_Data *cfdata);
|
||||
static Evas_Object *_basic_create(E_Config_Dialog *cfd,
|
||||
Evas *evas,
|
||||
E_Config_Dialog_Data *cfdata);
|
||||
|
||||
E_Config_Dialog *
|
||||
e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
|
||||
e_int_config_fileman(E_Container *con,
|
||||
const char *params __UNUSED__)
|
||||
{
|
||||
E_Config_Dialog *cfd;
|
||||
E_Config_Dialog_View *v;
|
||||
|
||||
|
||||
if (e_config_dialog_find("E", "fileman/fileman")) return NULL;
|
||||
v = E_NEW(E_Config_Dialog_View, 1);
|
||||
v->create_cfdata = _create_data;
|
||||
|
@ -92,17 +98,17 @@ e_int_config_fileman(E_Container *con, const char *params __UNUSED__)
|
|||
v->basic.create_widgets = _basic_create;
|
||||
v->basic.check_changed = _basic_check_changed;
|
||||
|
||||
cfd = e_config_dialog_new(con, _("Fileman Settings"), "E",
|
||||
"fileman/fileman",
|
||||
"system-file-manager", 0, v, NULL);
|
||||
cfd = e_config_dialog_new(con, _("Fileman Settings"), "E",
|
||||
"fileman/fileman",
|
||||
"system-file-manager", 0, v, NULL);
|
||||
return cfd;
|
||||
}
|
||||
|
||||
static void *
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
_create_data(E_Config_Dialog *cfd)
|
||||
{
|
||||
E_Config_Dialog_Data *cfdata;
|
||||
|
||||
|
||||
cfdata = E_NEW(E_Config_Dialog_Data, 1);
|
||||
cfd->cfdata = cfdata;
|
||||
cfdata->cfd = cfd;
|
||||
|
@ -110,8 +116,8 @@ _create_data(E_Config_Dialog *cfd)
|
|||
return cfdata;
|
||||
}
|
||||
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_fill_data(E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
cfdata->view.mode = fileman_config->view.mode;
|
||||
cfdata->view.open_dirs_in_place = fileman_config->view.open_dirs_in_place;
|
||||
|
@ -130,15 +136,17 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
cfdata->dbus.auto_open = e_config->device_auto_open;
|
||||
}
|
||||
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
||||
static void
|
||||
_free_data(E_Config_Dialog *cfd,
|
||||
E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
E_FREE(cfd->data);
|
||||
E_FREE(cfdata);
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
static int
|
||||
_basic_apply(E_Config_Dialog *cfd __UNUSED__,
|
||||
E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
fileman_config->view.mode = cfdata->view.mode;
|
||||
fileman_config->view.open_dirs_in_place = cfdata->view.open_dirs_in_place;
|
||||
|
@ -153,55 +161,58 @@ _basic_apply(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
|||
/* Make these two equal so that icons are proportioned correctly */
|
||||
fileman_config->icon.icon.w = cfdata->icon.icon.w;
|
||||
fileman_config->icon.icon.h = cfdata->icon.icon.w;
|
||||
|
||||
|
||||
fileman_config->list.sort.dirs.first = cfdata->list.sort.dirs.first;
|
||||
fileman_config->list.sort.dirs.last = !(cfdata->list.sort.dirs.first);
|
||||
fileman_config->list.sort.no_case = !(cfdata->list.sort.case_sen);
|
||||
|
||||
e_config->device_desktop = cfdata->dbus.desktop;
|
||||
if(e_config->device_desktop)
|
||||
if(e_config->device_desktop)
|
||||
e_fm2_device_show_desktop_icons();
|
||||
else
|
||||
e_fm2_device_hide_desktop_icons();
|
||||
|
||||
e_config->device_auto_mount = cfdata->dbus.auto_mount;
|
||||
e_config->device_auto_open = cfdata->dbus.auto_open;
|
||||
|
||||
|
||||
e_config_save_queue();
|
||||
|
||||
|
||||
/* FIXME: reload/refresh existing fm's */
|
||||
e_fwin_reload_all();
|
||||
return 1;
|
||||
}
|
||||
|
||||
static int
|
||||
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__, E_Config_Dialog_Data *cfdata)
|
||||
_basic_check_changed(E_Config_Dialog *cfd __UNUSED__,
|
||||
E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
return
|
||||
((fileman_config->view.mode != cfdata->view.mode) ||
|
||||
(fileman_config->view.open_dirs_in_place != cfdata->view.open_dirs_in_place) ||
|
||||
(fileman_config->view.single_click != cfdata->view.single_click) ||
|
||||
(fileman_config->view.show_full_path != cfdata->view.show_full_path) ||
|
||||
(fileman_config->view.show_desktop_icons != cfdata->view.show_desktop_icons) ||
|
||||
(fileman_config->view.show_toolbar != cfdata->view.show_toolbar) ||
|
||||
(fileman_config->icon.extension.show != cfdata->icon.extension.show) ||
|
||||
(fileman_config->selection.windows_modifiers != cfdata->selection.windows_modifiers) ||
|
||||
(fileman_config->icon.icon.w != cfdata->icon.icon.w) ||
|
||||
(fileman_config->icon.icon.h != cfdata->icon.icon.w) ||
|
||||
(fileman_config->list.sort.dirs.first != cfdata->list.sort.dirs.first) ||
|
||||
(fileman_config->list.sort.dirs.last != !(cfdata->list.sort.dirs.first)) ||
|
||||
(fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) ||
|
||||
(e_config->device_desktop != cfdata->dbus.desktop) ||
|
||||
(e_config->device_auto_mount != cfdata->dbus.auto_mount) ||
|
||||
(e_config->device_auto_open != cfdata->dbus.auto_open));
|
||||
(fileman_config->view.mode != cfdata->view.mode) ||
|
||||
(fileman_config->view.open_dirs_in_place != cfdata->view.open_dirs_in_place) ||
|
||||
(fileman_config->view.single_click != cfdata->view.single_click) ||
|
||||
(fileman_config->view.show_full_path != cfdata->view.show_full_path) ||
|
||||
(fileman_config->view.show_desktop_icons != cfdata->view.show_desktop_icons) ||
|
||||
(fileman_config->view.show_toolbar != cfdata->view.show_toolbar) ||
|
||||
(fileman_config->icon.extension.show != cfdata->icon.extension.show) ||
|
||||
(fileman_config->selection.windows_modifiers != cfdata->selection.windows_modifiers) ||
|
||||
(fileman_config->icon.icon.w != cfdata->icon.icon.w) ||
|
||||
(fileman_config->icon.icon.h != cfdata->icon.icon.w) ||
|
||||
(fileman_config->list.sort.dirs.first != cfdata->list.sort.dirs.first) ||
|
||||
(fileman_config->list.sort.dirs.last != !(cfdata->list.sort.dirs.first)) ||
|
||||
(fileman_config->list.sort.no_case != !(cfdata->list.sort.case_sen)) ||
|
||||
(e_config->device_desktop != cfdata->dbus.desktop) ||
|
||||
(e_config->device_auto_mount != cfdata->dbus.auto_mount) ||
|
||||
(e_config->device_auto_open != cfdata->dbus.auto_open);
|
||||
}
|
||||
|
||||
static Evas_Object *
|
||||
_basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data *cfdata)
|
||||
_basic_create(E_Config_Dialog *cfd __UNUSED__,
|
||||
Evas *evas,
|
||||
E_Config_Dialog_Data *cfdata)
|
||||
{
|
||||
Evas_Object *o, *ob, *of, *otb;
|
||||
E_Radio_Group *rg;
|
||||
|
||||
|
||||
otb = e_widget_toolbook_add(evas, 48 * e_scale, 48 * e_scale);
|
||||
|
||||
o = e_widget_list_add(evas, 0, 0);
|
||||
|
@ -223,66 +234,67 @@ _basic_create(E_Config_Dialog *cfd __UNUSED__, Evas *evas, E_Config_Dialog_Data
|
|||
ob = e_widget_radio_add(evas, _("List"), 5, rg);
|
||||
e_widget_framelist_object_append(of, ob);
|
||||
e_widget_list_object_append(o, of, 1, 1, 0.5);
|
||||
|
||||
|
||||
ob = e_widget_label_add(evas, _("Icon Size"));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 16.0, 256.0, 1.0, 0,
|
||||
NULL, &(cfdata->icon.icon.w), 150);
|
||||
ob = e_widget_slider_add(evas, 1, 0, _("%1.0f"), 16.0, 256.0, 1.0, 0,
|
||||
NULL, &(cfdata->icon.icon.w), 150);
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
e_widget_toolbook_page_append(otb, NULL, _("View"), o, 0, 0, 0, 0, 0.5, 0.0);
|
||||
|
||||
o = e_widget_list_add(evas, 1, 0);
|
||||
ob = e_widget_check_add(evas, _("Open Dirs In Place"),
|
||||
&(cfdata->view.open_dirs_in_place));
|
||||
ob = e_widget_check_add(evas, _("Open Dirs In Place"),
|
||||
&(cfdata->view.open_dirs_in_place));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
ob = e_widget_check_add(evas, _("Sort Dirs First"),
|
||||
&(cfdata->list.sort.dirs.first));
|
||||
ob = e_widget_check_add(evas, _("Sort Dirs First"),
|
||||
&(cfdata->list.sort.dirs.first));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_check_add(evas, _("Case Sensitive"),
|
||||
&(cfdata->list.sort.case_sen));
|
||||
ob = e_widget_check_add(evas, _("Case Sensitive"),
|
||||
&(cfdata->list.sort.case_sen));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
ob = e_widget_check_add(evas, _("Use Single Click"),
|
||||
&(cfdata->view.single_click));
|
||||
ob = e_widget_check_add(evas, _("Use Single Click"),
|
||||
&(cfdata->view.single_click));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_check_add(evas, _("Use Alternate Selection Modifiers"),
|
||||
&(cfdata->selection.windows_modifiers));
|
||||
ob = e_widget_check_add(evas, _("Use Alternate Selection Modifiers"),
|
||||
&(cfdata->selection.windows_modifiers));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
ob = e_widget_check_add(evas, _("Show Icon Extension"),
|
||||
&(cfdata->icon.extension.show));
|
||||
ob = e_widget_check_add(evas, _("Show Icon Extension"),
|
||||
&(cfdata->icon.extension.show));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_check_add(evas, _("Show Full Path"),
|
||||
&(cfdata->view.show_full_path));
|
||||
ob = e_widget_check_add(evas, _("Show Full Path"),
|
||||
&(cfdata->view.show_full_path));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_check_add(evas, _("Show Desktop Icons"),
|
||||
&(cfdata->view.show_desktop_icons));
|
||||
ob = e_widget_check_add(evas, _("Show Desktop Icons"),
|
||||
&(cfdata->view.show_desktop_icons));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_check_add(evas, _("Show Toolbar"),
|
||||
&(cfdata->view.show_toolbar));
|
||||
ob = e_widget_check_add(evas, _("Show Toolbar"),
|
||||
&(cfdata->view.show_toolbar));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
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);
|
||||
#ifdef HAVE_EUKIT
|
||||
ob = e_widget_check_add(evas, _("Show UDisks icons on desktop"),
|
||||
ob = e_widget_check_add(evas, _("Show UDisks icons on desktop"),
|
||||
#else
|
||||
ob = e_widget_check_add(evas, _("Show HAL icons on desktop"),
|
||||
ob = e_widget_check_add(evas, _("Show HAL icons on desktop"),
|
||||
#endif
|
||||
&(cfdata->dbus.desktop));
|
||||
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"),
|
||||
&(cfdata->dbus.auto_mount));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
ob = e_widget_check_add(evas, _("Open filemanager on mount"),
|
||||
&(cfdata->dbus.auto_open));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
|
||||
e_widget_toolbook_page_append(otb, NULL, _("HAL"), o, 0, 0, 0, 0, 0.5, 0.0);
|
||||
|
||||
e_widget_toolbook_page_show(otb, 0);
|
||||
return otb;
|
||||
return otb;
|
||||
}
|
||||
|
||||
|
|
|
@ -11,17 +11,18 @@ typedef struct _E_Fileman_DBus_Daemon E_Fileman_DBus_Daemon;
|
|||
struct _E_Fileman_DBus_Daemon
|
||||
{
|
||||
E_DBus_Connection *conn;
|
||||
E_DBus_Interface *iface;
|
||||
E_DBus_Object *obj;
|
||||
E_DBus_Interface *iface;
|
||||
E_DBus_Object *obj;
|
||||
|
||||
struct
|
||||
{
|
||||
DBusPendingCall *request_name;
|
||||
} pending;
|
||||
struct
|
||||
{
|
||||
DBusPendingCall *request_name;
|
||||
} pending;
|
||||
};
|
||||
|
||||
static DBusMessage *
|
||||
_e_fileman_dbus_daemon_error(DBusMessage *message, const char *msg)
|
||||
_e_fileman_dbus_daemon_error(DBusMessage *message,
|
||||
const char *msg)
|
||||
{
|
||||
return dbus_message_new_error(message, E_FILEMAN_ERROR, msg);
|
||||
}
|
||||
|
@ -34,8 +35,8 @@ _e_fileman_dbus_daemon_object_init(E_Fileman_DBus_Daemon *d)
|
|||
d->obj = e_dbus_object_add(d->conn, E_FILEMAN_PATH, d);
|
||||
if (!d->obj)
|
||||
{
|
||||
fprintf(stderr, "ERROR: cannot add object to %s\n", E_FILEMAN_PATH);
|
||||
return;
|
||||
fprintf(stderr, "ERROR: cannot add object to %s\n", E_FILEMAN_PATH);
|
||||
return;
|
||||
}
|
||||
|
||||
e_dbus_object_interface_attach(d->obj, d->iface);
|
||||
|
@ -49,8 +50,8 @@ _e_fileman_dbus_daemon_free(E_Fileman_DBus_Daemon *d)
|
|||
|
||||
if (d->obj)
|
||||
{
|
||||
e_dbus_object_interface_detach(d->obj, d->iface);
|
||||
e_dbus_object_free(d->obj);
|
||||
e_dbus_object_interface_detach(d->obj, d->iface);
|
||||
e_dbus_object_free(d->obj);
|
||||
}
|
||||
|
||||
if (d->iface)
|
||||
|
@ -63,7 +64,8 @@ _e_fileman_dbus_daemon_free(E_Fileman_DBus_Daemon *d)
|
|||
}
|
||||
|
||||
DBusMessage *
|
||||
_e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMessage *message)
|
||||
_e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__,
|
||||
DBusMessage *message)
|
||||
{
|
||||
DBusMessageIter itr;
|
||||
const char *directory = NULL, *p;
|
||||
|
@ -83,29 +85,28 @@ _e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMess
|
|||
if (!zone)
|
||||
return _e_fileman_dbus_daemon_error(message, "could not find a zone.");
|
||||
|
||||
|
||||
p = strchr(directory, '/');
|
||||
if (p)
|
||||
{
|
||||
int len = p - directory + 1;
|
||||
int len = p - directory + 1;
|
||||
|
||||
dev = malloc(len + 1);
|
||||
if (!dev)
|
||||
return _e_fileman_dbus_daemon_error
|
||||
(message, "could not allocate memory.");
|
||||
dev = malloc(len + 1);
|
||||
if (!dev)
|
||||
return _e_fileman_dbus_daemon_error
|
||||
(message, "could not allocate memory.");
|
||||
|
||||
memcpy(dev, directory, len);
|
||||
dev[len] = '\0';
|
||||
memcpy(dev, directory, len);
|
||||
dev[len] = '\0';
|
||||
|
||||
if ((dev[0] != '/') && (dev[0] != '~'))
|
||||
dev[len - 1] = '\0'; /* remove trailing '/' */
|
||||
if ((dev[0] != '/') && (dev[0] != '~'))
|
||||
dev[len - 1] = '\0'; /* remove trailing '/' */
|
||||
|
||||
directory += p - directory;
|
||||
directory += p - directory;
|
||||
}
|
||||
else
|
||||
{
|
||||
dev = strdup(directory);
|
||||
directory = "/";
|
||||
dev = strdup(directory);
|
||||
directory = "/";
|
||||
}
|
||||
|
||||
e_fwin_new(zone->container, dev, directory);
|
||||
|
@ -114,7 +115,9 @@ _e_fileman_dbus_daemon_open_directory_cb(E_DBus_Object *obj __UNUSED__, DBusMess
|
|||
}
|
||||
|
||||
static void
|
||||
_e_fileman_dbus_daemon_request_name_cb(void *data, DBusMessage *msg, DBusError *err)
|
||||
_e_fileman_dbus_daemon_request_name_cb(void *data,
|
||||
DBusMessage *msg,
|
||||
DBusError *err)
|
||||
{
|
||||
E_Fileman_DBus_Daemon *d = data;
|
||||
dbus_uint32_t ret;
|
||||
|
@ -124,37 +127,39 @@ _e_fileman_dbus_daemon_request_name_cb(void *data, DBusMessage *msg, DBusError *
|
|||
|
||||
if (dbus_error_is_set(err))
|
||||
{
|
||||
fprintf(stderr, "ERROR: FILEMAN: RequestName failed: %s\n",
|
||||
err->message);
|
||||
dbus_error_free(err);
|
||||
return;
|
||||
fprintf(stderr, "ERROR: FILEMAN: RequestName failed: %s\n",
|
||||
err->message);
|
||||
dbus_error_free(err);
|
||||
return;
|
||||
}
|
||||
|
||||
dbus_error_init(&new_err);
|
||||
dbus_message_get_args(msg, &new_err, DBUS_TYPE_UINT32, &ret,
|
||||
DBUS_TYPE_INVALID);
|
||||
DBUS_TYPE_INVALID);
|
||||
|
||||
if (dbus_error_is_set(&new_err))
|
||||
{
|
||||
fprintf(stderr,
|
||||
"ERROR: FILEMAN: could not get arguments of RequestName: %s\n",
|
||||
new_err.message);
|
||||
dbus_error_free(&new_err);
|
||||
return;
|
||||
fprintf(stderr,
|
||||
"ERROR: FILEMAN: could not get arguments of RequestName: %s\n",
|
||||
new_err.message);
|
||||
dbus_error_free(&new_err);
|
||||
return;
|
||||
}
|
||||
|
||||
switch (ret)
|
||||
{
|
||||
case DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER:
|
||||
case DBUS_REQUEST_NAME_REPLY_ALREADY_OWNER:
|
||||
_e_fileman_dbus_daemon_object_init(d);
|
||||
break;
|
||||
_e_fileman_dbus_daemon_object_init(d);
|
||||
break;
|
||||
|
||||
case DBUS_REQUEST_NAME_REPLY_IN_QUEUE:
|
||||
//XXX mark daemon as queued?
|
||||
break;
|
||||
//XXX mark daemon as queued?
|
||||
break;
|
||||
|
||||
case DBUS_REQUEST_NAME_REPLY_EXISTS:
|
||||
//XXX exit?
|
||||
break;
|
||||
//XXX exit?
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -166,8 +171,8 @@ _e_fileman_dbus_daemon_new(void)
|
|||
d = calloc(1, sizeof(*d));
|
||||
if (!d)
|
||||
{
|
||||
perror("ERROR: FILEMAN: cannot allocate fileman dbus daemon memory.");
|
||||
return NULL;
|
||||
perror("ERROR: FILEMAN: cannot allocate fileman dbus daemon memory.");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
d->conn = e_dbus_bus_get(DBUS_BUS_SESSION);
|
||||
|
@ -179,21 +184,21 @@ _e_fileman_dbus_daemon_new(void)
|
|||
goto error;
|
||||
|
||||
d->pending.request_name = e_dbus_request_name
|
||||
(d->conn, E_FILEMAN_BUS_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING,
|
||||
_e_fileman_dbus_daemon_request_name_cb, d);
|
||||
(d->conn, E_FILEMAN_BUS_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING,
|
||||
_e_fileman_dbus_daemon_request_name_cb, d);
|
||||
if (!d->pending.request_name)
|
||||
goto error;
|
||||
|
||||
const struct
|
||||
{
|
||||
const char *method;
|
||||
const char *signature;
|
||||
const char *ret_signature;
|
||||
E_DBus_Method_Cb func;
|
||||
} *itr, desc[] = {
|
||||
{"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb},
|
||||
{NULL}
|
||||
};
|
||||
const struct
|
||||
{
|
||||
const char *method;
|
||||
const char *signature;
|
||||
const char *ret_signature;
|
||||
E_DBus_Method_Cb func;
|
||||
} *itr, desc[] = {
|
||||
{"OpenDirectory", "s", "", _e_fileman_dbus_daemon_open_directory_cb},
|
||||
{NULL}
|
||||
};
|
||||
|
||||
for (itr = desc; itr->method; itr++)
|
||||
e_dbus_interface_method_add
|
||||
|
@ -201,13 +206,12 @@ _e_fileman_dbus_daemon_new(void)
|
|||
|
||||
return d;
|
||||
|
||||
error:
|
||||
error:
|
||||
fprintf(stderr, "ERROR: FILEMAN: failed to create daemon at %p\n", d);
|
||||
_e_fileman_dbus_daemon_free(d);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
static E_Fileman_DBus_Daemon *_daemon = NULL;
|
||||
|
||||
void
|
||||
|
@ -230,3 +234,4 @@ e_fileman_dbus_shutdown(void)
|
|||
_daemon = NULL;
|
||||
e_dbus_shutdown();
|
||||
}
|
||||
|
||||
|
|
|
@ -5,15 +5,25 @@
|
|||
#include "e_mod_dbus.h"
|
||||
|
||||
/* actual module specifics */
|
||||
static void _e_mod_action_fileman_cb(E_Object *obj, const char *params);
|
||||
static void _e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_mod_menu_virtual_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi);
|
||||
static void _e_mod_menu_add(void *data, E_Menu *m);
|
||||
static void _e_mod_fileman_config_load(void);
|
||||
static void _e_mod_fileman_config_free(void);
|
||||
static void _e_mod_action_fileman_cb(E_Object *obj,
|
||||
const char *params);
|
||||
static void _e_mod_menu_gtk_cb(void *data,
|
||||
E_Menu *m,
|
||||
E_Menu_Item *mi);
|
||||
static void _e_mod_menu_virtual_cb(void *data,
|
||||
E_Menu *m,
|
||||
E_Menu_Item *mi);
|
||||
static void _e_mod_menu_volume_cb(void *data,
|
||||
E_Menu *m,
|
||||
E_Menu_Item *mi);
|
||||
static void _e_mod_menu_add(void *data,
|
||||
E_Menu *m);
|
||||
static void _e_mod_fileman_config_load(void);
|
||||
static void _e_mod_fileman_config_free(void);
|
||||
static Eina_Bool _e_mod_cb_config_timer(void *data);
|
||||
static Eina_Bool _e_mod_zone_add(void *data, int type, void *event);
|
||||
static Eina_Bool _e_mod_zone_add(void *data,
|
||||
int type,
|
||||
void *event);
|
||||
|
||||
static E_Module *conf_module = NULL;
|
||||
static E_Action *act = NULL;
|
||||
|
@ -27,7 +37,7 @@ Config *fileman_config = NULL;
|
|||
EAPI E_Module_Api e_modapi =
|
||||
{
|
||||
E_MODULE_API_VERSION,
|
||||
"Fileman"
|
||||
"Fileman"
|
||||
};
|
||||
|
||||
EAPI void *
|
||||
|
@ -37,64 +47,64 @@ e_modapi_init(E_Module *m)
|
|||
E_Manager *man;
|
||||
E_Container *con;
|
||||
E_Zone *zone;
|
||||
|
||||
|
||||
conf_module = m;
|
||||
|
||||
//eina_init();
|
||||
|
||||
/* Setup Entry in Config Panel */
|
||||
e_configure_registry_category_add("fileman", 100, _("Files"),
|
||||
NULL, "system-file-manager");
|
||||
e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"),
|
||||
NULL, "system-file-manager",
|
||||
e_int_config_fileman);
|
||||
|
||||
e_configure_registry_category_add("fileman", 100, _("Files"),
|
||||
NULL, "system-file-manager");
|
||||
e_configure_registry_item_add("fileman/fileman", 10, _("File Manager"),
|
||||
NULL, "system-file-manager",
|
||||
e_int_config_fileman);
|
||||
|
||||
/* Setup Config edd */
|
||||
_e_mod_fileman_config_load();
|
||||
|
||||
|
||||
/* add module supplied action */
|
||||
act = e_action_add("fileman");
|
||||
if (act)
|
||||
{
|
||||
act->func.go = _e_mod_action_fileman_cb;
|
||||
e_action_predef_name_set(_("Launch"), _("File Manager"),
|
||||
"fileman", NULL, "syntax: /path/to/dir or ~/path/to/dir or favorites or desktop, examples: /boot/grub, ~/downloads", 1);
|
||||
act->func.go = _e_mod_action_fileman_cb;
|
||||
e_action_predef_name_set(_("Launch"), _("File Manager"),
|
||||
"fileman", NULL, "syntax: /path/to/dir or ~/path/to/dir or favorites or desktop, examples: /boot/grub, ~/downloads", 1);
|
||||
}
|
||||
maug = e_int_menus_menu_augmentation_add_sorted
|
||||
("main/1", _("Files"),_e_mod_menu_add, NULL, NULL, NULL);
|
||||
("main/1", _("Files"), _e_mod_menu_add, NULL, NULL, NULL);
|
||||
e_module_delayed_set(m, 1);
|
||||
|
||||
/* Hook into zones */
|
||||
for (l = e_manager_list(); l; l = l->next)
|
||||
{
|
||||
man = l->data;
|
||||
for (ll = man->containers; ll; ll = ll->next)
|
||||
{
|
||||
con = ll->data;
|
||||
for (lll = con->zones; lll; lll = lll->next)
|
||||
{
|
||||
zone = lll->data;
|
||||
man = l->data;
|
||||
for (ll = man->containers; ll; ll = ll->next)
|
||||
{
|
||||
con = ll->data;
|
||||
for (lll = con->zones; lll; lll = lll->next)
|
||||
{
|
||||
zone = lll->data;
|
||||
if (e_fwin_zone_find(zone)) continue;
|
||||
if ((zone->container->num == 0) && (zone->num == 0) &&
|
||||
(fileman_config->view.show_desktop_icons))
|
||||
e_fwin_zone_new(zone, "desktop", "/");
|
||||
else
|
||||
{
|
||||
char buf[256];
|
||||
|
||||
if (fileman_config->view.show_desktop_icons)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%i",
|
||||
(zone->container->num + zone->num));
|
||||
e_fwin_zone_new(zone, "desktop", buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ((zone->container->num == 0) && (zone->num == 0) &&
|
||||
(fileman_config->view.show_desktop_icons))
|
||||
e_fwin_zone_new(zone, "desktop", "/");
|
||||
else
|
||||
{
|
||||
char buf[256];
|
||||
|
||||
if (fileman_config->view.show_desktop_icons)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%i",
|
||||
(zone->container->num + zone->num));
|
||||
e_fwin_zone_new(zone, "desktop", buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
zone_add_handler = ecore_event_handler_add(E_EVENT_ZONE_ADD,
|
||||
_e_mod_zone_add, NULL);
|
||||
|
||||
_e_mod_zone_add, NULL);
|
||||
|
||||
/* FIXME: add system event for new zone creation, and on creation, add an fwin to the zone */
|
||||
|
||||
e_fileman_dbus_init();
|
||||
|
@ -114,40 +124,40 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
|
|||
|
||||
ecore_event_handler_del(zone_add_handler);
|
||||
zone_add_handler = NULL;
|
||||
|
||||
|
||||
/* Unhook zone fm */
|
||||
for (l = e_manager_list(); l; l = l->next)
|
||||
{
|
||||
man = l->data;
|
||||
for (ll = man->containers; ll; ll = ll->next)
|
||||
{
|
||||
con = ll->data;
|
||||
for (lll = con->zones; lll; lll = lll->next)
|
||||
{
|
||||
zone = lll->data;
|
||||
if (!zone) continue;
|
||||
e_fwin_zone_shutdown(zone);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
man = l->data;
|
||||
for (ll = man->containers; ll; ll = ll->next)
|
||||
{
|
||||
con = ll->data;
|
||||
for (lll = con->zones; lll; lll = lll->next)
|
||||
{
|
||||
zone = lll->data;
|
||||
if (!zone) continue;
|
||||
e_fwin_zone_shutdown(zone);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* remove module-supplied menu additions */
|
||||
if (maug)
|
||||
{
|
||||
e_int_menus_menu_augmentation_del("main/1", maug);
|
||||
maug = NULL;
|
||||
e_int_menus_menu_augmentation_del("main/1", maug);
|
||||
maug = NULL;
|
||||
}
|
||||
/* remove module-supplied action */
|
||||
if (act)
|
||||
{
|
||||
e_action_predef_name_del(_("Launch"), _("File Manager"));
|
||||
e_action_del("fileman");
|
||||
act = NULL;
|
||||
e_action_predef_name_del(_("Launch"), _("File Manager"));
|
||||
e_action_del("fileman");
|
||||
act = NULL;
|
||||
}
|
||||
/* remove fileman category from config panel */
|
||||
e_configure_registry_item_del("fileman/fileman");
|
||||
e_configure_registry_category_del("fileman");
|
||||
|
||||
|
||||
_e_mod_fileman_config_free();
|
||||
E_CONFIG_DD_FREE(conf_edd);
|
||||
|
||||
|
@ -166,62 +176,65 @@ e_modapi_save(E_Module *m __UNUSED__)
|
|||
|
||||
/* action callback */
|
||||
static void
|
||||
_e_mod_action_fileman_cb(E_Object *obj, const char *params)
|
||||
_e_mod_action_fileman_cb(E_Object *obj,
|
||||
const char *params)
|
||||
{
|
||||
E_Zone *zone = NULL;
|
||||
|
||||
|
||||
if (obj)
|
||||
{
|
||||
if (obj->type == E_MANAGER_TYPE)
|
||||
zone = e_util_zone_current_get((E_Manager *)obj);
|
||||
else if (obj->type == E_CONTAINER_TYPE)
|
||||
zone = e_util_zone_current_get(((E_Container *)obj)->manager);
|
||||
else if (obj->type == E_ZONE_TYPE)
|
||||
zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
|
||||
else
|
||||
zone = e_util_zone_current_get(e_manager_current_get());
|
||||
if (obj->type == E_MANAGER_TYPE)
|
||||
zone = e_util_zone_current_get((E_Manager *)obj);
|
||||
else if (obj->type == E_CONTAINER_TYPE)
|
||||
zone = e_util_zone_current_get(((E_Container *)obj)->manager);
|
||||
else if (obj->type == E_ZONE_TYPE)
|
||||
zone = e_util_zone_current_get(((E_Zone *)obj)->container->manager);
|
||||
else
|
||||
zone = e_util_zone_current_get(e_manager_current_get());
|
||||
}
|
||||
if (!zone) zone = e_util_zone_current_get(e_manager_current_get());
|
||||
if (zone)
|
||||
{
|
||||
if (params && params[0] == '/')
|
||||
e_fwin_new(zone->container, "/", params);
|
||||
else if (params && params[0] == '~')
|
||||
e_fwin_new(zone->container, "~/", params + 1);
|
||||
else if (params)
|
||||
{
|
||||
char *path;
|
||||
path = e_util_shell_env_path_eval(params);
|
||||
if (path)
|
||||
{
|
||||
e_fwin_new(zone->container, path, "/");
|
||||
free(path);
|
||||
}
|
||||
}
|
||||
else
|
||||
e_fwin_new(zone->container, "favorites", "/");
|
||||
if (params && params[0] == '/')
|
||||
e_fwin_new(zone->container, "/", params);
|
||||
else if (params && params[0] == '~')
|
||||
e_fwin_new(zone->container, "~/", params + 1);
|
||||
else if (params)
|
||||
{
|
||||
char *path;
|
||||
path = e_util_shell_env_path_eval(params);
|
||||
if (path)
|
||||
{
|
||||
e_fwin_new(zone->container, path, "/");
|
||||
free(path);
|
||||
}
|
||||
}
|
||||
else
|
||||
e_fwin_new(zone->container, "favorites", "/");
|
||||
}
|
||||
}
|
||||
|
||||
/* menu item callback(s) */
|
||||
//~ static int
|
||||
//~ _e_mod_fileman_defer_cb(void *data)
|
||||
//~ _e_mod_fileman_defer_cb(void *data)
|
||||
//~ {
|
||||
//~ E_Zone *zone;
|
||||
|
||||
//~ zone = data;
|
||||
//~ if (zone) e_fwin_new(zone->container, "favorites", "/");
|
||||
//~ return 0;
|
||||
//~ E_Zone *zone;
|
||||
|
||||
//~ zone = data;
|
||||
//~ if (zone) e_fwin_new(zone->container, "favorites", "/");
|
||||
//~ return 0;
|
||||
//~ }
|
||||
|
||||
//~ static void
|
||||
//~ static void
|
||||
//~ _e_mod_fileman_cb(void *data, E_Menu *m, E_Menu_Item *mi)
|
||||
//~ {
|
||||
//~ ecore_idle_enterer_add(_e_mod_fileman_defer_cb, m->zone);
|
||||
//~ ecore_idle_enterer_add(_e_mod_fileman_defer_cb, m->zone);
|
||||
//~ }
|
||||
|
||||
static void
|
||||
_e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
||||
_e_mod_menu_gtk_cb(void *data,
|
||||
E_Menu *m,
|
||||
E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
char *path;
|
||||
|
||||
|
@ -231,20 +244,24 @@ _e_mod_menu_gtk_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
_e_mod_menu_virtual_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
||||
_e_mod_menu_virtual_cb(void *data,
|
||||
E_Menu *m,
|
||||
E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
if (m->zone) e_fwin_new(m->zone->container, data, "/");
|
||||
}
|
||||
|
||||
static void
|
||||
_e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
||||
_e_mod_menu_volume_cb(void *data,
|
||||
E_Menu *m,
|
||||
E_Menu_Item *mi __UNUSED__)
|
||||
{
|
||||
E_Volume *vol = data;
|
||||
|
||||
if (vol->mounted)
|
||||
{
|
||||
if (m->zone)
|
||||
e_fwin_new(m->zone->container, NULL, vol->mount_point);
|
||||
if (m->zone)
|
||||
e_fwin_new(m->zone->container, NULL, vol->mount_point);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -257,58 +274,60 @@ _e_mod_menu_volume_cb(void *data, E_Menu *m, E_Menu_Item *mi __UNUSED__)
|
|||
}
|
||||
|
||||
static void
|
||||
_e_mod_fileman_parse_gtk_bookmarks(E_Menu *m, Eina_Bool need_separator)
|
||||
_e_mod_fileman_parse_gtk_bookmarks(E_Menu *m,
|
||||
Eina_Bool need_separator)
|
||||
{
|
||||
char line[PATH_MAX];
|
||||
char buf[PATH_MAX];
|
||||
E_Menu_Item *mi;
|
||||
Efreet_Uri *uri;
|
||||
char *alias;
|
||||
FILE* fp;
|
||||
FILE *fp;
|
||||
|
||||
snprintf(buf, sizeof(buf), "%s/.gtk-bookmarks", e_user_homedir_get());
|
||||
fp = fopen(buf, "r");
|
||||
if (fp)
|
||||
{
|
||||
while(fgets(line, sizeof(line), fp))
|
||||
{
|
||||
alias = NULL;
|
||||
line[strlen(line) - 1] = '\0';
|
||||
alias = strchr(line, ' ');
|
||||
if (alias)
|
||||
{
|
||||
line[alias-line] = '\0';
|
||||
alias++;
|
||||
}
|
||||
uri = efreet_uri_decode(line);
|
||||
if (uri && uri->path)
|
||||
{
|
||||
if (ecore_file_exists(uri->path))
|
||||
{
|
||||
if (need_separator)
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
need_separator = 0;
|
||||
}
|
||||
while(fgets(line, sizeof(line), fp))
|
||||
{
|
||||
alias = NULL;
|
||||
line[strlen(line) - 1] = '\0';
|
||||
alias = strchr(line, ' ');
|
||||
if (alias)
|
||||
{
|
||||
line[alias - line] = '\0';
|
||||
alias++;
|
||||
}
|
||||
uri = efreet_uri_decode(line);
|
||||
if (uri && uri->path)
|
||||
{
|
||||
if (ecore_file_exists(uri->path))
|
||||
{
|
||||
if (need_separator)
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
need_separator = 0;
|
||||
}
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, alias ? alias :
|
||||
ecore_file_file_get(uri->path));
|
||||
e_util_menu_item_theme_icon_set(mi, "folder");
|
||||
e_menu_item_callback_set(mi, _e_mod_menu_gtk_cb,
|
||||
(void *)eina_stringshare_add(uri->path));
|
||||
}
|
||||
}
|
||||
if (uri) efreet_uri_free(uri);
|
||||
}
|
||||
fclose(fp);
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, alias ? alias :
|
||||
ecore_file_file_get(uri->path));
|
||||
e_util_menu_item_theme_icon_set(mi, "folder");
|
||||
e_menu_item_callback_set(mi, _e_mod_menu_gtk_cb,
|
||||
(void *)eina_stringshare_add(uri->path));
|
||||
}
|
||||
}
|
||||
if (uri) efreet_uri_free(uri);
|
||||
}
|
||||
fclose(fp);
|
||||
}
|
||||
}
|
||||
|
||||
/* menu item add hook */
|
||||
void
|
||||
_e_mod_menu_generate(void *data __UNUSED__, E_Menu *m)
|
||||
_e_mod_menu_generate(void *data __UNUSED__,
|
||||
E_Menu *m)
|
||||
{
|
||||
E_Menu_Item *mi;
|
||||
E_Volume *vol;
|
||||
|
@ -350,20 +369,20 @@ _e_mod_menu_generate(void *data __UNUSED__, E_Menu *m)
|
|||
Eina_Bool volumes_visible = 0;
|
||||
EINA_LIST_FOREACH(e_fm2_device_volume_list_get(), l, vol)
|
||||
{
|
||||
if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;
|
||||
if (vol->mount_point && !strcmp(vol->mount_point, "/")) continue;
|
||||
|
||||
if (need_separator)
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
need_separator = 0;
|
||||
}
|
||||
if (need_separator)
|
||||
{
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_separator_set(mi, 1);
|
||||
need_separator = 0;
|
||||
}
|
||||
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, vol->label);
|
||||
e_util_menu_item_theme_icon_set(mi, vol->icon);
|
||||
e_menu_item_callback_set(mi, _e_mod_menu_volume_cb, vol);
|
||||
volumes_visible = 1;
|
||||
mi = e_menu_item_new(m);
|
||||
e_menu_item_label_set(mi, vol->label);
|
||||
e_util_menu_item_theme_icon_set(mi, vol->icon);
|
||||
e_menu_item_callback_set(mi, _e_mod_menu_volume_cb, vol);
|
||||
volumes_visible = 1;
|
||||
}
|
||||
|
||||
/* Favorites */
|
||||
|
@ -376,7 +395,8 @@ _e_mod_menu_generate(void *data __UNUSED__, E_Menu *m)
|
|||
}
|
||||
|
||||
void
|
||||
_e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
|
||||
_e_mod_menu_add(void *data __UNUSED__,
|
||||
E_Menu *m)
|
||||
{
|
||||
#ifdef ENABLE_FILES
|
||||
E_Menu_Item *mi;
|
||||
|
@ -392,8 +412,8 @@ _e_mod_menu_add(void *data __UNUSED__, E_Menu *m)
|
|||
}
|
||||
|
||||
/* Abstract fileman config load/create to one function for maintainability */
|
||||
static void
|
||||
_e_mod_fileman_config_load(void)
|
||||
static void
|
||||
_e_mod_fileman_config_load(void)
|
||||
{
|
||||
conf_edd = E_CONFIG_DD_NEW("Fileman_Config", Config);
|
||||
#undef T
|
||||
|
@ -429,83 +449,83 @@ _e_mod_fileman_config_load(void)
|
|||
E_CONFIG_VAL(D, T, theme.frame, STR);
|
||||
E_CONFIG_VAL(D, T, theme.icons, STR);
|
||||
E_CONFIG_VAL(D, T, theme.fixed, UCHAR);
|
||||
|
||||
|
||||
fileman_config = e_config_domain_load("module.fileman", conf_edd);
|
||||
if (fileman_config)
|
||||
if (fileman_config)
|
||||
{
|
||||
if ((fileman_config->config_version >> 16) < MOD_CONFIG_FILE_EPOCH)
|
||||
{
|
||||
_e_mod_fileman_config_free();
|
||||
ecore_timer_add(1.0, _e_mod_cb_config_timer,
|
||||
_("Fileman Module Settings data needed upgrading. Your old configuration<br>"
|
||||
"has been wiped and a new set of defaults initialized. This<br>"
|
||||
"will happen regularly during development, so don't report a<br>"
|
||||
"bug. This simply means Fileman module needs new configuration<br>"
|
||||
"data by default for usable functionality that your old<br>"
|
||||
"configuration simply lacks. This new set of defaults will fix<br>"
|
||||
"that by adding it in. You can re-configure things now to your<br>"
|
||||
"liking. Sorry for the hiccup in your configuration.<br>"));
|
||||
}
|
||||
else if (fileman_config->config_version > MOD_CONFIG_FILE_VERSION)
|
||||
{
|
||||
_e_mod_fileman_config_free();
|
||||
ecore_timer_add(1.0, _e_mod_cb_config_timer,
|
||||
_("Your Fileman Module configuration is NEWER than Fileman Module version. This is very<br>"
|
||||
"strange. This should not happen unless you downgraded<br>"
|
||||
"the Fileman Module or copied the configuration from a place where<br>"
|
||||
"a newer version of the Fileman Module was running. This is bad and<br>"
|
||||
"as a precaution your configuration has been now restored to<br>"
|
||||
"defaults. Sorry for the inconvenience.<br>"));
|
||||
}
|
||||
if ((fileman_config->config_version >> 16) < MOD_CONFIG_FILE_EPOCH)
|
||||
{
|
||||
_e_mod_fileman_config_free();
|
||||
ecore_timer_add(1.0, _e_mod_cb_config_timer,
|
||||
_("Fileman Module Settings data needed upgrading. Your old configuration<br>"
|
||||
"has been wiped and a new set of defaults initialized. This<br>"
|
||||
"will happen regularly during development, so don't report a<br>"
|
||||
"bug. This simply means Fileman module needs new configuration<br>"
|
||||
"data by default for usable functionality that your old<br>"
|
||||
"configuration simply lacks. This new set of defaults will fix<br>"
|
||||
"that by adding it in. You can re-configure things now to your<br>"
|
||||
"liking. Sorry for the hiccup in your configuration.<br>"));
|
||||
}
|
||||
else if (fileman_config->config_version > MOD_CONFIG_FILE_VERSION)
|
||||
{
|
||||
_e_mod_fileman_config_free();
|
||||
ecore_timer_add(1.0, _e_mod_cb_config_timer,
|
||||
_("Your Fileman Module configuration is NEWER than Fileman Module version. This is very<br>"
|
||||
"strange. This should not happen unless you downgraded<br>"
|
||||
"the Fileman Module or copied the configuration from a place where<br>"
|
||||
"a newer version of the Fileman Module was running. This is bad and<br>"
|
||||
"as a precaution your configuration has been now restored to<br>"
|
||||
"defaults. Sorry for the inconvenience.<br>"));
|
||||
}
|
||||
}
|
||||
|
||||
if (!fileman_config)
|
||||
|
||||
if (!fileman_config)
|
||||
{
|
||||
fileman_config = E_NEW(Config, 1);
|
||||
fileman_config->config_version = (MOD_CONFIG_FILE_EPOCH << 16);
|
||||
fileman_config = E_NEW(Config, 1);
|
||||
fileman_config->config_version = (MOD_CONFIG_FILE_EPOCH << 16);
|
||||
}
|
||||
#define IFMODCFG(v) \
|
||||
if ((fileman_config->config_version & 0xffff) < (v)) {
|
||||
if ((fileman_config->config_version & 0xffff) < (v)) {
|
||||
#define IFMODCFGEND }
|
||||
|
||||
IFMODCFG(0x008d);
|
||||
fileman_config->view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
|
||||
fileman_config->view.open_dirs_in_place = 0;
|
||||
fileman_config->view.selector = 0;
|
||||
fileman_config->view.single_click = 0;
|
||||
fileman_config->view.no_subdir_jump = 0;
|
||||
fileman_config->view.show_full_path = 0;
|
||||
fileman_config->view.show_desktop_icons = 1;
|
||||
fileman_config->icon.icon.w = 48;
|
||||
fileman_config->icon.icon.h = 48;
|
||||
fileman_config->icon.fixed.w = 0;
|
||||
fileman_config->icon.fixed.h = 0;
|
||||
fileman_config->icon.extension.show = 1;
|
||||
fileman_config->list.sort.no_case = 1;
|
||||
fileman_config->list.sort.dirs.first = 1;
|
||||
fileman_config->list.sort.dirs.last = 0;
|
||||
fileman_config->selection.single = 0;
|
||||
fileman_config->selection.windows_modifiers = 0;
|
||||
IFMODCFGEND;
|
||||
IFMODCFG(0x008d);
|
||||
fileman_config->view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
|
||||
fileman_config->view.open_dirs_in_place = 0;
|
||||
fileman_config->view.selector = 0;
|
||||
fileman_config->view.single_click = 0;
|
||||
fileman_config->view.no_subdir_jump = 0;
|
||||
fileman_config->view.show_full_path = 0;
|
||||
fileman_config->view.show_desktop_icons = 1;
|
||||
fileman_config->icon.icon.w = 48;
|
||||
fileman_config->icon.icon.h = 48;
|
||||
fileman_config->icon.fixed.w = 0;
|
||||
fileman_config->icon.fixed.h = 0;
|
||||
fileman_config->icon.extension.show = 1;
|
||||
fileman_config->list.sort.no_case = 1;
|
||||
fileman_config->list.sort.dirs.first = 1;
|
||||
fileman_config->list.sort.dirs.last = 0;
|
||||
fileman_config->selection.single = 0;
|
||||
fileman_config->selection.windows_modifiers = 0;
|
||||
IFMODCFGEND;
|
||||
|
||||
IFMODCFG(0x0101);
|
||||
fileman_config->view.show_toolbar = 0;
|
||||
IFMODCFGEND;
|
||||
IFMODCFG(0x0101);
|
||||
fileman_config->view.show_toolbar = 0;
|
||||
IFMODCFGEND;
|
||||
|
||||
fileman_config->config_version = MOD_CONFIG_FILE_VERSION;
|
||||
|
||||
/* UCHAR's give nasty compile warnings about comparisons so not gonna limit those */
|
||||
E_CONFIG_LIMIT(fileman_config->view.mode, E_FM2_VIEW_MODE_ICONS, E_FM2_VIEW_MODE_LIST);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.icon.w, 16, 256);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.icon.h, 16, 256);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.list.w, 16, 256);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.list.h, 16, 256);
|
||||
|
||||
e_config_save_queue();
|
||||
fileman_config->config_version = MOD_CONFIG_FILE_VERSION;
|
||||
|
||||
/* UCHAR's give nasty compile warnings about comparisons so not gonna limit those */
|
||||
E_CONFIG_LIMIT(fileman_config->view.mode, E_FM2_VIEW_MODE_ICONS, E_FM2_VIEW_MODE_LIST);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.icon.w, 16, 256);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.icon.h, 16, 256);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.list.w, 16, 256);
|
||||
E_CONFIG_LIMIT(fileman_config->icon.list.h, 16, 256);
|
||||
|
||||
e_config_save_queue();
|
||||
}
|
||||
|
||||
static void
|
||||
_e_mod_fileman_config_free(void)
|
||||
_e_mod_fileman_config_free(void)
|
||||
{
|
||||
if (fileman_config->theme.background)
|
||||
eina_stringshare_del(fileman_config->theme.background);
|
||||
|
@ -513,7 +533,7 @@ _e_mod_fileman_config_free(void)
|
|||
eina_stringshare_del(fileman_config->theme.frame);
|
||||
if (fileman_config->theme.icons)
|
||||
eina_stringshare_del(fileman_config->theme.icons);
|
||||
E_FREE(fileman_config);
|
||||
E_FREE(fileman_config);
|
||||
}
|
||||
|
||||
static Eina_Bool
|
||||
|
@ -524,28 +544,31 @@ _e_mod_cb_config_timer(void *data)
|
|||
}
|
||||
|
||||
static Eina_Bool
|
||||
_e_mod_zone_add(__UNUSED__ void *data, int type, void *event)
|
||||
_e_mod_zone_add(__UNUSED__ void *data,
|
||||
int type,
|
||||
void *event)
|
||||
{
|
||||
E_Event_Zone_Add *ev;
|
||||
E_Zone *zone;
|
||||
|
||||
|
||||
if (type != E_EVENT_ZONE_ADD) return ECORE_CALLBACK_PASS_ON;
|
||||
ev = event;
|
||||
zone = ev->zone;
|
||||
if (e_fwin_zone_find(zone)) return ECORE_CALLBACK_PASS_ON;
|
||||
if ((zone->container->num == 0) && (zone->num == 0) &&
|
||||
if ((zone->container->num == 0) && (zone->num == 0) &&
|
||||
(fileman_config->view.show_desktop_icons))
|
||||
e_fwin_zone_new(zone, "desktop", "/");
|
||||
else
|
||||
else
|
||||
{
|
||||
char buf[256];
|
||||
|
||||
if (fileman_config->view.show_desktop_icons)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%i",
|
||||
(zone->container->num + zone->num));
|
||||
e_fwin_zone_new(zone, "desktop", buf);
|
||||
}
|
||||
char buf[256];
|
||||
|
||||
if (fileman_config->view.show_desktop_icons)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%i",
|
||||
(zone->container->num + zone->num));
|
||||
e_fwin_zone_new(zone, "desktop", buf);
|
||||
}
|
||||
}
|
||||
return ECORE_CALLBACK_PASS_ON;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue