E CVS: pfritz pfritz
Enlightenment CVS committal Author : pfritz Project : devs Module : pfritz Dir : devs/pfritz Modified Files: info.txt Log Message: update my info === RCS file: /cvs/e/devs/pfritz/info.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- info.txt19 May 2006 16:49:38 - 1.1 +++ info.txt27 Mar 2007 07:34:12 - 1.2 @@ -4,4 +4,4 @@ Location: Nuremberg, Germany E-Mail: [EMAIL PROTECTED] WWW: -Managing: +Managing: EWL - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: www raster
Enlightenment CVS committal
Author : raster
Project : web
Module : www
Dir : web/www
Modified Files:
style.css
Log Message:
up the font em.
===
RCS file: /cvs/e/web/www/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- style.css 25 Mar 2007 06:23:25 - 1.3
+++ style.css 27 Mar 2007 12:21:06 - 1.4
@@ -24,7 +24,7 @@
vertical-align : top;
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
color : #44;
- font-size : 0.7em;
+ font-size : 0.9em;
}
div.bod {
@@ -54,31 +54,31 @@
h1 {
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
color : #00;
- font-size : 1.3em;
+ font-size : 1.5em;
}
h2 {
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
color : #00;
- font-size : 1.1em;
+ font-size : 1.3em;
}
h3 {
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
color : #00;
- font-size : 0.9em;
+ font-size : 1.1em;
}
p {
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
color : #44;
- font-size : 0.7em;
+ font-size : 0.9em;
}
p.tiny {
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
color : #88;
- font-size : 0.5em;
+ font-size : 0.7em;
}
a:link {
@@ -114,7 +114,7 @@
pre {
font-family: Bitstream Vera Mono, Vera Mono, Trebuchet MS
Mono, Trebuchet Mono, Tahoma Mono, mono;
color : #00;
- font-size : 1em;
+ font-size : 0.9em;
border : 1px dotted #ee;
text-align : left;
vertical-align : middle;
@@ -125,7 +125,7 @@
blockquote {
color : #00;
font-family: Bitstream Vera, Vera, Trebuchet MS,
Trebuchet, Tahoma, sans-serif;
- font-size : 1em;
+ font-size : 0.9em;
}
td.lnav {
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet dj2
Enlightenment CVS committal
Author : dj2
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_icon.c
Log Message:
- unused
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_icon.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- efreet_icon.c 26 Mar 2007 22:28:28 - 1.5
+++ efreet_icon.c 27 Mar 2007 16:54:54 - 1.6
@@ -381,7 +381,6 @@
{
char cache_key[PATH_MAX];
const char *key;
-Efreet_Icon *value;
snprintf(cache_key, sizeof(cache_key), [EMAIL PROTECTED], icon_name,
real_size, real_size);
key = ecore_string_instance(cache_key);
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_file Modified Files: ecore_file_monitor_inotify.c Log Message: TODO === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- ecore_file_monitor_inotify.c27 Mar 2007 05:36:29 - 1.15 +++ ecore_file_monitor_inotify.c27 Mar 2007 18:15:16 - 1.16 @@ -6,9 +6,10 @@ /* * TODO: * - * * Listen to these events: + * - Listen to these events: * IN_ACCESS, IN_ATTRIB, IN_CLOSE_WRITE, IN_CLOSE_NOWRITE, IN_OPEN - * + * - Read all events first, then call the callbacks. This will prevent several + * callbacks with the typic save cycle (delete file, new file) */ #ifdef HAVE_INOTIFY - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal
Author : pfritz
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_combo.c
Log Message:
- support different views for the expandable
- do some security checks
===
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_combo.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- ewl_combo.c 26 Mar 2007 18:41:40 - 1.52
+++ ewl_combo.c 27 Mar 2007 19:34:43 - 1.53
@@ -11,10 +11,10 @@
#include ewl_private.h
static void ewl_combo_cb_selected_change(Ewl_MVC *mvc);
-Ewl_Widget *ewl_combo_submenu_new(Ewl_Combo *c, Ewl_Model *model,
- void *mvc_data);
+Ewl_Widget *ewl_combo_submenu_new(Ewl_Combo *c, Ewl_Model *model,
+ Ewl_View *view, void *mvc_data);
static void ewl_combo_popup_fill(Ewl_Combo *combo, Ewl_Container *c,
- Ewl_Model *model, void *mvc_data);
+ Ewl_Model *model, Ewl_View *view, void *mvc_data);
/**
* @return Returns a pointer to a new combo on success, NULL on failure.
@@ -212,8 +212,7 @@
DCHECK_PARAM_PTR(combo, combo);
DCHECK_TYPE(combo, combo, EWL_COMBO_TYPE);
- if (combo-scrollable)
- combo-scrollable = FALSE;
+ combo-scrollable = FALSE;
ewl_context_menu_container_set(EWL_CONTEXT_MENU(combo-popup), c);
@@ -245,13 +244,11 @@
view = ewl_mvc_view_get(EWL_MVC(combo));
mvc_data = ewl_mvc_data_get(EWL_MVC(combo));
- /* nothing to do if we have no model/view or data */
+ /* nothing to do if we have no model or view
+* Note that mvc_data == NULL is legal */
if (!model || !view)
DRETURN(DLEVEL_STABLE);
- /* XXX put checks to make sure all the needed module and view
-* function callbacks are setup */
-
ewl_widget_show(combo-popup);
ewl_window_raise(EWL_WINDOW(combo-popup));
ewl_widget_focus_send(EWL_WIDGET(combo-popup));
@@ -263,7 +260,7 @@
DRETURN(DLEVEL_STABLE);
ewl_container_reset(EWL_CONTAINER(combo-popup));
- ewl_combo_popup_fill(combo, EWL_CONTAINER(combo-popup), model,
+ ewl_combo_popup_fill(combo, EWL_CONTAINER(combo-popup), model, view,
mvc_data);
ewl_mvc_dirty_set(EWL_MVC(combo), FALSE);
@@ -361,16 +358,14 @@
* @brief Callback for when the button to expand the combo is pressed
*/
Ewl_Widget *
-ewl_combo_submenu_new(Ewl_Combo *combo, Ewl_Model *model, void *mvc_data)
+ewl_combo_submenu_new(Ewl_Combo *combo, Ewl_Model *model, Ewl_View *view,
+ void *mvc_data)
{
Ewl_Widget *menu;
- Ewl_View *view;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR_RET(combo, combo, NULL);
- view = ewl_mvc_view_get(EWL_MVC(combo));
-
menu = ewl_menu_new();
ewl_widget_appearance_set(EWL_MENU(menu)-popup, EWL_COMBO_TYPE
/EWL_POPUP_TYPE);
@@ -380,7 +375,8 @@
if (!model || !view)
DRETURN_PTR(NULL, DLEVEL_STABLE);
- ewl_combo_popup_fill(combo, EWL_CONTAINER(menu), model, mvc_data);
+ ewl_combo_popup_fill(combo, EWL_CONTAINER(menu), model, view,
+ mvc_data);
ewl_button_label_set(EWL_BUTTON(menu), NULL);
ewl_button_image_set(EWL_BUTTON(menu), NULL, NULL);
@@ -401,19 +397,18 @@
* @brief fill the given container with the items
*/
static void
-ewl_combo_popup_fill(Ewl_Combo *combo, Ewl_Container *c, Ewl_Model *model,
void *mvc_data)
+ewl_combo_popup_fill(Ewl_Combo *combo, Ewl_Container *c, Ewl_Model *model,
+ Ewl_View *view, void *mvc_data)
{
- Ewl_View *view;
int count;
int i;
DENTER_FUNCTION(DLEVEL_STABLE);
DCHECK_PARAM_PTR(combo, combo);
- view = ewl_mvc_view_get(EWL_MVC(combo));
+ if (!model-count)
+ DRETURN(DLEVEL_STABLE);
- /* XXX put checks to make sure all the needed module and view
-* function callbacks are setup */
count = model-count(mvc_data);
for (i = 0; i count; i++)
{
@@ -422,11 +417,28 @@
if (model-expansion.is model-expansion.is(mvc_data, i))
{
Ewl_Model *em;
- void *data;
+ Ewl_View *ev;
+ void *ed;
+
+ /* if there shouldn't be a model for the expansion
+* we us the current model */
+ if (!model-expansion.model
+ || !(em = model-expansion.model(mvc_data, i)))
+ em = model;
+ /* if there shouldm't be a view for the expansion
+
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/src/lib Modified Files: ewl_scrollpane.c Log Message: formatting === RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_scrollpane.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -3 -r1.21 -r1.22 --- ewl_scrollpane.c6 Feb 2007 13:42:17 - 1.21 +++ ewl_scrollpane.c27 Mar 2007 19:38:18 - 1.22 @@ -401,7 +401,6 @@ ewl_widget_hide(s-vscrollbar); } - /* * Adjust the step and width dependant on scrollbar visibility. */ - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_desktop.c
Log Message:
Don't reallocate the Efreet_Desktop on re-read
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- efreet_desktop.c26 Mar 2007 16:17:40 - 1.9
+++ efreet_desktop.c27 Mar 2007 19:41:23 - 1.10
@@ -46,6 +46,8 @@
};
static Efreet_Desktop *efreet_desktop_new(const char *file);
+static int efreet_desktop_read(Efreet_Desktop *desktop);
+static void efreet_desktop_clear(Efreet_Desktop *desktop);
static Efreet_Desktop_Type_Info *efreet_desktop_type_parse(const char
*type_str);
static Ecore_List *efreet_desktop_string_list_parse(const char *string);
static char *efreet_desktop_string_list_join(Ecore_List *list);
@@ -193,6 +195,10 @@
if (efreet_desktop_cache_check(desktop))
return desktop;
+efreet_desktop_clear(desktop);
+if (efreet_desktop_read(desktop))
+return desktop;
+
ecore_hash_remove(efreet_desktop_cache, file);
efreet_desktop_free(desktop);
}
@@ -235,9 +241,6 @@
efreet_desktop_new(const char *file)
{
Efreet_Desktop *desktop;
-Efreet_Ini *ini;
-int error = 0;
-int ok;
desktop = NEW(Efreet_Desktop, 1);
if (!desktop) return NULL;
@@ -245,13 +248,32 @@
desktop-orig_path = strdup(file);
desktop-load_time = ecore_time_get();
-ini = efreet_ini_new(file);
+if (!efreet_desktop_read(desktop))
+{
+efreet_desktop_free(desktop);
+return NULL;
+}
+return desktop;
+}
+
+/**
+ * @internal
+ * @param desktop: The desktop to fill
+ * @return Returns 1 on success, 0 on failure
+ * @brief initialize an Efreet_Desktop from the contents of @a file
+ */
+static int
+efreet_desktop_read(Efreet_Desktop *desktop)
+{
+Efreet_Ini *ini;
+int error = 0;
+int ok;
+
+ini = efreet_ini_new(desktop-orig_path);
if (!ini-data)
{
efreet_ini_free(ini);
-IF_FREE(desktop-orig_path);
-free(desktop);
-return NULL;
+return 0;
}
ok = efreet_ini_section_set(ini, Desktop Entry);
@@ -287,11 +309,45 @@
efreet_ini_free(ini);
-if (!error)
- return desktop;
+if (error) return 0;
-efreet_desktop_free(desktop);
-return NULL;
+return 1;
+}
+
+/**
+ * @internal
+ * @param desktop: The Efreet_Desktop to work with
+ * @return Returns no value
+ * @brief Frees the Efreet_Desktop's data
+ */
+static void
+efreet_desktop_clear(Efreet_Desktop *desktop)
+{
+IF_FREE(desktop-name);
+IF_FREE(desktop-generic_name);
+IF_FREE(desktop-comment);
+IF_FREE(desktop-icon);
+IF_FREE(desktop-url);
+
+IF_FREE(desktop-try_exec);
+IF_FREE(desktop-exec);
+IF_FREE(desktop-path);
+IF_FREE(desktop-startup_wm_class);
+
+IF_FREE_LIST(desktop-only_show_in);
+IF_FREE_LIST(desktop-not_show_in);
+IF_FREE_LIST(desktop-categories);
+IF_FREE_LIST(desktop-mime_types);
+
+IF_FREE_HASH(desktop-x);
+
+if (desktop-type_data)
+{
+Efreet_Desktop_Type_Info *info;
+info = ecore_list_goto_index(efreet_desktop_types, desktop-type);
+if (info-free_func)
+info-free_func(desktop-type_data);
+}
}
/**
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_file Modified Files: ecore_file_monitor_inotify.c Log Message: Remove unneeded include. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_file/ecore_file_monitor_inotify.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- ecore_file_monitor_inotify.c27 Mar 2007 18:15:16 - 1.16 +++ ecore_file_monitor_inotify.c27 Mar 2007 18:59:23 - 1.17 @@ -14,7 +14,6 @@ #ifdef HAVE_INOTIFY -#include asm/unistd.h #include sys/inotify.h typedef struct _Ecore_File_Monitor_Inotify Ecore_File_Monitor_Inotify; - 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.phpp=sourceforgeCID=DEVDEV ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/efreet englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/efreet
Dir : e17/libs/efreet/src/lib
Modified Files:
efreet_desktop.c
Log Message:
Set load_time after read.
===
RCS file: /cvs/e/e17/libs/efreet/src/lib/efreet_desktop.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- efreet_desktop.c27 Mar 2007 19:41:23 - 1.10
+++ efreet_desktop.c27 Mar 2007 19:50:57 - 1.11
@@ -246,7 +246,6 @@
if (!desktop) return NULL;
desktop-orig_path = strdup(file);
-desktop-load_time = ecore_time_get();
if (!efreet_desktop_read(desktop))
{
@@ -308,6 +307,8 @@
ECORE_FOR_EACH(efreet_desktop_x_fields_parse), desktop);
efreet_ini_free(ini);
+
+desktop-load_time = ecore_time_get();
if (error) return 0;
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_widget_button.c
Log Message:
don't leak when setting an icon on a button that already has one
don't leave stale subobjects when setting a button's icon to NULL
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_widget_button.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_widget_button.c 28 Feb 2007 02:58:40 - 1.14
+++ e_widget_button.c 28 Mar 2007 05:50:43 - 1.15
@@ -86,15 +86,17 @@
E_Widget_Data *wd;
wd = e_widget_data_get(obj);
- if (!icon)
+ if (wd-o_icon)
{
+ e_widget_sub_object_del(obj, wd-o_icon);
evas_object_hide(wd-o_icon);
edje_object_signal_emit(wd-o_button, e,action,hide,icon, e);
edje_object_message_signal_process(wd-o_button);
edje_object_part_unswallow(wd-o_button, wd-o_icon);
evas_object_del(wd-o_icon);
+ wd-o_icon = NULL;
}
- else
+ if (icon)
{
wd-o_icon = icon;
edje_object_part_swallow(wd-o_button, e.swallow.icon, icon);
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_utils.c e_utils.h
Log Message:
add function to add an icon given an icon path or theme name
use this for desktop_icon_add()
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- e_utils.c 25 Mar 2007 19:05:05 - 1.63
+++ e_utils.c 28 Mar 2007 05:52:33 - 1.64
@@ -839,11 +839,19 @@
{
if ((!desktop) || (!desktop-icon)) return NULL;
- if (desktop-icon[0] == '/') return e_util_icon_add(desktop-icon, evas);
+ return e_util_icon_theme_icon_add(desktop-icon, size, evas);
+}
+
+EAPI Evas_Object *
+e_util_icon_theme_icon_add(const char *icon_name, const char *size, Evas *evas)
+{
+ if (!icon_name) return NULL;
+ if (icon_name[0] == '/') return e_util_icon_add(icon_name, evas);
else
{
const char *path;
- path = efreet_icon_path_find(e_config-icon_theme, desktop-icon, size);
+ path = efreet_icon_path_find(e_config-icon_theme, icon_name, size);
+ printf(path: %s\n, path);
if (path) return e_util_icon_add(path, evas);
}
return NULL;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_utils.h,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_utils.h 25 Mar 2007 19:05:05 - 1.34
+++ e_utils.h 28 Mar 2007 05:52:33 - 1.35
@@ -49,6 +49,7 @@
EAPI void e_util_library_path_restore(void);
EAPI Evas_Object *e_util_icon_add(const char *path, Evas *evas);
EAPI Evas_Object *e_util_desktop_icon_add(Efreet_Desktop *desktop, const char
*size, Evas *evas);
+EAPI Evas_Object * e_util_icon_theme_icon_add(const char *icon_name, const
char *size, Evas *evas);
EAPI void e_util_desktop_menu_item_icon_add(Efreet_Desktop *desktop,
const char *size, E_Menu_Item *mi);
#endif
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c e_eap_editor.h e_test.c
Log Message:
update desktop editor to use efreet.
this isn't enabled yet, but will be after a bit more testing.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -3 -r1.74 -r1.75
--- e_eap_editor.c 25 Mar 2007 22:44:59 - 1.74
+++ e_eap_editor.c 28 Mar 2007 05:58:01 - 1.75
@@ -1,52 +1,48 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
-#if 0
+#if 1
#include e.h
struct _E_Config_Dialog_Data
{
- E_App eap;
+ Efreet_Desktop *desktop;
- char *name; /* app name */
- char *generic; /* generic app name */
+ char *name; /* app name (e.g. Firefox) */
+ char *generic_name; /* generic app name (e.g. Web Browser) */
char *comment; /* a longer description */
- char *exe; /* command to execute, NULL if directory */
- char *exe_params; /* command params to execute, NULL if directory */
+ char*exec; /* command to execute */
+ char*try_exec; /* executable to test for an apps existance
*/
- char *win_name; /* window name */
- char *win_class; /* window class */
- char *win_title; /* window title */
- char *win_role; /* window role */
-
- char *icon_class; /* icon_class */
- char *icon_path; /* icon path */
- char *image; /* used when we're saving a image into the eap */
-
- intstartup_notify;
- intwait_exit;
-
- char *exec;
- inticon_theme;
- E_App_Edit *editor;
- Evas_Object *themed;
+ char *startup_wm_class; /* window class */
+ char *categories; /* list of category names that app is in */
+
+ char *icon; /* absolute path to file or icon name */
+
+ int startup_notify;
+ int terminal;
+ int show_in_menus;
+
+ int new_desktop;
+ int saved; /* whether desktop has been saved or not */
+
+ E_Desktop_Edit *editor;
};
/* local subsystem functions */
-static void _e_eap_edit_free(E_App_Edit *editor);
-static void *_e_eap_edit_create_data(E_Config_Dialog *cfd);
-static void _e_eap_edit_free_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
-static int_e_eap_edit_basic_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
-static int_e_eap_edit_advanced_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
-static Evas_Object *_e_eap_edit_basic_create_widgets(E_Config_Dialog *cfd,
Evas *evas, E_Config_Dialog_Data *data);
-static Evas_Object *_e_eap_edit_advanced_create_widgets(E_Config_Dialog
*cfd, Evas *evas, E_Config_Dialog_Data *data);
-static void _e_eap_editor_cb_icon_select(void *data1, void *data2);
-static void _e_eap_edit_select_cb(void *data, Evas_Object *obj);
-static void _e_eap_edit_cb_icon_select_ok(void *data, E_Dialog *dia);
-static void _e_eap_edit_cb_icon_select_cancel(void *data, E_Dialog
*dia);
-static void _cb_files_icon_theme_changed(void *data, Evas_Object
*obj, void *event_info);
-static void _e_eap_editor_icon_show(E_Config_Dialog_Data *cfdata);
+static void _e_desktop_edit_free(E_Desktop_Edit *editor);
+static void *_e_desktop_edit_create_data(E_Config_Dialog *cfd);
+static void _e_desktop_edit_free_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
+static int_e_desktop_edit_basic_apply_data(E_Config_Dialog *cfd,
E_Config_Dialog_Data *data);
+static int_e_desktop_edit_advanced_apply_data(E_Config_Dialog
*cfd, E_Config_Dialog_Data *data);
+static Evas_Object *_e_desktop_edit_basic_create_widgets(E_Config_Dialog
*cfd, Evas *evas, E_Config_Dialog_Data *data);
+static Evas_Object *_e_desktop_edit_advanced_create_widgets(E_Config_Dialog
*cfd, Evas *evas, E_Config_Dialog_Data *data);
+static void _e_desktop_editor_cb_icon_select(void *data1, void
*data2);
+static void _e_desktop_edit_select_cb(void *data, Evas_Object *obj);
+static void _e_desktop_edit_cb_icon_select_ok(void *data, E_Dialog
*dia);
+static void _e_desktop_edit_cb_icon_select_cancel(void *data,
E_Dialog *dia);
+static void _e_desktop_editor_icon_update(E_Config_Dialog_Data
*cfdata);
#define IFADD(src, dst) if (src) dst = evas_stringshare_add(src); else dst =
NULL
#define IFDEL(src) if (src) evas_stringshare_del(src); src = NULL;
@@ -55,15 +51,15 @@
/* externally accessible functions */
-EAPI E_App_Edit *
-e_eap_edit_show(E_Container *con, E_App *a)
+EAPI E_Desktop_Edit *
+e_desktop_edit_show(E_Container *con,
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
remove #if 1
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -3 -r1.75 -r1.76
--- e_eap_editor.c 28 Mar 2007 05:58:01 - 1.75
+++ e_eap_editor.c 28 Mar 2007 05:58:54 - 1.76
@@ -1,7 +1,6 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
-#if 1
#include e.h
struct _E_Config_Dialog_Data
@@ -507,4 +506,3 @@
/* NB this takes care of freeing any previous icon object */
e_widget_button_icon_set(cfdata-editor-img_widget, o);
}
-#endif
-
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.phpp=sourceforgeCID=DEVDEV
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
