Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mount
Dir : e_modules/mount
Modified Files:
e_mod_main.c
Log Message:
Formatting. Update Labels to use mount point text, not device label (Fixed
HandyAndE :) ). Should now be possible to use enlightenment_remote to set the
theme.
===================================================================
RCS file: /cvsroot/enlightenment/e_modules/mount/e_mod_main.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_mod_main.c 13 Jan 2006 06:38:35 -0000 1.8
+++ e_mod_main.c 14 Jan 2006 10:51:49 -0000 1.9
@@ -51,8 +51,8 @@
"Mount"
};
-EAPI void
-*e_modapi_init(E_Module *m)
+EAPI void *
+e_modapi_init(E_Module *m)
{
Mount *mnt;
@@ -303,11 +303,11 @@
int mounted;
/* Check proc mounts */
- mounted = _parse_file("/proc/mounts", mntpoint);
+ mounted = _parse_file(PROCMOUNTS, mntpoint);
if (mounted <= 0)
{
/* Check mtab */
- mounted = _parse_file("/etc/mtab", mntpoint);
+ mounted = _parse_file(MTAB, mntpoint);
if (mounted <= 0) mounted = 0;
}
return mounted;
@@ -366,8 +366,8 @@
free(mnticon);
}
-static Mount
-*_mount_new(E_Module *m)
+static Mount *
+_mount_new(E_Module *m)
{
Mount *mnt;
Evas_List *managers, *l, *l2;
@@ -489,7 +489,8 @@
o = edje_object_add(mntbox->evas);
mntbox->bar_object = o;
- edje_object_file_set(o, strdup(buffer), "modules/mount/main");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/main"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/main");
evas_object_show(o);
o = evas_object_rectangle_add(mntbox->evas);
@@ -498,14 +499,12 @@
evas_object_repeat_events_set(o, 1);
evas_object_color_set(o, 0, 0, 0, 0);
evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_mount_box_cb_mouse_down, mntbox);
- // evas_object_pass_events_set(o, 0);
evas_object_show(o);
o = e_box_add(mntbox->evas);
mntbox->box_object = o;
evas_object_intercept_move_callback_add(o, _mount_box_cb_intercept_move,
mntbox);
evas_object_intercept_resize_callback_add(o,
_mount_box_cb_intercept_resize, mntbox);
- // evas_object_pass_events_set(o, 0);
e_box_freeze(o);
edje_object_part_swallow(mntbox->bar_object, "items", o);
evas_object_show(o);
@@ -535,7 +534,8 @@
edje_object_part_geometry_get(mntbox->bar_object, "items", &x, &y, &w, &h);
o = edje_object_add(mntbox->evas);
- edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/icon"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
evas_object_resize(o, mntbox->mnt->conf->icon_size,
mntbox->mnt->conf->icon_size);
edje_object_calc_force(o);
edje_object_part_geometry_get(o, "item", &x, &y, &w, &h);
@@ -650,8 +650,8 @@
}
}
-static Mount_Icon
-*_mount_icon_new(Mount_Box *mntbox, Mount_Point *point)
+static Mount_Icon *
+_mount_icon_new(Mount_Box *mntbox, Mount_Point *point)
{
Mount_Icon *mnticon;
Evas_Object *o;
@@ -670,14 +670,16 @@
mnticon->bg_object = o;
evas_object_intercept_move_callback_add(o, _mount_icon_cb_intercept_move,
mnticon);
evas_object_intercept_resize_callback_add(o,
_mount_icon_cb_intercept_resize, mnticon);
- edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/icon"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
evas_object_show(o);
o = edje_object_add(mntbox->evas);
mnticon->icon_object = o;
edje_extern_object_min_size_set(o, mntbox->mnt->conf->icon_size,
mntbox->mnt->conf->icon_size);
evas_object_resize(o, mntbox->mnt->conf->icon_size,
mntbox->mnt->conf->icon_size);
- edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/icon"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
edje_object_signal_callback_add(o, "mouse,down,1", "icon",
_mount_icon_cb_edje_mouse_down, mnticon);
edje_object_part_swallow(mnticon->bg_object, "item", o);
evas_object_show(o);
@@ -691,13 +693,14 @@
o = edje_object_add(mntbox->evas);
mnticon->txt_object = o;
- edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/icon"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
evas_object_show(o);
- char *strip = strrchr(point->device, '/');
+ char *strip = strrchr(point->path, '/');
if (!strip)
{
- strip = point->device;
+ strip = point->path;
}
else
{
@@ -715,7 +718,8 @@
edje_object_message_signal_process(o);
o = edje_object_add(mntbox->evas);
- edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/icon"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
evas_object_resize(o, mntbox->mnt->conf->icon_size,
mntbox->mnt->conf->icon_size);
edje_object_calc_force(o);
edje_object_part_geometry_get(o, "item", &x, &y, &w, &h);
@@ -814,7 +818,8 @@
evas_object_resize(o, mntbox->mnt->conf->icon_size,
mntbox->mnt->conf->icon_size);
o = edje_object_add(mntbox->evas);
- edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
+ if (!e_theme_edje_object_set(o, "base/theme/modules/mount",
"module/mount/icon"))
+ edje_object_file_set(o, strdup(buffer), "modules/mount/icon");
evas_object_resize(o, mntbox->mnt->conf->icon_size,
mntbox->mnt->conf->icon_size);
edje_object_calc_force(o);
edje_object_part_geometry_get(o, "item", &x, &y, &w, &h);
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
