Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_callbacks.c
Log Message:
TON OF WORK. See example at www.ecoding.org/files/images/ephoto_more_nice.png
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -3 -r1.68 -r1.69
--- ephoto.c 5 Sep 2006 22:28:38 -0000 1.68
+++ ephoto.c 6 Sep 2006 00:48:56 -0000 1.69
@@ -6,6 +6,7 @@
{
FILE *file;
char *home;
+ const char *icon_theme_path;
char ephoto_path[PATH_MAX];
char ephoto_complete[PATH_MAX];
m = NULL;
@@ -41,6 +42,7 @@
ewl_widget_show(m->win);
m->vbox = ewl_vbox_new();
+ ewl_box_spacing_set(EWL_BOX(m->vbox), 1);
ewl_container_child_append(EWL_CONTAINER(m->win), m->vbox);
ewl_object_fill_policy_set(EWL_OBJECT(m->vbox), EWL_FLAG_FILL_ALL);
ewl_widget_show(m->vbox);
@@ -63,6 +65,52 @@
ewl_object_fill_policy_set(EWL_OBJECT(m->menu_item), EWL_FLAG_FILL_ALL);
ewl_widget_show(m->menu_item);
+ m->hseparator = ewl_hseparator_new();
+ ewl_object_alignment_set(EWL_OBJECT(m->hseparator), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox), m->hseparator);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hseparator), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(m->hseparator);
+
+ m->hbox = ewl_hbox_new();
+ ewl_box_spacing_set(EWL_BOX(m->hbox), 5);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox), m->hbox);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hbox), EWL_FLAG_FILL_HFILL |
+ EWL_FLAG_FILL_VSHRINK);
+ ewl_widget_show(m->hbox);
+
+ m->image = ewl_image_new();
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->image);
+ icon_theme_path = ewl_icon_theme_icon_path_get(EWL_ICON_GO_UP,
+ EWL_ICON_SIZE_MEDIUM);
+ ewl_image_file_set(EWL_IMAGE(m->image), icon_theme_path, NULL);
+ //ewl_callback_append(m->image, EWL_CALLBACK_CLICKED, go_up, NULL);
+ ewl_widget_show(m->image);
+
+ m->image = ewl_image_new();
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->image);
+ icon_theme_path = ewl_icon_theme_icon_path_get(EWL_ICON_GO_HOME,
+ EWL_ICON_SIZE_MEDIUM);
+ ewl_image_file_set(EWL_IMAGE(m->image), icon_theme_path, NULL);
+ //ewl_callback_append(m->image, EWL_CALLBACK_CLICKED, go_home, NULL);
+ ewl_widget_show(m->image);
+
+ m->text = ewl_text_new();
+ ewl_text_text_set(EWL_TEXT(m->text), "Location:");
+ ewl_object_alignment_set(EWL_OBJECT(m->text), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->text);
+ ewl_widget_show(m->text);
+
+ m->entry = ewl_entry_new();
+ ewl_text_text_set(EWL_TEXT(m->entry), home);
+ ewl_container_child_append(EWL_CONTAINER(m->hbox), m->entry);
+ ewl_widget_show(m->entry);
+
+ m->hseparator = ewl_hseparator_new();
+ ewl_object_alignment_set(EWL_OBJECT(m->hseparator), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->vbox), m->hseparator);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hseparator), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(m->hseparator);
+
m->hpaned = ewl_hpaned_new();
ewl_object_alignment_set(EWL_OBJECT(m->hpaned), EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(m->vbox), m->hpaned);
@@ -75,13 +123,26 @@
ewl_object_size_request(EWL_OBJECT(m->groups), 30, 250);
ewl_widget_show(m->groups);
+ m->browser = ewl_tree_new(1);
+ ewl_container_child_append(EWL_CONTAINER(m->groups), m->browser);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->browser), EWL_FLAG_FILL_ALL);
+ ewl_tree_headers_visible_set(EWL_TREE(m->browser), 0);
+ ewl_tree_expandable_rows_set(EWL_TREE(m->browser), FALSE);
+ ewl_widget_show(m->browser);
+
+ m->hseparator = ewl_hseparator_new();
+ ewl_object_alignment_set(EWL_OBJECT(m->hseparator), EWL_FLAG_ALIGN_CENTER);
+ ewl_container_child_append(EWL_CONTAINER(m->groups), m->hseparator);
+ ewl_object_fill_policy_set(EWL_OBJECT(m->hseparator), EWL_FLAG_FILL_ALL);
+ ewl_widget_show(m->hseparator);
+
m->albums_border = ewl_border_new();
ewl_border_text_set(EWL_BORDER(m->albums_border), "Albums");
ewl_border_label_alignment_set(EWL_BORDER(m->albums_border),
EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(m->groups), m->albums_border);
ewl_object_alignment_set(EWL_OBJECT(m->albums_border), EWL_FLAG_ALIGN_CENTER);
ewl_object_fill_policy_set(EWL_OBJECT(m->albums_border), EWL_FLAG_FILL_ALL);
- ewl_object_size_request(EWL_OBJECT(m->albums_border), 30, 250);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->albums_border), 999999, 250);
ewl_widget_show(m->albums_border);
m->albums = ewl_tree_new(1);
@@ -89,41 +150,11 @@
ewl_object_fill_policy_set(EWL_OBJECT(m->albums), EWL_FLAG_FILL_ALL);
ewl_tree_headers_visible_set(EWL_TREE(m->albums), 0);
ewl_tree_expandable_rows_set(EWL_TREE(m->albums), FALSE);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->albums), 999999, 250);
ewl_widget_show(m->albums);
-
- m->hseparator = ewl_hseparator_new();
- ewl_object_alignment_set(EWL_OBJECT(m->hseparator), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->groups), m->hseparator);
- ewl_object_fill_policy_set(EWL_OBJECT(m->hseparator), EWL_FLAG_FILL_ALL);
- ewl_widget_show(m->hseparator);
-
- m->browser_border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->browser_border), "Browser");
- ewl_border_label_alignment_set(EWL_BORDER(m->browser_border),
- EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->groups), m->browser_border);
- ewl_object_alignment_set(EWL_OBJECT(m->browser_border),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(m->browser_border), EWL_FLAG_FILL_ALL);
- ewl_object_size_request(EWL_OBJECT(m->browser_border), 30, 250);
- ewl_widget_show(m->browser_border);
- m->browser = ewl_tree_new(1);
- ewl_container_child_append(EWL_CONTAINER(m->browser_border), m->browser);
- ewl_object_fill_policy_set(EWL_OBJECT(m->browser), EWL_FLAG_FILL_ALL);
- ewl_tree_headers_visible_set(EWL_TREE(m->browser), 0);
- ewl_tree_expandable_rows_set(EWL_TREE(m->browser), FALSE);
- ewl_widget_show(m->browser);
-
- m->viewer_border = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->viewer_border), "Viewer");
- ewl_border_label_alignment_set(EWL_BORDER(m->viewer_border),
EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(m->hpaned), m->viewer_border);
- ewl_object_alignment_set(EWL_OBJECT(m->viewer_border), EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(m->viewer_border), EWL_FLAG_FILL_ALL);
- ewl_widget_show(m->viewer_border);
-
m->viewer = ewl_scrollpane_new();
- ewl_container_child_append(EWL_CONTAINER(m->viewer_border), m->viewer);
+ ewl_container_child_append(EWL_CONTAINER(m->hpaned), m->viewer);
ewl_object_fill_policy_set(EWL_OBJECT(m->viewer), EWL_FLAG_FILL_ALL);
ewl_widget_show(m->viewer);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- ephoto.h 5 Sep 2006 23:24:17 -0000 1.33
+++ ephoto.h 6 Sep 2006 00:48:56 -0000 1.34
@@ -35,7 +35,10 @@
Ewl_Widget *viewer;
Ewl_Widget *viewer_border;
Ewl_Widget *viewer_freebox;
+ Ewl_Widget *image;
Ewl_Widget *icon;
+ Ewl_Widget *text;
+ Ewl_Widget *entry;
};
extern Main *m;
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- ephoto_callbacks.c 5 Sep 2006 23:37:17 -0000 1.12
+++ ephoto_callbacks.c 6 Sep 2006 00:48:56 -0000 1.13
@@ -190,11 +190,8 @@
{
image = ecore_list_remove_first(images);
- m->icon = ewl_icon_new();
- ewl_box_orientation_set(EWL_BOX(m->icon), EWL_ORIENTATION_VERTICAL);
- ewl_icon_image_set(EWL_ICON(m->icon), image, NULL);
- //ewl_icon_label_set(EWL_ICON(m->icon), image);
- ewl_icon_constrain_set(EWL_ICON(m->icon), 64);
+ m->icon = ewl_image_thumbnail_new();
+ ewl_image_thumbnail_request(EWL_IMAGE_THUMBNAIL(m->icon), image);
ewl_container_child_append(EWL_CONTAINER(m->viewer_freebox), m->icon);
ewl_widget_show(m->icon);
}
-------------------------------------------------------------------------
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
