Enlightenment CVS committal
Author : titan
Project : e17
Module : proto
Dir : e17/proto/ephoto/src/bin
Modified Files:
ephoto.c ephoto.h ephoto_gui.c
Log Message:
A ton of autofoo work... rework NLS a little bit.
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- ephoto.c 22 Dec 2006 03:33:18 -0000 1.6
+++ ephoto.c 19 Jan 2007 03:20:11 -0000 1.7
@@ -18,7 +18,7 @@
#endif
//ewl_theme_theme_set(PACKAGE_DATA_DIR "/themes/ephoto.edj");
/*Start the GUI*/
- init_gui();
+ create_main_gui();
return 0;
}
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ephoto.h 12 Jan 2007 01:24:34 -0000 1.7
+++ ephoto.h 19 Jan 2007 03:20:11 -0000 1.8
@@ -14,7 +14,7 @@
#include <unistd.h>
/* Main gui callbacks */
-void init_gui(void);
+void create_main_gui(void);
/* Ephoto Browsing */
Ecore_List *get_directories(char *directory);
===================================================================
RCS file: /cvs/e/e17/proto/ephoto/src/bin/ephoto_gui.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- ephoto_gui.c 12 Jan 2007 01:24:34 -0000 1.21
+++ ephoto_gui.c 19 Jan 2007 03:20:11 -0000 1.22
@@ -1,9 +1,5 @@
#include "ephoto.h"
-/*Destroy Boot/Create Main Window*/
-static int destroy_boot(void *data);
-static void create_main_gui(void);
-
/*Ewl Callbacks*/
static void destroy(Ewl_Widget *w, void *event, void *data);
static void populate_files(Ewl_Widget *w, void *event, void *data);
@@ -40,79 +36,6 @@
/*Ephoto Current Directory*/
static char *current_directory;
-/*Destroy Boot Splash*/
-int destroy_boot(void *data)
-{
- Ewl_Widget *win;
- double val, new_val;
-
- val = ewl_range_value_get(EWL_RANGE(progress));
- new_val = val + 20;
- ewl_range_value_set(EWL_RANGE(progress), new_val);
-
- if (new_val == 100)
- {
- win = data;
- ewl_widget_destroy(win);
- ecore_timer_del(timer);
- create_main_gui();
- }
- return 1;
-}
-
-/*Create the Boot Splash and Start its Timer*/
-void init_gui(void)
-{
- Ewl_Widget *win, *vbox, *image, *text;
-
- win = ewl_window_new();
- ewl_window_title_set(EWL_WINDOW(win), "Ephoto!");
- ewl_window_name_set(EWL_WINDOW(win), "Ephoto!");
- ewl_window_override_set(EWL_WINDOW(win), 1);
- ewl_object_size_request(EWL_OBJECT(win), 325, 240);
- ewl_callback_append(win, EWL_CALLBACK_DELETE_WINDOW, destroy, NULL);
- ewl_widget_state_set(win, "splash", EWL_STATE_PERSISTENT);
- ewl_widget_show(win);
-
- vbox = ewl_vbox_new();
- ewl_object_fill_policy_set(EWL_OBJECT(vbox), EWL_FLAG_FILL_ALL);
- ewl_container_child_append(EWL_CONTAINER(win), vbox);
- ewl_widget_show(vbox);
-
- text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), VERSION);
- ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_LEFT);
- ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(vbox), text);
- ewl_widget_show(text);
-
- image = ewl_image_new();
- ewl_image_file_set(EWL_IMAGE(image),
- PACKAGE_DATA_DIR "/images/logo.png", NULL);
- ewl_object_alignment_set(EWL_OBJECT(image), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), image);
- ewl_widget_show(image);
-
- text = ewl_text_new();
- ewl_text_text_set(EWL_TEXT(text), " Ephoto \n"
- "By Stephen Houston");
- ewl_object_alignment_set(EWL_OBJECT(text), EWL_FLAG_ALIGN_CENTER);
- ewl_object_fill_policy_set(EWL_OBJECT(text), EWL_FLAG_FILL_SHRINK);
- ewl_container_child_append(EWL_CONTAINER(vbox), text);
- ewl_widget_show(text);
-
- progress = ewl_progressbar_new();
- ewl_range_value_set(EWL_RANGE(progress), 0);
- ewl_object_alignment_set(EWL_OBJECT(progress), EWL_FLAG_ALIGN_CENTER);
- ewl_container_child_append(EWL_CONTAINER(vbox), progress);
- ewl_object_maximum_size_set(EWL_OBJECT(progress), 200, 20);
- ewl_widget_show(progress);
-
- timer = ecore_timer_add(.2, destroy_boot, win);
-
- ewl_main();
-}
-
/*Destroy the Main Window*/
static void destroy(Ewl_Widget *w, void *event, void *data)
{
@@ -338,7 +261,7 @@
ewl_mvc_data_set(EWL_MVC(ftree), directories);
- ewl_container_reset(EWL_CONTAINER(fbox));
+ //ewl_container_reset(EWL_CONTAINER(fbox));
while (!ecore_list_is_empty(images))
{
imagef = ecore_list_remove_first(images);
@@ -351,8 +274,8 @@
ewl_callback_append(thumb, EWL_CALLBACK_CLICKED, view_image,
imagef);
ewl_widget_show(thumb);
}
- ewl_widget_configure(fbox);
- ewl_widget_configure(fbox->parent);
+ //ewl_widget_configure(fbox);
+ //ewl_widget_configure(fbox->parent);
}
/*Flip the image 180 degrees horizontally*/
@@ -408,7 +331,7 @@
}
/*Create the Main Ephoto Window*/
-static void create_main_gui(void)
+void create_main_gui(void)
{
Ewl_Widget *win, *vbox, *menu_bar, *menu, *paned;
Ewl_Widget *ihbox, *sp;
-------------------------------------------------------------------------
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
