forked from enlightenment/enlightenment
Add options for showing Full Path in the window & option to disable Desktop
Icons. SVN revision: 31274
This commit is contained in:
parent
3e63519a9a
commit
934f311ffa
|
@ -393,12 +393,18 @@ _e_fwin_new(E_Container *con, const char *dev, const char *path)
|
|||
|
||||
snprintf(buf, sizeof(buf), "_fwin::/%s", e_fm2_real_path_get(fwin->fm_obj));
|
||||
e_win_name_class_set(fwin->win, "E", buf);
|
||||
file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
|
||||
if (file)
|
||||
snprintf(buf, sizeof(buf), "%s", file);
|
||||
|
||||
if (fileman_config->view.show_full_path)
|
||||
file = e_fm2_real_path_get(fwin->fm_obj);
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%s", e_fm2_real_path_get(fwin->fm_obj));
|
||||
e_win_title_set(fwin->win, buf);
|
||||
file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
|
||||
|
||||
if (file)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%s", file);
|
||||
e_win_title_set(fwin->win, buf);
|
||||
}
|
||||
|
||||
e_win_size_min_set(fwin->win, 24, 24);
|
||||
e_win_resize(fwin->win, 280, 200);
|
||||
e_win_show(fwin->win);
|
||||
|
@ -571,12 +577,16 @@ _e_fwin_changed(void *data, Evas_Object *obj, void *event_info)
|
|||
e_fm2_custom_theme_set(obj, NULL);
|
||||
|
||||
if (fwin->zone) return;
|
||||
file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
|
||||
if (file)
|
||||
snprintf(buf, sizeof(buf), "%s", file);
|
||||
if (fileman_config->view.show_full_path)
|
||||
file = e_fm2_real_path_get(fwin->fm_obj);
|
||||
else
|
||||
snprintf(buf, sizeof(buf), "%s", e_fm2_real_path_get(fwin->fm_obj));
|
||||
e_win_title_set(fwin->win, buf);
|
||||
file = ecore_file_file_get(e_fm2_real_path_get(fwin->fm_obj));
|
||||
|
||||
if (file)
|
||||
{
|
||||
snprintf(buf, sizeof(buf), "%s", file);
|
||||
e_win_title_set(fwin->win, buf);
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -15,6 +15,8 @@ struct _E_Config_Dialog_Data
|
|||
int always_order;
|
||||
int link_drop;
|
||||
int fit_custom_pos;
|
||||
int show_full_path;
|
||||
int show_desktop_icons;
|
||||
} view;
|
||||
/* display of icons */
|
||||
struct {
|
||||
|
@ -101,6 +103,8 @@ _fill_data(E_Config_Dialog_Data *cfdata)
|
|||
|
||||
cfdata->view.open_dirs_in_place = fileman_config->view.open_dirs_in_place;
|
||||
cfdata->view.single_click = fileman_config->view.single_click;
|
||||
cfdata->view.show_full_path = fileman_config->view.show_full_path;
|
||||
cfdata->view.show_desktop_icons = fileman_config->view.show_desktop_icons;
|
||||
cfdata->icon.icon.w = fileman_config->icon.icon.w;
|
||||
cfdata->icon.icon.h = fileman_config->icon.icon.h;
|
||||
cfdata->icon.extension.show = fileman_config->icon.extension.show;
|
||||
|
@ -121,6 +125,8 @@ _basic_apply(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
|
|||
|
||||
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->icon.extension.show = cfdata->icon.extension.show;
|
||||
|
||||
/* Make these two equal so that icons are proportioned correctly */
|
||||
|
@ -162,6 +168,12 @@ _basic_create(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cfdata)
|
|||
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));
|
||||
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));
|
||||
e_widget_list_object_append(o, ob, 1, 1, 0.5);
|
||||
|
||||
return o;
|
||||
}
|
||||
|
|
|
@ -59,7 +59,8 @@ e_modapi_init(E_Module *m)
|
|||
for (lll = con->zones; lll; lll = lll->next)
|
||||
{
|
||||
zone = lll->data;
|
||||
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
|
||||
{
|
||||
|
@ -67,7 +68,8 @@ e_modapi_init(E_Module *m)
|
|||
|
||||
snprintf(buf, sizeof(buf), "%i",
|
||||
(zone->container->num + zone->num));
|
||||
e_fwin_zone_new(zone, "desktop", buf);
|
||||
if (fileman_config->view.show_desktop_icons)
|
||||
e_fwin_zone_new(zone, "desktop", buf);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -216,6 +218,8 @@ _e_mod_fileman_config_load(void)
|
|||
E_CONFIG_VAL(D, T, view.always_order, UCHAR);
|
||||
E_CONFIG_VAL(D, T, view.link_drop, UCHAR);
|
||||
E_CONFIG_VAL(D, T, view.fit_custom_pos, UCHAR);
|
||||
E_CONFIG_VAL(D, T, view.show_full_path, UCHAR);
|
||||
E_CONFIG_VAL(D, T, view.show_desktop_icons, UCHAR);
|
||||
E_CONFIG_VAL(D, T, icon.icon.w, INT);
|
||||
E_CONFIG_VAL(D, T, icon.icon.h, INT);
|
||||
E_CONFIG_VAL(D, T, icon.list.w, INT);
|
||||
|
@ -238,14 +242,16 @@ _e_mod_fileman_config_load(void)
|
|||
{
|
||||
fileman_config = E_NEW(Config, 1);
|
||||
fileman_config->view.mode = E_FM2_VIEW_MODE_GRID_ICONS;
|
||||
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->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;
|
||||
|
|
|
@ -25,6 +25,8 @@ struct _Config
|
|||
unsigned char always_order;
|
||||
unsigned char link_drop;
|
||||
unsigned char fit_custom_pos;
|
||||
unsigned char show_full_path;
|
||||
unsigned char show_desktop_icons;
|
||||
} view;
|
||||
/* display of icons */
|
||||
struct {
|
||||
|
|
Loading…
Reference in New Issue