Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src
Modified Files:
ephoto.c ephoto.h ephoto_browsing.c
Log Message:
New Layout of the objects in the left paned.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ephoto.c 29 Mar 2006 03:34:26 -0000 1.24
+++ ephoto.c 30 Mar 2006 22:07:12 -0000 1.25
@@ -280,11 +280,10 @@
ewl_widget_show(m->vbox);
m->images = ewl_border_new();
- ewl_border_text_set(EWL_BORDER(m->images), "Select Images For
Slideshow");
+ ewl_border_text_set(EWL_BORDER(m->images), "Add Content");
ewl_border_label_alignment_set(EWL_BORDER(m->images),
EWL_FLAG_ALIGN_CENTER);
ewl_container_child_append(EWL_CONTAINER(m->vbox), m->images);
ewl_object_alignment_set(EWL_OBJECT(m->images),
EWL_FLAG_ALIGN_CENTER);
- ewl_object_size_request(EWL_OBJECT(m->images), 250, 210);
ewl_widget_show(m->images);
m->directory = ewl_entry_new();
@@ -294,11 +293,16 @@
ewl_callback_append(m->directory, EWL_CALLBACK_VALUE_CHANGED,
populatei_cb, NULL);
ewl_widget_show(m->directory);
+ m->dirtree = ewl_tree_new(1);
+ ewl_container_child_append(EWL_CONTAINER(m->images),
m->dirtree);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->dirtree), 200, 160);
+ ewl_widget_show(m->dirtree);
+
m->imagetree = ewl_tree_new(1);
ewl_container_child_append(EWL_CONTAINER(m->images),
m->imagetree);
ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 160);
ewl_widget_show(m->imagetree);
-
+
m->notebook = ewl_notebook_new();
ewl_notebook_tabbar_position_set(EWL_NOTEBOOK(m->notebook),
EWL_POSITION_TOP);
ewl_container_child_append(EWL_CONTAINER(m->hbox), m->notebook);
@@ -347,15 +351,7 @@
ewl_widget_show(m->vbox2);
ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook),
m->vbox2, "Slideshow/Presentation");
-
- m->songs = ewl_vbox_new();
- ewl_container_child_append(EWL_CONTAINER(m->notebook),
m->songs);
- ewl_object_alignment_set(EWL_OBJECT(m->songs),
EWL_FLAG_ALIGN_CENTER);
- ewl_box_spacing_set(EWL_BOX(m->songs), 10);
- ewl_widget_show(m->songs);
-
- ewl_notebook_page_tab_text_set(EWL_NOTEBOOK(m->notebook),
m->songs, "Select/Preview Audio");
-
+
m->content = ewl_border_new();
ewl_border_text_set(EWL_BORDER(m->content), "Content");
ewl_border_label_alignment_set(EWL_BORDER(m->content),
EWL_FLAG_ALIGN_CENTER);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ephoto.h 21 Mar 2006 23:44:15 -0000 1.9
+++ ephoto.h 30 Mar 2006 22:07:12 -0000 1.10
@@ -48,43 +48,45 @@
Ewl_Widget *vbox;
Ewl_Widget *vsep;
Ewl_Widget *vbox2;
- Ewl_Widget *content;
- Ewl_Widget *images;
- Ewl_Widget *songs;
- Ewl_Widget *directory;
- Ewl_Widget *directorya;
- Ewl_Widget *audiotree;
- Ewl_Widget *imagetree;
- Ewl_Widget *image;
- Ewl_Widget *children[2];
- Ewl_Widget *row;
+ Ewl_Widget *content;
+ Ewl_Widget *images;
+ Ewl_Widget *songs;
+ Ewl_Widget *directory;
+ Ewl_Widget *directorya;
+ Ewl_Widget *audiotree;
+ Ewl_Widget *imagetree;
+ Ewl_Widget *image;
+ Ewl_Widget *children[2];
+ Ewl_Widget *row;
Ewl_Widget *ib;
Ewl_Widget *slideshow;
Ewl_Widget *presentation;
- Ewl_Widget *text;
+ Ewl_Widget *text;
Ewl_Widget *slidetime;
- Ewl_Widget *settings;
- Ewl_Widget *wsize;
- Ewl_Widget *hsize;
- Ewl_Widget *atext;
- Ewl_Widget *texta;
- Ewl_Widget *texti;
- Ewl_Widget *rad1;
+ Ewl_Widget *settings;
+ Ewl_Widget *wsize;
+ Ewl_Widget *hsize;
+ Ewl_Widget *atext;
+ Ewl_Widget *texta;
+ Ewl_Widget *texti;
+ Ewl_Widget *rad1;
Ewl_Widget *rad2;
Ewl_Widget *rad3;
Ewl_Widget *rad4;
- Ewl_Widget *rad5;
- Ewl_Widget *fullrad;
- Ewl_Widget *audiolen;
- Ewl_Widget *loopcheck;
- Ewl_Widget *i;
- Ewl_Widget *notebook;
- Ewl_Widget *vimage;
- Ewl_Widget *viewbox;
- Ewl_Widget *vbutton;
- Ewl_Widget *viewscroll;
- Ecore_List *imagelist;
- Ecore_List *presentlist;
+ Ewl_Widget *rad5;
+ Ewl_Widget *fullrad;
+ Ewl_Widget *audiolen;
+ Ewl_Widget *loopcheck;
+ Ewl_Widget *i;
+ Ewl_Widget *notebook;
+ Ewl_Widget *vimage;
+ Ewl_Widget *viewbox;
+ Ewl_Widget *vbutton;
+ Ewl_Widget *viewscroll;
+ Ewl_Widget *dirtree;
+ Ewl_Widget *spacer;
+ Ecore_List *imagelist;
+ Ecore_List *presentlist;
};
struct _Slide
@@ -94,25 +96,25 @@
Ewl_Widget *vboxs;
Ewl_Widget *hboxs;
Ewl_Widget *screen;
- Ewl_Widget *white;
- Ewl_Widget *black;
- Ewl_Widget *text;
- Ewl_Widget *cell;
+ Ewl_Widget *white;
+ Ewl_Widget *black;
+ Ewl_Widget *text;
+ Ewl_Widget *cell;
Ecore_Timer *timer;
};
struct _Present
{
- Ewl_Widget *winp;
- Ewl_Widget *vbox1p;
- Ewl_Widget *vboxp;
- Ewl_Widget *vbox2p;
- Ewl_Widget *imagep;
- Ewl_Widget *hboxp;
- Ewl_Widget *next;
- Ewl_Widget *previous;
- Ewl_Widget *first;
- Ewl_Widget *last;
+ Ewl_Widget *winp;
+ Ewl_Widget *vbox1p;
+ Ewl_Widget *vboxp;
+ Ewl_Widget *vbox2p;
+ Ewl_Widget *imagep;
+ Ewl_Widget *hboxp;
+ Ewl_Widget *next;
+ Ewl_Widget *previous;
+ Ewl_Widget *first;
+ Ewl_Widget *last;
};
extern Main *m;
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/ephoto_browsing.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ephoto_browsing.c 29 Mar 2006 03:34:26 -0000 1.11
+++ ephoto_browsing.c 30 Mar 2006 22:07:12 -0000 1.12
@@ -57,13 +57,26 @@
/*****************************************/
/************Get the tree ready!***********/
-
+
+ ewl_widget_destroy(m->dirtree);
ewl_widget_destroy(m->imagetree);
+ ewl_widget_destroy(m->spacer);
+
+ m->dirtree = ewl_tree_new(1);
+ ewl_container_child_append(EWL_CONTAINER(m->images),
m->dirtree);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->dirtree), 200, 215);
+ ewl_tree_headers_visible_set(EWL_TREE(m->dirtree), 0);
+ ewl_widget_show(m->dirtree);
+
+ m->spacer = ewl_spacer_new();
+ ewl_object_maximum_size_set(EWL_OBJECT(m->spacer), 10, 10);
+ ewl_container_child_append(EWL_CONTAINER(m->images), m->spacer);
+ ewl_widget_show(m->spacer);
m->imagetree = ewl_tree_new(1);
ewl_container_child_append(EWL_CONTAINER(m->images),
m->imagetree);
- ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 425);
- ewl_tree_headers_visible_set(EWL_TREE(m->imagetree), FALSE);
+ ewl_object_maximum_size_set(EWL_OBJECT(m->imagetree), 200, 215);
+ ewl_tree_headers_visible_set(EWL_TREE(m->imagetree), 0);
ewl_widget_show(m->imagetree);
/******************************************/
@@ -91,7 +104,7 @@
m->children[0] = m->hbox;
m->children[1] = NULL;
- m->row = ewl_tree_row_add(EWL_TREE(m->imagetree), NULL,
m->children);
+ m->row = ewl_tree_row_add(EWL_TREE(m->dirtree), NULL,
m->children);
ewl_callback_append(m->texti, EWL_CALLBACK_CLICKED, up_cb,
NULL);
/*****************************************************************/
@@ -133,8 +146,8 @@
}
if ( fnmatch("*.[Ww][Aa][Vv]", pathw, 0) == 0 ) {
- ecore_list_append(audiofiles, strdup(pathw));
- }
+ ecore_list_append(audiofiles, strdup(pathw));
+ }
bname = basename(pathw);
@@ -159,7 +172,7 @@
m->children[0] = m->hbox;
m->children[1] = NULL;
- m->row =
ewl_tree_row_add(EWL_TREE(m->imagetree), NULL, m->children);
+ m->row = ewl_tree_row_add(EWL_TREE(m->dirtree),
NULL, m->children);
ewl_callback_append(m->text,
EWL_CALLBACK_CLICKED, populatei_cb, NULL);
}
}
@@ -183,7 +196,7 @@
m->text = ewl_text_new();
ewl_widget_name_set(m->text, itemp);
ewl_text_text_set(EWL_TEXT(m->text), bname2);
- ewl_object_minimum_size_set(EWL_OBJECT(m->text), 10, 16);
+ ewl_object_minimum_size_set(EWL_OBJECT(m->text), 10,
16);
ewl_object_fill_policy_set(EWL_OBJECT(m->text),
EWL_FLAG_FILL_ALL);
ewl_container_child_append(EWL_CONTAINER(m->hbox),
m->text);
ewl_widget_show(m->text);
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
