Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
Makefile.am e_configure.c e_configure.h e_dialog.c
e_includes.h e_int_menus.c e_test.c
Added Files:
e_about.c e_about.h
Log Message:
nice new about box... fully themable. :)
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- Makefile.am 19 Sep 2005 15:25:23 -0000 1.44
+++ Makefile.am 20 Sep 2005 08:34:23 -0000 1.45
@@ -70,7 +70,8 @@
e_win.h \
e_pan.h \
e_dialog.h \
-e_configure.h
+e_configure.h \
+e_about.h
enlightenment_SOURCES = \
e_main.c \
@@ -129,6 +130,7 @@
e_pan.c \
e_dialog.c \
e_configure.c \
+e_about.c \
$(ENLIGHTENMENTHEADERS)
enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@
@cf_libs@
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_configure.c 19 Sep 2005 23:55:44 -0000 1.2
+++ e_configure.c 20 Sep 2005 08:34:23 -0000 1.3
@@ -1,18 +1,5 @@
#include "e.h"
-typedef struct E_Configure
-{
- E_Container *con;
- E_Win *win;
- Evas *evas;
- Evas_Object *edje;
- Evas_Object *box;
- E_App *apps;
- Evas_List *icons;
- Evas_List *app_ref;
-
-} E_Configure;
-
static void _e_configure_gui_show(E_Configure *app);
static void _e_configure_gui_hide(E_Win *win);
static void _e_configure_apps_load(E_Configure *app);
@@ -20,18 +7,14 @@
static void _e_configure_apps_click(void *data, Evas_Object *obj, const char
*emission, const char *source);
-E_Path *path_themes;
-
E_Configure *
e_configure_show(E_Container *con)
{
E_Configure *app;
- app = malloc(sizeof(E_Configure));
-
+ app = calloc(1, sizeof(E_Configure));
app->con = con;
_e_configure_gui_show(app);
-
return app;
}
@@ -122,6 +105,7 @@
Evas_Object *o, *icon;
Evas_Coord w, h;
+ if (!app->apps) return;
e_app_subdir_scan(app->apps, 0);
for (l = app->apps->subapps; l; l = l->next)
{
@@ -172,7 +156,7 @@
app->icons = evas_list_remove(app->icons, icon);
evas_object_free(icon);
}*/
- while(app->app_ref)
+ while (app->app_ref)
{
a = evas_list_data(app->app_ref);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_configure.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_configure.h 19 Sep 2005 15:25:23 -0000 1.1
+++ e_configure.h 20 Sep 2005 08:34:23 -0000 1.2
@@ -1,7 +1,21 @@
#ifdef E_TYPEDEFS
-#ifndef E_WIN_H
-#define E_WIN_H
+typedef struct _E_Configure E_Configure;
+
+#ifndef E_CONFIGURE_H
+#define E_CONFIGURE_H
+
+struct _E_Configure
+{
+ E_Container *con;
+ E_Win *win;
+ Evas *evas;
+ Evas_Object *edje;
+ Evas_Object *box;
+ E_App *apps;
+ Evas_List *icons;
+ Evas_List *app_ref;
+};
E_Configure *e_configure_show(E_Container *con);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_dialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_dialog.c 19 Sep 2005 12:55:59 -0000 1.10
+++ e_dialog.c 20 Sep 2005 08:34:23 -0000 1.11
@@ -19,7 +19,7 @@
static void _e_dialog_free(E_Dialog *dia);
static void _e_dialog_cb_button_clicked(void *data, Evas_Object *obj, const
char *emission, const char *source);
static void _e_dialog_cb_delete(E_Win *win);
-
+
/* local subsystem globals */
/* externally accessible functions */
@@ -47,6 +47,7 @@
free(dia);
return NULL;
}
+ e_win_delete_callback_set(dia->win, _e_dialog_cb_delete);
dia->win->data = dia;
e_win_name_class_set(dia->win, "E", "_dialog");
o = edje_object_add(e_win_evas_get(dia->win));
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- e_includes.h 28 Jul 2005 04:35:44 -0000 1.31
+++ e_includes.h 20 Sep 2005 08:34:23 -0000 1.32
@@ -56,3 +56,5 @@
#include "e_win.h"
#include "e_pan.h"
#include "e_dialog.h"
+#include "e_configure.h"
+#include "e_about.h"
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- e_int_menus.c 19 Sep 2005 23:55:44 -0000 1.93
+++ e_int_menus.c 20 Sep 2005 08:34:23 -0000 1.94
@@ -352,14 +352,10 @@
static void
_e_int_menus_main_about(void *data, E_Menu *m, E_Menu_Item *mi)
{
- e_error_dialog_show(_("About Enlightenment"),
- _("This is Enlightenment %s.\n"
- "Copyright © 1999-2005, by the Enlightenment Dev
Team.\n"
- "\n"
- "We hope you enjoy using this software as much as we
enjoyed writing it.\n\n"
- "Please think of the aardvarks. They need some love
too."),
- VERSION
- );
+ E_About *about;
+
+ about = e_about_new(e_container_current_get(e_manager_current_get()));
+ if (about) e_about_show(about);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_test.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_test.c 19 Sep 2005 10:52:45 -0000 1.16
+++ e_test.c 20 Sep 2005 08:34:23 -0000 1.17
@@ -304,7 +304,7 @@
e_dialog_button_add(dia, "OK", NULL, NULL, NULL);
e_dialog_button_add(dia, "Apply", "enlightenment/reset", NULL, NULL);
e_dialog_button_add(dia, "Cancel", "enlightenment/exit", NULL, NULL);
- e_win_centered_set(dia->win);
+ e_win_centered_set(dia->win, 1);
e_dialog_show(dia);
}
#elif 0
-------------------------------------------------------
SF.Net email is sponsored by:
Tame your development challenges with Apache's Geronimo App Server. Download
it for free - -and be entered to win a 42" plasma tv or your very own
Sony(tm)PSP. Click here to play: http://sourceforge.net/geronimo.php
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
