E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: Prefer to have just my name. === RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- AUTHORS 21 Jul 2007 12:35:06 - 1.36 +++ AUTHORS 27 Jul 2007 19:17:07 - 1.37 @@ -13,7 +13,7 @@ Stafford Horne <[EMAIL PROTECTED]> Cedric Bail <[EMAIL PROTECTED]> onefang (David Seikel) <[EMAIL PROTECTED]> -UnixTitan (Stephen Houston) <[EMAIL PROTECTED]> +Stephen Houston <[EMAIL PROTECTED]> Byron Hillis <[EMAIL PROTECTED]> Ravenlock (Eric Schuele) <[EMAIL PROTECTED]> ManoWarrior (Luchezar Petkov) <[EMAIL PROTECTED]> - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: POTFILES.in Log Message: Seems e_int_config_apps.c was removed from e/src/bin but was left in e/po/POTFILES.in causing problems while building. === RCS file: /cvs/e/e17/apps/e/po/POTFILES.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- POTFILES.in 14 Jul 2007 17:09:47 - 1.23 +++ POTFILES.in 25 Jul 2007 06:16:44 - 1.24 @@ -50,7 +50,6 @@ src/bin/e_int_border_menu.c src/bin/e_int_border_prop.c src/bin/e_int_border_remember.c -src/bin/e_int_config_apps.c src/bin/e_int_config_clientlist.c src/bin/e_int_config_desk.c src/bin/e_int_config_desklock.c - This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_modules.c
Log Message:
Make her flow from left to right instead of top to bottom!
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_modules.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- e_int_config_modules.c 17 Apr 2007 04:22:50 - 1.49
+++ e_int_config_modules.c 17 Apr 2007 05:12:25 - 1.50
@@ -251,7 +251,7 @@
_fill_list(cfdata);
e_widget_framelist_object_append(of, ilist);
- e_widget_table_object_append(ot, of, 0, 0, 3, 3, 1, 1, 1, 1);
+ e_widget_table_object_append(ot, of, 0, 0, 1, 2, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Module State"), 0);
mt = e_widget_table_add(evas, 0);
@@ -266,10 +266,10 @@
ob = e_widget_radio_add(evas, _("Disabled"), MOD_UNLOADED, rg);
cfdata->gui.unloaded = ob;
e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(mt, ob, 1, 0, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(mt, ob, 0, 1, 1, 1, 1, 0, 1, 0);
e_widget_framelist_object_append(of, mt);
- e_widget_table_object_append(ot, of, 0, 3, 3, 1, 1, 1, 1, 1);
+ e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Module Actions"), 0);
mt = e_widget_table_add(evas, 0);
@@ -280,13 +280,13 @@
ob = e_widget_button_add(evas, _("About"), NULL, _module_about, cfdata,
NULL);
cfdata->gui.about = ob;
- e_widget_table_object_append(mt, ob, 1, 0, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(mt, ob, 0, 1, 1, 1, 1, 0, 1, 0);
e_widget_disabled_set(cfdata->gui.configure, 1);
e_widget_disabled_set(cfdata->gui.about, 1);
e_widget_framelist_object_append(of, mt);
- e_widget_table_object_append(ot, of, 0, 4, 3, 1, 1, 1, 1, 1);
+ e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 1, 1, 1);
e_widget_list_object_append(o, ot, 1, 1, 0.5);
return o;
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_fonts.c e_int_config_modules.c
Log Message:
Rework the fonts config dialog.. this needed to be done. BAD. Also
shuffled the module dialog around so it looks much better.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_fonts.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_int_config_fonts.c10 Apr 2007 18:42:50 - 1.42
+++ e_int_config_fonts.c17 Apr 2007 04:22:50 - 1.43
@@ -340,23 +340,7 @@
e_widget_min_size_set(ob, w, 250);
e_widget_on_change_hook_set(ob, _ilist_font_cb_change, cfdata);
e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(ot, of, 0, 1, 1, 1, 1, 1, 1, 1);
-
- ott = e_widget_table_add(evas, 0);
- ob = e_widget_check_add(evas, _("Enable Font Class"),
&(cfdata->cur_enabled));
- cfdata->gui.enabled = ob;
- e_widget_on_change_hook_set(ob, _enabled_font_cb_change, cfdata);
- e_widget_disabled_set(ob, 1);
- e_widget_table_object_append(ott, ob, 0, 0, 2, 1, 1, 0, 1, 0);
- ob = e_widget_label_add(evas, _("Font Size:"));
- e_widget_table_object_append(ott, ob, 0, 1, 1, 1, 1, 0, 1, 0);
- ob = e_widget_slider_add(evas, 1, 0, _("%2.1f pixels"), 5.0, 25.0, 0.5, 0,
- &(cfdata->cur_size), NULL, 25);
- cfdata->gui.size = ob;
- e_widget_disabled_set(ob, 1);
- e_widget_on_change_hook_set(ob, _size_cb_change, cfdata);
- e_widget_table_object_append(ott, ob, 1, 1, 2, 1, 1, 0, 1, 0);
- e_widget_table_object_append(ot, ott, 1, 0, 2, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(ot, of, 0, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_framelist_add(evas, _("Fonts"), 1);
ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_font));
@@ -402,7 +386,7 @@
edje_thaw();
evas_event_thaw(evas_object_evas_get(ob));
e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(ot, of, 1, 1, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(ot, of, 1, 0, 1, 1, 1, 0, 1, 0);
of = e_widget_framelist_add(evas, _("Styles"), 1);
ob = e_widget_ilist_add(evas, 16, 16, &(cfdata->cur_style));
@@ -411,8 +395,25 @@
e_widget_ilist_go(ob);
e_widget_min_size_set(ob, 125, 250);
e_widget_framelist_object_append(of, ob);
- e_widget_table_object_append(ot, of, 2, 1, 1, 1, 1, 0, 1, 0);
+ e_widget_table_object_append(ot, of, 2, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_check_add(evas, _("Enable Font Class"),
&(cfdata->cur_enabled));
+ cfdata->gui.enabled = ob;
+ e_widget_on_change_hook_set(ob, _enabled_font_cb_change, cfdata);
+ e_widget_disabled_set(ob, 1);
+ e_widget_table_object_append(ot, ob, 0, 1, 1, 1, 1, 0, 1, 0);
+ ott = e_widget_table_add(evas, 1);
+ ob = e_widget_label_add(evas, _("Font Size:"));
+ e_widget_table_object_append(ott, ob, 0, 0, 1, 1, 1, 0, 1, 0);
+ ob = e_widget_slider_add(evas, 1, 0, _("%2.1f pixels"), 5.0, 25.0, 0.5, 0,
+ &(cfdata->cur_size), NULL, 25);
+ cfdata->gui.size = ob;
+ e_widget_disabled_set(ob, 1);
+ e_widget_on_change_hook_set(ob, _size_cb_change, cfdata);
+ e_widget_table_object_append(ott, ob, 1, 0, 2, 1, 1, 0, 1, 0);
+
+ e_widget_table_object_append(ot, ott, 1, 1, 2, 1, 1, 0, 1, 0);
+
return ot;
}
@@ -477,7 +478,7 @@
static Evas_Object *
_advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas,
E_Config_Dialog_Data *cfdata)
{
- Evas_Object *o, *of, *ob, *ott, *oft;
+ Evas_Object *o, *of, *ob, *ott, *ot;
Evas_List *next;
E_Radio_Group *rg;
int option_enable;
@@ -490,7 +491,8 @@
o = e_widget_list_add(evas, 0, 0);
/* Create Font Class Widgets */
- oft = e_widget_frametable_add(evas, _("Font Class Configuration"), 0);
+ ot = e_widget_table_add(evas, 0);
+ of = e_widget_framelist_add(evas, _("Font Class"), 1);
ob = e_widget_ilist_add(evas, 16, 16, NULL);
cfdata->gui.class_list = ob;
_fill_ilist(cfdata);
@@ -498,25 +500,9 @@
e_widget_min_size_get(ob, &w, NULL);
e_widget_min_size_set(ob, w, 100);
e_widget_on_change_hook_set(ob, _ilist_font_cb_change, cfdata);
- e_widget_frametable_object_append(oft, ob, 0, 0, 1, 5, 1, 1, 1, 1);
-
- ott = e_widget_table_add(evas, 0);
- cfdata->gui.enabled = e_widget_check_add(evas, _("Enable Font Class"),
&(cfdata->cur_enabled));
- e_widget_disabled_set(cfdata->gui.enabled, 1);
- e_widget_table_object_append(ott, cfdata->gui.enabled, 0, 0, 3, 1, 1, 0, 1,
0);
- e_widget_on_change_hook_set(cfdata->gui.enabled, _enabled_font_cb_change,
cfdata);
+ e_widget_framelist_object_append(of, ob);
+ e_widget_table_object_append(ot, of, 0, 0, 1, 5, 1, 1, 1, 1);
- ob = e_widget_label_add(evas, _("Font Size:"));
- e_widget_table_object_append(ott, ob, 0, 1, 1, 1, 1, 0, 1, 0);
-
- cfdata->gui.size = e_widget_slider_add
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_shelf.edc
Log Message:
Lets rename shelf/gold to shelf/alternate. This way when other themes
are used, they can replace these two without having to name one of their
shelf themes shelf/gold. They can name it shelf/alternate! :)
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_shelf.edc,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- default_shelf.edc 8 Apr 2007 09:32:47 - 1.19
+++ default_shelf.edc 15 Apr 2007 17:01:27 - 1.20
@@ -575,7 +575,7 @@
group {
- name: "e/shelf/gold/base";
+ name: "e/shelf/alternate/base";
data {
// this tells e the border is shaped
item: "shaped" "1";
@@ -1028,7 +1028,7 @@
}
}
group {
- name: "e/shelf/gold/inset";
+ name: "e/shelf/alternate/inset";
parts {
part {
name: "background";
@@ -1100,7 +1100,7 @@
}
}
group {
- name: "e/shelf/gold/plain";
+ name: "e/shelf/alternate/plain";
parts {
part {
name: "items_clip";
-
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
___
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: Update my information in the AUTHORS files I am associated with. Lame commit I know. === RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- AUTHORS 11 Nov 2006 21:21:26 - 1.31 +++ AUTHORS 2 Jan 2007 09:32:48 - 1.32 @@ -13,5 +13,5 @@ Stafford Horne <[EMAIL PROTECTED]> Cedric Bail <[EMAIL PROTECTED]> onefang (David Seikel) <[EMAIL PROTECTED]> -LinuxTitan (Stephen Houston) <[EMAIL PROTECTED]> +UnixTitan (Stephen Houston) <[EMAIL PROTECTED]> Byron Hillis <[EMAIL PROTECTED]> - 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
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_preview.edc
Log Message:
Fix up the preview a little bit.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_preview.edc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- default_preview.edc 1 Oct 2006 12:05:33 - 1.4
+++ default_preview.edc 15 Dec 2006 03:28:03 - 1.5
@@ -1,6 +1,6 @@
images {
- image: "e17_ibar_bg_v.png" COMP;
- image: "e17_ibar_over_v.png" COMP;
+ image: "e17_preview_bg.png" COMP;
+ image: "e17_preview_bg_over.png" COMP;
}
group {
@@ -20,7 +20,7 @@
offset: 2 2;
}
image {
- normal: "e17_ibar_bg_v.png";
+ normal: "e17_preview_bg.png";
border: 7 7 7 7;
}
fill {
@@ -65,13 +65,15 @@
state:"default" 0.0;
rel1 {
to: "bg";
+ offset: 2 1;
}
rel2 {
to: "bg";
+ offset: -3 -2;
}
image {
- normal: "e17_ibar_over_v.png";
- border: 13 13 13 13;
+ normal: "e17_preview_bg_over.png";
+ border: 5 5 5 6;
middle: 0;
}
fill {
-
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
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_preview_bg.png e17_preview_bg_over.png Log Message: Fix up the preview a little bit. - 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
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_fsel.c Log Message: Ok. This is a much better way to display the directory :) === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- e_widget_fsel.c 28 Aug 2006 01:46:38 - 1.30 +++ e_widget_fsel.c 28 Aug 2006 01:51:27 - 1.31 @@ -216,6 +216,8 @@ stat(wd->path, &st); if (!S_ISDIR(st.st_mode)) e_widget_entry_text_set(wd->o_entry, ici->file); + else + e_widget_entry_text_set(wd->o_entry, wd->path); evas_list_free(selected); if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj); } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Ok. This is a much better way to display the directory :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- e_widget_fsel.c 27 Aug 2006 16:16:57 - 1.29
+++ e_widget_fsel.c 28 Aug 2006 01:46:38 - 1.30
@@ -28,10 +28,8 @@
Evas_Object *o_favorites_add;
Evas_Object *o_files_frame;
Evas_Object *o_files_fm;
- Evas_Object *o_directory_entry;
Evas_Object *o_entry;
Evas_Coord preview_w, preview_h;
- char *directory_entry_text;
char *entry_text;
char *preview_size_text;
char *preview_owner_text;
@@ -64,7 +62,7 @@
e_fm2_parent_go(wd->o_files_fm);
if (wd->o_files_frame)
e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
- e_widget_entry_text_set(wd->o_directory_entry,
+ e_widget_entry_text_set(wd->o_entry,
e_fm2_real_path_get(wd->o_files_fm));
}
@@ -132,7 +130,7 @@
}
}
done:
- e_widget_entry_text_set(wd->o_directory_entry, realpath);
+ e_widget_entry_text_set(wd->o_entry, realpath);
E_FREE(p1);
evas_list_free(icons);
}
@@ -156,7 +154,7 @@
e_fm2_path_set(wd->o_files_fm, NULL, ici->link);
evas_list_free(selected);
e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
- e_widget_entry_text_set(wd->o_directory_entry,
+ e_widget_entry_text_set(wd->o_entry,
e_fm2_real_path_get(wd->o_files_fm));
}
@@ -181,8 +179,7 @@
if (wd->o_files_frame)
e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
if (stat(wd->path, &st) == 0)
- e_widget_entry_text_set(wd->o_directory_entry, wd->path);
- e_widget_entry_text_set(wd->o_entry, " ");
+ e_widget_entry_text_set(wd->o_entry, wd->path);
E_FREE(wd->path);
if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
}
@@ -195,6 +192,7 @@
E_Fm2_Icon_Info *ici;
const char *realpath;
char buf[4096];
+ struct stat st;
wd = data;
if (!wd->o_files_fm) return;
@@ -214,8 +212,10 @@
}
wd->path = strdup(buf);
if (wd->preview)
- _e_wid_fsel_preview_file(wd);
- e_widget_entry_text_set(wd->o_entry, ici->file);
+ _e_wid_fsel_preview_file(wd);
+ stat(wd->path, &st);
+ if (!S_ISDIR(st.st_mode))
+ e_widget_entry_text_set(wd->o_entry, ici->file);
evas_list_free(selected);
if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
}
@@ -440,10 +440,6 @@
e_widget_min_size_set(o, 128, 128);
e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1);
- o = e_widget_entry_add(evas, &(wd->directory_entry_text));
- wd->o_directory_entry = o;
- e_widget_sub_object_add(obj, o);
-
o = e_widget_entry_add(evas, &(wd->entry_text));
wd->o_entry = o;
e_widget_sub_object_add(obj, o);
@@ -461,12 +457,10 @@
2, 1, 1, 1, 0, 1, 0, 1);
}
- e_widget_table_object_append(wd->o_table, wd->o_directory_entry,
-0, 0, 1, 1, 1, 0, 1, 0);
e_widget_table_object_append(wd->o_table, wd->o_table2,
-0, 1, 1, 1, 1, 1, 1, 1);
+0, 0, 1, 1, 1, 1, 1, 1);
e_widget_table_object_append(wd->o_table, wd->o_entry,
-0, 2, 1, 1, 1, 0, 1, 0);
+0, 1, 1, 1, 1, 0, 1, 0);
e_widget_min_size_get(wd->o_table, &mw, &mh);
e_widget_min_size_set(obj, mw, mh);
@@ -477,7 +471,6 @@
evas_object_show(wd->o_favorites_fm);
evas_object_show(wd->o_files_frame);
evas_object_show(wd->o_files_fm);
- evas_object_show(wd->o_directory_entry);
evas_object_show(wd->o_entry);
if (preview)
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO-- Fsel now displays the current directory. Should we allow the user to browse the fsel using this current directory entry? === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.411 retrieving revision 1.412 diff -u -3 -r1.411 -r1.412 --- TODO27 Aug 2006 06:28:22 - 1.411 +++ TODO27 Aug 2006 16:16:56 - 1.412 @@ -34,7 +34,6 @@ * fm2 .desktop parser needs to handle i18n * fm2 needs a mime filter * fm2 needs to have a mime & filetype -> icon mapping -* fsel needs to display the current dir (for better context) somewhere * eap editor is broken - segv in advanced mode * use .desktop files and move eap editor to edit them etc. etc. instead to fix * if we want to do icons on the desktop - and as part of efm, i am thinking - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
TODO-- Fsel now displays the current directory. Should we allow the user to
browse the fsel using this current directory entry?
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- e_widget_fsel.c 27 Aug 2006 13:41:37 - 1.28
+++ e_widget_fsel.c 27 Aug 2006 16:16:57 - 1.29
@@ -28,8 +28,10 @@
Evas_Object *o_favorites_add;
Evas_Object *o_files_frame;
Evas_Object *o_files_fm;
+ Evas_Object *o_directory_entry;
Evas_Object *o_entry;
Evas_Coord preview_w, preview_h;
+ char *directory_entry_text;
char *entry_text;
char *preview_size_text;
char *preview_owner_text;
@@ -62,6 +64,8 @@
e_fm2_parent_go(wd->o_files_fm);
if (wd->o_files_frame)
e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
+ e_widget_entry_text_set(wd->o_directory_entry,
+ e_fm2_real_path_get(wd->o_files_fm));
}
static void
@@ -128,6 +132,7 @@
}
}
done:
+ e_widget_entry_text_set(wd->o_directory_entry, realpath);
E_FREE(p1);
evas_list_free(icons);
}
@@ -151,12 +156,15 @@
e_fm2_path_set(wd->o_files_fm, NULL, ici->link);
evas_list_free(selected);
e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
+ e_widget_entry_text_set(wd->o_directory_entry,
+ e_fm2_real_path_get(wd->o_files_fm));
}
static void
_e_wid_fsel_files_changed(void *data, Evas_Object *obj, void *event_info)
{
E_Widget_Data *wd;
+ struct stat st;
wd = data;
if (!wd->o_files_fm) return;
@@ -172,9 +180,11 @@
}
if (wd->o_files_frame)
e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0);
+ if (stat(wd->path, &st) == 0)
+ e_widget_entry_text_set(wd->o_directory_entry, wd->path);
+ e_widget_entry_text_set(wd->o_entry, " ");
E_FREE(wd->path);
if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
- e_widget_entry_text_set(wd->o_entry, " ");
}
static void
@@ -430,6 +440,10 @@
e_widget_min_size_set(o, 128, 128);
e_widget_table_object_append(wd->o_table2, o, 1, 1, 1, 1, 1, 1, 1, 1);
+ o = e_widget_entry_add(evas, &(wd->directory_entry_text));
+ wd->o_directory_entry = o;
+ e_widget_sub_object_add(obj, o);
+
o = e_widget_entry_add(evas, &(wd->entry_text));
wd->o_entry = o;
e_widget_sub_object_add(obj, o);
@@ -447,10 +461,12 @@
2, 1, 1, 1, 0, 1, 0, 1);
}
+ e_widget_table_object_append(wd->o_table, wd->o_directory_entry,
+0, 0, 1, 1, 1, 0, 1, 0);
e_widget_table_object_append(wd->o_table, wd->o_table2,
-0, 0, 1, 1, 1, 1, 1, 1);
+0, 1, 1, 1, 1, 1, 1, 1);
e_widget_table_object_append(wd->o_table, wd->o_entry,
-0, 1, 1, 1, 1, 0, 1, 0);
+0, 2, 1, 1, 1, 0, 1, 0);
e_widget_min_size_get(wd->o_table, &mw, &mh);
e_widget_min_size_set(obj, mw, mh);
@@ -461,6 +477,7 @@
evas_object_show(wd->o_favorites_fm);
evas_object_show(wd->o_files_frame);
evas_object_show(wd->o_files_fm);
+ evas_object_show(wd->o_directory_entry);
evas_object_show(wd->o_entry);
if (preview)
{
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
This is more standard way of incrementing
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_widget_fsel.c 27 Aug 2006 06:28:22 - 1.27
+++ e_widget_fsel.c 27 Aug 2006 13:41:37 - 1.28
@@ -85,7 +85,7 @@
snprintf(dest_path, PATH_MAX, "%s/.e/e/fileman/favorites/%s-%d",
getenv("HOME"),
basename(current_path), i);
-i = i+1;
+i++;
}
symlink(current_path, dest_path);
}
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_fsel.c Log Message: TODO-- We now clear the file entry when we enter a new directory in the fsel. === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -3 -r1.26 -r1.27 --- e_widget_fsel.c 27 Aug 2006 06:14:43 - 1.26 +++ e_widget_fsel.c 27 Aug 2006 06:28:22 - 1.27 @@ -174,6 +174,7 @@ e_widget_scrollframe_child_pos_set(wd->o_files_frame, 0, 0); E_FREE(wd->path); if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj); + e_widget_entry_text_set(wd->o_entry, " "); } static void - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO-- We now clear the file entry when we enter a new directory in the fsel. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.410 retrieving revision 1.411 diff -u -3 -r1.410 -r1.411 --- TODO27 Aug 2006 06:13:09 - 1.410 +++ TODO27 Aug 2006 06:28:22 - 1.411 @@ -31,7 +31,6 @@ ESSENTIAL FEATURES --- -* fsel needs to clear the entry when entering a new dir * fm2 .desktop parser needs to handle i18n * fm2 needs a mime filter * fm2 needs to have a mime & filetype -> icon mapping - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO--. Add directory to favorites in fsel is now implemented. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.409 retrieving revision 1.410 diff -u -3 -r1.409 -r1.410 --- TODO27 Aug 2006 04:38:51 - 1.409 +++ TODO27 Aug 2006 06:13:09 - 1.410 @@ -31,8 +31,6 @@ ESSENTIAL FEATURES --- -* fsel needs "add" button for favorites to add whataver directory is selected - if any dir is selected (create symlink) * fsel needs to clear the entry when entering a new dir * fm2 .desktop parser needs to handle i18n * fm2 needs a mime filter - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Now you can add your own locations to the favorites list!
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- e_widget_fsel.c 27 Aug 2006 04:08:22 - 1.24
+++ e_widget_fsel.c 27 Aug 2006 06:10:57 - 1.25
@@ -25,6 +25,7 @@
Evas_Object *o_up_button;
Evas_Object *o_favorites_frame;
Evas_Object *o_favorites_fm;
+ Evas_Object *o_favorites_add;
Evas_Object *o_files_frame;
Evas_Object *o_files_fm;
Evas_Object *o_entry;
@@ -64,6 +65,34 @@
}
static void
+_e_wid_fsel_favorites_add(void *data1, void *data2)
+{
+ E_Widget_Data *wd;
+ const char *current_path;
+ char dest_path[PATH_MAX];
+ struct stat st;
+ int i = 1;
+
+ wd = data1;
+ current_path = e_fm2_real_path_get(wd->o_files_fm);
+ snprintf(dest_path, PATH_MAX, "%s/.e/e/fileman/favorites/%s",
+ getenv("HOME"), basename(current_path));
+ if (stat(dest_path, &st) < 0) symlink(current_path, dest_path);
+ else
+ {
+while(stat(dest_path, &st) == 0)
+ {
+snprintf(dest_path, PATH_MAX, "%s/.e/e/fileman/favorites/%s-%d",
+getenv("HOME"),
+basename(current_path), i);
+i = i+1;
+ }
+ symlink(current_path, dest_path);
+ }
+ e_fm2_refresh(wd->o_favorites_fm);
+}
+
+static void
_e_wid_fsel_favorites_files_changed(void *data, Evas_Object *obj, void
*event_info)
{
E_Widget_Data *wd;
@@ -226,6 +255,12 @@
wd->o_table2 = o;
e_widget_sub_object_add(obj, o);
+ o = e_widget_button_add(evas, _("Add Current to Favorites"),
"widget/add_fav",
+ _e_wid_fsel_favorites_add, wd, NULL);
+ wd->o_favorites_add = o;
+ e_widget_sub_object_add(obj, o);
+ e_widget_table_object_append(wd->o_table2, o, 0, 0, 1, 1, 0, 0, 1, 0);
+
o = e_widget_button_add(evas, _("Go up a Directory"), "widget/up_dir",
_e_wid_fsel_button_up, wd, NULL);
wd->o_up_button = o;
@@ -418,7 +453,8 @@
e_widget_min_size_get(wd->o_table, &mw, &mh);
e_widget_min_size_set(obj, mw, mh);
-
+
+ evas_object_show(wd->o_favorites_add);
evas_object_show(wd->o_up_button);
evas_object_show(wd->o_favorites_frame);
evas_object_show(wd->o_favorites_fm);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c Log Message: Bad titan! Bad Bad Bad titan! No cookie! Fix the seg I left in :) === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- e_eap_editor.c 27 Aug 2006 04:33:07 - 1.43 +++ e_eap_editor.c 27 Aug 2006 05:33:19 - 1.44 @@ -12,6 +12,7 @@ Evas_Object *img; Evas_Object *img_widget; + Evas_Object *fsel; E_Dialog*fsel_dia; int img_set; @@ -157,7 +158,7 @@ if (data->editor->img) evas_object_del(data->editor->img); if (data->editor->img_widget) evas_object_del(data->editor->img_widget); free(data->editor); - if (data->editor->fsel_dia) e_object_del(E_OBJECT(data->editor->fsel_dia)); + if (data->editor->fsel) e_object_del(E_OBJECT(data->editor->fsel_dia)); } free(data); } @@ -432,6 +433,7 @@ _e_eap_edit_select_cb, cfdata, _e_eap_edit_change_cb, cfdata, 1); evas_object_show(o); + editor->fsel = o; e_widget_min_size_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: TODO-- The preview pane is implemented :) === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.408 retrieving revision 1.409 diff -u -3 -r1.408 -r1.409 --- TODO26 Aug 2006 11:06:05 - 1.408 +++ TODO27 Aug 2006 04:38:51 - 1.409 @@ -77,8 +77,6 @@ * bg gradient dialog needs a preview widget. also edje needs to be updated so we can do proper fills for non 0 angles. * wallpaper dialog needs to select an existing wallpaper when the current on e is deleted. (might need to add a hook to e_fm2 for delete events). -* fsel could do with an optional preview pane for selected file (bigger icon, - file info (permissions, modification date etc.) * clientinfo dialog could be nicer - then again it is an obsucre thing. * desklock's pam profile should be configurable as system-auth doesn't always work and the fallback checks might not work either. - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c Log Message: Lets make sure if the editor closes and the fsel is open, the fsel closes too. === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- e_eap_editor.c 27 Aug 2006 03:53:15 - 1.42 +++ e_eap_editor.c 27 Aug 2006 04:33:07 - 1.43 @@ -12,6 +12,7 @@ Evas_Object *img; Evas_Object *img_widget; + E_Dialog*fsel_dia; int img_set; E_Config_Dialog *cfd; @@ -156,6 +157,7 @@ if (data->editor->img) evas_object_del(data->editor->img); if (data->editor->img_widget) evas_object_del(data->editor->img_widget); free(data->editor); + if (data->editor->fsel_dia) e_object_del(E_OBJECT(data->editor->fsel_dia)); } free(data); } @@ -283,7 +285,7 @@ if (editor->img_widget) evas_object_del(editor->img_widget); editor->img_widget = e_widget_button_add(evas, "", NULL, - _e_eap_editor_cb_icon_select, data, NULL); + _e_eap_editor_cb_icon_select, data, editor); e_widget_button_icon_set(editor->img_widget, editor->img); e_widget_min_size_set(editor->img_widget, 48, 48); e_widget_frametable_object_append(o, editor->img_widget, @@ -416,7 +418,9 @@ E_Dialog *dia; Evas_Object *o; Evas_Coord mw, mh; + E_App_Edit *editor; + editor = data2; cfdata = data1; dia = e_dialog_new(cfdata->editor->cfd->con, "E", "_eap_icon_select_dialog"); if (!dia) return; @@ -438,6 +442,7 @@ e_win_centered_set(dia->win, 1); e_dialog_show(dia); e_win_resize(dia->win, 475, 341); + editor->fsel_dia = dia; } static void - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c Log Message: Add preview when selecting icons. === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- e_eap_editor.c 14 Aug 2006 17:48:52 - 1.40 +++ e_eap_editor.c 27 Aug 2006 03:36:33 - 1.41 @@ -426,7 +426,7 @@ o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, _e_eap_edit_select_cb, cfdata, -_e_eap_edit_change_cb, cfdata, 0); +_e_eap_edit_change_cb, cfdata, 1); evas_object_show(o); e_widget_min_size_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); @@ -437,7 +437,7 @@ e_dialog_resizable_set(dia, 1); e_win_centered_set(dia->win, 1); e_dialog_show(dia); - e_win_resize(dia->win, 400, 300); + e_win_resize(dia->win, 475, 341); } static void - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_fsel.c Log Message: This fixes it completely. === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_widget_fsel.c 15 Aug 2006 01:37:00 - 1.13 +++ e_widget_fsel.c 15 Aug 2006 01:43:00 - 1.14 @@ -38,6 +38,7 @@ void *sel_data; void (*chg_func) (void *data, Evas_Object *obj); void *chg_data; + int preview; }; static void _e_wid_fsel_preview_file(E_Widget_Data *wd); @@ -170,7 +171,7 @@ realpath, ici->file); } wd->path = strdup(buf); - if (preview) + if (wd->preview) _e_wid_fsel_preview_file(wd); e_widget_entry_text_set(wd->o_entry, ici->file); evas_list_free(selected); @@ -211,6 +212,7 @@ wd->sel_data = sel_data; wd->chg_func = chg_func; wd->chg_data = chg_data; + wd->preview = preview; o = e_widget_table_add(evas, 0); wd->o_table = o; - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_fsel.c Log Message: Fix the segaroonie === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_widget_fsel.c 14 Aug 2006 17:42:45 - 1.12 +++ e_widget_fsel.c 15 Aug 2006 01:37:00 - 1.13 @@ -170,7 +170,8 @@ realpath, ici->file); } wd->path = strdup(buf); - _e_wid_fsel_preview_file(wd); + if (preview) + _e_wid_fsel_preview_file(wd); e_widget_entry_text_set(wd->o_entry, ici->file); evas_list_free(selected); if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c e_int_config_wallpaper_import.c Log Message: Whoops. Lets not allow these quite yet :) Need to get the packing of the preview working first. === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -3 -r1.39 -r1.40 --- e_eap_editor.c 14 Aug 2006 17:42:45 - 1.39 +++ e_eap_editor.c 14 Aug 2006 17:48:52 - 1.40 @@ -426,7 +426,7 @@ o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, _e_eap_edit_select_cb, cfdata, -_e_eap_edit_change_cb, cfdata, 1); +_e_eap_edit_change_cb, cfdata, 0); evas_object_show(o); e_widget_min_size_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_int_config_wallpaper_import.c 14 Aug 2006 17:42:45 - 1.11 +++ e_int_config_wallpaper_import.c 14 Aug 2006 17:48:52 - 1.12 @@ -138,7 +138,7 @@ } ofm = e_widget_fsel_add(evas, fdev, fpath, NULL, NULL, _import_cb_sel_selected, import, - _import_cb_sel_change, import, 1 + _import_cb_sel_change, import, 0 ); import->fsel_obj = ofm; e_widget_list_object_append(o, ofm, 1, 1, 0.5); - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: AUTHORS Log Message: Authors++ Allow an e_thumb api for e_widget_preview. Fixup the file selector preview to use this new api. === RCS file: /cvs/e/e17/apps/e/AUTHORS,v retrieving revision 1.25 retrieving revision 1.26 diff -u -3 -r1.25 -r1.26 --- AUTHORS 13 Jun 2006 10:20:31 - 1.25 +++ AUTHORS 14 Aug 2006 17:42:45 - 1.26 @@ -12,3 +12,4 @@ ilLogict <[EMAIL PROTECTED]> Stafford Horne <[EMAIL PROTECTED]> Cedric Bail <[EMAIL PROTECTED]> +LinuxTitan (Stephen Houston) <[EMAIL PROTECTED]> - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_int_config_wallpaper_import.c e_widget_fsel.c
e_widget_preview.c e_widget_preview.h
Log Message:
Authors++
Allow an e_thumb api for e_widget_preview.
Fixup the file selector preview to use this new api.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_eap_editor.c 14 Aug 2006 15:22:44 - 1.38
+++ e_eap_editor.c 14 Aug 2006 17:42:45 - 1.39
@@ -426,7 +426,7 @@
o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL,
_e_eap_edit_select_cb, cfdata,
-_e_eap_edit_change_cb, cfdata, 0);
+_e_eap_edit_change_cb, cfdata, 1);
evas_object_show(o);
e_widget_min_size_get(o, &mw, &mh);
e_dialog_content_set(dia, o, mw, mh);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_int_config_wallpaper_import.c 14 Aug 2006 11:08:40 - 1.10
+++ e_int_config_wallpaper_import.c 14 Aug 2006 17:42:45 - 1.11
@@ -138,7 +138,7 @@
}
ofm = e_widget_fsel_add(evas, fdev, fpath, NULL, NULL,
_import_cb_sel_selected, import,
- _import_cb_sel_change, import, 0
+ _import_cb_sel_change, import, 1
);
import->fsel_obj = ofm;
e_widget_list_object_append(o, ofm, 1, 1, 0.5);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_widget_fsel.c 14 Aug 2006 11:08:40 - 1.11
+++ e_widget_fsel.c 14 Aug 2006 17:42:45 - 1.12
@@ -450,6 +450,7 @@
static void
_e_wid_fsel_preview_file(E_Widget_Data *wd)
{
+ Evas_Coord mw = 0, mh = 0;
char *size, *owner, *perms, *time;
struct stat st;
@@ -459,7 +460,16 @@
owner = _e_wid_file_user_get(st.st_uid);
perms = _e_wid_file_perms_get(st.st_mode, st.st_uid, st.st_gid);
time = _e_wid_file_time_get(st.st_mtime);
-
+
+ e_widget_preview_thumb_set(wd->o_preview_preview, wd->path, "background",
120, 120);
+
+ /*e_table_unpack(wd->o_preview_preview);
+ e_table_pack(wd->o_preview_preview_table, wd->o_preview_preview, 0, 0, 1,
1);
+ e_widget_min_size_get(wd->o_preview_preview, &mw, &mh);
+ e_table_pack_options_set(wd->o_preview_preview, 1, 1, 1, 1, 0.5, 0.5, mw,
mh, 9, 9);
+ e_table_min_size_get(wd->o_preview_preview_table, &mw, &mh);
+ e_widget_min_size_set(wd->o_preview_preview_table, mw, mh);*/
+
e_widget_entry_text_set(wd->o_preview_size_entry, size);
e_widget_entry_text_set(wd->o_preview_owner_entry, owner);
e_widget_entry_text_set(wd->o_preview_perms_entry, perms);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_preview.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_preview.c 1 Apr 2006 09:24:56 - 1.2
+++ e_widget_preview.c 14 Aug 2006 17:42:45 - 1.3
@@ -10,7 +10,7 @@
};
static void _e_wid_del_hook(Evas_Object *obj);
-
+static void _e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void
*event_info);
/* local subsystem functions */
/* externally accessible functions */
@@ -56,12 +56,47 @@
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
- if (wd->o_thumb) evas_object_del(wd->o_thumb);
+
+ if (wd->o_thumb)
+ evas_object_del(wd->o_thumb);
+
wd->o_thumb = e_icon_add(e_livethumb_evas_get(wd->img));
e_icon_file_key_set(wd->o_thumb, file, key);
evas_object_show(wd->o_thumb);
e_livethumb_thumb_set(wd->img, wd->o_thumb);
return 1;
+}
+
+EAPI int
+e_widget_preview_thumb_set(Evas_Object *obj, const char *file, const char
*key, int w, int h)
+{
+ E_Widget_Data *wd;
+
+ wd = e_widget_data_get(obj);
+
+ if (wd->img)
+ evas_object_del(wd->img);
+
+ wd->img = e_thumb_icon_add(evas_object_evas_get(obj));
+ e_thumb_icon_file_set(wd->img, file, key);
+ e_thumb_icon_size_set(wd->img, w, h);
+ e_thumb_icon_begin(wd->img);
+ evas_object_smart_callback_add(wd->img, "e_thumb_gen",
_e_wid_preview_thumb_gen, wd);
+
+ edje_object_part_swallow(wd->o_frame, "item", wd->img);
+ evas_object_show(wd->img);
+ return 1;
+}
+
+static void
+_e_wid_preview_thumb_gen(void *data, Evas_Object *obj, void *event_info)
+{
+ Evas_Coord w, h;
+ E_Widget_Data *wd;
+ wd = data;
+
+ e_icon_size_get(wd->img, &w, &h);
+ evas_object_resize(wd->o_frame, w, h);
}
EAPI in
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Formatting
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_widget_fsel.c 13 Aug 2006 06:51:33 - 1.9
+++ e_widget_fsel.c 13 Aug 2006 21:58:55 - 1.10
@@ -385,13 +385,17 @@
if (preview)
{
- e_widget_frametable_object_append(wd->o_preview_frame,
wd->o_preview_preview_table,
-0, 0, 1, 1, 1, 1, 1, 1);
-e_widget_frametable_object_append(wd->o_preview_frame,
wd->o_preview_table,
-0, 1, 1, 1, 1, 1, 1, 1);
-e_widget_table_object_append(wd->o_table2, wd->o_preview_frame,
-2, 1, 1, 1, 1, 1, 1, 1);
+ e_widget_frametable_object_append(wd->o_preview_frame,
+ wd->o_preview_preview_table,
+ 0, 0, 1, 1, 1, 1, 1, 1);
+e_widget_frametable_object_append(wd->o_preview_frame,
+ wd->o_preview_table,
+ 0, 1, 1, 1, 1, 1, 1, 1);
+e_widget_table_object_append(wd->o_table2,
+wd->o_preview_frame,
+ 2, 1, 1, 1, 1, 1, 1, 1);
}
+
e_widget_table_object_append(wd->o_table, wd->o_table2,
0, 0, 1, 1, 1, 1, 1, 1);
e_widget_table_object_append(wd->o_table, wd->o_entry,
@@ -467,15 +471,18 @@
char size[1024];
dsize = (double)st_size;
- if (dsize < 1024) snprintf(size, 1024, "%'.0f B", dsize);
+ if (dsize < 1024)
+ snprintf(size, 1024, "%'.0f B", dsize);
else
{
dsize /= 1024.0;
- if (dsize < 1024) snprintf(size, 1024, "%'.0f KB", dsize);
+ if (dsize < 1024)
+ snprintf(size, 1024, "%'.0f KB", dsize);
else
{
dsize /= 1024.0;
- if (dsize < 1024) snprintf(size, 1024, "%'.0f MB", dsize);
+ if (dsize < 1024)
+ snprintf(size, 1024, "%'.0f MB", dsize);
else
{
dsize /= 1024.0;
@@ -492,12 +499,15 @@
char name[PATH_MAX];
struct passwd *pwd;
- if (getuid() == st_uid) snprintf(name, PATH_MAX, "You");
+ if (getuid() == st_uid)
+ snprintf(name, PATH_MAX, "You");
else
{
pwd = getpwuid(st_uid);
- if (pwd) snprintf(name, PATH_MAX, "%s", pwd->pw_name);
- else snprintf(name, PATH_MAX, "%-8d", (int)st_uid);
+ if (pwd)
+ snprintf(name, PATH_MAX, "%s", pwd->pw_name);
+ else
+ snprintf(name, PATH_MAX, "%-8d", (int)st_uid);
}
return strdup(name);
}
@@ -518,12 +528,17 @@
int other_write = 0;
int i;
- if (getuid() == st_uid) owner = 1;
- if (getgid() == st_gid) group = 1;
+ if (getuid() == st_uid)
+ owner = 1;
+ if (getgid() == st_gid)
+ group = 1;
perm = (char *)malloc(sizeof(char) * 10);
- for (i = 0; i < 9; i++) perm[i] = '-';
+
+ for (i = 0; i < 9; i++)
+ perm[i] = '-';
perm[9] = '\0';
+
if ((S_IRUSR & st_mode) == S_IRUSR)
{
perm[0] = 'r';
@@ -534,7 +549,8 @@
perm[1] = 'w';
user_write = 1;
}
- if ((S_IXUSR & st_mode) == S_IXUSR) perm[2] = 'x';
+ if ((S_IXUSR & st_mode) == S_IXUSR)
+ perm[2] = 'x';
if ((S_IRGRP & st_mode) == S_IRGRP)
{
@@ -546,7 +562,8 @@
perm[4] = 'w';
group_write = 1;
}
- if ((S_IXGRP & st_mode) == S_IXGRP) perm[5] = 'x';
+ if ((S_IXGRP & st_mode) == S_IXGRP)
+ perm[5] = 'x';
if ((S_IROTH & st_mode) == S_IROTH)
{
@@ -558,34 +575,40 @@
perm[6] = 'w';
other_write = 1;
}
- if ((S_IXOTH & st_mode) == S_IXOTH) perm[8] = 'x';
+ if ((S_IXOTH & st_mode) == S_IXOTH)
+ perm[8] = 'x';
if (owner)
{
-if ((!user_read) && (!user_write)) snprintf(perms, PATH_MAX,
- "Protected");
-else if ((user_read) && (!user_write)) snprintf(perms, PATH_MAX,
- "Read Only");
-else if ((user_read) && (user_write)) access = 1;
+if ((!user_read) && (!user_write))
+ snprintf(perms, PATH_MAX, "Protected");
+else if ((user_read) && (!user_write))
+ snprintf(perms, PATH_MAX, "Read Only");
+else if ((user_read) && (user_write))
+ access = 1;
}
else if (group)
{
-if ((!group_read) && (!group_write)) snprintf(perms, PATH_MAX,
-"Forbidden");
-else if ((group_read) && (!group_write)) snprintf(perms, PATH_MAX,
-
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
Fix the Modified time to be logical.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_widget_fsel.c 13 Aug 2006 05:00:16 - 1.8
+++ e_widget_fsel.c 13 Aug 2006 06:51:33 - 1.9
@@ -437,7 +437,7 @@
size = _e_wid_file_size_get(st.st_size);
owner = _e_wid_file_user_get(st.st_uid);
perms = _e_wid_file_perms_get(st.st_mode, st.st_uid, st.st_gid);
- time = _e_wid_file_time_get(st.st_mtime);
+ time = _e_wid_file_time_get(st.st_mtime);
e_widget_entry_text_set(wd->o_preview_size_entry, size);
e_widget_entry_text_set(wd->o_preview_owner_entry, owner);
@@ -591,11 +591,27 @@
static char *
_e_wid_file_time_get(time_t st_modtime)
{
- char *time;
- time = ctime(&st_modtime);
- if (time) time = strdup(time);
- else time = strdup("unknown");
- return time;
+ float diff;
+ time_t ltime;
+ char modtime[PATH_MAX];
+ char *motime;
+
+ ltime = time(NULL);
+ diff = difftime(ltime, st_modtime);
+ if (diff <= 60) snprintf(modtime, PATH_MAX, "Under a minute ago");
+ if (diff > 60) snprintf(modtime, PATH_MAX, "%d minutes ago",
((int)diff/60));
+ if (diff >= 3600) snprintf(modtime, PATH_MAX, "%d hours ago",
((int)diff/3600));
+ if (diff >= 86400) snprintf(modtime, PATH_MAX, "%d days ago",
((int)diff/86400));
+ if (diff >= 604800) snprintf(modtime, PATH_MAX, "%d weeks ago",
+ ((int)diff/604800));
+ if (diff >= 2592000) snprintf(modtime, PATH_MAX, "%d months ago",
+ ((int)diff/2592000));
+ if (diff >= 31526000) snprintf(modtime, PATH_MAX, "%d years ago",
+ ((int)diff/31526000));
+
+ if (modtime) motime = strdup(modtime);
+ else motime = strdup("unknown");
+ return motime;
}
static void
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c
Log Message:
More preview work. It is nearly complete.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_widget_fsel.c 13 Aug 2006 02:49:54 - 1.7
+++ e_widget_fsel.c 13 Aug 2006 05:00:16 - 1.8
@@ -10,13 +10,17 @@
Evas_Object *o_table;
Evas_Object *o_table2;
Evas_Object *o_preview_table;
+ Evas_Object *o_preview_preview_table;
+ Evas_Object *o_preview_frame;
Evas_Object *o_preview_scroll;
- Evas_Object *o_preview_name;
Evas_Object *o_preview_size;
+ Evas_Object *o_preview_size_entry;
Evas_Object *o_preview_owner;
- Evas_Object *o_preview_group;
+ Evas_Object *o_preview_owner_entry;
Evas_Object *o_preview_perms;
+ Evas_Object *o_preview_perms_entry;
Evas_Object *o_preview_time;
+ Evas_Object *o_preview_time_entry;
Evas_Object *o_preview_preview;
Evas_Object *o_up_button;
Evas_Object *o_favorites_frame;
@@ -25,6 +29,10 @@
Evas_Object *o_files_fm;
Evas_Object *o_entry;
char *entry_text;
+ char *preview_size_text;
+ char *preview_owner_text;
+ char *preview_perms_text;
+ char *preview_time_text;
char *path;
void (*sel_func) (void *data, Evas_Object *obj);
void *sel_data;
@@ -35,8 +43,7 @@
static void _e_wid_fsel_preview_file(E_Widget_Data *wd);
static char *_e_wid_file_size_get(off_t st_size);
static char *_e_wid_file_user_get(uid_t st_uid);
-static char *_e_wid_file_group_get(gid_t st_gid);
-static char *_e_wid_file_perms_get(mode_t st_mode, uid_t st_uid);
+static char *_e_wid_file_perms_get(mode_t st_mode, uid_t st_uid, gid_t gid);
static char *_e_wid_file_time_get(time_t st_modtime);
static void _e_wid_del_hook(Evas_Object *obj);
@@ -222,6 +229,82 @@
e_widget_sub_object_add(obj, o);
e_widget_table_object_append(wd->o_table2, o, 1, 0, 1, 1, 0, 0, 1, 0);
+ if (preview)
+ {
+o = e_widget_frametable_add(evas, "Preview", 0);
+wd->o_preview_frame = o;
+e_widget_sub_object_add(obj, o);
+
+o = e_widget_table_add(evas, 0);
+wd->o_preview_preview_table = o;
+e_widget_sub_object_add(obj, o);
+
+o = e_widget_table_add(evas, 0);
+wd->o_preview_table = o;
+e_widget_sub_object_add(obj, o);
+
+o = e_widget_preview_add(evas, 64, 64);
+wd->o_preview_preview = o;
+e_widget_sub_object_add(obj, o);
+e_widget_table_object_append(wd->o_preview_preview_table,
+ wd->o_preview_preview,
+ 0, 0, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_label_add(evas, "Size:");
+wd->o_preview_size = o;
+e_widget_sub_object_add(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_size,
+ 0, 0, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_entry_add(evas, &(wd->preview_size_text));
+wd->o_preview_size_entry = o;
+e_widget_sub_object_add(obj, o);
+e_widget_min_size_set(o, 100, 15);
+e_widget_table_object_append(wd->o_preview_table,
+wd->o_preview_size_entry, 1, 0, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_label_add(evas, "Owner:");
+wd->o_preview_owner = o;
+e_widget_sub_object_add(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_owner,
+ 0, 1, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_entry_add(evas, &(wd->preview_owner_text));
+wd->o_preview_owner_entry = o;
+e_widget_sub_object_add(obj, o);
+e_widget_min_size_set(o, 100, 15);
+e_widget_table_object_append(wd->o_preview_table,
+wd->o_preview_owner_entry, 1, 1, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_label_add(evas, "Permissions:");
+wd->o_preview_perms = o;
+e_widget_sub_object_add(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_perms,
+ 0, 2, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_entry_add(evas, &(wd->preview_perms_text));
+wd->o_preview_perms_entry = o;
+e_widget_sub_object_add(obj, o);
+e_widget_min_size_set(o, 100, 15);
+e_widget_table_object_append(wd->o_preview_table,
+wd->o_preview_perms_entry, 1, 2, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_label_add(evas, "Modified:");
+wd->o_preview_time = o;
+e_widget_sub_object_add(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_time,
+ 0, 3, 1, 1, 1, 1, 1, 1);
+
+o = e_widget_entry_add(evas, &(wd->preview_time_text));
+wd->o_prev
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_eap_editor.c e_int_config_wallpaper_import.c e_test.c e_widget_scrollframe.c Log Message: Get the things that use fsel to keep from breaking with the new preview api. Also a fix or two for the simple scrollframe. === RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- e_eap_editor.c 10 Aug 2006 13:29:59 - 1.36 +++ e_eap_editor.c 13 Aug 2006 02:51:34 - 1.37 @@ -423,7 +423,7 @@ o = e_widget_fsel_add(dia->win->evas, "~/", "/", NULL, NULL, _e_eap_edit_select_cb, cfdata, -_e_eap_edit_change_cb, cfdata); +_e_eap_edit_change_cb, cfdata, 0); evas_object_show(o); e_widget_min_size_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_int_config_wallpaper_import.c 13 Aug 2006 02:40:11 - 1.6 +++ e_int_config_wallpaper_import.c 13 Aug 2006 02:51:34 - 1.7 @@ -131,7 +131,7 @@ ofm = e_widget_fsel_add(evas, "~/", "/", NULL, NULL, _import_cb_sel_change, import, - _import_cb_sel_change, import + _import_cb_sel_change, import, 0 ); import->fsel_obj = ofm; e_widget_list_object_append(o, ofm, 1, 1, 0.5); === RCS file: /cvs/e/e17/apps/e/src/bin/e_test.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- e_test.c29 Jul 2006 09:28:50 - 1.61 +++ e_test.c13 Aug 2006 02:51:34 - 1.62 @@ -780,7 +780,7 @@ o = e_widget_fsel_add(dia->win->evas, "~/", "/tst", NULL, NULL, _e_test_cb_selected, dia, -_e_test_cb_changed, dia); +_e_test_cb_changed, dia, 0); evas_object_show(o); e_widget_min_size_get(o, &mw, &mh); e_dialog_content_set(dia, o, mw, mh); === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_scrollframe.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_widget_scrollframe.c 12 Aug 2006 21:53:26 - 1.4 +++ e_widget_scrollframe.c 13 Aug 2006 02:51:34 - 1.5 @@ -44,7 +44,7 @@ evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE, _e_wid_cb_scrollframe_resize, wd->o_child); - return wd->o_scrollframe; + return obj; } EAPI Evas_Object * - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_fsel.c e_widget_fsel.h
Log Message:
Get preview code into cvs. You will not see it yet.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_fsel.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- e_widget_fsel.c 12 Aug 2006 12:49:52 - 1.6
+++ e_widget_fsel.c 13 Aug 2006 02:49:54 - 1.7
@@ -9,6 +9,15 @@
Evas_Object *obj;
Evas_Object *o_table;
Evas_Object *o_table2;
+ Evas_Object *o_preview_table;
+ Evas_Object *o_preview_scroll;
+ Evas_Object *o_preview_name;
+ Evas_Object *o_preview_size;
+ Evas_Object *o_preview_owner;
+ Evas_Object *o_preview_group;
+ Evas_Object *o_preview_perms;
+ Evas_Object *o_preview_time;
+ Evas_Object *o_preview_preview;
Evas_Object *o_up_button;
Evas_Object *o_favorites_frame;
Evas_Object *o_favorites_fm;
@@ -23,6 +32,12 @@
void *chg_data;
};
+static void _e_wid_fsel_preview_file(E_Widget_Data *wd);
+static char *_e_wid_file_size_get(off_t st_size);
+static char *_e_wid_file_user_get(uid_t st_uid);
+static char *_e_wid_file_group_get(gid_t st_gid);
+static char *_e_wid_file_perms_get(mode_t st_mode, uid_t st_uid);
+static char *_e_wid_file_time_get(time_t st_modtime);
static void _e_wid_del_hook(Evas_Object *obj);
/* local subsystem functions */
@@ -148,6 +163,7 @@
realpath, ici->file);
}
wd->path = strdup(buf);
+ _e_wid_fsel_preview_file(wd);
e_widget_entry_text_set(wd->o_entry, ici->file);
evas_list_free(selected);
if (wd->chg_func) wd->chg_func(wd->chg_data, wd->obj);
@@ -172,7 +188,7 @@
EAPI Evas_Object *
e_widget_fsel_add(Evas *evas, char *dev, char *path, char *selected, char
*filter,
void (*sel_func) (void *data, Evas_Object *obj), void
*sel_data,
- void (*chg_func) (void *data, Evas_Object *obj), void
*chg_data)
+ void (*chg_func) (void *data, Evas_Object *obj), void
*chg_data, int preview)
{
Evas_Object *obj, *o;
E_Widget_Data *wd;
@@ -284,11 +300,66 @@
wd->o_entry = o;
e_widget_sub_object_add(obj, o);
+ if (preview)
+ {
+o = e_widget_table_add(evas, 0);
+wd->o_preview_table = o;
+e_widget_sub_object_add(obj, o);
+e_widget_min_size_set(o, 128, 128);
+e_widget_resize_object_set(obj, o);
+
+o = e_widget_preview_add(evas, 64, 64);
+wd->o_preview_preview = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table,
+wd->o_preview_preview,
+0, 0, 1, 1, 1, 1, 1, 1);
+ o = e_widget_label_add(evas, "Name:");
+wd->o_preview_name = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_name,
+ 0, 1, 1, 1, 1, 1, 1, 1);
+o = e_widget_label_add(evas, "Size:");
+wd->o_preview_size = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_size,
+ 0, 2, 1, 1, 1, 1, 1, 1);
+o = e_widget_label_add(evas, "Owner:");
+wd->o_preview_owner = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_owner,
+ 0, 3, 1, 1, 1, 1, 1, 1);
+o = e_widget_label_add(evas, "Group:");
+wd->o_preview_group = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_group,
+ 0, 4, 1, 1, 1, 1, 1, 1);
+o = e_widget_label_add(evas, "Permissions:");
+wd->o_preview_perms = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_perms,
+ 0, 5, 1, 1, 1, 1, 1, 1);
+o = e_widget_label_add(evas, "Last Modification:");
+wd->o_preview_time = o;
+e_widget_sub_object_add(obj, o);
+e_widget_resize_object_set(obj, o);
+e_widget_table_object_append(wd->o_preview_table, wd->o_preview_time,
+ 0, 6, 1, 1, 1, 1, 1, 1);
+
+e_widget_table_object_append(wd->o_table2, wd->o_preview_table,
+ 2, 1, 1, 1, 1, 1, 1, 1);
+ }
e_widget_table_object_append(wd->o_table, wd->o_table2,
-
E CVS: apps/e titan
Enlightenment CVS committal
Author : titan
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_scrollframe.c e_widget_scrollframe.h
Log Message:
Add a new api for a simple scrollframe that manages pans size on its own.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_scrollframe.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_widget_scrollframe.c 28 Jul 2006 11:36:10 - 1.3
+++ e_widget_scrollframe.c 12 Aug 2006 21:53:26 - 1.4
@@ -12,9 +12,42 @@
static void _e_wid_del_hook(Evas_Object *obj);
static void _e_wid_focus_hook(Evas_Object *obj);
static void _e_wid_focus_steal(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-
+static void _e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj,
+void *event_info);
/* externally accessible functions */
EAPI Evas_Object *
+e_widget_scrollframe_simple_add(Evas *evas, Evas_Object *child)
+{
+ E_Widget_Data *wd;
+ Evas_Object *obj, *o;
+
+ obj = e_widget_add(evas);
+
+ e_widget_del_hook_set(obj, _e_wid_del_hook);
+ e_widget_focus_hook_set(obj, _e_wid_focus_hook);
+ wd = calloc(1, sizeof(wd));
+ e_widget_data_set(obj, wd);
+
+ o = e_scrollframe_add(evas);
+ e_scrollframe_policy_set(o, E_SCROLLFRAME_POLICY_AUTO,
+ E_SCROLLFRAME_POLICY_AUTO);
+ wd->o_scrollframe = o;
+ evas_object_show(o);
+ e_widget_sub_object_add(obj, o);
+ e_widget_resize_object_set(obj, o);
+ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN,
_e_wid_focus_steal, obj);
+
+ e_scrollframe_child_set(wd->o_scrollframe, child);
+ evas_object_show(child);
+ wd->o_child = child;
+ e_widget_sub_object_add(obj, child);
+ evas_object_event_callback_add(wd->o_scrollframe, EVAS_CALLBACK_RESIZE,
+ _e_wid_cb_scrollframe_resize, wd->o_child);
+
+ return wd->o_scrollframe;
+}
+
+EAPI Evas_Object *
e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan, void (*pan_set)
(Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get) (Evas_Object
*obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get) (Evas_Object *obj,
Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get) (Evas_Object *obj,
Evas_Coord *x, Evas_Coord *y))
{
Evas_Object *obj, *o;
@@ -101,3 +134,18 @@
{
e_widget_focus_steal(data);
}
+
+static void
+_e_wid_cb_scrollframe_resize(void *data, Evas *e, Evas_Object *obj, void
*event_info)
+{
+Evas_Coord mw, mh, vw, vh, w, h;
+
+e_scrollframe_child_viewport_size_get(obj, &vw, &vh);
+e_widget_min_size_get(data, &mw, &mh);
+evas_object_geometry_get(data, NULL, NULL, &w, &h);
+if (vw >= mw)
+{
+ if (w != vw) evas_object_resize(data, vw, h);
+}
+}
+
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_scrollframe.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_widget_scrollframe.h 22 Jul 2006 21:48:24 - 1.2
+++ e_widget_scrollframe.h 12 Aug 2006 21:53:26 - 1.3
@@ -7,6 +7,7 @@
#define E_WIDGET_SCROLLFRAME_H
EAPI Evas_Object *e_widget_scrollframe_pan_add(Evas *evas, Evas_Object *pan,
void (*pan_set) (Evas_Object *obj, Evas_Coord x, Evas_Coord y), void (*pan_get)
(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_max_get)
(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y), void (*pan_child_size_get)
(Evas_Object *obj, Evas_Coord *x, Evas_Coord *y));
+EAPI Evas_Object *e_widget_scrollframe_simple_add(Evas *evas, Evas_Object
*child);
EAPI void e_widget_scrollframe_child_pos_set(Evas_Object *obj, Evas_Coord x,
Evas_Coord y);
EAPI void e_widget_scrollframe_child_pos_get(Evas_Object *obj, Evas_Coord *x,
Evas_Coord *y);
EAPI void e_widget_scrollframe_child_region_show(Evas_Object *obj, Evas_Coord
x, Evas_Coord y, Evas_Coord w, Evas_Coord h);
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e titan
Enlightenment CVS committal Author : titan Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_widget_label.c Log Message: Whoops I was resizing wrong. This is the correct resize. === RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_label.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_widget_label.c7 Aug 2006 20:25:34 - 1.5 +++ e_widget_label.c8 Aug 2006 06:21:22 - 1.6 @@ -49,7 +49,7 @@ wd = e_widget_data_get(obj); edje_object_part_text_set(wd->text, "label", text); edje_object_size_min_calc(wd->text, &mw, &mh); - evas_object_resize(wd->text, mw, mh); + edje_extern_object_min_size_set(wd->text, mw, mh); return; } - Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
