Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
Makefile.am background.c behavior.c layout.c main.c sessions.c
x_settings.c
Log Message:
We're now using our own edje theme file. No more direct etk dependency except
in the backend. Also, make those place holder handlers actually printf by
appending newlines.
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 13 Aug 2006 02:17:14 -0000 1.4
+++ Makefile.am 13 Aug 2006 02:48:19 -0000 1.5
@@ -12,14 +12,11 @@
Egui.h
entrance_edit_gui_CFLAGS = \
- -I$(top_srcdir)/src/widgets \
- @etk_cflags@
+ -I$(top_srcdir)/src/widgets
entrance_edit_gui_LDFLAGS = \
-L$(top_srcdir)/src/widgets
entrance_edit_gui_LDADD = \
-lentrance_widgets \
- -lentrance_edit \
- @etk_libs@
-
+ -lentrance_edit
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- background.c 12 Aug 2006 14:54:42 -0000 1.1
+++ background.c 13 Aug 2006 02:48:19 -0000 1.2
@@ -3,5 +3,5 @@
void
egui_background_dialog_show() {
-printf("Background clicked");
+printf("Background clicked\n");
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/behavior.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- behavior.c 12 Aug 2006 14:54:42 -0000 1.1
+++ behavior.c 13 Aug 2006 02:48:19 -0000 1.2
@@ -3,5 +3,5 @@
void
egui_behavior_dialog_show() {
- printf("Behavior clicked");
+ printf("Behavior clicked\n");
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/layout.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- layout.c 12 Aug 2006 14:54:42 -0000 1.1
+++ layout.c 13 Aug 2006 02:48:19 -0000 1.2
@@ -3,6 +3,6 @@
void
egui_layout_dialog_show() {
- printf("Layout clicked");
+ printf("Layout clicked\n");
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- main.c 12 Aug 2006 15:23:53 -0000 1.3
+++ main.c 13 Aug 2006 02:48:19 -0000 1.4
@@ -1,6 +1,7 @@
#include <Etk.h>
#include <Entrance_Widgets.h>
#include "Egui.h"
+#include "config.h"
static void _main_dialog_show(void);
static void _close_button_cb(void *, void *);
@@ -27,15 +28,15 @@
_main_dialog_show()
{
dialog = ew_dialog_new(_("Entrance Configuration"), EW_TRUE);
- const char* edjefile = etk_theme_icon_theme_get();
+ const char* edjefile = PACKAGE_DATA_DIR"/icons/icons.edj";
Entrance_List tree = ew_edjelist_new("<b>Configuration</b>", 320, 240, 52,
90);
- ew_edjelist_add(tree, _("Theme"), edjefile,
"apps/preferences-desktop-theme_48", NULL, 0, egui_theme_dialog_show);
- ew_edjelist_add(tree, _("Background"), edjefile,
"apps/preferences-desktop-wallpaper_48", NULL, 0, egui_background_dialog_show);
- ew_edjelist_add(tree, _("Layout"), edjefile,
"categories/preferences-desktop_48", NULL, 0, egui_layout_dialog_show);
- ew_edjelist_add(tree, _("Behavior"), edjefile,
"categories/preferences-system_48", NULL, 0, egui_behavior_dialog_show);
- ew_edjelist_add(tree, _("Sessions"),edjefile,
"apps/preferences-system-session_48", NULL, 0, egui_sessions_dialog_show);
- ew_edjelist_add(tree, _("X settings"), edjefile,
"devices/video-display_48",NULL, 0, egui_x_settings_dialog_show);
+ ew_edjelist_add(tree, _("Theme"), edjefile, "icons/main/theme", NULL, 0,
egui_theme_dialog_show);
+ ew_edjelist_add(tree, _("Background"), edjefile, "icons/main/background",
NULL, 0, egui_background_dialog_show);
+ ew_edjelist_add(tree, _("Layout"), edjefile, "icons/main/layout", NULL, 0,
egui_layout_dialog_show);
+ ew_edjelist_add(tree, _("Behavior"), edjefile, "icons/main/behavior", NULL,
0, egui_behavior_dialog_show);
+ ew_edjelist_add(tree, _("Sessions"),edjefile, "icons/main/sessions", NULL,
0, egui_sessions_dialog_show);
+ ew_edjelist_add(tree, _("X settings"), edjefile,
"icons/main/xsettings",NULL, 0, egui_x_settings_dialog_show);
Entrance_Widget group = ew_dialog_group_add(dialog, _("Configuration"));
ew_group_add(group, tree);
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/sessions.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- sessions.c 12 Aug 2006 14:54:42 -0000 1.1
+++ sessions.c 13 Aug 2006 02:48:19 -0000 1.2
@@ -3,6 +3,6 @@
void
egui_sessions_dialog_show() {
- printf("Sessions clicked");
+ printf("Sessions clicked\n");
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/x_settings.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- x_settings.c 12 Aug 2006 14:54:42 -0000 1.1
+++ x_settings.c 13 Aug 2006 02:48:19 -0000 1.2
@@ -3,6 +3,6 @@
void
egui_x_settings_dialog_show() {
- printf("X settings dialog clicked");
+ printf("X settings dialog clicked\n");
}
-------------------------------------------------------------------------
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
