Enlightenment CVS committal
Author : essiene
Project : e17
Module : proto
Dir : e17/proto/entrance_edit_gui/src/gui
Modified Files:
Egui.h Makefile.am background.c behavior.c
egui_graphics_dialog.c layout.c x_settings.c
Added Files:
egui_settings_dialog.c egui_settings_dialog.h
Removed Files:
egui_settings.c egui_settings.h
Log Message:
- More filename refactoring in egui land
- More proper object handling in egui land
- Update TODO File
And now...
- Huge Object Corruption Bug FIXED!!! Booyahhh!!! For the record, there wasn't
anything wrong with ecore_list_for_each, I just seem to be pointer challenged :(
- Update e theme namespace changes for background
The above fixes mean the UNcommon man (other devs) can *start* to use
entrance_edit_gui. There is still quite some stuff to be done, but its mostly
downhill from here on. By the end of the week, it should be fit for the
*common* man.
Oh... and I think we need a better name... anyone with ideas? entrance_edit_gui
just kinda rubs me wrong, though it works in cvs/proto
Ok... time to sleep here
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Egui.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- Egui.h 28 Sep 2006 22:09:50 -0000 1.12
+++ Egui.h 29 Sep 2006 02:36:38 -0000 1.13
@@ -4,10 +4,8 @@
#include <Ecore_Data.h>
-#include "egui_settings.h"
#include "egui_graphics_dialog.h"
-
-
+#include "egui_settings_dialog.h"
void egui_theme_dialog_show(void*);
void egui_background_dialog_show(void*);
@@ -16,8 +14,5 @@
void egui_behavior_dialog_show(void*);
void egui_sessions_dialog_show(void*);
void egui_x_settings_dialog_show(void*);
-/*void egui_preview_show(void*);*/
-
-
#endif
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- Makefile.am 28 Sep 2006 22:09:50 -0000 1.14
+++ Makefile.am 29 Sep 2006 02:36:38 -0000 1.15
@@ -11,8 +11,8 @@
x_settings.c \
egui_graphics_dialog.c \
egui_graphics_dialog.h \
- egui_settings.c \
- egui_settings.h \
+ egui_settings_dialog.c \
+ egui_settings_dialog.h \
Egui.h
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/background.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- background.c 28 Sep 2006 22:09:50 -0000 1.11
+++ background.c 29 Sep 2006 02:36:38 -0000 1.12
@@ -12,7 +12,7 @@
Egui_Graphics_Dialog_Settings background_settings = {
"background",
"/usr/share/enlightenment/data/backgrounds",
- "desktop/background",
+ "e/desktop/background",
"Entrance Configuration - Background",
"Backgrounds",
ENTRANCE_EDIT_KEY_CLIENT_BACKGROUND_STR,
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/behavior.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- behavior.c 27 Sep 2006 21:45:47 -0000 1.10
+++ behavior.c 29 Sep 2006 02:36:38 -0000 1.11
@@ -8,102 +8,113 @@
Ecore_List *groups = ecore_list_new();
/* Autologin group */
- Egui_Settings_Group autologin = es_group_new("AutoLogin",
EW_GROUP_VERTICAL);
- Egui_Settings_Item autologin_check = {
+ Egui_Settings_Group autologin = egui_sg_new("AutoLogin",
EW_GROUP_VERTICAL);
+ Egui_Settings_Item autologin_check = egui_si_new(
ew_checkbox_new("Enable Autologin"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_AUTOLOGIN_MODE_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item autologin_entry = {
+ );
+
+ Egui_Settings_Item autologin_entry = egui_si_new(
ew_entry_new("Autologin User", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_AUTOLOGIN_USER_STR,
EGUI_TYPE_STR
- };
+ );
/* Preselect group */
- Egui_Settings_Group preselect = es_group_new("Preselect",
EW_GROUP_VERTICAL);
- Egui_Settings_Item preselect_check = {
+ Egui_Settings_Group preselect = egui_sg_new("Preselect",
EW_GROUP_VERTICAL);
+ Egui_Settings_Item preselect_check = egui_si_new(
ew_checkbox_new("Enable Preselect Mode"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_PRESEL_MODE_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item preselect_entry = {
+ );
+
+ Egui_Settings_Item preselect_entry = egui_si_new(
ew_entry_new("Previous Preselect User", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_PRESEL_PREVUSER_STR,
EGUI_TYPE_STR
- };
+ );
/* Remember group */
- Egui_Settings_Group remember = es_group_new("Remember",
EW_GROUP_VERTICAL);
- Egui_Settings_Item remember_check = {
+ Egui_Settings_Group remember = egui_sg_new("Remember",
EW_GROUP_VERTICAL);
+ Egui_Settings_Item remember_check = egui_si_new(
ew_checkbox_new("Enable User Remember"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_USER_REMEMBER_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item remember_count = {
+ );
+
+ Egui_Settings_Item remember_count = egui_si_new(
ew_entry_new("User Remember Count", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_USER_REMEMBER_N_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item remember_user_count = {
+ );
+
+ Egui_Settings_Item remember_user_count = egui_si_new(
ew_entry_new("User Count", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_USER_COUNT_INT,
EGUI_TYPE_INT
- };
+ );
/* Others group */
- Egui_Settings_Group others = es_group_new("Others", EW_GROUP_VERTICAL);
- Egui_Settings_Item others_auth = {
+ Egui_Settings_Group others = egui_sg_new("Others", EW_GROUP_VERTICAL);
+ Egui_Settings_Item others_auth = egui_si_new(
ew_checkbox_new("Use Authentication"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_AUTH_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item others_engine = {
+ );
+
+ Egui_Settings_Item others_engine = egui_si_new(
ew_checkbox_new("Use OpenGL Engine"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_ENGINE_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item others_reboot = {
+ );
+
+ Egui_Settings_Item others_reboot = egui_si_new(
ew_checkbox_new("Show Reboot Button"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_SYSTEM_REBOOT_INT,
EGUI_TYPE_INT
- };
- Egui_Settings_Item others_halt = {
+ );
+
+ Egui_Settings_Item others_halt = egui_si_new(
ew_checkbox_new("Show Halt Button"),
EGUI_TYPE_CHECKBOX,
ENTRANCE_EDIT_KEY_CLIENT_SYSTEM_HALT_INT,
EGUI_TYPE_INT
- };
+ );
/* init */
- es_group_append(autologin, &autologin_check);
- es_group_append(autologin, &autologin_entry);
+ egui_sg_item_append(autologin, autologin_check);
+ egui_sg_item_append(autologin, autologin_entry);
ecore_list_append(groups, autologin);
- es_group_append(preselect, &preselect_check);
- es_group_append(preselect, &preselect_entry);
+ egui_sg_item_append(preselect, preselect_check);
+ egui_sg_item_append(preselect, preselect_entry);
ecore_list_append(groups, preselect);
- es_group_append(remember, &remember_check);
- es_group_append(remember, &remember_count);
- es_group_append(remember, &remember_user_count);
+ egui_sg_item_append(remember, remember_check);
+ egui_sg_item_append(remember, remember_count);
+ egui_sg_item_append(remember, remember_user_count);
ecore_list_append(groups, remember);
- es_group_append(others, &others_auth);
- es_group_append(others, &others_engine);
- es_group_append(others, &others_reboot);
- es_group_append(others, &others_halt);
+ egui_sg_item_append(others, others_auth);
+ egui_sg_item_append(others, others_engine);
+ egui_sg_item_append(others, others_reboot);
+ egui_sg_item_append(others, others_halt);
ecore_list_append(groups, others);
/* show */
- es_dialog_show("Behaviour", groups);
+ static Egui_Settings_Dialog esd = NULL;
+ if(!esd)
+ esd = egui_sd_new("Behaviour", groups);
+
+ egui_sd_show(esd);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/egui_graphics_dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- egui_graphics_dialog.c 28 Sep 2006 22:09:50 -0000 1.1
+++ egui_graphics_dialog.c 29 Sep 2006 02:36:38 -0000 1.2
@@ -134,6 +134,7 @@
_gd_cb_close(void *object, void *data)
{
_gd_close(data);
+ /*TODO: neccessary?*/
data = NULL;
}
@@ -256,6 +257,5 @@
free(file);
/*FIXME: selecting the first row doesn't work - maybe we select first row
while adding elements to the list:(*/
/*ew_list_first_row_select(list_thumbs);*/
-
- return;
}
+
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/layout.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- layout.c 27 Sep 2006 21:45:47 -0000 1.9
+++ layout.c 29 Sep 2006 02:36:38 -0000 1.10
@@ -7,47 +7,51 @@
egui_layout_dialog_show(void *data)
{
- Egui_Settings_Group group_greeting = es_group_new("Greetings",
EW_GROUP_VERTICAL);
+ Egui_Settings_Group group_greeting = egui_sg_new("Greetings",
EW_GROUP_VERTICAL);
- Egui_Settings_Item before = {
+ Egui_Settings_Item before = egui_si_new(
ew_entry_new("Before", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_GREETING_BEFORE_STR,
EGUI_TYPE_STR
- };
+ );
- Egui_Settings_Item after = {
+ Egui_Settings_Item after = egui_si_new(
ew_entry_new("After", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_GREETING_AFTER_STR,
EGUI_TYPE_STR
- };
+ );
- es_group_append(group_greeting, &before);
- es_group_append(group_greeting, &after);
+ egui_sg_item_append(group_greeting, before);
+ egui_sg_item_append(group_greeting, after);
- Egui_Settings_Group group_format = es_group_new("Time/Date Format",
EW_GROUP_VERTICAL);
+ Egui_Settings_Group group_format = egui_sg_new("Time/Date Format",
EW_GROUP_VERTICAL);
- Egui_Settings_Item time_format = {
+ Egui_Settings_Item time_format = egui_si_new(
ew_entry_new("Time format", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_TIME_FORMAT_STR,
EGUI_TYPE_STR
- };
+ );
- Egui_Settings_Item date_format = {
+ Egui_Settings_Item date_format = egui_si_new(
ew_entry_new("Data format", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_TIME_FORMAT_STR,
EGUI_TYPE_STR
- };
+ );
- es_group_append(group_format, &time_format);
- es_group_append(group_format, &date_format);
+ egui_sg_item_append(group_format, time_format);
+ egui_sg_item_append(group_format, date_format);
Ecore_List *groups = ecore_list_new();
ecore_list_append(groups, group_greeting);
ecore_list_append(groups, group_format);
- es_dialog_show("Layout settings", groups);
+ static Egui_Settings_Dialog esd = NULL;
+ if(!esd)
+ esd = egui_sd_new("Layout settings", groups);
+
+ egui_sd_show(esd);
}
===================================================================
RCS file: /cvs/e/e17/proto/entrance_edit_gui/src/gui/x_settings.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- x_settings.c 27 Sep 2006 21:45:47 -0000 1.7
+++ x_settings.c 29 Sep 2006 02:36:38 -0000 1.8
@@ -10,38 +10,34 @@
void
egui_x_settings_dialog_show(void *data)
{
- egui_init();
-
- Egui_Settings_Group group_daemon = es_group_new("Daemon Settings",
EW_GROUP_VERTICAL);
-
- Egui_Settings_Item item_attempts = {
+ Egui_Settings_Group group_daemon = egui_sg_new("Daemon Settings",
EW_GROUP_VERTICAL);
+ Egui_Settings_Item item_attempts = egui_si_new(
ew_entry_new("X Attempts", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_DAEMON_ATTEMPTS_INT,
EGUI_TYPE_INT
- };
+ );
- Egui_Settings_Item item_xserver = {
+ Egui_Settings_Item item_xserver = egui_si_new(
ew_entry_new("X Commandline", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_DAEMON_XSERVER_STR,
EGUI_TYPE_STR
- };
+ );
- es_group_append(group_daemon, &item_attempts);
- es_group_append(group_daemon, &item_xserver);
+ egui_sg_item_append(group_daemon, item_attempts);
+ egui_sg_item_append(group_daemon, item_xserver);
- Egui_Settings_Group group_client = es_group_new("Client Settings",
EW_GROUP_VERTICAL);
-
- Egui_Settings_Item item_xsession = {
+ Egui_Settings_Group group_client = egui_sg_new("Client Settings",
EW_GROUP_VERTICAL);
+ Egui_Settings_Item item_xsession = egui_si_new(
ew_entry_new("X Session", NULL, EW_FALSE),
EGUI_TYPE_ENTRY,
ENTRANCE_EDIT_KEY_CLIENT_XSESSION_STR,
EGUI_TYPE_STR
- };
+ );
- es_group_append(group_client, &item_xsession);
+ egui_sg_item_append(group_client, item_xsession);
Ecore_List *groups = ecore_list_new();
if(groups)
@@ -49,6 +45,10 @@
ecore_list_append(groups, group_daemon);
ecore_list_append(groups, group_client);
- es_dialog_show("X Settings", groups);
+ static Egui_Settings_Dialog esd = NULL;
+ if(!esd)
+ esd = egui_sd_new("X Settings", groups);
+
+ egui_sd_show(esd);
}
}
-------------------------------------------------------------------------
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
