Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_fm.c e_fm.h e_includes.h
Added Files:
e_fm_prop.c e_fm_prop.h
Log Message:
lotys of changes - mayaswell asparagus - and the start of some of my fm
properties dialog work... it sucks - i know.
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -3 -r1.166 -r1.167
--- Makefile.am 30 Nov 2006 16:35:56 -0000 1.166
+++ Makefile.am 4 Dec 2006 12:14:17 -0000 1.167
@@ -179,7 +179,8 @@
e_filereg.h \
e_widget_desk_preview.h \
e_int_config_borders.h \
-e_int_config_desk.h
+e_int_config_desk.h \
+e_fm_prop.h
enlightenment_src = \
e_user.c \
@@ -335,6 +336,7 @@
e_filereg.c \
e_int_config_borders.c \
e_int_config_desk.c \
+e_fm_prop.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_SOURCES = \
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- e_fm.c 27 Nov 2006 12:07:32 -0000 1.115
+++ e_fm.c 4 Dec 2006 12:14:17 -0000 1.116
@@ -287,6 +287,7 @@
static void _e_fm2_file_rename_delete_cb(void *obj);
static void _e_fm2_file_rename_yes_cb(char *text, void *data);
static void _e_fm2_file_rename_no_cb(void *data);
+static void _e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_file_delete(void *data, E_Menu *m, E_Menu_Item *mi);
static void _e_fm2_file_delete_delete_cb(void *obj);
static void _e_fm2_file_delete_yes_cb(void *data, E_Dialog *dialog);
@@ -1634,6 +1635,7 @@
/* create icon */
ic = E_NEW(E_Fm2_Icon, 1);
+ ic->info.fm = sd->obj;
ic->info.file = evas_stringshare_add(file);
ic->sd = sd;
if (!_e_fm2_icon_fill(ic))
@@ -1664,9 +1666,10 @@
ic->info.link = NULL;
ic->info.real_link = NULL;
ic->info.pseudo_dir = NULL;
- ic->info.broken_link = 0;
- ic->info.pseudo_link = 0;
ic->info.mount = 0;
+ ic->info.pseudo_link = 0;
+ ic->info.deleted = 0;
+ ic->info.broken_link = 0;
}
static int
@@ -4616,6 +4619,14 @@
}
}
+ mi = e_menu_item_new(mn);
+ e_menu_item_label_set(mi, _("Properties"));
+ e_menu_item_icon_edje_set(mi,
+ e_theme_edje_file_get("base/theme/fileman",
+
"e/fileman/button/properties"),
+ "e/fileman/button/properties");
+ e_menu_item_callback_set(mi, _e_fm2_file_properties, ic);
+
if (sd->icon_menu.end.func)
{
mi = e_menu_item_new(mn);
@@ -4911,6 +4922,26 @@
ic = data;
ic->entry_dialog = NULL;
+}
+
+static void
+_e_fm2_file_properties(void *data, E_Menu *m, E_Menu_Item *mi)
+{
+ E_Fm2_Icon *ic;
+ E_Manager *man;
+ E_Container *con;
+ char text[PATH_MAX + 256];
+
+ ic = data;
+ if (ic->entry_dialog) return;
+
+ man = e_manager_current_get();
+ if (!man) return;
+ con = e_container_current_get(man);
+ if (!con) return;
+
+ /* FIXME: get and store properties dialog into icon */
+ e_fm_prop_file(con, &(ic->info));
}
static void
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- e_fm.h 27 Nov 2006 12:07:32 -0000 1.33
+++ e_fm.h 4 Dec 2006 12:14:17 -0000 1.34
@@ -89,6 +89,7 @@
struct _E_Fm2_Icon_Info
{
+ Evas_Object *fm;
const char *file;
const char *mime;
const char *label;
===================================================================
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -3 -r1.142 -r1.143
--- e_includes.h 30 Nov 2006 16:35:56 -0000 1.142
+++ e_includes.h 4 Dec 2006 12:14:17 -0000 1.143
@@ -156,4 +156,4 @@
#include "e_widget_desk_preview.h"
#include "e_int_config_borders.h"
#include "e_int_config_desk.h"
-
+#include "e_fm_prop.h"
-------------------------------------------------------------------------
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
