Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.h e_fm_prop.c e_utils.c e_utils.h e_widget_fsel.c
Log Message:
working on file properties dialog.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_fm.h 4 Dec 2006 12:14:17 -0000 1.34
+++ e_fm.h 5 Dec 2006 14:28:48 -0000 1.35
@@ -14,6 +14,7 @@
E_FM2_VIEW_MODE_CUSTOM_SMART_GRID_ICONS, /* icons go anywhere u drop them
but try align to icons nearby */
E_FM2_VIEW_MODE_LIST /* vertical fileselector list */
} E_Fm2_View_Mode;
+
typedef enum _E_Fm2_Menu_Flags
{
E_FM2_MENU_NO_REFRESH = (1 << 0),
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_prop.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_fm_prop.c 4 Dec 2006 12:14:17 -0000 1.1
+++ e_fm_prop.c 5 Dec 2006 14:28:48 -0000 1.2
@@ -6,20 +6,20 @@
/* FIXME:
*
* basic -
- * * show file
- * * show size
- * * show modified date
- * * show permissions
- * * show preview
+ * + show file
+ * + show size
+ * + show modified date
+ * + show mimetype
+ * + show permissions (others read, others write)
+ * + show preview
* * show icon
* * show symlink/fifo/socket/etc. status
* * show broken link status
* * change icon for mime type
* * change icon for just this file
- * * change permissions
+ * * change permissions (others read, others write)
*
* advanced (extra) -
- * * change app to open THIS file with
* * show access date
* * show change date
* * show pseudolink status
@@ -29,6 +29,7 @@
* * show mount status
* * show link destination (if symlink or link)
* * change link destination
+ * * change app to open THIS file with (or dir)
*
*/
@@ -46,6 +47,12 @@
{
E_Fm2_Icon_Info *fi;
/*- BASIC -*/
+ char *file;
+ char *size;
+ char *mod_date;
+ char *mime;
+ int others_read;
+ int others_write;
/*- ADVANCED -*/
};
@@ -77,7 +84,15 @@
static void
_fill_data(E_Config_Dialog_Data *cfdata, E_Fm2_Icon_Info *fi)
{
+ char buf[4096];
+
cfdata->fi = fi;
+ if (fi->file) cfdata->file = strdup(fi->file);
+ cfdata->size = e_util_size_string_get(fi->statinfo.st_size);
+ cfdata->mod_date = e_util_file_time_get(fi->statinfo.st_mtime);
+ if (fi->mime) cfdata->mime = strdup(fi->mime);
+ if (fi->statinfo.st_mode & S_IROTH) cfdata->others_read = 1;
+ if (fi->statinfo.st_mode & S_IWOTH) cfdata->others_write = 1;
}
static void *
@@ -98,6 +113,10 @@
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
/* Free the cfdata */
+ E_FREE(cfdata->file);
+ E_FREE(cfdata->size);
+ E_FREE(cfdata->mod_date);
+ E_FREE(cfdata->mime);
free(cfdata);
}
@@ -119,7 +138,7 @@
_basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
*cfdata)
{
/* generate the core widget layout for a basic dialog */
- Evas_Object *o, *ot, *ob;
+ Evas_Object *o, *ot, *ob, *of;
char buf[4096];
snprintf(buf, sizeof(buf), "%s/%s",
@@ -130,18 +149,39 @@
ob = e_widget_label_add(evas, _("File:"));
e_widget_table_object_append(ot, ob, 0, 0, 1, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, NULL);
- e_widget_min_size_set(ob, 80, -1);
+ ob = e_widget_entry_add(evas, &(cfdata->file));
+ e_widget_min_size_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 0, 1, 1, 1, 0, 1, 0);
ob = e_widget_label_add(evas, _("Size:"));
e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_entry_add(evas, NULL);
- e_widget_min_size_set(ob, 80, -1);
+ ob = e_widget_entry_add(evas, &(cfdata->size));
+ e_widget_min_size_set(ob, 140, -1);
e_widget_entry_readonly_set(ob, 1);
e_widget_table_object_append(ot, ob, 1, 1, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_label_add(evas, _("Last Modified:"));
+ e_widget_table_object_append(ot, ob, 0, 2, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &(cfdata->mod_date));
+ e_widget_min_size_set(ob, 140, -1);
+ e_widget_entry_readonly_set(ob, 1);
+ e_widget_table_object_append(ot, ob, 1, 2, 1, 1, 1, 0, 1, 0);
+
+ ob = e_widget_label_add(evas, _("File Type:"));
+ e_widget_table_object_append(ot, ob, 0, 3, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_entry_add(evas, &(cfdata->mime));
+ e_widget_min_size_set(ob, 140, -1);
+ e_widget_entry_readonly_set(ob, 1);
+ e_widget_table_object_append(ot, ob, 1, 3, 1, 1, 1, 0, 1, 0);
+
+ of = e_widget_framelist_add(evas, _("Permissions"), 0);
+ ob = e_widget_check_add(evas, _("Others can read"), &(cfdata->others_read));
+ e_widget_framelist_object_append(of, ob);
+ ob = e_widget_check_add(evas, _("Others can write"),
&(cfdata->others_write));
+ e_widget_framelist_object_append(of, ob);
+ e_widget_table_object_append(ot, of, 0, 4, 2, 1, 1, 0, 1, 0);
+
e_widget_table_object_append(o, ot, 0, 0, 1, 1, 1, 1, 1, 1);
ot = e_widget_table_add(evas, 0);
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_utils.c 1 Oct 2006 18:21:31 -0000 1.53
+++ e_utils.c 5 Dec 2006 14:28:48 -0000 1.54
@@ -716,6 +716,71 @@
return strdup(buf);
}
+EAPI char *
+e_util_size_string_get(off_t size)
+{
+ double dsize;
+ char buf[256];
+
+ dsize = (double)size;
+ if (dsize < 1024.0) snprintf(buf, sizeof(buf), _("%'.0f Bytes"), dsize);
+ else
+ {
+ dsize /= 1024.0;
+ if (dsize < 1024) snprintf(buf, sizeof(buf), _("%'.0f KB"), dsize);
+ else
+ {
+ dsize /= 1024.0;
+ if (dsize < 1024) snprintf(buf, sizeof(buf), _("%'.0f MB"), dsize);
+ else
+ {
+ dsize /= 1024.0;
+ snprintf(buf, sizeof(buf), _("%'.1f GB"), dsize);
+ }
+ }
+ }
+ return strdup(buf);
+}
+
+EAPI char *
+e_util_file_time_get(time_t ftime)
+{
+ time_t diff;
+ time_t ltime;
+ char buf[256];
+ char *s = NULL;
+
+ ltime = time(NULL);
+ diff = ltime - ftime;
+ if (ftime > ltime)
+ {
+ snprintf(buf, sizeof(buf), _("In the Future"));
+ }
+ else
+ {
+ if (diff <= 60)
+ snprintf(buf, sizeof(buf), _("In the last Minute"));
+ else if (diff >= 31526000)
+ snprintf(buf, sizeof(buf), _("%li Years ago"), (diff / 31526000));
+ else if (diff >= 2592000)
+ snprintf(buf, sizeof(buf), _("%li Months ago"), (diff / 2592000));
+ else if (diff >= 604800)
+ snprintf(buf, sizeof(buf), _("%li Weeks ago"), (diff / 604800));
+ else if (diff >= 86400)
+ snprintf(buf, sizeof(buf), _("%li Days ago"), (diff / 86400));
+ else if (diff >= 3600)
+ snprintf(buf, sizeof(buf), _("%li Hours ago"), (diff / 3600));
+ else if (diff > 60)
+ snprintf(buf, sizeof(buf), _("%li Minutes ago"), (diff / 60));
+ }
+
+ if (buf)
+ s = strdup(buf);
+ else
+ s = strdup(_("Unknown"));
+ return s;
+}
+
/* local subsystem functions */
static void
_e_util_container_fake_mouse_up_cb(void *data)
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_utils.h 1 Oct 2006 18:31:19 -0000 1.28
+++ e_utils.h 5 Dec 2006 14:28:48 -0000 1.29
@@ -45,6 +45,8 @@
EAPI const char *e_util_filename_escape(const char *filename);
EAPI int e_util_icon_save(Ecore_X_Icon *icon, const char *filename);
EAPI char *e_util_shell_env_path_eval(char *path);
+EAPI char *e_util_size_string_get(off_t size);
+EAPI char *e_util_file_time_get(time_t ftime);
#endif
#endif
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- e_widget_fsel.c 19 Nov 2006 03:43:18 -0000 1.47
+++ e_widget_fsel.c 5 Dec 2006 14:28:48 -0000 1.48
@@ -603,30 +603,7 @@
static char *
_e_wid_file_size_get(off_t st_size)
{
- double dsize;
- char size[256];
-
- dsize = (double)st_size;
- if (dsize < 1024.0)
- snprintf(size, sizeof(size), _("%'.0f Bytes"), dsize);
- else
- {
- dsize /= 1024.0;
- if (dsize < 1024)
- snprintf(size, sizeof(size), _("%'.0f KB"), dsize);
- else
- {
- dsize /= 1024.0;
- if (dsize < 1024)
- snprintf(size, sizeof(size), _("%'.0f MB"), dsize);
- else
- {
- dsize /= 1024.0;
- snprintf(size, sizeof(size), _("%'.1f GB"), dsize);
- }
- }
- }
- return strdup(size);
+ return e_util_size_string_get(st_size);
}
static char *
@@ -718,40 +695,7 @@
static char *
_e_wid_file_time_get(time_t st_modtime)
{
- time_t diff;
- time_t ltime;
- char modtime[256];
- char *motime;
-
- ltime = time(NULL);
- diff = ltime - st_modtime;
- if (st_modtime > ltime)
- {
- snprintf(modtime, sizeof(modtime), _("In the Future"));
- }
- else
- {
- if (diff <= 60)
- snprintf(modtime, sizeof(modtime), _("In the last Minute"));
- else if (diff >= 31526000)
- snprintf(modtime, sizeof(modtime), _("%li Years ago"), (diff /
31526000));
- else if (diff >= 2592000)
- snprintf(modtime, sizeof(modtime), _("%li Months ago"), (diff /
2592000));
- else if (diff >= 604800)
- snprintf(modtime, sizeof(modtime), _("%li Weeks ago"), (diff /
604800));
- else if (diff >= 86400)
- snprintf(modtime, sizeof(modtime), _("%li Days ago"), (diff / 86400));
- else if (diff >= 3600)
- snprintf(modtime, sizeof(modtime), _("%li Hours ago"), (diff / 3600));
- else if (diff > 60)
- snprintf(modtime, sizeof(modtime), _("%li Minutes ago"), (diff / 60));
- }
-
- if (modtime)
- motime = strdup(modtime);
- else
- motime = strdup(_("Unknown"));
- return motime;
+ return e_util_file_time_get(st_modtime);
}
static void
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
