E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_menu.c ecore_desktop_tree.c
Log Message:
The results of a small session with valgrind.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_menu.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ecore_desktop_menu.c30 Aug 2006 14:49:38 - 1.10
+++ ecore_desktop_menu.c1 Sep 2006 06:24:11 - 1.11
@@ -170,8 +170,21 @@
/* I can safely assume that they are all strings. */
text = (char *)merge_stack-elements[i].element;
+/* printf(--- %s --- %s\n, text, file);
+if (text)
+if (file) */
if (strcmp(text, file) == 0)
{
+/* FIXME: valgrind says -
+==5761== Conditional jump or move depends on uninitialised value(s)
+==5761==at 0x1B90565C: strcmp (in /usr/lib/valgrind/vgpreload_memcheck.so)
+==5761==by 0x1BA3E984: _ecore_desktop_menu_get0 (ecore_desktop_menu.c:176)
+==5761==by 0x1BA3FE3F: _ecore_desktop_menu_merge
(ecore_desktop_menu.c:1146)
+==5761==by 0x1BA3D5A2: ecore_desktop_tree_foreach
(ecore_desktop_tree.c:267)
+ * which is the strcmp just above. But it doesn't complain about the first
two if's,
+ * or the printf, which I inserted to try and track this down.
+ * No idea what it actually is complaining about, so I'll comment it for
future study.
+ */
fprintf(stderr,
\n### Oops, infinite menu merging loop detected at
%s\n,
file);
@@ -1134,7 +1147,7 @@
/* FIXME: Actually implement this when I have some menus that
will exercise it. */
merge_path[0] = '\0';
- printf(\n### Didn't expect a MergeFile parent type\n);
+ printf(\n### Didn't expect a MergeFile parent type in the
FDO menu. onefang must write more code now.\n);
}
if (merge_path[0] != '\0')
{
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_tree.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ecore_desktop_tree.c14 Aug 2006 04:41:44 - 1.2
+++ ecore_desktop_tree.c1 Sep 2006 06:24:11 - 1.3
@@ -126,7 +126,7 @@
sizeof
(Ecore_Desktop_Tree_Element));
tree-size += size;
- for (i = tree-size - 1; i before; i--)
+ for (i = tree-size - 1; (i before) ((i - size) 0); i--)
{
tree-elements[i].element = tree-elements[i - size].element;
tree-elements[i].type = tree-elements[i - size].type;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
Etk.h Makefile.am etk_engine.c etk_engine.h etk_popup_window.c
etk_utils.h etk_window.c etk_window.h
Log Message:
* Some work to clean up the engine's API
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Etk.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- Etk.h 31 Aug 2006 17:32:06 - 1.41
+++ Etk.h 1 Sep 2006 06:41:17 - 1.42
@@ -10,6 +10,7 @@
#endif
#include etk_argument.h
+#include etk_config.h
#include etk_main.h
#include etk_marshallers.h
#include etk_object.h
@@ -19,9 +20,8 @@
#include etk_string.h
#include etk_type.h
#include etk_types.h
-#include etk_config.h
#include etk_utils.h
-
+
#include etk_alignment.h
#include etk_bin.h
#include etk_box.h
@@ -76,7 +76,7 @@
#include etk_viewport.h
#include etk_widget.h
#include etk_window.h
-
+
#ifdef __cplusplus
}
#endif
===
RCS file: /cvs/e/e17/proto/etk/src/lib/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Makefile.am 31 Aug 2006 17:32:06 - 1.45
+++ Makefile.am 1 Sep 2006 06:41:17 - 1.46
@@ -28,6 +28,7 @@
etk_clipboard.h \
etk_colorpicker.h \
etk_combobox.h \
+etk_config.h \
etk_container.h \
etk_dialog.h \
etk_dnd.h \
@@ -83,8 +84,7 @@
etk_utils.h \
etk_viewport.h \
etk_widget.h \
-etk_window.h \
-etk_config.h
+etk_window.h
libetk_la_SOURCES = \
etk_alignment.c \
@@ -98,6 +98,7 @@
etk_clipboard.c \
etk_colorpicker.c \
etk_combobox.c \
+etk_config.c \
etk_container.c \
etk_dialog.c \
etk_dnd.c \
@@ -153,7 +154,6 @@
etk_viewport.c \
etk_widget.c \
etk_window.c \
-etk_config.c \
$(ETKHEADERS)
installed_headersdir = $(prefix)/include/etk
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_engine.c30 Jul 2006 21:09:32 - 1.7
+++ etk_engine.c1 Sep 2006 06:41:17 - 1.8
@@ -1,14 +1,16 @@
/** @file etk_engine.c */
+#include etk_engine.h
#include stdlib.h
#include string.h
#include limits.h
#include dlfcn.h
-
#include Ecore_Data.h
#include Ecore_File.h
-#include Evas.h
-
-#include etk_engine.h
+#include etk_object.h
+#include etk_window.h
+#include etk_popup_window.h
+#include etk_drag.h
+#include etk_widget.h
#include etk_utils.h
#include config.h
@@ -35,9 +37,8 @@
/**
* @internal
- * @brief Initializes the engine system
+ * @brief Initializes the engine subsystem
* @return Returns ETK_TRUE on success, ETK_FALSE on failure
- * @warning You should not call it manually, it's called by etk_init()
*/
Etk_Bool etk_engine_init()
{
@@ -49,7 +50,7 @@
files = ecore_file_ls(PACKAGE_LIB_DIR /etk/engines);
if (!files || (ecore_list_nodes(files) == 0))
- return ETK_FALSE;
+ return ETK_FALSE;
ecore_list_goto_first(files);
while ((file = ecore_list_next(files)))
@@ -70,8 +71,7 @@
/**
* @internal
- * @brief Shutdowns the engine system
- * @warning You should not call it manually, it's called by etk_shutdown()
+ * @brief Shutdowns the engine subsystem
*/
void etk_engine_shutdown()
{
@@ -79,7 +79,8 @@
while (_loaded_engines)
{
Etk_Engine *engine;
- void *(*engine_close)();
+ void *(*engine_close)();
+
engine = _loaded_engines-data;
_loaded_engines = evas_list_remove(_loaded_engines, engine);
@@ -122,6 +123,9 @@
{
Evas_List *l;
+ if (!engine_name)
+ return ETK_FALSE;
+
for (l = _etk_engines; l; l = l-next)
{
if (strcmp(l-data, engine_name) == 0)
@@ -132,8 +136,8 @@
}
/**
- * @brief Gets the engine used by Etk
- * @return Returns the engine used by Etk or NULL if no engine is loaded yet
+ * @brief Gets the engine currently used by Etk
+ * @return Returns the engine currently used by Etk or NULL if no engine is
loaded yet
*/
Etk_Engine *etk_engine_get()
{
@@ -145,7 +149,6 @@
* @brief Loads an engine. The loaded engine will automatically become the
engine used by Etk
* @param engine_name the name of the engine to load
* @return Returns the loaded engine, or NULL if the engine could not be loaded
- * @warning You should not call this function yourself, etk_init() calls it
automatically
*/
Etk_Engine *etk_engine_load(const char *engine_name)
{
@@ -161,7 +164,7 @@
if (!ecore_file_exists(filename))
{
- ETK_WARNING(Etk can not find requested engine!);
+ ETK_WARNING(Etk can not find the requested engine!);
return NULL;
}
@@ -202,7 +205,7 @@
}
/**
- * @brief Makes the engine inherit from another exising engine: the methods of
the base engine
+ *
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Modified Files: ecore_evas.c Log Message: * Some work to clean up the engine's API === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ecore_evas.c30 Jul 2006 21:09:32 - 1.8 +++ ecore_evas.c1 Sep 2006 06:41:16 - 1.9 @@ -1,10 +1,7 @@ #include stdio.h #include string.h #include Ecore_Evas.h - -#include etk_engine.h -#include etk_utils.h - +#include Etk.h #include Etk_Engine_Ecore_Evas.h typedef Etk_Engine_Ecore_Evas_Window_Data Etk_Engine_Window_Data; @@ -79,8 +76,7 @@ _window_evas_position_get, _window_screen_position_get, _window_size_get, - NULL, /* window_center_on_window */ - NULL, /* window_move_to_mouse */ + NULL, /* window_screen_geometry_get */ NULL, /* window_modal_for_window */ _window_iconified_set, _window_iconified_get, @@ -102,15 +98,15 @@ NULL, /* window_skip_taskbar_hint_get */ NULL, /* window_skip_pager_hint_set */ NULL, /* window_skip_pager_hint_get */ - NULL, /* window_dnd_aware_set */ - NULL, /* window_dnd_aware_get */ NULL, /* window_pointer_set */ NULL, /* popup_window_constructor */ NULL, /* popup_window_popup_at_xy */ - NULL, /* popup_window_popup */ NULL, /* popup_window_popdown */ NULL, /* popup_window_popped_get */ + + NULL, /* mouse_position_get */ + NULL, /* mouse_screen_geometry_get */ NULL, /* drag_constructor */ NULL, /* drag_begin */ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_software_x11 Modified Files: ecore_evas_software_x11.c Log Message: * Some work to clean up the engine's API === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- ecore_evas_software_x11.c 30 Jul 2006 21:09:32 - 1.7 +++ ecore_evas_software_x11.c 1 Sep 2006 06:41:17 - 1.8 @@ -1,12 +1,7 @@ #include string.h #include stdlib.h #include Ecore_Evas.h - -#include etk_types.h -#include etk_engine.h -#include etk_window.h -#include etk_utils.h - +#include Etk.h #include Etk_Engine_Ecore_Evas.h #include Etk_Engine_Ecore_Evas_X11.h @@ -45,8 +40,7 @@ NULL, /* window_evas_position_get */ NULL, /* window_screen_position_get */ NULL, /* window_size_get */ - NULL, /* window_center_on_window */ - NULL, /* window_move_to_mouse */ + NULL, /* window_screen_geometry_get */ NULL, /* window_modal_for_window */ NULL, /* window_iconified_set */ NULL, /* window_iconified_get */ @@ -68,15 +62,15 @@ NULL, /* window_skip_taskbar_hint_ge */ NULL, /* window_skip_pager_hint_set */ NULL, /* window_skip_pager_hint_get */ - NULL, /* window_dnd_aware_set */ - NULL, /* window_dnd_aware_get */ NULL, /* window_pointer_set */ NULL, /* popup_window_constructor */ NULL, /* popup_window_popup_at_xy */ - NULL, /* popup_window_popup */ NULL, /* popup_window_popdown */ NULL, /* popup_window_popped_get */ + + NULL, /* mouse_position_get */ + NULL, /* mouse_screen_geometry_get */ NULL, /* drag_constructor */ NULL, /* drag_begin */ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines Modified Files: Makefile.am Log Message: * Some work to clean up the engine's API === RCS file: /cvs/e/e17/proto/etk/src/engines/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- Makefile.am 31 Jul 2006 23:23:12 - 1.2 +++ Makefile.am 1 Sep 2006 06:41:16 - 1.3 @@ -2,5 +2,4 @@ SUBDIRS = ecore_evas \ ecore_evas_x11 \ - ecore_evas_software_x11 \ - ecore_fb + ecore_evas_software_x11 - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop.c ecore_desktop_paths.c
Log Message:
Find a few more icons.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- ecore_desktop.c 31 Aug 2006 12:10:09 - 1.18
+++ ecore_desktop.c 1 Sep 2006 06:59:21 - 1.19
@@ -308,15 +308,34 @@
}
if (exe)
{
- if (done)
-strcat(result-icon_class, ,);
- strcat(result-icon_class, exe);
+ char *tmp;
+
+ tmp = strdup(ecore_file_get_file(exe));
+ if (tmp)
+{
+ p = tmp;
+ while (*p != '\0')
+ {
+ if (*p == ' ')
+ {
+*p = '\0';
+break;
+ }
+ p++;
+ }
+ if (done)
+ strcat(result-icon_class, ,);
+ strcat(result-icon_class, tmp);
+ done = 1;
+ free(tmp);
+}
}
if (categories)
{
if (done)
strcat(result-icon_class, ,);
strcat(result-icon_class, categories);
+ done = 1;
}
p = result-icon_class;
while (*p != '\0')
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_paths.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- ecore_desktop_paths.c 30 Aug 2006 18:51:04 - 1.15
+++ ecore_desktop_paths.c 1 Sep 2006 06:59:21 - 1.16
@@ -196,6 +196,8 @@
/usr/local/share/pixmaps/);
_ecore_desktop_paths_check_and_add(ecore_desktop_paths_icons,
/usr/share/pixmaps/);
+ _ecore_desktop_paths_check_and_add(ecore_desktop_paths_icons,
+
/usr/share/update-desktop-files/kappfinder-icons/);
gnome = getenv(GNOME_ICON_PATH);
if (gnome)
_ecore_desktop_paths_check_and_add(ecore_desktop_paths_icons, gnome);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
Implement per-gadget move/resize also.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- e_gadcon.c 31 Aug 2006 04:16:43 - 1.41
+++ e_gadcon.c 1 Sep 2006 08:49:46 - 1.42
@@ -789,6 +789,8 @@
evas_object_show(gcc-o_event);
evas_object_show(gcc-o_control);
+
+ gcc-gadcon-editing = 1;
}
EAPI void
@@ -817,6 +819,8 @@
gcc-o_event = NULL;
if (gcc-o_control) evas_object_del(gcc-o_control);
gcc-o_control = NULL;
+
+ gcc-gadcon-editing = 0;
}
EAPI void
@@ -1137,6 +1141,14 @@
mi = e_menu_item_new(menu);
e_menu_item_separator_set(mi, 1);
+ if (!gcc-gadcon-editing)
+ {
+ mi = e_menu_item_new(menu);
+ e_menu_item_label_set(mi, _(Move/Resize this gadget));
+ e_util_menu_item_edje_icon_set(mi, enlightenment/edit);
+ e_menu_item_callback_set(mi, _e_gadcon_client_cb_menu_edit, gcc);
+ }
+
mi = e_menu_item_new(menu);
e_menu_item_label_set(mi, _(Remove this gadget));
e_util_menu_item_edje_icon_set(mi, enlightenment/remove);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : tclock
Dir : e_modules/tclock
Modified Files:
tclock.edc
Log Message:
Fix the font clipping issue when switching between plain/inset style that
Hawkwind pointed out. Thanks :)
===
RCS file: /cvs/e/e_modules/tclock/tclock.edc,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- tclock.edc 14 Jul 2006 17:44:55 - 1.20
+++ tclock.edc 1 Sep 2006 08:57:21 - 1.21
@@ -11,21 +11,9 @@
{
part
{
- name: base;
- type: RECT;
- mouse_events: 1;
- description
- {
- state: default 0.0;
- color: 255 255 255 255;
- }
- }
-part
- {
name: tclock_time;
type: TEXT;
effect: OUTLINE_SOFT_SHADOW;
- clip_to: base;
mouse_events: 1;
description
{
@@ -71,7 +59,6 @@
{
name: tclock_date;
type: TEXT;
- clip_to: base;
effect: OUTLINE_SOFT_SHADOW;
mouse_events: 1;
description
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_apps.h e_int_menus.c e_menu.c e_menu.h
Log Message:
Beginning to drag all the basic show this icon for this app code
together in one place to make it easy to keep it consistant.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -3 -r1.159 -r1.160
--- e_apps.c31 Aug 2006 12:11:20 - 1.159
+++ e_apps.c1 Sep 2006 09:01:52 - 1.160
@@ -1617,8 +1617,34 @@
e_icon_file_set(o, a-icon_path);
e_icon_fill_inside_set(o, 1);
}
+ /* FIXME: if we still haven't found an icon, feed icon_class into
the FDO lookup process. */
}
return o;
+}
+
+/* Search order? -
+ *
+ * fixed path to icon
+ * an .edje icon in ~/.e/e/icons
+ * icon_class in theme
+ * icon from a-path in theme
+ * FDO search
+ * FDO search for icon_class
+ */
+
+EAPI void
+e_app_icon_add_to_menu_item(E_Menu_Item *mi, E_App *a)
+{
+ if (!e_util_menu_item_edje_icon_list_set(mi, a-icon_class))
+ {
+ /* e_menu_item_icon_edje_set() just tucks away the params, the actual
call to edje_object_file_set() happens later. */
+ /* e_menu_item_icon_file_set() just tucks away the params, the actual
call to e_icon_add() happens later. */
+ e_menu_item_icon_edje_set(mi, a-path, icon);
+ if (a-icon_path) /* If that fails, then this might be an FDO icon.
*/
+ e_menu_item_icon_file_set(mi, a-icon_path);
+ /* FIXME: if we still haven't found an icon, feed icon_class into the
FDO lookup process. */
+ }
+ return;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- e_apps.h31 Aug 2006 02:27:05 - 1.37
+++ e_apps.h1 Sep 2006 09:01:52 - 1.38
@@ -136,6 +136,7 @@
EAPI void e_app_fields_empty (E_App *a);
EAPI int e_app_valid_exe_get (E_App *a);
EAPI Evas_Object *e_app_icon_add (Evas *evas, E_App
*a);
+EAPI void e_app_icon_add_to_menu_item (E_Menu_Item *mi,
E_App *a);
#endif
#endif
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_menus.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -3 -r1.155 -r1.156
--- e_int_menus.c 31 Aug 2006 05:01:48 - 1.155
+++ e_int_menus.c 1 Sep 2006 09:01:52 - 1.156
@@ -467,12 +467,7 @@
e_menu_item_label_set(mi, label);
if (a-exe)
{
- if (!((a-icon_class)
-(e_util_menu_item_edje_icon_list_set(mi,
a-icon_class
- {
-e_menu_item_icon_edje_set(mi, a-path, icon);
-if (a-icon_path) e_menu_item_icon_path_set(mi,
a-icon_path);
- }
+ e_app_icon_add_to_menu_item(mi, a);
e_menu_item_callback_set(mi, _e_int_menus_apps_run, a);
e_menu_item_drag_callback_set(mi,
_e_int_menus_apps_drag, a);
app_count++;
@@ -481,6 +476,7 @@
{
char buf[4096];
+ /* FIXME: .directory.eaps are obsolete, but have yet to
be replaced by FDO stuff. */
snprintf(buf, sizeof(buf), %s/.directory.eap, a-path);
if (!((a-icon_class)
(e_util_menu_item_edje_icon_list_set(mi,
a-icon_class
@@ -946,14 +942,7 @@
e_menu_item_callback_set(mi, _e_int_menus_lost_clients_item_cb, bd);
a = bd-app;
if (a)
- {
-if (!((a-icon_class)
- (e_util_menu_item_edje_icon_list_set(mi, a-icon_class
- {
- e_menu_item_icon_edje_set(mi, a-path, icon);
- if (a-icon_path) e_menu_item_icon_path_set(mi,
a-icon_path);
- }
- }
+ e_app_icon_add_to_menu_item(mi, a);
}
e_object_free_attach_func_set(E_OBJECT(m),
_e_int_menus_lost_clients_free_hook);
e_object_data_set(E_OBJECT(m), borders);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_menu.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- e_menu.c23 Aug 2006 03:39:02 - 1.63
+++ e_menu.c1 Sep 2006 09:01:52 - 1.64
@@ -552,21 +552,6 @@
}
EAPI void
-e_menu_item_icon_path_set(E_Menu_Item *mi, const char *icon)
-{
-
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_apps.h e_int_config_apps.c
Log Message:
Since raster added the ability for fm2 to delete from within .order
files that are displayed as a virtual folder, there is no need for the
all apps app deletion buttons and code.
If you are still having issues with deleting apps, take it up with raster.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -3 -r1.160 -r1.161
--- e_apps.c1 Sep 2006 09:01:52 - 1.160
+++ e_apps.c1 Sep 2006 09:26:55 - 1.161
@@ -812,59 +812,6 @@
e_object_unref(E_OBJECT(a));
}
-
-EAPI void
-e_app_remove_file_from_order(const char *order, const char *file)
-{
- char buf[4096];
- Evas_List *list = NULL, *l;
- int ret = 0;
- FILE *f;
-
- snprintf(buf, sizeof(buf), %s/.order, order);
- if (!ecore_file_exists(buf)) return;
- f = fopen(buf, rb);
- if (!f) return;
-
- while (fgets(buf, sizeof(buf), f))
- {
- int len;
-
- len = strlen(buf);
- if (len 0)
- {
-if (buf[len - 1] == '\n')
- {
- buf[len - 1] = 0;
- len--;
- }
-if (strcmp(buf, file) != 0)
- list = evas_list_append(list, strdup(buf));
- }
- }
- fclose(f);
-
- snprintf(buf, sizeof(buf), %s/.order, order);
- ecore_file_unlink(buf);
- f = fopen(buf, wb);
- if (!f) return;
- for (l = list; l; l = l-next)
- {
-char *text;
-
-text = l-data;
- fprintf(f, %s\n, text);
- free(text);
- }
- fclose(f);
- evas_list_free(list);
-
- snprintf(buf, sizeof(buf), %s/.eap.cache.cfg, order);
- ecore_file_unlink(buf);
-
- return;
-}
-
EAPI void
e_app_change_callback_add(void (*func) (void *data, E_App *a, E_App_Change
ch), void *data)
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.h,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- e_apps.h1 Sep 2006 09:01:52 - 1.38
+++ e_apps.h1 Sep 2006 09:26:55 - 1.39
@@ -112,7 +112,6 @@
EAPI voide_app_files_prepend_relative(Evas_List *files,
E_App *before);
EAPI voide_app_files_append (Evas_List *files,
E_App *parent);
EAPI voide_app_remove(E_App *a);
-EAPI voide_app_remove_file_from_order(const char *order,
const char *file);
EAPI voide_app_change_callback_add (void (*func) (void
*data, E_App *a, E_App_Change ch), void *data);
EAPI voide_app_change_callback_del (void (*func) (void
*data, E_App *a, E_App_Change ch), void *data);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_apps.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_int_config_apps.c 31 Aug 2006 02:21:00 - 1.12
+++ e_int_config_apps.c 1 Sep 2006 09:26:55 - 1.13
@@ -244,91 +244,6 @@
}
static void
-_cb_button_delete_left(void *data1, void *data2)
-{
- E_Config_Dialog_Data *cfdata;
- Evas_List *l;
- E_Fm2_Icon_Info *ici;
- const char *realpath;
- char buf[4096];
-
- cfdata = data1;
- if (!cfdata-gui.o_fm_all) return;
- if (!cfdata-parent_all) return;
-
- l = e_fm2_selected_list_get(cfdata-gui.o_fm_all);
- if (!l) return;
- ici = l-data;
- evas_list_free(l);
-
-#if 0
- /* This just isn't working, lets try the crude method instead. */
- for (l = cfdata-parent_all-subapps; l; l = l-next)
- {
- E_App *a2;
-
- a2 = l-data;
- if ((a2-deleted) || ((a2-orig) (a2-orig-deleted))) continue;
- if (!strcmp(ecore_file_get_file(a2-path),
ecore_file_get_file(ici-file)))
- {
- e_app_remove(a2);
- e_fm2_refresh(cfdata-gui.o_fm_all);
- break;
- }
- }
-#else
- realpath = e_fm2_real_path_get(cfdata-gui.o_fm_all);
- if (!strcmp(realpath, /))
- snprintf(buf, sizeof(buf), /%s, ici-file);
- else
- snprintf(buf, sizeof(buf), %s/%s, realpath, ici-file);
- ecore_file_unlink(buf);
- snprintf(buf, sizeof(buf), %s/.eap.cache.cfg, realpath);
- ecore_file_unlink(buf);
- e_fm2_refresh(cfdata-gui.o_fm_all);
-#endif
-}
-
-static void
-_cb_button_delete_right(void *data1, void *data2)
-{
- E_Config_Dialog_Data *cfdata;
- Evas_List *l;
- E_Fm2_Icon_Info *ici;
- const char *realpath;
-
- cfdata = data1;
- if (!cfdata-gui.o_fm) return;
-
- l = e_fm2_selected_list_get(cfdata-gui.o_fm);
- if (!l) return;
- ici = l-data;
- evas_list_free(l);
-
-#if 0
- /* This just isn't working, lets try the crude method
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * Config version bump * Start to load/save global config === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- etk_options_dialog.c31 Aug 2006 13:09:34 - 1.6 +++ etk_options_dialog.c1 Sep 2006 10:10:57 - 1.7 @@ -101,6 +101,7 @@ entropy_config_misc_item_set_str(key,c_obj-value); } + ecore_list_destroy(keys); } } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Config version bump
* Start to load/save global config
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- entropy_config.c31 Aug 2006 13:09:34 - 1.21
+++ entropy_config.c1 Sep 2006 10:10:57 - 1.22
@@ -7,7 +7,7 @@
#include Eet.h
#include stdarg.h
-#define ENTROPY_CONFIG_VERSION 14
+#define ENTROPY_CONFIG_VERSION 15
static Entropy_Config* _Entropy_Config = NULL;
@@ -310,7 +310,8 @@
char* data;
int size_ret;
int ok;
-
+ Evas_List* l;
+ Entropy_Config_Item* item;
Entropy_Config_Loaded* mimes;
if (_Entropy_Config) return _Entropy_Config;
@@ -384,9 +385,6 @@
entropy_config_loaded_config_free();
}
-
-
-
/*Load the eet config*/
conf_file = eet_open(_Entropy_Config-config_dir_and_file_eet,
EET_FILE_MODE_READ);
if (conf_file) {
@@ -399,11 +397,21 @@
}
/*--*/
+ /*Xlate misc list-hash*/
+ if (_Entropy_Config-Loaded_Config-Misc_Config)
+ ecore_hash_destroy(_Entropy_Config-Loaded_Config-Misc_Config);
+
+ _Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash,ecore_str_compare);
+
+ for (l =_Entropy_Config-Loaded_Config-Misc_Config_Load ; l; ) {
+ item = l-data;
+ ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config,
item-name, item);
+ printf(Loaded misc '%s' - '%s'\n, item-name, item-value);
+
+ l=l-next;
+ }
-
-
-
-
+
//Init ecore_config
ecore_config_init(entropy_config);
ecore_config_file_load(_Entropy_Config-config_dir_and_file);
@@ -469,11 +477,30 @@
int size_ret;
int ok;
Entropy_Config* config;
+ char* key;
+ Ecore_List* keys;
+ Entropy_Config_Item* item;
config = entropy_core_get_core()-config;
+ /*Xlate misc hash-list*/
+ if (config-Loaded_Config-Misc_Config_Load)
+ evas_list_free(config-Loaded_Config-Misc_Config_Load);
+
+ config-Loaded_Config-Misc_Config_Load = NULL;
+ keys = ecore_hash_keys(config-Loaded_Config-Misc_Config);
+ while ((key = ecore_list_remove_first(keys))) {
+ item = ecore_hash_get(config-Loaded_Config-Misc_Config,key);
+
+ if (item item-name item-value) {
+ config-Loaded_Config-Misc_Config_Load =
+
evas_list_append(config-Loaded_Config-Misc_Config_Load, item);
+ }
+ }
+ ecore_list_destroy(keys);
- conf_file = eet_open(config-config_dir_and_file_eet,
EET_FILE_MODE_WRITE);
+
+ conf_file = eet_open(config-config_dir_and_file_eet,
EET_FILE_MODE_WRITE);
if (conf_file) {
char buf[10];
/*Write the config version..*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
Make sure bi is set before trying to use it or else Seggy. Thanks iSteve :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_gadcon.c 1 Sep 2006 08:49:46 - 1.42
+++ e_gadcon.c 1 Sep 2006 10:40:54 - 1.43
@@ -3868,6 +3868,7 @@
for (l = lc-items; l; l = l-next)
{
+ bi = l-data;
if (bi-gcc-state_info.flags
E_GADCON_LAYOUT_ITEM_LOCK_POSITION)
{
if (sd-horizontal) shift = bi-ask.pos - bi-x;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_eap_editor.c e_int_border_menu.c
Log Message:
More icon work.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.534
retrieving revision 1.535
diff -u -3 -r1.534 -r1.535
--- e_border.c 30 Aug 2006 13:37:35 - 1.534
+++ e_border.c 1 Sep 2006 10:43:20 - 1.535
@@ -2536,6 +2536,7 @@
e_util_edje_icon_set(o, enlightenment/e);
else
{
+/* FIXME: .eaps are going away, raster says this is for module
.eaps, so need to take care of all that at the same time. */
if (!strcmp(bd-internal_icon + strlen(bd-internal_icon) - 4,
.eap))
{
if (!edje_object_file_set(o, bd-internal_icon, icon))
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- e_eap_editor.c 31 Aug 2006 14:51:44 - 1.45
+++ e_eap_editor.c 1 Sep 2006 10:43:20 - 1.46
@@ -32,6 +32,7 @@
char *wtitle;
char *wrole;
char *iclass;
+ char *ipath;
int icon_theme;
int startup_notify;
int wait_exit;
@@ -113,6 +114,7 @@
IFDUP(cfdata-editor-eap-win_title, cfdata-wtitle);
IFDUP(cfdata-editor-eap-win_role, cfdata-wrole);
IFDUP(cfdata-editor-eap-icon_class, cfdata-iclass);
+ IFDUP(cfdata-editor-eap-icon_path, cfdata-ipath);
cfdata-startup_notify = cfdata-editor-eap-startup_notify;
cfdata-wait_exit = cfdata-editor-eap-wait_exit;
/*- COMMON -*/
@@ -147,6 +149,7 @@
E_FREE(data-wtitle);
E_FREE(data-wrole);
E_FREE(data-iclass);
+ E_FREE(data-ipath);
E_FREE(data-image);
if (data-editor-eap-tmpfile) ecore_file_unlink(data-editor-eap-image);
data-editor-eap-tmpfile = 0;
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_border_menu.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -3 -r1.40 -r1.41
--- e_int_border_menu.c 23 Aug 2006 03:39:02 - 1.40
+++ e_int_border_menu.c 1 Sep 2006 10:43:20 - 1.41
@@ -278,7 +278,7 @@
mi = e_menu_item_new(m);
e_menu_item_label_set(mi, _(Edit Icon));
e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, bd);
-e_menu_item_icon_edje_set(mi, bd-app-path, icon);
+ e_app_icon_add_to_menu_item(mi, bd-app);
}
else if (bd-client.icccm.class) /* icons with no class useless to
borders */
{
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_engine.h etk_window.c
Log Message:
* [Engine] Documentation++
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_engine.c1 Sep 2006 06:41:17 - 1.8
+++ etk_engine.c1 Sep 2006 10:53:20 - 1.9
@@ -431,22 +431,11 @@
_engine-window_screen_geometry_get(window, x, y, w, h);
}
-
-/* TODO: remove */
-/*void etk_engine_window_center_on_window(Etk_Window *window_to_center,
Etk_Window *window)
-{
- if (!_engine || !_engine-window_center_on_window)
- return;
- _engine-window_center_on_window(window_to_center, window);
-}
-
-void etk_engine_window_move_to_mouse(Etk_Window *window)
-{
- if (!_engine || !_engine-window_move_to_mouse)
- return;
- _engine-window_move_to_mouse(window);
-}*/
-
+/**
+ * @brief Calls the engines's method to make a window modal for another window
+ * @param window_to_modal the window to make modal
+ * @param window the window on which @a window_to_modal will modal'ed on, or
NULL to disable the modal state
+ */
void etk_engine_window_modal_for_window(Etk_Window *window_to_modal,
Etk_Window *window)
{
if (!_engine || !_engine-window_modal_for_window)
@@ -454,6 +443,11 @@
_engine-window_modal_for_window(window_to_modal, window);
}
+/**
+ * @brief Calls the engines's method to set whether or not a window is
iconified
+ * @param window a window
+ * @param iconified ETK_TRUE to iconify the window, ETK_FALSE to de-iconify it
+ */
void etk_engine_window_iconified_set(Etk_Window *window, Etk_Bool iconified)
{
if (!_engine || !_engine-window_iconified_set)
@@ -461,6 +455,11 @@
_engine-window_iconified_set(window, iconified);
}
+/**
+ * @brief Calls the engines's method to get whether or not a window is
iconified
+ * @param window a window
+ * @return Returns ETK_TRUE if the window is iconified, ETK_FALSE if not
+ */
Etk_Bool etk_engine_window_iconified_get(Etk_Window *window)
{
if (!_engine || !_engine-window_iconified_get)
@@ -468,6 +467,11 @@
return _engine-window_iconified_get(window);
}
+/**
+ * @brief Calls the engines's method to set whether or not a window is
maximized
+ * @param window a window
+ * @param maximized ETK_TRUE to maximize the window, ETK_FALSE to unmaximize it
+ */
void etk_engine_window_maximized_set(Etk_Window *window, Etk_Bool maximized)
{
if (!_engine || !_engine-window_maximized_set)
@@ -475,6 +479,11 @@
_engine-window_maximized_set(window, maximized);
}
+/**
+ * @brief Calls the engines's method to get whether or not a window is
maximized
+ * @param window a window
+ * @return Returns ETK_TRUE if the window is maximized, ETK_FALSE if not
+ */
Etk_Bool etk_engine_window_maximized_get(Etk_Window *window)
{
if (!_engine || !_engine-window_maximized_get)
@@ -482,6 +491,11 @@
return _engine-window_maximized_get(window);
}
+/**
+ * @brief Calls the engines's method to set whether or not a window is in
fullscreen mode
+ * @param window a window
+ * @param fullscreen ETK_TRUE to place the window in the fullscreen state,
ETK_FALSE to toggle off the fullscreen state
+ */
void etk_engine_window_fullscreen_set(Etk_Window *window, Etk_Bool fullscreen)
{
if (!_engine || !_engine-window_fullscreen_set)
@@ -489,6 +503,11 @@
_engine-window_fullscreen_set(window, fullscreen);
}
+/**
+ * @brief Calls the engines's method to get whether a window is in fullscreen
mode
+ * @param window a window
+ * @return Returns ETK_TRUE if the window is in fullscreen mode, ETK_FALSE
otherwise
+ */
Etk_Bool etk_engine_window_fullscreen_get(Etk_Window *window)
{
if (!_engine || !_engine-window_fullscreen_get)
@@ -496,6 +515,10 @@
return _engine-window_fullscreen_get(window);
}
+/**
+ * @brief Calls the engines's method to raise a window. The window will be
stacked above all the existing windows
+ * @param window the window to raise
+ */
void etk_engine_window_raise(Etk_Window *window)
{
if (!_engine || !_engine-window_raise)
@@ -503,6 +526,10 @@
_engine-window_raise(window);
}
+/**
+ * @brief Calls the engines's method to lower a window. The window will be
stacked below all the existing windows
+ * @param window the window to lower
+ */
void etk_engine_window_lower(Etk_Window *window)
{
if (!_engine || !_engine-window_lower)
@@ -510,6 +537,12 @@
_engine-window_lower(window);
}
+/**
+ * @brief Calls the engines's method to set whether a window is sticky. A
sticky window is a window that appears on all
+ * the virtual desktops
+ * @param window a window
+ * @param sticky ETK_TRUE to make the window sticky, ETK_FALSE otherwise
+ */
void etk_engine_window_sticky_set(Etk_Window *window, Etk_Bool sticky)
{
if
E CVS: cpu devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : cpu
Dir : e_modules/cpu
Modified Files:
e_mod_main.c
Log Message:
Modified Patch from Rabinath for multi-cpu fixes (had a minor error in the
patch). Thanks :)
===
RCS file: /cvs/e/e_modules/cpu/e_mod_main.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- e_mod_main.c30 Aug 2006 18:08:52 - 1.23
+++ e_mod_main.c1 Sep 2006 10:57:19 - 1.24
@@ -210,21 +210,34 @@
{
FILE *stat;
static unsigned long old_u[4], old_n[4], old_s[4], old_i[4], old_wa[4],
old_hi[4], old_si[4];
- unsigned long new_u, new_n, new_s, new_i, new_wa = 0, new_hi = 0, new_si =
0, ticks_past;
+ unsigned long new_u, new_n, new_s, new_i, new_wa = 0, new_hi = 0, new_si =
0, dummy2, ticks_past;
int tmp_u = 0, tmp_n = 0, tmp_s = 0;
char dummy[16];
int i = 0;
if (!(stat = fopen(/proc/stat, r))) return -1;
+ /* since if there are more than 1 CPUs, the first entry is the summary:
+ cpu 366384 274786 214744 7129029 1975609 12775 353729 0
+ cpu0 167188 137966 127694 3664600 704402 12775 353588 0
+ cpu1 199195 136820 87050 3464429 1271207 0 140 0
+
+ In this case the first line is read and forgotten
+ */
+ if(cpu_count1){
+ /* I had to add another %lu (linux 2.6.17) */
+ fscanf(stat, %s %lu %lu %lu %lu %lu %lu %lu %lu, dummy, new_u,
new_n, new_s, new_i, new_wa, new_hi, new_si, dummy2);
+ }
+
while (i cpu_count)
{
- if (fscanf(stat, %s %lu %lu %lu %lu %lu %lu %lu, dummy, new_u,
new_n,
-new_s, new_i, new_wa, new_hi, new_si) 5)
+/* I had to add another %lu (linux 2.6.17) */
+ if (fscanf(stat, %s %lu %lu %lu %lu %lu %lu %lu %lu, dummy, new_u,
new_n,
+new_s, new_i, new_wa, new_hi, new_si, dummy2) 5)
{
fclose (stat);
-return;
+return -1;
}
ticks_past = ((new_u + new_n + new_s + new_i + new_wa + new_hi +
new_si) -
@@ -237,7 +250,7 @@
tmp_s = ((new_s - old_s[i]));
}
- cpu_stats[i] = (tmp_u + tmp_n + tmp_s) / cpu_count;
+ cpu_stats[i] = (tmp_u + tmp_n + tmp_s);
old_u[i] = new_u;
old_n[i] = new_n;
@@ -246,11 +259,12 @@
old_hi[i] = new_hi;
old_si[i] = new_si;
- if (cpu_stats[i] = 100) cpu_stats[i] = 100;
+ cpu_stats[i]=(cpu_stats[i]100?100:cpu_stats[i]);
i++;
}
fclose (stat);
+ return 0;
}
static void
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: IBox also has the same problem as IBar. Seems o_empty object is not resized when the module is. Clicking in the center of the module (where o_empty is) brings up the menu. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.414 retrieving revision 1.415 diff -u -3 -r1.414 -r1.415 --- TODO29 Aug 2006 23:26:18 - 1.414 +++ TODO1 Sep 2006 11:05:27 - 1.415 @@ -10,7 +10,9 @@ * BUG: e17 screen res diaolg doesnt work under xephyr - why? * BUG: the ibar specific menu only shows when you right click on icons (and not - on the bar itself). so, if there are no icons you can't get to the config + on the bar itself). so, if there are no icons you can't get to the config. + ibox also has this problem..related to the o_empty object not resizing when + the module does. * BUG: match this window only doesnt fall back to other unused remembers * BUG: if app asks for borderless in properties - borderless toggle in menu doesn't have any effect. - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* Config load/save
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -3 -r1.57 -r1.58
--- layout_etk_simple.c 31 Aug 2006 02:06:23 - 1.57
+++ layout_etk_simple.c 1 Sep 2006 11:07:51 - 1.58
@@ -562,6 +562,7 @@
Evas_List* structures;
Entropy_Config_Structure* structure;
+ int local_viewer_selected = 0;
/*Entropy related init */
@@ -675,10 +676,16 @@
if (local) {
local_plugin_init =
dlsym (local-dl_ref, entropy_plugin_gui_instance_new);
- instance = (*local_plugin_init)(core, layout,NULL);
- instance-plugin = local;
- gui-list_viewer = instance;
- etk_box_append(ETK_BOX(gui-localshell), instance-gui_object,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ gui-list_viewer = (*local_plugin_init)(core, layout,NULL);
+ gui-list_viewer-plugin = local;
+
+ if (entropy_config_misc_is_set(general.listviewer)) {
+ gui-list_viewer-active=1;
+ local_viewer_selected = 1;
+ etk_box_append(ETK_BOX(gui-localshell),
gui-list_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ } else {
+ gui-list_viewer-active=0;
+ }
}
/*Initialise the icon viewer*/
@@ -689,7 +696,14 @@
dlsym (local-dl_ref, entropy_plugin_gui_instance_new);
gui-iconbox_viewer = (*local_plugin_init)(core, layout,NULL);
gui-iconbox_viewer-plugin = local;
- gui-iconbox_viewer-active=0;
+
+ if (entropy_config_misc_is_set(general.iconviewer)) {
+ gui-iconbox_viewer-active=1;
+ local_viewer_selected = 1;
+ etk_box_append(ETK_BOX(gui-localshell),
gui-iconbox_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
+ } else {
+ gui-iconbox_viewer-active=0;
+ }
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/include Modified Files: entropy_config.h Log Message: * Config load/save === RCS file: /cvs/e/e17/proto/entropy/src/include/entropy_config.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- entropy_config.h31 Aug 2006 13:09:34 - 1.12 +++ entropy_config.h1 Sep 2006 11:07:51 - 1.13 @@ -56,7 +56,7 @@ void entropy_config_destroy(Entropy_Config* config); char* entropy_config_str_get(char* module, char* key); void entropy_config_str_set(char* module, char* key, char* value); - +int entropy_config_misc_is_set(char*); Evas_List* entropy_config_standard_structures_parse (entropy_gui_component_instance * instance, char *config); Entropy_Config_Structure* entropy_config_standard_structures_add (char *name, char *uri); @@ -72,9 +72,11 @@ Entropy_Config_Structure* entropy_config_structure_new(char* name, char* uri); void entropy_config_items_init(); -void entropy_config_misc_item_set_str(char* item, char* value); -char* entropy_config_misc_item_get_str(char* item); +void entropy_config_misc_item_str_set(char* item, char* value, int loc); +char* entropy_config_misc_item_str_get(char* item); #define ENTROPY_CONFIG_INT_UNDEFINED 65535 +#define ENTROPY_CONFIG_LOC_HASH 0 +#define ENTROPY_CONFIG_LOC_LIST 1 #endif - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src
Modified Files:
entropy_config.c
Log Message:
* Config load/save
===
RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- entropy_config.c1 Sep 2006 10:10:57 - 1.22
+++ entropy_config.c1 Sep 2006 11:07:51 - 1.23
@@ -7,7 +7,7 @@
#include Eet.h
#include stdarg.h
-#define ENTROPY_CONFIG_VERSION 15
+#define ENTROPY_CONFIG_VERSION 16
static Entropy_Config* _Entropy_Config = NULL;
@@ -351,6 +351,7 @@
if (stat(_Entropy_Config-config_dir_and_file_eet, eetstat)) {
//Make the dir..
+ _Entropy_Config-Loaded_Config = mimes;
entropy_config_defaults_populate(mimes);
@@ -380,8 +381,6 @@
eet_close(conf_file);
}
-
- _Entropy_Config-Loaded_Config = mimes;
entropy_config_loaded_config_free();
}
@@ -398,8 +397,8 @@
/*--*/
/*Xlate misc list-hash*/
- if (_Entropy_Config-Loaded_Config-Misc_Config)
- ecore_hash_destroy(_Entropy_Config-Loaded_Config-Misc_Config);
+ /*Init the misc hash*/
+ entropy_config_items_init();
_Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash,ecore_str_compare);
@@ -416,9 +415,6 @@
ecore_config_init(entropy_config);
ecore_config_file_load(_Entropy_Config-config_dir_and_file);
- /*Init the misc hash*/
- entropy_config_items_init();
-
return _Entropy_Config;
}
@@ -495,6 +491,7 @@
if (item item-name item-value) {
config-Loaded_Config-Misc_Config_Load =
evas_list_append(config-Loaded_Config-Misc_Config_Load, item);
+ printf(CONFIG SAVE: Wrote '%s' for '%s'\n,
item-name, item-value);
}
}
ecore_list_destroy(keys);
@@ -619,6 +616,15 @@
config-structures = evas_list_append(config-structures,
entropy_config_structure_new(Virtual Folders,
vfolder:///)
);
+
+ /*Default settings*/
+ entropy_config_misc_item_str_set(general.listviewer,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.iconviewer,
0,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.trackback,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.presortfolders,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.hiddenbackup,
1,ENTROPY_CONFIG_LOC_LIST);
+ entropy_config_misc_item_str_set(general.iconsize,
48,ENTROPY_CONFIG_LOC_LIST);
+
}
Evas_List *
@@ -664,27 +670,64 @@
void entropy_config_items_init()
{
+ if (_Entropy_Config-Loaded_Config-Misc_Config)
+ ecore_hash_destroy(_Entropy_Config-Loaded_Config-Misc_Config);
+
_Entropy_Config-Loaded_Config-Misc_Config =
ecore_hash_new(ecore_str_hash, ecore_str_compare);
}
-void entropy_config_misc_item_set_str(char* item, char* value)
+void entropy_config_misc_item_str_set(char* item, char* value, int loc)
{
Entropy_Config_Item* c_item;
-
- if
(!(c_item=ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config, item))) {
+
+ if (loc == ENTROPY_CONFIG_LOC_HASH) {
+ if
(!(c_item=ecore_hash_get(_Entropy_Config-Loaded_Config-Misc_Config, item))) {
+ c_item = calloc(1,sizeof(Entropy_Config_Item));
+ c_item-name = strdup(item);
+ if (value) c_item-value = strdup(value);
+
+
ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config, c_item-name,
c_item);
+ printf (hash Set '%s' - '%s'\n,c_item-name,
c_item-value);
+ } else {
+ if (c_item-value) free(c_item-value);
+ if (value)
+ c_item-value = strdup(value);
+ else
+ c_item-value = NULL;
+
+ printf (hash Set (existing) '%s' -
'%s'\n,c_item-name, c_item-value);
+ }
+ } else if (loc == ENTROPY_CONFIG_LOC_LIST) {
c_item = calloc(1,sizeof(Entropy_Config_Item));
c_item-name = strdup(item);
- if (value) c_item-value = strdup(value);
- ecore_hash_set(_Entropy_Config-Loaded_Config-Misc_Config,
c_item-name, c_item);
+ if (value) c_item-value = strdup(value);
- } else {
-
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* Config load/save
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_options_dialog.c1 Sep 2006 10:10:57 - 1.7
+++ etk_options_dialog.c1 Sep 2006 11:07:51 - 1.8
@@ -99,7 +99,7 @@
c_obj = ecore_hash_get(_entropy_global_options_hash,
key);
printf('%s' - '%s'\n, key, c_obj-value);
- entropy_config_misc_item_set_str(key,c_obj-value);
+ entropy_config_misc_item_str_set(key,c_obj-value,
ENTROPY_CONFIG_LOC_HASH);
}
ecore_list_destroy(keys);
}
@@ -170,7 +170,11 @@
etk_signal_connect(toggled, ETK_OBJECT(radio),
ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.iconviewer );
-
+ check = etk_check_button_new_with_label(Show trackback viewer);
+ etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_signal_connect(toggled, ETK_OBJECT(check),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.trackback);
+
check = etk_check_button_new_with_label(Sort folders before
files);
etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
etk_signal_connect(toggled, ETK_OBJECT(check),
@@ -248,6 +252,7 @@
entropy_etk_options_object_create(general.listviewer);
entropy_etk_options_object_create(general.iconviewer);
+ entropy_etk_options_object_create(general.trackback);
entropy_etk_options_object_create(general.presortfolders);
entropy_etk_options_object_create(general.hiddenbackup);
entropy_etk_options_object_create(general.iconsize);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* More config work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- layout_etk_simple.c 1 Sep 2006 11:07:51 - 1.58
+++ layout_etk_simple.c 1 Sep 2006 11:27:35 - 1.59
@@ -49,6 +49,7 @@
Etk_Widget* popup;
Etk_Widget* localshell;
+ Etk_Widget* trackback_shell;
Ecore_Hash* progress_hash; /*Track progress events-dialogs*/
Ecore_Hash* properties_request_hash;
@@ -278,10 +279,11 @@
entropy_gui_component_instance* instance = data;
entropy_layout_gui* gui = instance-data;
- if (!etk_widget_is_visible(gui-trackback-gui_object)) {
- etk_widget_show_all(gui-trackback-gui_object);
+ if (etk_container_is_child(ETK_CONTAINER(gui-trackback_shell),
gui-trackback-gui_object) == ETK_FALSE) {
+ etk_box_append(ETK_BOX(gui-trackback_shell),
gui-trackback-gui_object, ETK_BOX_START, ETK_BOX_NONE,0);
+ etk_widget_show_all(ETK_WIDGET(gui-trackback-gui_object));
} else {
- etk_widget_hide(gui-trackback-gui_object);
+ etk_container_remove(ETK_CONTAINER(gui-trackback_shell),
gui-trackback-gui_object);
}
}
@@ -536,7 +538,6 @@
Etk_Widget *window;
entropy_layout_gui *gui;
entropy_gui_component_instance *layout;
- entropy_gui_component_instance* instance= NULL;
void *(*local_plugin_init) (entropy_core * core,
entropy_gui_component_instance *,
@@ -653,6 +654,9 @@
gui-localshell = etk_vbox_new(ETK_TRUE,0);
etk_paned_child2_set(ETK_PANED(gui-paned), gui-localshell, ETK_TRUE);
+ /*Trackback container init*/
+ gui-trackback_shell = etk_vbox_new(ETK_TRUE,0);
+
/*Popup init*/
gui-popup = etk_menu_new();
etk_signal_connect(row_clicked, ETK_OBJECT( gui-tree ),
@@ -726,6 +730,10 @@
gui-trackback = (*local_plugin_init)(core, layout,NULL);
gui-trackback-plugin = trackback;
gui-trackback-active=1;
+
+ if (entropy_config_misc_is_set(general.trackback)) {
+ etk_box_append(ETK_BOX(gui-trackback_shell),
gui-trackback-gui_object, ETK_BOX_START, ETK_BOX_NONE, 0);
+ }
}
@@ -807,11 +815,7 @@
etk_box_append(ETK_BOX(vbox), menubar, ETK_BOX_START, ETK_BOX_NONE, 0);
-
- if (trackback) {
- etk_box_append(ETK_BOX(vbox), gui-trackback-gui_object,
ETK_BOX_START, ETK_BOX_NONE, 0);
- }
-
+ etk_box_append(ETK_BOX(vbox), gui-trackback_shell, ETK_BOX_START,
ETK_BOX_NONE, 0);
etk_box_append(ETK_BOX(vbox), gui-paned, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
/*---*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
layout_etk_simple.c
Log Message:
* More config dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- layout_etk_simple.c 1 Sep 2006 11:27:35 - 1.59
+++ layout_etk_simple.c 1 Sep 2006 11:59:45 - 1.60
@@ -783,7 +783,9 @@
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_tree_cb), layout);
menu_item = _entropy_etk_menu_check_item_new(_(Trackback view),
ETK_MENU_SHELL(menu));
- etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),1 );
+ if (entropy_config_misc_is_set(general.trackback)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(entropy_etk_layout_trackback_cb), layout);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/dialogs
Modified Files:
etk_options_dialog.c
Log Message:
* More config dialog
===
RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- etk_options_dialog.c1 Sep 2006 11:07:51 - 1.8
+++ etk_options_dialog.c1 Sep 2006 11:59:45 - 1.9
@@ -14,9 +14,13 @@
Entropy_Etk_Options_Object* entropy_etk_options_object_create(char* name)
{
Entropy_Etk_Options_Object* obj;
+ char* val;
obj = calloc(1, sizeof(Entropy_Etk_Options_Object));
obj-name = strdup(name);
+ if ( (val = entropy_config_misc_item_str_get(name))) {
+ obj-value = strdup(val);
+ }
ecore_hash_set(_entropy_global_options_hash, obj-name, obj);
@@ -97,9 +101,11 @@
keys = ecore_hash_keys(_entropy_global_options_hash);
while ((key = ecore_list_remove_first(keys))) {
c_obj = ecore_hash_get(_entropy_global_options_hash,
key);
- printf('%s' - '%s'\n, key, c_obj-value);
-
- entropy_config_misc_item_str_set(key,c_obj-value,
ENTROPY_CONFIG_LOC_HASH);
+
+ if (c_obj-value) {
+ printf('%s' - '%s'\n, key, c_obj-value);
+
entropy_config_misc_item_str_set(key,c_obj-value, ENTROPY_CONFIG_LOC_HASH);
+ }
}
ecore_list_destroy(keys);
}
@@ -117,6 +123,42 @@
}
+Etk_Widget* etk_options_dialog_checkbox_new(char* label, char* config_item)
+{
+ Etk_Widget* check;
+
+check = etk_check_button_new_with_label(label);
+ etk_signal_connect(toggled, ETK_OBJECT(check),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
config_item);
+
+ if (entropy_config_misc_is_set(config_item))
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check),
ETK_TRUE);
+ else
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(check),
ETK_FALSE);
+
+ return check;
+}
+
+Etk_Widget* etk_options_dialog_radiobutton_new(char* label, char* config_item,
Etk_Widget* from)
+{
+ Etk_Widget* radio;
+
+if (!from)
+ radio = etk_radio_button_new_with_label(label,NULL);
+ else
+ radio = etk_radio_button_new_with_label_from_widget(label,
ETK_RADIO_BUTTON(from));
+
+ etk_signal_connect(toggled, ETK_OBJECT(radio),
+ ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
config_item);
+
+ if (entropy_config_misc_is_set(config_item))
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(radio),
ETK_TRUE);
+ else
+ etk_toggle_button_active_set(ETK_TOGGLE_BUTTON(radio),
ETK_FALSE);
+
+ return radio;
+}
+
void entropy_etk_options_dialog_create()
{
Etk_Widget* toolbar;
@@ -127,7 +169,6 @@
Etk_Widget* ivbox;
Etk_Widget* iivbox;
Etk_Widget* radio;
- Etk_Widget* check;
Etk_Widget* hbox;
Etk_Widget* slider;
Etk_Widget* label;
@@ -161,29 +202,24 @@
iivbox = etk_vbox_new(ETK_FALSE,0);
etk_container_add(ETK_CONTAINER(iframe), iivbox);
- radio = etk_radio_button_new_with_label(List view, NULL);
- etk_box_append(ETK_BOX(iivbox), radio, ETK_BOX_START,
ETK_BOX_NONE, 0);
- etk_signal_connect(toggled, ETK_OBJECT(radio),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.listviewer );
- radio = etk_radio_button_new_with_label_from_widget(Icon view,
ETK_RADIO_BUTTON(radio));
- etk_box_append(ETK_BOX(iivbox), radio, ETK_BOX_START,
ETK_BOX_NONE, 0);
- etk_signal_connect(toggled, ETK_OBJECT(radio),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.iconviewer );
-
- check = etk_check_button_new_with_label(Show trackback viewer);
- etk_box_append(ETK_BOX(ivbox), check, ETK_BOX_START, ETK_BOX_NONE,
0);
- etk_signal_connect(toggled, ETK_OBJECT(check),
- ETK_CALLBACK(entropy_etk_options_radio_generic_cb),
general.trackback);
+ radio=etk_options_dialog_radiobutton_new(Icon view,
general.iconviewer, NULL);
+ etk_box_append(ETK_BOX(iivbox),radio , ETK_BOX_START, ETK_BOX_NONE,
0);
+ etk_box_append(ETK_BOX(iivbox), etk_options_dialog_radiobutton_new(
+ List view, general.listviewer, radio),
ETK_BOX_START, ETK_BOX_NONE, 0);
+
+ etk_box_append(ETK_BOX(ivbox),
+ etk_options_dialog_checkbox_new(Show trackback
viewer,
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_list_viewer.c layout_etk_simple.c
Log Message:
* More config work
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- etk_list_viewer.c 24 Aug 2006 23:18:03 - 1.70
+++ etk_list_viewer.c 1 Sep 2006 12:12:50 - 1.71
@@ -120,21 +120,27 @@
{
gui_file *file1, *file2;
int val;
+ int presort_folder;
if (!tree || !row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
file2 = ecore_hash_get(etk_list_viewer_row_hash, row2);
+
+ presort_folder = entropy_config_misc_is_set(general.presortfolders);
if (file1 file2) {
val = strcasecmp(file1-file-filename, file2-file-filename);
-if ( !strcmp(file1-file-mime_type, file/folder)
strcmp(file2-file-mime_type, file/folder))
-return -1;
-else if (!strcmp(file2-file-mime_type, file/folder)
strcmp(file1-file-mime_type, file/folder))
-return 1;
-else
+if (presort_folder) {
+if ( !strcmp(file1-file-mime_type, file/folder)
strcmp(file2-file-mime_type, file/folder))
+return -1;
+else if (!strcmp(file2-file-mime_type, file/folder)
strcmp(file1-file-mime_type, file/folder))
+return 1;
+else
+return val;
+} else
return val;
} else {
printf(Could not locate file!\n);
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- layout_etk_simple.c 1 Sep 2006 11:59:45 - 1.60
+++ layout_etk_simple.c 1 Sep 2006 12:12:50 - 1.61
@@ -686,9 +686,11 @@
if (entropy_config_misc_is_set(general.listviewer)) {
gui-list_viewer-active=1;
local_viewer_selected = 1;
+ etk_widget_show(gui-list_viewer-gui_object);
etk_box_append(ETK_BOX(gui-localshell),
gui-list_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
gui-list_viewer-active=0;
+ etk_widget_show(gui-list_viewer-gui_object);
}
}
@@ -704,9 +706,11 @@
if (entropy_config_misc_is_set(general.iconviewer)) {
gui-iconbox_viewer-active=1;
local_viewer_selected = 1;
+ etk_widget_show(gui-iconbox_viewer-gui_object);
etk_box_append(ETK_BOX(gui-localshell),
gui-iconbox_viewer-gui_object, ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
} else {
gui-iconbox_viewer-active=0;
+ etk_widget_show(gui-iconbox_viewer-gui_object);
}
}
@@ -795,11 +799,17 @@
menu_item = _entropy_etk_radio_item_new(_(List View (Alt-l)), NULL,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), VISUAL, gui-list_viewer);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_local_viewer_cb), layout);
+ if (entropy_config_misc_is_set(general.listviewer)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
menu_item = _entropy_etk_radio_item_new(_(Icon View (Alt-i)), menu_item,
ETK_MENU_SHELL(menu));
etk_object_data_set(ETK_OBJECT(menu_item), VISUAL, gui-iconbox_viewer);
etk_signal_connect(activated, ETK_OBJECT(menu_item),
ETK_CALLBACK(etk_local_viewer_cb), layout);
+ if (entropy_config_misc_is_set(general.iconviewer)) {
+ etk_menu_item_check_active_set(ETK_MENU_ITEM_CHECK(menu_item),
ETK_TRUE);
+ }
/*Debug menu*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e kaethorn
Enlightenment CVS committal Author : kaethorn Project : e17 Module : apps/e Dir : e17/apps/e/debian Modified Files: control Log Message: fix virtual debian package. === RCS file: /cvs/e/e17/apps/e/debian/control,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- control 23 Aug 2006 11:17:04 - 1.19 +++ control 1 Sep 2006 12:16:24 - 1.20 @@ -89,7 +89,7 @@ Package: e17-extras Architecture: any Section: x11 -Depends: exhibit, entropy, edje-viewer, empower, extract, estickies, ephoto, entice, engage, entrance, entrance-edit-gui +Depends: exhibit, entropy, edje-viewer, empower, extrackt, estickies, ephoto, entice, engage, entrance, entrance-edit-gui Suggests: enlightenment Description: Virtual package providing extras for the E17 window manager Enlightenment is an advanced window manager for X11. Unique @@ -103,7 +103,7 @@ * entropy - file manager based on Etk * edje-viewer - A simple viewer for edje files * empower - graphical sudo tool - * extract - an audio CD ripper and encoder + * extrackt - an audio CD ripper and encoder * estickies - A sticky notes application based on Etk * ephoto - A slideshow creator with audio-support * entice - Image viewer based on libeet - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e_utils devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e_utils Dir : e17/apps/e_utils/src/bin/e17setroot Modified Files: e17setroot.c Log Message: Patch from boneyfrog for fixing E backgrounds. === RCS file: /cvs/e/e17/apps/e_utils/src/bin/e17setroot/e17setroot.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- e17setroot.c9 Jul 2006 23:13:39 - 1.33 +++ e17setroot.c1 Sep 2006 12:37:04 - 1.34 @@ -195,7 +195,7 @@ roots = ecore_x_window_root_list(num); ecore_x_window_size_get(roots[0], w, h); snprintf(filename_s, PATH_MAX, /tmp/%s.png, filenoext); - snprintf(static_bg, PATH_MAX, edje_thumb %s desktop/background %s -g %dx%d -og %dx%d, filename, filename_s, w, h, w, h); + snprintf(static_bg, PATH_MAX, edje_thumb %s e/desktop/background %s -g %dx%d -og %dx%d, filename, filename_s, w, h, w, h); system(static_bg); _e_bg_bg_set(filename); @@ -229,7 +229,7 @@ engrave_file_image_add(edj, image); grp = engrave_group_new(); - engrave_group_name_set(grp, desktop/background); + engrave_group_name_set(grp, e/desktop/background); engrave_file_group_add(edj, grp); part = engrave_part_new(ENGRAVE_PART_TYPE_IMAGE); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
etk_icon_viewer.c
Log Message:
* Bugfixes
* More config items
===
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- etk_icon_viewer.c 26 Aug 2006 12:59:15 - 1.16
+++ etk_icon_viewer.c 1 Sep 2006 12:39:39 - 1.17
@@ -36,6 +36,8 @@
};
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data);
+void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value ) ;
+
/*- boilerplate -*/
typedef struct gui_file gui_file;
@@ -169,14 +171,8 @@
return base;
}
-void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+void entropy_etk_icon_viewer_icon_size_set(entropy_etk_iconbox_viewer* viewer,
double value )
{
- entropy_gui_component_instance *instance;
- entropy_etk_iconbox_viewer *viewer;
-
- instance = data;
- viewer = instance-data;
-
etk_iconbox_model_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer-iconbox)),
(value*2) + 14,
value + 22,
@@ -189,6 +185,17 @@
0, value + 2, (value*2) + 4, 12, 0.5,0);
}
+void _entropy_etk_icon_viewer_slider_cb(Etk_Object *object, double value, void
*data)
+{
+ entropy_gui_component_instance *instance;
+ entropy_etk_iconbox_viewer *viewer;
+
+ instance = data;
+ viewer = instance-data;
+
+ entropy_etk_icon_viewer_icon_size_set(viewer, value);
+}
+
void _entropy_etk_icon_viewer_click_cb(Etk_Object *object, void *event_info,
void *data)
{
entropy_gui_component_instance *instance;
@@ -309,7 +316,7 @@
Etk_Iconbox *iconbox;
const char **types;
unsigned int num_types;
- Etk_Drag *drag;
+ Etk_Widget *drag;
Etk_Widget *image;
entropy_gui_component_instance* instance;
entropy_etk_iconbox_viewer* viewer;
@@ -388,8 +395,8 @@
printf(Drag buffer: %s\n, buffer);
- etk_drag_types_set(drag, types, num_types);
- etk_drag_data_set(drag, buffer, strlen(buffer)+1);
+ etk_drag_types_set(ETK_DRAG(drag), types, num_types);
+ etk_drag_data_set(ETK_DRAG(drag), buffer, strlen(buffer)+1);
@@ -412,6 +419,7 @@
entropy_etk_iconbox_viewer *viewer;
char **dnd_types;
int dnd_types_num=0;
+ char* size;
instance = entropy_gui_component_instance_new ();
@@ -422,6 +430,11 @@
/*Make the various widgets*/
viewer-vbox = etk_vbox_new(ETK_FALSE,0);
+
+ instance-gui_object = viewer-vbox;
+ instance-core = core;
+ instance-data = viewer;
+ instance-layout_parent = layout;
/*Make the slider*/
viewer-slider = etk_hslider_new(10,128, 48, 1, 1);
@@ -432,7 +445,10 @@
viewer-iconbox = etk_iconbox_new();
etk_box_append(ETK_BOX(viewer-vbox), viewer-iconbox, ETK_BOX_START,
ETK_BOX_EXPAND_FILL, 0);
-
+ if ((size = entropy_config_misc_item_str_get(general.iconsize))) {
+ etk_range_value_set(ETK_RANGE(viewer-slider), atoi(size));
+ entropy_etk_icon_viewer_icon_size_set(viewer, atoi(size));
+ }
/*etk_iconbox_model_icon_geometry_set(etk_iconbox_current_model_get(ETK_ICONBOX(viewer-iconbox)),
0,0,64,64,1,1);*/
@@ -440,11 +456,6 @@
etk_signal_connect(mouse_down, ETK_OBJECT(viewer-iconbox),
ETK_CALLBACK(_entropy_etk_icon_viewer_click_cb), instance);
- instance-gui_object = viewer-vbox;
- instance-core = core;
- instance-data = viewer;
- instance-layout_parent = layout;
-
/*DND Setup*/
/* dnd_types_num = 1;
dnd_types = entropy_malloc(dnd_types_num* sizeof(char*));
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_fm.c e_int_config_wallpaper.c
Log Message:
Add a files_deleted hook for fm2.
Wallpaper dialog will now select an existing when something gets deleted.
Another TODO item gone :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_fm.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_fm.c 31 Aug 2006 12:51:54 - 1.48
+++ e_fm.c 1 Sep 2006 13:12:39 - 1.49
@@ -3021,6 +3021,8 @@
if (ic-sd-refresh_job) ecore_job_del(ic-sd-refresh_job);
ic-sd-refresh_job = ecore_job_add(_e_fm2_refresh_job_cb, ic-sd-obj);
+
+ evas_object_smart_callback_call(ic-sd-obj, files_deleted, NULL);
}
static void
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_int_config_wallpaper.c30 Aug 2006 14:45:33 - 1.11
+++ e_int_config_wallpaper.c1 Sep 2006 13:12:39 - 1.12
@@ -171,7 +171,7 @@
_cb_files_selected(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
-
+
cfdata = data;
}
@@ -205,11 +205,49 @@
else
p = cfdata-bg;
}
+
e_fm2_select_set(cfdata-o_fm, p, 1);
e_fm2_file_show(cfdata-o_fm, p);
}
static void
+_cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
+{
+ E_Config_Dialog_Data *cfdata;
+ Evas_List *sel, *all, *n;
+ E_Fm2_Icon_Info *ici, *ic;
+
+ cfdata = data;
+ if (!cfdata-bg) return;
+ if (!cfdata-o_fm) return;
+
+ all = e_fm2_all_list_get(cfdata-o_fm);
+ if (!all) return;
+ sel = e_fm2_selected_list_get(cfdata-o_fm);
+ if (!sel) return;
+
+ ici = sel-data;
+
+ all = evas_list_find_list(all, ici);
+ n = evas_list_next(all);
+ if (!n)
+ {
+ n = evas_list_prev(all);
+ if (!n) return;
+ }
+
+ ic = n-data;
+ if (!ic) return;
+
+ e_fm2_select_set(cfdata-o_fm, ic-file, 1);
+ e_fm2_file_show(cfdata-o_fm, ic-file);
+
+ evas_list_free(n);
+
+ evas_object_smart_callback_call(cfdata-o_fm, selection_change, cfdata);
+}
+
+static void
_cb_theme_wallpaper(void *data, Evas_Object *obj, void *event_info)
{
E_Config_Dialog_Data *cfdata;
@@ -421,6 +459,9 @@
_cb_files_selected, cfdata);
evas_object_smart_callback_add(o, changed,
_cb_files_files_changed, cfdata);
+ evas_object_smart_callback_add(o, files_deleted,
+ _cb_files_files_deleted, cfdata);
+
e_fm2_path_set(o, path, /);
of = e_widget_scrollframe_pan_add(evas, o,
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: TODO Log Message: Wallpaper delete/select is done. === RCS file: /cvs/e/e17/apps/e/TODO,v retrieving revision 1.415 retrieving revision 1.416 diff -u -3 -r1.415 -r1.416 --- TODO1 Sep 2006 11:05:27 - 1.415 +++ TODO1 Sep 2006 13:14:25 - 1.416 @@ -76,7 +76,6 @@ --- * bg gradient dialog needs a preview widget. also edje needs to be updated so we can do proper fills for non 0 angles. -* wallpaper dialog needs to select an existing wallpaper when the current on e is deleted. (might need to add a hook to e_fm2 for delete events). * clientinfo dialog could be nicer - then again it is an obsucre thing. * desklock's pam profile should be configurable as system-auth doesn't always work and the fallback checks might not work either. - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_engine.c etk_engine.h etk_window.c etk_window.h
Log Message:
* [Window] Add etk_window_stacking_set/get() to change the stacking
layer of a window (normal, always on top, always below)
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_engine.c1 Sep 2006 10:53:20 - 1.9
+++ etk_engine.c1 Sep 2006 13:32:30 - 1.10
@@ -538,6 +538,30 @@
}
/**
+ * @brief Calls the engines's method to set the stacking layer of the window
+ * @param window a window
+ * @param stacking the stacking layer to use
+ */
+void etk_engine_window_stacking_set(Etk_Window *window, Etk_Window_Stacking
stacking)
+{
+ if (!_engine || !_engine-window_stacking_set)
+ return;
+ _engine-window_stacking_set(window, stacking);
+}
+
+/**
+ * @brief Calls the engines's method to get the stacking layer of the window
+ * @param window a window
+ * @return Returns the stacking layer of the window
+ */
+Etk_Window_Stacking etk_engine_window_stacking_get(Etk_Window *window)
+{
+ if (!_engine || !_engine-window_stacking_get)
+ return ETK_WINDOW_NORMAL;
+ return _engine-window_stacking_get(window);
+}
+
+/**
* @brief Calls the engines's method to set whether a window is sticky. A
sticky window is a window that appears on all
* the virtual desktops
* @param window a window
@@ -859,7 +883,9 @@
INHERIT(window_fullscreen_set);
INHERIT(window_fullscreen_get);
INHERIT(window_raise);
- INHERIT(window_lower);
+ INHERIT(window_lower);
+ INHERIT(window_stacking_set);
+ INHERIT(window_stacking_get);
INHERIT(window_sticky_set);
INHERIT(window_sticky_get);
INHERIT(window_focused_set);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_engine.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- etk_engine.h1 Sep 2006 10:53:20 - 1.9
+++ etk_engine.h1 Sep 2006 13:32:30 - 1.10
@@ -4,6 +4,7 @@
#include Evas.h
#include etk_toplevel_widget.h
+#include etk_window.h
#include etk_types.h
struct Etk_Engine
@@ -39,7 +40,9 @@
void (*window_fullscreen_set)(Etk_Window *window, Etk_Bool fullscreen);
Etk_Bool (*window_fullscreen_get)(Etk_Window *window);
void (*window_raise)(Etk_Window *window);
- void (*window_lower)(Etk_Window *window);
+ void (*window_lower)(Etk_Window *window);
+ void (*window_stacking_set)(Etk_Window *window, Etk_Window_Stacking
stacking);
+ Etk_Window_Stacking (*window_stacking_get)(Etk_Window *window);
void (*window_sticky_set)(Etk_Window *window, Etk_Bool sticky);
Etk_Bool (*window_sticky_get)(Etk_Window *window);
void (*window_focused_set)(Etk_Window *window, Etk_Bool focused);
@@ -110,7 +113,9 @@
void etk_engine_window_fullscreen_set(Etk_Window *window, Etk_Bool fullscreen);
Etk_Bool etk_engine_window_fullscreen_get(Etk_Window *window);
void etk_engine_window_raise(Etk_Window *window);
-void etk_engine_window_lower(Etk_Window *window);
+void etk_engine_window_lower(Etk_Window *window);
+void etk_engine_window_stacking_set(Etk_Window *window, Etk_Window_Stacking
stacking);
+Etk_Window_Stacking etk_engine_window_stacking_get(Etk_Window *window);
void etk_engine_window_sticky_set(Etk_Window *window, Etk_Bool on);
Etk_Bool etk_engine_window_sticky_get(Etk_Window *window);
void etk_engine_window_focused_set(Etk_Window *window, Etk_Bool focused);
===
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_window.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- etk_window.c1 Sep 2006 10:53:20 - 1.37
+++ etk_window.c1 Sep 2006 13:32:30 - 1.38
@@ -238,6 +238,7 @@
* @param window_to_modal the window to make modal
* @param window the window on which @a window_to_modal will modal'ed on, or
NULL to disable the modal state
*/
+/* TODO: grab the input */
void etk_window_modal_for_window(Etk_Window *window_to_modal, Etk_Window
*window)
{
if (window_to_modal)
@@ -265,6 +266,30 @@
if (!window)
return;
etk_engine_window_lower(window);
+}
+
+/**
+ * @brief Sets the stacking layer of the window (normal, always on top or
always below)
+ * @param window a window
+ * @param stacking the stacking layer to use
+ */
+void etk_window_stacking_set(Etk_Window *window, Etk_Window_Stacking stacking)
+{
+ if (!window)
+ return;
+ etk_engine_window_stacking_set(window, stacking);
+}
+
+/**
+ * @brief Gets the stacking layer of the window
+ * @param window a window
+ * @return Returns the stacking layer of the window
+ */
+Etk_Window_Stacking
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_theme.c
Log Message:
Add the fm2 delete hook and select a theme if one is in the list.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- e_int_config_theme.c30 Aug 2006 14:45:33 - 1.34
+++ e_int_config_theme.c1 Sep 2006 13:32:39 - 1.35
@@ -170,6 +170,42 @@
e_fm2_path_set(cfdata-o_fm, path, /);
}
+static void
+_cb_files_files_deleted(void *data, Evas_Object *obj, void *event_info)
+{
+ E_Config_Dialog_Data *cfdata;
+ Evas_List *sel, *all, *n;
+ E_Fm2_Icon_Info *ici, *ic;
+
+ cfdata = data;
+ if (!cfdata-theme) return;
+ if (!cfdata-o_fm) return;
+
+ all = e_fm2_all_list_get(cfdata-o_fm);
+ if (!all) return;
+ sel = e_fm2_selected_list_get(cfdata-o_fm);
+ if (!sel) return;
+
+ ici = sel-data;
+
+ all = evas_list_find_list(all, ici);
+ n = evas_list_next(all);
+ if (!n)
+ {
+ n = evas_list_prev(all);
+ if (!n) return;
+ }
+
+ ic = n-data;
+ if (!ic) return;
+
+ e_fm2_select_set(cfdata-o_fm, ic-file, 1);
+ e_fm2_file_show(cfdata-o_fm, ic-file);
+
+ evas_list_free(n);
+
+ evas_object_smart_callback_call(cfdata-o_fm, selection_change, cfdata);
+}
@@ -304,6 +340,9 @@
_cb_files_selected, cfdata);
evas_object_smart_callback_add(o, changed,
_cb_files_files_changed, cfdata);
+ evas_object_smart_callback_add(o, files_deleted,
+ _cb_files_files_deleted, cfdata);
+
e_fm2_path_set(o, path, /);
of = e_widget_scrollframe_pan_add(evas, o,
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas Modified Files: ecore_evas.c Log Message: * [Window] Add etk_window_stacking_set/get() to change the stacking layer of a window (normal, always on top, always below) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas/ecore_evas.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ecore_evas.c1 Sep 2006 06:41:16 - 1.9 +++ ecore_evas.c1 Sep 2006 13:32:30 - 1.10 @@ -86,6 +86,8 @@ _window_fullscreen_get, _window_raise, _window_lower, + NULL, /* window_stacking_set */ + NULL, /* window_stacking_get */ _window_sticky_set, _window_sticky_get, _window_focused_set, - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/engines/ecore_evas_software_x11
Modified Files:
ecore_evas_software_x11.c
Log Message:
* [Window] Add etk_window_stacking_set/get() to change the stacking
layer of a window (normal, always on top, always below)
===
RCS file:
/cvs/e/e17/proto/etk/src/engines/ecore_evas_software_x11/ecore_evas_software_x11.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ecore_evas_software_x11.c 1 Sep 2006 06:41:17 - 1.8
+++ ecore_evas_software_x11.c 1 Sep 2006 13:32:30 - 1.9
@@ -6,8 +6,7 @@
#include Etk_Engine_Ecore_Evas_X11.h
/* Etk_Window engine data
- * we do another typedef to shorten the name for internal use
- */
+ * we do another typedef to shorten the name for internal use */
typedef Etk_Engine_Ecore_Evas_X11_Window_Data Etk_Engine_Window_Data;
/* General engine functions */
@@ -50,6 +49,8 @@
NULL, /* window_fullscreen_get */
NULL, /* window_raise */
NULL, /* window_lower */
+ NULL, /* window_stacking_set */
+ NULL, /* window_stacking_get */
NULL, /* window_sticky_set */
NULL, /* window_sticky_get */
NULL, /* window_focused_set */
@@ -109,13 +110,12 @@
static void _window_constructor(Etk_Window *window)
{
/* We _MUST_ initialize and create the ecore_evas and the x_window
-* variables in the engine_data.
-*/
- Etk_Engine_Window_Data *engine_data;
+* variables in the engine_data. */
+ Etk_Engine_Window_Data *engine_data;
engine_data = malloc(sizeof(Etk_Engine_Window_Data));
window-engine_data = engine_data;
ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)-ecore_evas =
ecore_evas_software_x11_new(NULL, 0, 0, 0, 0, 0);
engine_data-x_window =
ecore_evas_software_x11_window_get(ETK_ENGINE_ECORE_EVAS_WINDOW_DATA(engine_data)-ecore_evas);
- engine_info.super-window_constructor(window);
+ engine_info.super-window_constructor(window);
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto moom
Enlightenment CVS committal Author : moom Project : e17 Module : proto Dir : e17/proto/etk/src/engines/ecore_evas_x11 Modified Files: ecore_evas_x11.c Log Message: * [Window] Add etk_window_stacking_set/get() to change the stacking layer of a window (normal, always on top, always below) === RCS file: /cvs/e/e17/proto/etk/src/engines/ecore_evas_x11/ecore_evas_x11.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- ecore_evas_x11.c1 Sep 2006 06:41:17 - 1.12 +++ ecore_evas_x11.c1 Sep 2006 13:32:30 - 1.13 @@ -13,20 +13,7 @@ /* Engine specific data for Etk_Window * We do this to shorten the name for internal use */ typedef Etk_Engine_Ecore_Evas_X11_Window_Data Etk_Engine_Window_Data; -static Ecore_Event_Handler *_window_property_handler = NULL; -static int _window_property_cb(void *data, int ev_type, void *ev); -/* Engine specific data for Etk_Popup_Window */ -static Ecore_X_Window _etk_popup_window_input_window = 0; -static Ecore_Event_Handler *_popup_window_key_down_handler = NULL; -static Ecore_Event_Handler *_popup_window_key_up_handler = NULL; -static Ecore_Event_Handler *_popup_window_mouse_up_handler = NULL; -static Ecore_Event_Handler *_popup_window_mouse_move_handler = NULL; -static int _popup_window_popup_timestamp = 0; -static int _popup_window_mouse_x = -10; -static int _popup_window_mouse_y = -10; -static Ecore_Timer *_popup_window_slide_timer = NULL; -static Evas_List *_popup_window_popped_windows = NULL; /* General engine functions */ Etk_Engine *engine_open(); @@ -39,6 +26,8 @@ static void _window_destructor(Etk_Window *window); static void _window_screen_geometry_get(Etk_Window *window, int *x, int *y, int *w, int *h); static void _window_modal_for_window(Etk_Window *window_to_modal, Etk_Window *window); +static void _window_stacking_set(Etk_Window *window, Etk_Window_Stacking stacking); +static Etk_Window_Stacking _window_stacking_get(Etk_Window *window); static void _window_skip_taskbar_hint_set(Etk_Window *window, Etk_Bool skip_taskbar_hint); static Etk_Bool _window_skip_taskbar_hint_get(Etk_Window *window); static void _window_skip_pager_hint_set(Etk_Window *window, Etk_Bool skip_pager_hint); @@ -60,21 +49,18 @@ static int _popup_window_mouse_move_cb(void *data, int type, void *event); static int _popup_window_mouse_up_cb(void *data, int type, void *event); -/* Mouse */ +/* Mouse functions */ static void _mouse_position_get(int *x, int *y); static void _mouse_screen_geometry_get(int *x, int *y, int *w, int *h); -/* Etk_Drag */ +/* Etk_Drag functions*/ static void _drag_constructor(Etk_Drag *drag); static void _drag_begin(Etk_Drag *drag); -static Ecore_Event_Handler *_drag_mouse_move_handler; -static Ecore_Event_Handler *_drag_mouse_up_handler; - static int _drag_mouse_up_cb(void *data, int type, void *event); static int _drag_mouse_move_cb(void *data, int type, void *event); -/* Etk Dnd */ +/* Etk_Dnd functions */ static Etk_Bool _dnd_init(); static void _dnd_shutdown(); @@ -87,6 +73,35 @@ static int _dnd_status_handler(void *data, int type, void *event); static int _dnd_finished_handler(void *data, int type, void *event); +/* Etk_Clipboard functions */ +static void _clipboard_text_request(Etk_Widget *widget); +static void _clipboard_text_set(Etk_Widget *widget, const char *text, int length); + +/* Etk_Selection functions */ +static void _selection_text_request(Etk_Widget *widget); +static void _selection_text_set(Etk_Widget *widget, const char *text, int length); +static void _selection_clear(void); + +/* Private functions */ +static int _window_property_cb(void *data, int ev_type, void *ev); + +/* Private vars */ +static Ecore_Event_Handler *_window_property_handler = NULL; + +static Ecore_X_Window _etk_popup_window_input_window = 0; +static Ecore_Event_Handler *_popup_window_key_down_handler = NULL; +static Ecore_Event_Handler *_popup_window_key_up_handler = NULL; +static Ecore_Event_Handler *_popup_window_mouse_up_handler = NULL; +static Ecore_Event_Handler *_popup_window_mouse_move_handler = NULL; +static int _popup_window_popup_timestamp = 0; +static int _popup_window_mouse_x = -10; +static int _popup_window_mouse_y = -10; +static Ecore_Timer *_popup_window_slide_timer = NULL; +static Evas_List *_popup_window_popped_windows = NULL; + +static Ecore_Event_Handler *_drag_mouse_move_handler; +static Ecore_Event_Handler *_drag_mouse_up_handler; + extern Etk_Widget *_etk_selection_widget; extern Etk_Widget *_etk_drag_widget; static char **_dnd_types = NULL; @@ -95,14 +110,6 @@ static Evas_List *_dnd_handlers = NULL; static int _dnd_widget_accepts = 0; -/* Etk Clipboard functions */ -static void _clipboard_text_request(Etk_Widget *widget); -static void _clipboard_text_set(Etk_Widget *widget, const char *text, int length); - -/* Etk Selection
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/tools/etk_prefs
Modified Files:
etk_prefs.c
Log Message:
- [Etk_Prefs] We dont need to destroy the widgets in the preview pane and
create them again for every theme change. Just apply the theme to the parent
widget and watch it propagate to the children. werd.
===
RCS file: /cvs/e/e17/proto/etk/src/tools/etk_prefs/etk_prefs.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- etk_prefs.c 31 Aug 2006 17:55:51 - 1.2
+++ etk_prefs.c 1 Sep 2006 13:44:20 - 1.3
@@ -196,7 +196,7 @@
static void _etk_prefs_theme_row_selected_cb(Etk_Object *object, Etk_Tree_Row
*row, void *data)
{
- static Etk_Widget *child = NULL;
+ Etk_Widget *child = NULL;
Etk_Tree *tree;
char *icol_string;
Etk_Widget *preview;
@@ -205,11 +205,6 @@
preview = data;
etk_tree_row_fields_get(row, etk_tree_nth_col_get(tree, 0), icol_string,
NULL, NULL, NULL);
- if(child)
- {
- etk_container_remove(ETK_CONTAINER(preview), child);
- etk_object_destroy(ETK_OBJECT(child));
- }
child = _etk_prefs_theme_preview_get(icol_string);
etk_container_add(ETK_CONTAINER(preview), child);
etk_widget_show_all(child);
@@ -218,7 +213,7 @@
static Etk_Widget *_etk_prefs_theme_preview_get(const char *theme)
{
char file[PATH_MAX];
- Etk_Widget *box;
+ static Etk_Widget *box = NULL;
Etk_Widget *widget;
Etk_Widget *vbox;
Etk_Widget *frame;
@@ -240,7 +235,13 @@
free(_etk_prefs_widget_theme);
_etk_prefs_widget_theme = strdup(theme);
- box = etk_vbox_new(ETK_FALSE, 0);
+ if (box)
+ {
+ etk_widget_theme_file_set(box, file);
+ return box;
+ }
+
+ box = etk_vbox_new(ETK_FALSE, 0);
etk_widget_theme_file_set(box, file);
frame = etk_frame_new(Buttons);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_eap_editor.c
Log Message:
Uses the standard icon search method now.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_eap_editor.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- e_eap_editor.c 1 Sep 2006 10:43:20 - 1.46
+++ e_eap_editor.c 1 Sep 2006 13:57:28 - 1.47
@@ -21,25 +21,26 @@
struct _E_Config_Dialog_Data
{
+ E_App eap;
/*- BASIC -*/
- char *name;
- char *exe;
+ char *name;
+ char *exe;
/*- ADVANCED -*/
- char *generic;
- char *comment;
- char *wname;
- char *wclass;
- char *wtitle;
- char *wrole;
- char *iclass;
- char *ipath;
- int icon_theme;
- int startup_notify;
- int wait_exit;
+ char *generic;
+ char *comment;
+ char *wname;
+ char *wclass;
+ char *wtitle;
+ char *wrole;
+ char *iclass;
+ char *ipath;
+ intstartup_notify;
+ intwait_exit;
/*- common -*/
- char *image;
- int width;
- int height;
+ char *image;
+ intwidth;
+ intheight;
+ inticon_theme;
E_App_Edit *editor;
};
@@ -122,6 +123,11 @@
cfdata-height = cfdata-editor-eap-height;
cfdata-width = cfdata-editor-eap-width;
if (cfdata-image) cfdata-editor-img_set = 1;
+
+ IFDUP(cfdata-editor-eap-path, cfdata-eap.path);
+ IFDUP(cfdata-editor-eap-icon_class, cfdata-eap.icon_class);
+ IFDUP(cfdata-editor-eap-icon_path, cfdata-eap.icon_path);
+
}
static void *
@@ -151,6 +157,14 @@
E_FREE(data-iclass);
E_FREE(data-ipath);
E_FREE(data-image);
+
+ if (data-eap.path)
+ free((char *) data-eap.path);
+ if (data-eap.icon_class)
+ free((char *) data-eap.icon_class);
+ if (data-eap.icon_path)
+ free((char *) data-eap.icon_path);
+
if (data-editor-eap-tmpfile) ecore_file_unlink(data-editor-eap-image);
data-editor-eap-tmpfile = 0;
if (data-editor-eap-image)
evas_stringshare_del(data-editor-eap-image);
@@ -183,7 +197,11 @@
if (data-name) eap-name = evas_stringshare_add(data-name);
if (data-exe) eap-exe = evas_stringshare_add(data-exe);
- if (data-image) eap-image = evas_stringshare_add(data-image);
+ if (data-image)
+ {
+ eap-image = evas_stringshare_add(data-image);
+ eap-icon_class = evas_stringshare_add(); /* Call this temporary,
until I reconsider the icon search order. */
+ }
eap-startup_notify = data-startup_notify;
eap-wait_exit = data-wait_exit;
@@ -228,7 +246,6 @@
if (data-name) eap-name = evas_stringshare_add(data-name);
if (data-exe) eap-exe = evas_stringshare_add(data-exe);
- if (data-image) eap-image = evas_stringshare_add(data-image);
if (data-generic) eap-generic = evas_stringshare_add(data-generic);
if (data-comment) eap-comment = evas_stringshare_add(data-comment);
@@ -238,6 +255,12 @@
if (data-wrole) eap-win_role = evas_stringshare_add(data-wrole);
if (data-iclass) eap-icon_class = evas_stringshare_add(data-iclass);
+ if (data-image)
+ {
+ eap-image = evas_stringshare_add(data-image);
+ eap-icon_class = evas_stringshare_add(); /* Call this temporary,
until I reconsider the icon search order. */
+ }
+
/* FIXME: hardcoded until the eap editor provides fields to change it */
if (data-width) eap-width = data-width;
else eap-width = 128;
@@ -272,6 +295,8 @@
editor-img = NULL;
}
+ editor-img = e_app_icon_add(evas, (data-eap));
+#if 0
if ((editor-img_set) (data-image))
{
if (editor-img) evas_object_del(editor-img);
@@ -288,6 +313,7 @@
e_icon_fill_inside_set(editor-img, 1);
}
}
+#endif
if (editor-img_widget) evas_object_del(editor-img_widget);
editor-img_widget = e_widget_button_add(evas, , NULL,
@@ -501,9 +527,23 @@
{
cfdata-editor-img_set = 1;
if (cfdata-editor-img) evas_object_del(cfdata-editor-img);
+
+if (cfdata-eap.path)
+ free((char *) cfdata-eap.path);
+if (cfdata-eap.icon_class)
+ free((char *) cfdata-eap.icon_class);
+if (cfdata-eap.icon_path)
+ free((char *) cfdata-eap.icon_path);
+
+ cfdata-eap.icon_path = strdup(cfdata-image);
+ cfdata-eap.path = strdup();
+ cfdata-eap.icon_class = strdup();
+cfdata-editor-img = e_app_icon_add(cfdata-editor-evas,
(cfdata-eap));
+#if 0
cfdata-editor-img = e_icon_add(cfdata-editor-evas);
e_icon_file_set(cfdata-editor-img, cfdata-image);
e_icon_fill_inside_set(cfdata-editor-img, 1);
+#endif
e_widget_button_icon_set(cfdata-editor-img_widget,
cfdata-editor-img);
}
else
-
Using Tomcat but need to do more? Need to support web services,
E CVS: emu e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : emu Dir : e_modules/emu/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/emu/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:27:22 - 1.1 +++ eo.po 1 Sep 2006 14:29:21 - 1.2 @@ -1,231 +1,138 @@ # translation of eo.po to # This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. -# Yasufumi Haga [EMAIL PROTECTED], 2006 # msgid msgstr +Language-Team: Esperanto [EMAIL PROTECTED]\n +Report-Msgid-Bugs-To: [EMAIL PROTECTED] Project-Id-Version: eo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-04-30 18:35+0900\n -PO-Revision-Date: 2006-06-08 21:17+0200\n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:54+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n Content-Type: text/plain; charset=UTF-8\n Content-Transfer-Encoding: 8bit\n -X-Poedit-Language: Esperanto\n -X-Poedit-Basepath: .\n -X-Poedit-SearchPath-0: /usr/portage/distfiles/cvs-src/e_modules/emu\n X-Generator: KBabel 1.11.2\n -#: src/modules/emu/border_props.c:55 -#: src/modules/emu_gadcon/border_props.c:55 +#: src/modules/emu/border_props.c:52 msgid Window properties -msgstr Fenestraj ecoj +msgstr Fenestraj Ecoj -#: src/modules/emu/border_props.c:224 -#: src/modules/emu/border_props.c:279 -#: src/modules/emu_gadcon/border_props.c:224 -#: src/modules/emu_gadcon/border_props.c:279 +#: src/modules/emu/border_props.c:221 src/modules/emu/border_props.c:276 msgid Window identification -msgstr Fenestra identeco +msgstr -#: src/modules/emu/border_props.c:225 -#: src/modules/emu/border_props.c:292 -#: src/modules/emu_gadcon/border_props.c:225 -#: src/modules/emu_gadcon/border_props.c:292 +#: src/modules/emu/border_props.c:222 src/modules/emu/border_props.c:289 msgid Title (%T) msgstr Titolo (%T) -#: src/modules/emu/border_props.c:231 -#: src/modules/emu/border_props.c:310 -#: src/modules/emu_gadcon/border_props.c:231 -#: src/modules/emu_gadcon/border_props.c:310 +#: src/modules/emu/border_props.c:228 src/modules/emu/border_props.c:307 msgid Properties -msgstr Atributoj +msgstr Ecoj -#: src/modules/emu/border_props.c:232 -#: src/modules/emu/border_props.c:311 -#: src/modules/emu_gadcon/border_props.c:232 -#: src/modules/emu_gadcon/border_props.c:311 +#: src/modules/emu/border_props.c:229 src/modules/emu/border_props.c:308 #, c-format msgid Position (%p) msgstr Pozicio (%p) -#: src/modules/emu/border_props.c:236 -#: src/modules/emu/border_props.c:315 -#: src/modules/emu_gadcon/border_props.c:236 -#: src/modules/emu_gadcon/border_props.c:315 +#: src/modules/emu/border_props.c:233 src/modules/emu/border_props.c:312 #, c-format msgid Size (%s) msgstr Grandeco (%s) -#: src/modules/emu/border_props.c:240 -#: src/modules/emu/border_props.c:323 -#: src/modules/emu_gadcon/border_props.c:240 -#: src/modules/emu_gadcon/border_props.c:323 +#: src/modules/emu/border_props.c:237 src/modules/emu/border_props.c:320 msgid Border style (%b) -msgstr Borda stilo (%b) +msgstr Randa stilo (%b) -#: src/modules/emu/border_props.c:244 -#: src/modules/emu_gadcon/border_props.c:244 +#: src/modules/emu/border_props.c:241 #, c-format msgid Stickiness (%p) msgstr Glueco (%p) -#: src/modules/emu/border_props.c:248 -#: src/modules/emu/border_props.c:331 -#: src/modules/emu_gadcon/border_props.c:248 -#: src/modules/emu_gadcon/border_props.c:331 +#: src/modules/emu/border_props.c:245 src/modules/emu/border_props.c:328 #, c-format msgid Virtual desktop (%d) -msgstr Virtuala Labortablo (%d) +msgstr Virtuala labortablo (%d) -#: src/modules/emu/border_props.c:252 -#: src/modules/emu/border_props.c:335 -#: src/modules/emu_gadcon/border_props.c:252 -#: src/modules/emu_gadcon/border_props.c:335 +#: src/modules/emu/border_props.c:249 src/modules/emu/border_props.c:332 msgid Shaded state (%r) -msgstr Ombra stato (%r) +msgstr -#: src/modules/emu/border_props.c:256 -#: src/modules/emu/border_props.c:347 -#: src/modules/emu_gadcon/border_props.c:256 -#: src/modules/emu_gadcon/border_props.c:347 +#: src/modules/emu/border_props.c:253 src/modules/emu/border_props.c:344 #, c-format msgid Fullscreen (%f) -msgstr Tutekrana (%f) +msgstr Tutekreano (%f) -#: src/modules/emu/border_props.c:260 -#: src/modules/emu/border_props.c:351 -#: src/modules/emu_gadcon/border_props.c:260 -#: src/modules/emu_gadcon/border_props.c:351 +#: src/modules/emu/border_props.c:257 src/modules/emu/border_props.c:348 #, c-format msgid Iconified (%i) msgstr Piktogramigita (%i) -#: src/modules/emu/border_props.c:280 -#: src/modules/emu_gadcon/border_props.c:280 -#, fuzzy +#: src/modules/emu/border_props.c:277 msgid Window ID (%I) msgstr Fenestra ID (%i) -#:
E CVS: mem e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : mem Dir : e_modules/mem/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/mem/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:27:23 - 1.1 +++ eo.po 1 Sep 2006 14:29:31 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 19:56+0200\n -PO-Revision-Date: 2006-06-04 19:57+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:35+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,8 +17,51 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:94 -#, c-format -msgid %1.0f seconds -msgstr %1.0f sekundoj +#: e_mod_config.c:43 +msgid Mem Configuration +msgstr + +#: e_mod_config.c:91 +msgid General Settings +msgstr Äeneralaj Agordoj + +#: e_mod_config.c:93 +msgid Always Show Text +msgstr Cxiam Vidigi Tekston + +#: e_mod_config.c:95 +msgid Show Text On Mouse Over +msgstr Vidigi Tekston dum movado de muso + +#: e_mod_config.c:98 +msgid Show Text As Percent +msgstr + +#: e_mod_config.c:103 +msgid Ignore Buffers +msgstr + +#: e_mod_config.c:107 +msgid Ignore Cached +msgstr + +#: e_mod_config.c:111 +msgid Check Interval: +msgstr Kontroli Intervalon : + +#: e_mod_main.c:106 +msgid Mem +msgstr + +#: e_mod_main.c:155 +msgid Configuration +msgstr Konfiguraĵo + +#: e_mod_main.c:366 +msgid Enlightenment Mem Monitor Module +msgstr + +#: e_mod_main.c:367 +msgid This module is used to monitor memory. +msgstr - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: net e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : net Dir : e_modules/net/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/net/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:31:59 - 1.1 +++ eo.po 1 Sep 2006 14:29:42 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 19:59+0200\n -PO-Revision-Date: 2006-06-04 20:00+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:27+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,13 +17,47 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:138 -#, c-format -msgid %1.0f seconds -msgstr %1.0f sekundoj - -#: e_mod_config.c:144 -#, c-format -msgid %1.0f -msgstr %1.0f +#: e_mod_config.c:44 +msgid Net Configuration +msgstr Konfiguraĵo de Reto + +#: e_mod_config.c:122 +msgid General Settings +msgstr Äeneralaj Agordoj + +#: e_mod_config.c:124 +msgid Always Show Text +msgstr Cxiam Vidigi Tekston + +#: e_mod_config.c:126 +msgid Show Text On Mouse Over +msgstr Vidigi Tekston dum movado de muso + +#: e_mod_config.c:130 +msgid Device Settings +msgstr Aparataj Agordoj + +#: e_mod_config.c:142 +msgid Check Interval: +msgstr Kontroli Intervalon : + +#: e_mod_config.c:150 +msgid Max MTU: +msgstr + +#: e_mod_main.c:114 +msgid Net +msgstr Reto + +#: e_mod_main.c:176 +msgid Configuration +msgstr Konfiguraĵo + +#: e_mod_main.c:379 +msgid Enlightenment Network Monitor Module +msgstr \Enlightenment-a Reta Kasxauxskulto\ Modulo + +#: e_mod_main.c:381 +msgid This module is used to monitor a network device. +msgstr Tiu modulo uzigxas por kasxauxskulti retan aparaton - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: moon e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : moon Dir : e_modules/moon/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/moon/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:27:23 - 1.1 +++ eo.po 1 Sep 2006 14:29:53 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 19:57+0200\n -PO-Revision-Date: 2006-06-04 19:57+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:34+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,7 +17,83 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: src/e_mod_main.c:261 -msgid Configuration -msgstr Konfiguraĵo +#: src/e_mod_config.c:101 +msgid Moon Configuration +msgstr Luna Konfigurajxo + +#: src/e_mod_config.c:157 +msgid Display Settings +msgstr Vidigaj Agordoj + +#: src/e_mod_config.c:158 +msgid Animated Clouds +msgstr Animitaj Nuboj + +#: src/e_mod_config.c:162 +msgid Moon Phase Value +msgstr + +#: src/e_mod_config.c:164 +msgid Show always +msgstr Montru Äiam + +#: src/e_mod_config.c:166 +msgid Show on mouse over +msgstr Vidigi dum musa movado + +#: src/e_mod_config.c:168 +msgid Never show +msgstr Neniam vidigi + +#: src/e_mod_config.c:172 +msgid Description +msgstr Priskribo + +#: src/e_mod_config.c:175 +msgid Numerical +msgstr + +#: src/e_mod_main.c:126 +msgid Moon Clock Module +msgstr + +#: src/e_mod_main.c:129 +msgid Display current phase of the moon ala e16 E-MoonClock +msgstr + +#: src/e_mod_main.c:217 +msgid Moon +msgstr Luno + +#: src/e_mod_main.c:495 +msgid New Moon +msgstr Novluno + +#: src/e_mod_main.c:497 +msgid Waxing Crescent +msgstr + +#: src/e_mod_main.c:499 +msgid First Quarter +msgstr Kreskanta kvaronluno + +#: src/e_mod_main.c:501 +msgid Waxing Gibbous +msgstr + +#: src/e_mod_main.c:503 +msgid Full Moon +msgstr Plenluno + +#: src/e_mod_main.c:505 +msgid Waning Gibbous +msgstr + +#: src/e_mod_main.c:507 +msgid Last Quarter +msgstr Malkreskanta kvaronluno + +#: src/e_mod_main.c:509 +msgid Waning Crescent +msgstr - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: rain e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : rain Dir : e_modules/rain/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/rain/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:30:04 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 20:00+0200\n -PO-Revision-Date: 2006-06-04 20:01+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:33+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,7 +17,37 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:94 -msgid General Settings -msgstr Äeneral Agordoj +#: e_mod_config.c:40 +msgid Rain Module +msgstr Pluva Modulo + +#: e_mod_config.c:98 +msgid Show Clouds +msgstr Vidigi Nubojn + +#: e_mod_config.c:102 +msgid Rain Density +msgstr Pluva Dendeco + +#: e_mod_config.c:104 +msgid Sprinkle +msgstr ĵetkovri + +#: e_mod_config.c:106 +msgid Drizzle +msgstr Pluveti + +#: e_mod_config.c:108 +msgid Downpour +msgstr + +#: e_mod_main.c:67 +msgid Enlightenment Rain Module +msgstr \Enlightenment-a Pluvo\ Modulo + +#: e_mod_main.c:69 +msgid +This is a simple module to display some rain on the desktop.brIt can +display clouds too, if you like clouds. +msgstr Tiu estas simpla modulo por vidigi pluvon super labortablo.brGxi povas vidigi nubojn ankaux, se vi sxatas nubojn. - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: snow e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : snow Dir : e_modules/snow/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/snow/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:30:15 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 20:29+0200\n -PO-Revision-Date: 2006-06-04 20:30+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:07+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,11 +17,31 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:92 -msgid General Settings -msgstr Äeneral Agordoj - -#: e_mod_config.c:101 -msgid Medium -msgstr Mezo +#: e_mod_config.c:39 +msgid Snow Configuration +msgstr Konfiguraĵo de NeÄo + +#: e_mod_config.c:96 +msgid Show Trees +msgstr Vidigi Arbojn + +#: e_mod_config.c:100 +msgid Snow Density +msgstr NeÄa Denseco + +#: e_mod_config.c:102 +msgid Sparse +msgstr + +#: e_mod_config.c:106 +msgid Dense +msgstr Densa + +#: e_mod_main.c:72 +msgid Enlightenment Snow Module +msgstr \Enlightenment-a NeÄo\ Modulo + +#: e_mod_main.c:72 +msgid This is a snow module that may replace xsnow. +msgstr Tiu estas neÄa modulo kiu eblas anstataÅigi \xsnow\ - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: wlan e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : wlan Dir : e_modules/wlan/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/wlan/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:30:26 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 20:36+0200\n -PO-Revision-Date: 2006-06-04 20:36+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 22:54+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,16 +17,35 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:137 -#, c-format -msgid %1.0f seconds -msgstr %1.0f sekundoj - -#: e_mod_main.c:207 e_mod_main.c:332 -msgid Configuration -msgstr Konfiguraĵo - -#: e_mod_main.c:337 -msgid Edit Mode -msgstr Redaktomoduso +#: e_mod_config.c:45 +msgid Wlan Configuration +msgstr Konfigurajxo de Wlan + +#: e_mod_config.c:123 +msgid General Settings +msgstr Äeneralaj AlÄustigoj + +#: e_mod_config.c:124 +msgid Show Text +msgstr Vidigi Tekston + +#: e_mod_config.c:126 +msgid Show Graph +msgstr Vidigi Grafon + +#: e_mod_config.c:130 +msgid Device Settings +msgstr Aparataj Agordoj + +#: e_mod_config.c:142 +msgid Check Interval: +msgstr Kontroli Intervalon + +#: e_mod_main.c:85 +msgid Enlightenment Wlan Monitor Module +msgstr Modulo de Enlightenment-a Wlan kaÅaÅskulto + +#: e_mod_main.c:86 +msgid This module is used to monitor a wlan device. +msgstr Tiu modulo uzigxas por kaÅaÅskulti Wlan-aparaton - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: eveil e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : eveil Dir : e_modules/eveil/po Added Files: eo.po Log Message: e_module eo.po updates (Olivier M.) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: flame e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : flame Dir : e_modules/flame/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/flame/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:27:23 - 1.1 +++ eo.po 1 Sep 2006 14:30:48 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 19:55+0200\n -PO-Revision-Date: 2006-06-04 19:55+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:40+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,12 +17,59 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:165 e_mod_config.c:170 e_mod_config.c:175 -#, c-format -msgid %1.0f -msgstr %1.0f - -#: e_mod_main.c:226 -msgid Configuration -msgstr Konfiguraĵo +#: e_mod_config.c:44 +msgid Flame Configuration +msgstr Konfigurajxo de Flamoj + +#: e_mod_config.c:89 e_mod_config.c:172 +msgid Flame Color +msgstr Koloro de Flamoj + +#: e_mod_config.c:91 +msgid Gold +msgstr Oro + +#: e_mod_config.c:93 +msgid Fire +msgstr Fajro + +#: e_mod_config.c:95 +msgid Plasma +msgstr + +#: e_mod_config.c:97 +msgid Matrix +msgstr Matrico + +#: e_mod_config.c:99 +msgid Ice +msgstr Glacio + +#: e_mod_config.c:101 +msgid White +msgstr Blanko + +#: e_mod_config.c:103 +msgid Custom +msgstr Propra + +#: e_mod_config.c:174 +msgid Red Amount +msgstr + +#: e_mod_config.c:181 +msgid Blue Amount +msgstr + +#: e_mod_config.c:188 +msgid Green Amount +msgstr + +#: e_mod_main.c:97 +msgid Enlightenment Flame Module +msgstr \Enlightenment-a Flamo\ Modulo + +#: e_mod_main.c:98 +msgid A simple module to display flames. +msgstr Simpla modulo por vidigi flamojn. - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: calendar e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : calendar Dir : e_modules/calendar/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/calendar/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:27:22 - 1.1 +++ eo.po 1 Sep 2006 14:31:10 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 19:51+0200\n -PO-Revision-Date: 2006-06-04 19:52+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-31 00:03+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,56 +17,370 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: src/otherfonts_editor.c:114 src/otherfonts_editor.c:117 -#: src/otherfonts_editor.c:120 src/otherfonts_editor.c:123 -#: src/otherfonts_editor.c:134 src/otherfonts_editor.c:137 -#: src/otherfonts_editor.c:140 src/otherfonts_editor.c:143 -#: src/otherfonts_editor.c:229 src/otherfonts_editor.c:232 -#: src/otherfonts_editor.c:235 src/otherfonts_editor.c:238 -#: src/otherfonts_editor.c:274 src/otherfonts_editor.c:277 -#: src/otherfonts_editor.c:280 src/otherfonts_editor.c:283 -#: src/weekend_editor.c:117 src/weekend_editor.c:120 src/weekend_editor.c:123 -#: src/weekend_editor.c:126 src/weekend_editor.c:137 src/weekend_editor.c:140 -#: src/weekend_editor.c:143 src/weekend_editor.c:146 src/weekend_editor.c:234 -#: src/weekend_editor.c:237 src/weekend_editor.c:240 src/weekend_editor.c:243 -#: src/weekend_editor.c:254 src/weekend_editor.c:257 src/weekend_editor.c:260 -#: src/weekend_editor.c:263 src/today_editor.c:113 src/today_editor.c:116 -#: src/today_editor.c:119 src/today_editor.c:122 src/today_editor.c:133 -#: src/today_editor.c:136 src/today_editor.c:139 src/today_editor.c:142 -#: src/today_editor.c:229 src/today_editor.c:232 src/today_editor.c:235 -#: src/today_editor.c:238 src/today_editor.c:249 src/today_editor.c:252 -#: src/today_editor.c:255 src/today_editor.c:258 src/weekday_editor.c:120 -#: src/weekday_editor.c:123 src/weekday_editor.c:126 src/weekday_editor.c:129 -#: src/weekday_editor.c:140 src/weekday_editor.c:143 src/weekday_editor.c:146 -#: src/weekday_editor.c:149 src/weekday_editor.c:236 src/weekday_editor.c:239 -#: src/weekday_editor.c:242 src/weekday_editor.c:245 src/weekday_editor.c:256 -#: src/weekday_editor.c:259 src/weekday_editor.c:262 src/weekday_editor.c:265 -#, c-format -msgid %1.0f -msgstr %1.0f - -#: src/otherfonts_editor.c:242 src/otherfonts_editor.c:245 -#: src/otherfonts_editor.c:248 src/otherfonts_editor.c:251 -#: src/otherfonts_editor.c:254 src/otherfonts_editor.c:257 -#: src/otherfonts_editor.c:260 src/otherfonts_editor.c:263 -#: src/otherfonts_editor.c:287 src/otherfonts_editor.c:291 -#: src/otherfonts_editor.c:295 src/otherfonts_editor.c:299 -#: src/otherfonts_editor.c:303 src/otherfonts_editor.c:307 -#: src/otherfonts_editor.c:311 src/otherfonts_editor.c:315 -#: src/weekend_editor.c:267 src/weekend_editor.c:270 src/weekend_editor.c:273 -#: src/weekend_editor.c:276 src/weekend_editor.c:279 src/weekend_editor.c:282 -#: src/weekend_editor.c:285 src/weekend_editor.c:288 src/main_editor.c:336 -#: src/main_editor.c:345 src/main_editor.c:352 src/today_editor.c:262 -#: src/today_editor.c:265 src/today_editor.c:268 src/today_editor.c:271 -#: src/today_editor.c:274 src/today_editor.c:277 src/today_editor.c:280 -#: src/today_editor.c:283 src/weekday_editor.c:269 src/weekday_editor.c:272 -#: src/weekday_editor.c:275 src/weekday_editor.c:278 src/weekday_editor.c:281 -#: src/weekday_editor.c:284 src/weekday_editor.c:287 src/weekday_editor.c:290 -#, c-format -msgid %1.2f -msgstr %1.2f - -#: src/cal_face_func.c:432 -msgid Edit Mode -msgstr Redaktomoduso +#: src/add_event_dialog.c:47 src/add_todo_dialog.c:49 +msgid Font Editor +msgstr Tipara Redaktilo + +#: src/add_event_dialog.c:118 +msgid Event Type +msgstr Eventa Tipo + +#: src/add_event_dialog.c:120 +msgid Birthday +msgstr NaskiÄdato + +#: src/add_event_dialog.c:122 +msgid Anniversary +msgstr Datreveno + +#: src/add_event_dialog.c:124 +msgid Other +msgstr Alia + +#: src/add_event_dialog.c:127 src/add_todo_dialog.c:118 +msgid Event +msgstr Evento + +#: src/cal_face_func.c:436 +msgid Config Dialog +msgstr Konfigurajxa Dialogo + +#: src/cal_face_func.c:455 +msgid View Events +msgstr Vidigi Eventojn + +#: src/cal_face_func.c:459 +msgid View TODO +msgstr Vidigi TODO + +#:
E CVS: evolume e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : evolume Dir : e_modules/evolume/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/evolume/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:27:23 - 1.1 +++ eo.po 1 Sep 2006 14:31:22 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 19:54+0200\n -PO-Revision-Date: 2006-06-04 19:54+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:51+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,15 +17,39 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: src/module/e_mod_cmdialog.c:59 src/module/e_mod_cdialog.c:44 -msgid Mixer Face Configuration +#: src/module/e_mod_cdialog.c:108 +msgid Mixers +msgstr Miksiloj + +#: src/module/e_mod_cdialog.c:118 +msgid Configure +msgstr Konfiguri + +#: src/module/e_mod_cmdialog.c:122 +msgid Mixer Configuration +msgstr Miksila Konfigurajxo + +#: src/module/e_mod_cmdialog.c:132 +msgid Active +msgstr Aktiva + +#: src/module/e_mod_cmdialog.c:133 +msgid Balance msgstr -#: src/module/e_mod_menu.c:159 -msgid Configuration -msgstr Konfiguraĵo - -#: src/module/e_mod_menu.c:164 -msgid Edit Mode -msgstr Redaktomoduso +#: src/module/e_mod_main.c:77 +msgid Enlightenment Evolume Module +msgstr \Enlightenment-a Miksilo\ Modulo + +#: src/module/e_mod_main.c:78 +msgid A simple module to give E17 a volume control for some mixers. +msgstr Simpla modulo por aldoni el E17 volumkontrolon por kelkaj miksiloj. + +#: src/module/e_mod_menu.c:145 +msgid Faces +msgstr Vizagxoj + +#: src/module/e_mod_menu.c:150 +msgid Remove Face +msgstr Forigi Vizagxon - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : tclock Dir : e_modules/tclock/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/tclock/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:31:33 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Bulgarian translations for tclock package. # This file is put in the public domain. -# Luchezar P. Petkov , 2006. +# FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr +Language-Team: Esperanto [EMAIL PROTECTED]\n +Report-Msgid-Bugs-To: [EMAIL PROTECTED] Project-Id-Version: eo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-05-27 03:28+0300\n -PO-Revision-Date: 2006-06-04 20:33+0200\n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:00+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,55 +17,55 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:36 +#: e_mod_config.c:41 msgid Tclock Configuration -msgstr Agordo de Tclock +msgstr Konfiguraĵo de \TClock\ -#: e_mod_config.c:80 +#: e_mod_config.c:88 msgid Resolution msgstr Distingivo -#: e_mod_config.c:82 +#: e_mod_config.c:90 msgid 1 Minute msgstr 1 Minuto -#: e_mod_config.c:84 +#: e_mod_config.c:92 msgid 1 Second msgstr 1 Sekundo -#: e_mod_config.c:88 +#: e_mod_config.c:96 msgid Date msgstr Dato -#: e_mod_config.c:89 +#: e_mod_config.c:98 msgid Show Date -msgstr Montru daton +msgstr Vidigi Daton -#: e_mod_config.c:98 e_mod_config.c:112 +#: e_mod_config.c:108 e_mod_config.c:124 msgid Consult strftime(3) for format syntax msgstr -#: e_mod_config.c:102 +#: e_mod_config.c:112 msgid Time msgstr Tempo -#: e_mod_config.c:103 +#: e_mod_config.c:114 msgid Show Time -msgstr Montru tempon +msgstr Vidigi Tempon -#: e_mod_main.c:103 +#: e_mod_main.c:123 msgid TClock -msgstr TClock +msgstr -#: e_mod_main.c:137 +#: e_mod_main.c:159 msgid Configuration msgstr Konfiguraĵo -#: e_mod_main.c:406 -msgid Displays a digital clock on the desktop -msgstr - -#: e_mod_main.c:406 +#: e_mod_main.c:424 msgid Simple Digital Clock -msgstr +msgstr Simpla Cxifera Horlogxo + +#: e_mod_main.c:425 +msgid Displays a digital clock on the desktop +msgstr Vidigi cxiferan horlogxon en la labortablo - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: uptime e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : uptime Dir : e_modules/uptime/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/uptime/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:34:00 - 1.1 +++ eo.po 1 Sep 2006 14:31:44 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# This file is put in the public domain. # FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr -Project-Id-Version: eo\n +Language-Team: Esperanto [EMAIL PROTECTED]\n Report-Msgid-Bugs-To: [EMAIL PROTECTED] -POT-Creation-Date: 2006-06-04 20:33+0200\n -PO-Revision-Date: 2006-06-04 20:34+0200\n +Project-Id-Version: eo\n +Report-Msgid-Bugs-To: \n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 22:58+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,16 +17,50 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:77 -#, c-format -msgid %1.0f seconds -msgstr %1.0f sekundoj +#: e_mod_config.c:52 +msgid Uptime Configuration +msgstr + +#: e_mod_config.c:105 +msgid Uptime Settings +msgstr + +#: e_mod_config.c:107 +msgid Update Interval: +msgstr + +#: e_mod_config.c:114 +msgid Check Interval: +msgstr Kontroli Intervalon : + +#: e_mod_main.c:161 +msgid Uptime +msgstr -#: e_mod_main.c:183 e_mod_main.c:272 +#: e_mod_main.c:201 msgid Configuration msgstr Konfiguraĵo -#: e_mod_main.c:277 -msgid Edit Mode -msgstr Redaktomoduso +#: e_mod_main.c:402 +msgid Enlightenment Uptime Monitor Module +msgstr + +#: e_mod_main.c:403 +msgid This module is used to monitor uptime. +msgstr + +#: e_mod_main.c:574 +#, c-format +msgid up: %d days, %d:%02d:%02ld +msgstr + +#: e_mod_main.c:581 +#, c-format +msgid la: %.2f %.2f %.2f +msgstr + +#: e_mod_main.c:586 +#, c-format +msgid users: %d +msgstr Usantoj : %d - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : weather Dir : e_modules/weather/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/weather/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:32:20 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# Italian translation for E17 weather module. # This file is put in the public domain. -# Massimo Maiurana [EMAIL PROTECTED], 2006. +# FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr +Language-Team: Esperanto [EMAIL PROTECTED]\n +Report-Msgid-Bugs-To: [EMAIL PROTECTED] Project-Id-Version: eo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-05-21 10:14+0200\n -PO-Revision-Date: 2006-06-04 20:36+0200\n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 22:58+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,68 +17,68 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:34 +#: e_mod_config.c:40 msgid Weather Configuration -msgstr Agordo de Vetero +msgstr Vetera Konfiguraĵo -#: e_mod_config.c:77 +#: e_mod_config.c:86 msgid Display Settings -msgstr AfiÅaĵa Agordo +msgstr Vidigaj Agordoj -#: e_mod_config.c:79 +#: e_mod_config.c:88 msgid Simple msgstr Simpla -#: e_mod_config.c:81 +#: e_mod_config.c:90 msgid Detailed -msgstr +msgstr Detala -#: e_mod_config.c:83 +#: e_mod_config.c:92 msgid Poll Time msgstr -#: e_mod_config.c:85 +#: e_mod_config.c:95 #, c-format msgid %2.0f minutes msgstr %2.0f minutoj -#: e_mod_config.c:89 +#: e_mod_config.c:100 msgid Degree Settings -msgstr +msgstr Degraj Agordoj -#: e_mod_config.c:91 +#: e_mod_config.c:102 msgid Celsius -msgstr Celsius +msgstr -#: e_mod_config.c:93 +#: e_mod_config.c:104 msgid Farenheit -msgstr Farenheit +msgstr -#: e_mod_config.c:97 e_mod_config.c:98 +#: e_mod_config.c:108 e_mod_config.c:109 msgid ICAO Code msgstr Kodo de ICAO -#: e_mod_config.c:103 +#: e_mod_config.c:114 msgid Get your ICAO code at: -msgstr Ottenete il codice ICAO da: +msgstr Akhavi vian Kodo de ICAO en : -#: e_mod_config.c:105 +#: e_mod_config.c:117 msgid http://www.weather.gov/tg/siteloc.shtml; -msgstr http://www.weather.gov/tg/siteloc.shtml; +msgstr -#: e_mod_main.c:144 +#: e_mod_main.c:171 msgid Weather -msgstr Weather +msgstr Vetero -#: e_mod_main.c:179 +#: e_mod_main.c:207 msgid Configuration -msgstr Configurazione +msgstr Konfiguraĵo -#: e_mod_main.c:373 +#: e_mod_main.c:396 msgid Enlightenment Weather Module -msgstr Modulo Weather di Enlightenment +msgstr \Enlightenment-a Vetero\ Modulo -#: e_mod_main.c:374 +#: e_mod_main.c:397 msgid A weather forecast module for Enlightenment -msgstr Un modulo per le previsioni del tempo per Enlightenment. +msgstr Modulo de Enlightenment por aÅguri veteron - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: language e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : language Dir : e_modules/language/po Added Files: eo.po Log Message: e_module eo.po updates (Olivier M.) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : slideshow Dir : e_modules/slideshow/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/slideshow/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:32:41 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# French translation for Slideshow module for Enlightenment DR0.17 # This file is put in the public domain. -# Chidambar 'ilLogict' Zinnoury [EMAIL PROTECTED], 2006. +# FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr +Language-Team: Esperanto [EMAIL PROTECTED]\n +Report-Msgid-Bugs-To: [EMAIL PROTECTED] Project-Id-Version: eo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-02-07 00:56+0100\n -PO-Revision-Date: 2006-06-04 20:28+0200\n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:10+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,41 +17,52 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:47 +#: e_mod_config.c:39 msgid Slideshow Configuration -msgstr Agordo de Diapozitivomontro +msgstr Konfiguraĵo de \Foliprezento\ -#: e_mod_config.c:93 +#: e_mod_config.c:91 msgid Cycle Time -msgstr DaÅro +msgstr -#: e_mod_config.c:94 +#: e_mod_config.c:93 msgid Disable Timer -msgstr Neebligu Tempoplanilon +msgstr Neebligi Tempoplanilon #: e_mod_config.c:96 #, c-format msgid %3.0f seconds -msgstr %3.0f sekundoj +msgstr %3.0f secondoj -#: e_mod_config.c:102 -msgid Theme -msgstr Etoso +#: e_mod_config.c:101 +msgid Directory +msgstr Dosierujo -#: e_mod_config.c:104 +#: e_mod_config.c:103 msgid Sub-directory to use for backgrounds -msgstr +msgstr Patraj dosierujoj por uzado de ekranfonoj + +#: e_mod_config.c:110 +msgid Extra +msgstr Ekstra + +#: e_mod_config.c:111 +msgid Randomize order +msgstr Senvicigi ordon + +#: e_mod_main.c:140 +msgid Slideshow +msgstr Foliprezento -#: e_mod_config.c:106 -msgid Leave blank for none -msgstr Lasu malplene por nenio +#: e_mod_main.c:174 +msgid Configuration +msgstr Konfiguraĵo -#: e_mod_main.c:148 +#: e_mod_main.c:384 msgid Enlightenment Slide Show Module -msgstr Modulo de Diapozitivomontroj de Enlightenment +msgstr \Enlightenment-a Foliprezento\ Modulo -#: e_mod_main.c:149 -#, fuzzy +#: e_mod_main.c:385 msgid This module is VERY simple and is used to cycle desktop backgrounds -msgstr Tiu modulo estas simplega kaj permesas havi diapozitivomontron de ekranfonoj. +msgstr Tiu modulo estas simplega kaj uzigxas por senhalte sxangxi ekranfonoj - 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=lnkkid=120709bid=263057dat=121642___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: screenshot e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : screenshot Dir : e_modules/screenshot/po Modified Files: eo.po Log Message: e_module eo.po updates (Olivier M.) === RCS file: /cvs/e/e_modules/screenshot/po/eo.po,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- eo.po 10 Jun 2006 02:32:00 - 1.1 +++ eo.po 1 Sep 2006 14:33:17 - 1.2 @@ -1,14 +1,15 @@ # translation of eo.po to -# French translation for Screenshot module for Enlightenment DR0.17 # This file is put in the public domain. -# Chidambar 'ilLogict' Zinnoury [EMAIL PROTECTED], 2006. +# FIRST AUTHOR [EMAIL PROTECTED], YEAR. # msgid msgstr +Language-Team: Esperanto [EMAIL PROTECTED]\n +Report-Msgid-Bugs-To: [EMAIL PROTECTED] Project-Id-Version: eo\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2006-02-07 00:56+0100\n -PO-Revision-Date: 2006-06-04 20:20+0200\n +POT-Creation-Date: 2006-08-29 10:20+0200\n +PO-Revision-Date: 2006-08-30 23:24+0200\n Last-Translator: \n Language-Team: [EMAIL PROTECTED]\n MIME-Version: 1.0\n @@ -16,86 +17,112 @@ Content-Transfer-Encoding: 8bit\n X-Generator: KBabel 1.11.2\n -#: e_mod_config.c:75 +#: e_mod_config.c:72 msgid Screenshot Configuration -msgstr Agordo de Ekrankopio +msgstr Konfiguraĵo de Ekrankopio -#: e_mod_config.c:163 e_mod_config.c:283 +#: e_mod_config.c:142 e_mod_config.c:242 +msgid General Settings +msgstr Äeneralaj Agordoj + +#: e_mod_config.c:148 e_mod_config.c:248 msgid Use Import -msgstr Uzi «import» +msgstr Uzi la programon \import\ -#: e_mod_config.c:165 e_mod_config.c:285 +#: e_mod_config.c:150 e_mod_config.c:250 msgid Use Scrot -msgstr Uzi «scrot» +msgstr Uzi la programon \scrot\ -#: e_mod_config.c:172 e_mod_config.c:292 +#: e_mod_config.c:158 e_mod_config.c:258 msgid Delay Time: -msgstr Limtempo : +msgstr Intertempo : + +#: e_mod_config.c:161 e_mod_config.c:261 +#, c-format +msgid %1.0f seconds +msgstr %1.0f sekundoj -#: e_mod_config.c:182 e_mod_config.c:302 +#: e_mod_config.c:166 e_mod_config.c:275 msgid File Settings -msgstr Agordoj de Dosieroj +msgstr Dosieraj Agordoj -#: e_mod_config.c:185 e_mod_config.c:305 +#: e_mod_config.c:168 e_mod_config.c:277 +msgid Always Prompt For Filename +msgstr Cxiam Peti Dosiernomon + +#: e_mod_config.c:172 e_mod_config.c:281 msgid Save Directory: -msgstr Konserva Dosierujo : +msgstr Konservi Dosierujon : -#: e_mod_config.c:191 e_mod_config.c:311 -msgid Filename (minus extension): -msgstr Dosiernomo (sen finaĵo) : +#: e_mod_config.c:176 e_mod_config.c:285 +msgid Filename: +msgstr Dosiernomo: -#: e_mod_config.c:199 e_mod_config.c:319 -#, c-format -msgid Example: screenshot%d = screenshot1, screenshot2, etc... -msgstr Ekzemple : ekrancopi%d = ekrancopio1, ekrancopio2, ktp⦠+#: e_mod_config.c:266 +msgid Image Viewer Settings +msgstr Bildprezentaj Agordoj -#: e_mod_config.c:326 -msgid Import Options -msgstr Opcioj de «import» +#: e_mod_config.c:268 +msgid Launch Image Viewer After Screenshot +msgstr Lancxi Bildprezento Poste Ekrankopiado -#: e_mod_config.c:327 e_mod_config.c:348 +#: e_mod_config.c:295 +msgid Import Settings +msgstr Agordoj de \import\ programo + +#: e_mod_config.c:297 e_mod_config.c:326 msgid Include Image Border -msgstr Inkluzivi bildan bordon +msgstr Inkluzi Bildan Randon -#: e_mod_config.c:330 +#: e_mod_config.c:301 msgid Use Image Dithering msgstr Uzi Bildan Punktismon -#: e_mod_config.c:333 +#: e_mod_config.c:305 msgid Include Window Manager Frame -msgstr Inkluzivu Kadron de Fenestroadministrilon +msgstr Inkluzivi Kadron de Fenestradministrilo -#: e_mod_config.c:336 -#, fuzzy +#: e_mod_config.c:309 msgid Choose Window To Grab -msgstr Elektu Ekkaptontan Fenestron +msgstr Elekti Fenestron Ekkaptendan -#: e_mod_config.c:339 +#: e_mod_config.c:313 msgid Silent -msgstr Silento +msgstr Silentigi -#: e_mod_config.c:342 +#: e_mod_config.c:317 msgid Trim Edges -msgstr Stucu Egxojn +msgstr Struci Randojn -#: e_mod_config.c:347 -msgid Scrot Options -msgstr Opcioj de «scrot» +#: e_mod_config.c:324 +msgid Scrot Settings +msgstr Agordoj de la programon \Scrot\ -#: e_mod_config.c:351 -#, fuzzy +#: e_mod_config.c:330 msgid Generate Thumbnail -msgstr Kreu Bildeton +msgstr Krei Bildeton + +#: e_mod_main.c:136 +msgid Screenshot +msgstr Ekrankopio + +#: e_mod_main.c:171 +msgid Configuration +msgstr Konfiguraĵo -#: e_mod_main.c:108 e_mod_main.c:527 +#: e_mod_main.c:428 e_mod_main.c:665 e_mod_main.c:718 msgid Enlightenment Screenshot Module -msgstr Modulo de Ekrancopio de Enlightenment +msgstr \Enlightenment-a Ekrankopio\ Modulo -#: e_mod_main.c:109 +#: e_mod_main.c:429 msgid This module is used to take screenshots -msgstr Tiun modulon uzas por fari ekrankopiojn. +msgstr Tiu modulo uzigxas por ekkapti ekrankopion -#: e_mod_main.c:528 -msgid Please Choose A Program To Use For Taking Screenshots. -msgstr Bonvulu elekti
E CVS: language e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : language Dir : e_modules/language Modified Files: configure.in Log Message: enable new eo.po files === RCS file: /cvs/e/e_modules/language/configure.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- configure.in28 Jul 2006 17:51:08 - 1.11 +++ configure.in1 Sep 2006 14:35:23 - 1.12 @@ -17,7 +17,7 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS=it sv +ALL_LINGUAS=eo it sv AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: taskbar e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : taskbar Dir : e_modules/taskbar Modified Files: configure.in Log Message: enable new eo.po files === RCS file: /cvs/e/e_modules/taskbar/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- configure.in25 Jul 2006 13:34:31 - 1.8 +++ configure.in1 Sep 2006 14:35:23 - 1.9 @@ -17,7 +17,7 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS=it sv +ALL_LINGUAS=eo it sv AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: eveil e-taro
Enlightenment CVS committal Author : e-taro Project : e_modules Module : eveil Dir : e_modules/eveil Modified Files: configure.in Log Message: enable new eo.po files === RCS file: /cvs/e/e_modules/eveil/configure.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- configure.in25 Jul 2006 13:30:57 - 1.7 +++ configure.in1 Sep 2006 14:35:23 - 1.8 @@ -20,7 +20,7 @@ AM_ENABLE_SHARED AM_PROG_LIBTOOL -ALL_LINGUAS=it ja sv +ALL_LINGUAS=eo it ja sv AC_SUBST(ALL_LINGUAS) AM_GNU_GETTEXT([external]) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ecore onefang
Enlightenment CVS committal Author : onefang Project : e17 Module : libs/ecore Dir : e17/libs/ecore/src/lib/ecore_desktop Modified Files: ecore_desktop.c Log Message: Reap what I sow. === RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- ecore_desktop.c 1 Sep 2006 06:59:21 - 1.19 +++ ecore_desktop.c 1 Sep 2006 15:03:19 - 1.20 @@ -257,6 +257,12 @@ } result-icon = (char *)ecore_hash_get(result-group, Icon); + + result-icon_class = + (char *)ecore_hash_get(result-group, X-Enlightenment-IconClass); + result-icon_path = + (char *)ecore_hash_get(result-group, X-Enlightenment-IconPath); + result-categories = (char *)ecore_hash_get(result-group, Categories); if (result-categories) - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c
Log Message:
No need to search for the icon if we already have it.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -3 -r1.161 -r1.162
--- e_apps.c1 Sep 2006 09:26:55 - 1.161
+++ e_apps.c1 Sep 2006 15:06:30 - 1.162
@@ -1165,11 +1165,12 @@
if (desktop-exec) a-exe = evas_stringshare_add(desktop-exec);
if (desktop-icon_class) a-icon_class =
evas_stringshare_add(desktop-icon_class);
+ if (desktop-icon_path) a-icon_path =
evas_stringshare_add(desktop-icon_path);
if (desktop-window_class) a-win_class =
evas_stringshare_add(desktop-window_class);
if (desktop-startup)
a-startup_notify = *(desktop-startup);
- if (desktop-icon)
+ if ((desktop-icon) (!desktop-icon_path))
{
/* FIXME: Should do this only when needed, is it can be
expensive. */
/* FIXME: Use a real icon size. */
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_border.c e_border.h e_config.c e_config.h e_desk.c e_desk.h
e_int_config_desks.c e_int_config_performance.c
Log Message:
1. fix perf dialog - to actually change fps
2. save icon theme config
3. add config for desk flip animation modes etc. etc.
4. desk flip animation!!! 2 main modes. might restructure this a bit tho
(separate out on/off from the mode as there may be many more modes later)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.c,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -3 -r1.535 -r1.536
--- e_border.c 1 Sep 2006 10:43:20 - 1.535
+++ e_border.c 1 Sep 2006 15:37:23 - 1.536
@@ -827,7 +827,7 @@
bd-y + bd-fx.y + bd-client_inset.t,
bd-client.w,
bd-client.h);
- _e_border_move_update(bd);
+ if (bd-moving) _e_border_move_update(bd);
}
EAPI void
@@ -2309,8 +2309,9 @@
bl = e_container_border_list_last(con);
while ((bd = e_container_border_list_prev(bl)))
{
- if ((bd-changes.visible) (bd-visible)
- (!bd-new_client))
+ if ((bd-changes.visible) (bd-visible)
+ (!bd-new_client) (!bd-changes.pos)
+ (!bd-changes.size))
{
ecore_evas_show(bd-bg_ecore_evas);
ecore_x_window_show(bd-win);
@@ -2343,6 +2344,13 @@
bd-changes.visible = 0;
}
if (bd-changed) _e_border_eval(bd);
+ if ((bd-changes.visible) (bd-visible)
+ (!bd-new_client))
+ {
+ ecore_evas_show(bd-bg_ecore_evas);
+ ecore_x_window_show(bd-win);
+ bd-changes.visible = 0;
+ }
}
e_container_border_list_free(bl);
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_border.h,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -3 -r1.149 -r1.150
--- e_border.h 30 Aug 2006 13:37:35 - 1.149
+++ e_border.h 1 Sep 2006 15:37:23 - 1.150
@@ -125,6 +125,10 @@
struct {
int x, y;
+ struct {
+int x, y;
+doublet;
+ } start;
} fx;
struct {
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.c,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -3 -r1.200 -r1.201
--- e_config.c 31 Aug 2006 04:16:43 - 1.200
+++ e_config.c 1 Sep 2006 15:37:23 - 1.201
@@ -473,6 +473,12 @@
E_CONFIG_VAL(D, T, border_raise_on_focus, INT);
E_CONFIG_VAL(D, T, desk_flip_wrap, INT);
+ E_CONFIG_VAL(D, T, icon_theme, STR);
+
+ E_CONFIG_VAL(D, T, desk_flip_animate_mode, INT);
+ E_CONFIG_VAL(D, T, desk_flip_animate_interpolation, INT);
+ E_CONFIG_VAL(D, T, desk_flip_animate_time, DOUBLE);
+
E_CONFIG_VAL(D, T, wallpaper_import_last_dev, STR);
E_CONFIG_VAL(D, T, wallpaper_import_last_path, STR);
@@ -1216,7 +1222,10 @@
e_config-wallpaper_grad_c2_b = 255;
IFCFGEND;
- IFCFG(0x0100);
+ IFCFG(0x0101);
+ e_config-desk_flip_animate_mode = 1;
+ e_config-desk_flip_animate_interpolation = 0;
+ e_config-desk_flip_animate_time = 0.2;
IFCFGEND;
#if 0 /* example of new config */
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_config.h,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -3 -r1.115 -r1.116
--- e_config.h 31 Aug 2006 04:20:04 - 1.115
+++ e_config.h 1 Sep 2006 15:37:23 - 1.116
@@ -50,7 +50,7 @@
/* increment this whenever a new set of config values are added but the users
* config doesn't need top be wiped - simply new values need to be put in
*/
-#define E_CONFIG_FILE_GENERATION 0x0100
+#define E_CONFIG_FILE_GENERATION 0x0101
#define E_CONFIG_FILE_VERSION((E_CONFIG_FILE_EPOCH 16) |
E_CONFIG_FILE_GENERATION)
#define E_EVAS_ENGINE_DEFAULT 0
@@ -235,6 +235,10 @@
int desk_flip_wrap; // GUI
const char *icon_theme; // GUI
+
+ int desk_flip_animate_mode;
+ int desk_flip_animate_interpolation;
+ double desk_flip_animate_time;
const char *wallpaper_import_last_dev; // INTERNAL
const char *wallpaper_import_last_path; // INTERNAL
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_desk.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -3 -r1.62 -r1.63
--- e_desk.c30 Aug 2006 13:37:35
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_int_config_wallpaper.c Log Message: Fix leak on wallpaper_update function. === RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_int_config_wallpaper.c1 Sep 2006 13:12:39 - 1.12 +++ e_int_config_wallpaper.c1 Sep 2006 17:00:30 - 1.13 @@ -67,6 +67,7 @@ cfdata-fmdir = 1; e_widget_radio_toggle_set(cfdata-o_personal, 1); snprintf(path, sizeof(path), %s/.e/e/backgrounds, homedir); + E_FREE(homedir); E_FREE(cfdata-bg); cfdata-bg = strdup(file); cfdata-use_theme_bg = 0; - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_includes.h Makefile.am e_int_config_theme.c
e_int_config_theme.h
Added Files:
e_int_config_theme_import.h e_int_config_theme_import.c
Log Message:
Added theme import dialog :) Auto-sets to the imported theme.
Some cleanup on wallpaper import dialog.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_includes.h,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- e_includes.h28 Aug 2006 11:22:27 - 1.124
+++ e_includes.h1 Sep 2006 17:21:23 - 1.125
@@ -102,6 +102,7 @@
#include e_int_config_window_manipulation.h
#include e_int_config_window_display.h
#include e_int_config_theme.h
+#include e_int_config_theme_import.h
#include e_int_config_icon_themes.h
#include e_int_config_menus.h
#include e_int_config_keybindings.h
===
RCS file: /cvs/e/e17/apps/e/src/bin/Makefile.am,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -3 -r1.145 -r1.146
--- Makefile.am 28 Aug 2006 11:22:27 - 1.145
+++ Makefile.am 1 Sep 2006 17:21:23 - 1.146
@@ -129,6 +129,7 @@
e_int_config_window_manipulation.h \
e_int_config_window_display.h \
e_int_config_theme.h \
+e_int_config_theme_import.h \
e_int_config_icon_themes.h \
e_int_config_menus.h \
e_int_config_keybindings.h \
@@ -282,6 +283,7 @@
e_int_config_window_manipulation.c \
e_int_config_window_display.c \
e_int_config_theme.c \
+e_int_config_theme_import.c \
e_int_config_icon_themes.c \
e_int_config_menus.c \
e_int_config_keybindings.c \
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- e_int_config_theme.c1 Sep 2006 13:32:39 - 1.35
+++ e_int_config_theme.c1 Sep 2006 17:21:23 - 1.36
@@ -22,6 +22,9 @@
int fmdir;
char *theme;
+
+ /* Dialog */
+ E_Win *win_import;
};
EAPI E_Config_Dialog *
@@ -44,6 +47,53 @@
return cfd;
}
+EAPI void
+e_int_config_theme_import_done(E_Config_Dialog *dia)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = dia-cfdata;
+ cfdata-win_import = NULL;
+}
+
+EAPI void
+e_int_config_theme_update(E_Config_Dialog *dia, char *file)
+{
+ E_Config_Dialog_Data *cfdata;
+ char *homedir, path[4096];
+
+ cfdata = dia-cfdata;
+
+ homedir = e_user_homedir_get();
+ if (!homedir) return;
+ cfdata-fmdir = 1;
+ e_widget_radio_toggle_set(cfdata-o_personal, 1);
+
+ snprintf(path, sizeof(path), %s/.e/e/themes, homedir);
+ E_FREE(homedir);
+ E_FREE(cfdata-theme);
+ cfdata-theme = strdup(file);
+
+ if (cfdata-o_fm)
+ e_fm2_path_set(cfdata-o_fm, path, /);
+
+ if (cfdata-o_preview)
+ e_widget_preview_edje_set(cfdata-o_preview, cfdata-theme,
e/desktop/background);
+ if (cfdata-o_frame)
+ e_widget_change(cfdata-o_frame);
+
+/*
+
+ if (cfdata-o_fm)
+ {
+ e_fm2_select_set(cfdata-o_fm, file, 1);
+ e_fm2_file_show(cfdata-o_fm, file);
+
+ evas_object_smart_callback_call(cfdata-o_fm,
+ selection_change, cfdata);
+ }
+ */
+}
static void
_cb_button_up(void *data1, void *data2)
@@ -86,19 +136,24 @@
E_Fm2_Icon_Info *ici;
const char *realpath;
char buf[4096];
-
+
cfdata = data;
if (!cfdata-o_fm) return;
+
selected = e_fm2_selected_list_get(cfdata-o_fm);
if (!selected) return;
+
ici = selected-data;
realpath = e_fm2_real_path_get(cfdata-o_fm);
+
if (!strcmp(realpath, /))
snprintf(buf, sizeof(buf), /%s, ici-file);
else
snprintf(buf, sizeof(buf), %s/%s, realpath, ici-file);
evas_list_free(selected);
+
if (ecore_file_is_dir(buf)) return;
+
E_FREE(cfdata-theme);
cfdata-theme = strdup(buf);
if (cfdata-o_preview)
@@ -207,7 +262,17 @@
evas_object_smart_callback_call(cfdata-o_fm, selection_change, cfdata);
}
-
+static void
+_cb_import(void *data1, void *data2)
+{
+ E_Config_Dialog_Data *cfdata;
+
+ cfdata = data1;
+ if (cfdata-win_import)
+ e_win_raise(cfdata-win_import);
+ else
+ cfdata-win_import = e_int_config_theme_import(cfdata-cfd);
+}
static void
_fill_data(E_Config_Dialog_Data *cfdata)
@@ -264,6 +329,9 @@
static void
_free_data(E_Config_Dialog *cfd, E_Config_Dialog_Data *cfdata)
{
+ if (cfdata-win_import)
+ e_int_config_theme_del(cfdata-win_import);
+
E_FREE(cfdata-theme);
free(cfdata);
}
@@ -356,6 +424,12 @@
e_widget_table_object_append(ot, ol, 0, 0, 1, 1, 1, 1, 1, 1);
of = e_widget_list_add(evas, 0, 0);
+
+ il = e_widget_list_add(evas, 0, 1);
+ o = e_widget_button_add(evas, _(Import...),
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_win.h e_win.c e_int_config_wallpaper_import.c
e_int_config_wallpaper_gradient.c e_int_config_theme_import.c
Log Message:
Add function to set window border icon so that Import dialogs and such can
have same icon as their parent.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_win.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_win.h 20 Aug 2006 04:48:27 - 1.9
+++ e_win.h 1 Sep 2006 17:38:25 - 1.10
@@ -65,6 +65,7 @@
EAPI void e_win_step_set (E_Win *win, int x, int y);
EAPI void e_win_name_class_set (E_Win *win, const char *name, const char
*class);
EAPI void e_win_title_set (E_Win *win, const char *title);
+EAPI void e_win_border_icon_set(E_Win *win, const char *icon);
EAPI void e_win_centered_set (E_Win *win, int centered);
EAPI void e_win_dialog_set (E_Win *win, int dialog);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_win.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_win.c 20 Aug 2006 06:42:20 - 1.21
+++ e_win.c 1 Sep 2006 17:38:25 - 1.22
@@ -365,6 +365,17 @@
return win;
}
+EAPI void
+e_win_border_icon_set(E_Win *win, const char *icon)
+{
+ E_Border *border;
+
+ if (!icon) return;
+ border = win-border;
+ if (!border) return;
+ border-internal_icon = evas_stringshare_add(icon);
+}
+
/* local subsystem functions */
static void
_e_win_free(E_Win *win)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -3 -r1.19 -r1.20
--- e_int_config_wallpaper_import.c 26 Aug 2006 09:06:47 - 1.19
+++ e_int_config_wallpaper_import.c 1 Sep 2006 17:38:25 - 1.20
@@ -99,7 +99,7 @@
e_win_resize_callback_set(win, _import_cb_resize);
e_win_dialog_set(win, 1);
e_win_name_class_set(win, E, _wallpaper_import_dialog);
-
+
o = edje_object_add(evas);
import-bg_obj = o;
e_theme_edje_object_set(o, base/theme/dialog, e/widgets/dialog/main);
@@ -198,6 +198,7 @@
e_win_size_min_set(win, w, h);
e_win_size_max_set(win, 9, 9);
e_win_show(win);
+ e_win_border_icon_set(win, enlightenment/background);
if (!e_widget_focus_get(import-bg_obj))
e_widget_focus_set(import-box_obj, 1);
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_gradient.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- e_int_config_wallpaper_gradient.c 23 Aug 2006 03:39:02 - 1.8
+++ e_int_config_wallpaper_gradient.c 1 Sep 2006 17:38:25 - 1.9
@@ -187,6 +187,8 @@
_import_opt_disabled_set(import, 1);
e_dialog_resizable_set(dia, 0);
e_dialog_show(dia);
+
+ e_dialog_border_icon_set(dia, enlightenment/background);
return dia;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- e_int_config_theme_import.c 1 Sep 2006 17:21:22 - 1.1
+++ e_int_config_theme_import.c 1 Sep 2006 17:38:25 - 1.2
@@ -134,6 +134,7 @@
e_win_size_min_set(win, w, h);
e_win_size_max_set(win, 9, 9);
e_win_show(win);
+ e_win_border_icon_set(win, enlightenment/themes);
win-data = import;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_desks.c
Log Message:
Minor fix for Flip Animate apply in basic mode.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_desks.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_int_config_desks.c1 Sep 2006 15:37:23 - 1.20
+++ e_int_config_desks.c1 Sep 2006 18:01:21 - 1.21
@@ -118,9 +118,15 @@
if (cfdata-flip_animate)
{
+ cfdata-flip_mode = 1;
e_config-desk_flip_animate_mode = 1;
e_config-desk_flip_animate_interpolation = 0;
e_config-desk_flip_animate_time = 0.5;
+ }
+else
+ {
+ cfdata-flip_mode = 0;
+ e_config-desk_flip_animate_mode = 0;
}
e_config-edge_flip_dragging = cfdata-edge_flip_basic;
e_config-edge_flip_moving = cfdata-edge_flip_basic;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl
Modified Files:
Makefile.PL test.pl
Log Message:
- make test now works
===
RCS file: /cvs/e/e17/proto/etk-perl/Makefile.PL,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.PL 20 Aug 2006 09:34:33 - 1.8
+++ Makefile.PL 1 Sep 2006 18:08:07 - 1.9
@@ -25,4 +25,15 @@
OBJECT= '$(O_FILES)',
);
+sub MY::test_via_harness {
+local $_ = shift()-MM::test_via_harness( @_ );
+s/\bPERL_DL_NONLAZY=1 +//g;
+return $_;
+}
+
+sub MY::test_via_script {
+local $_ = shift()-MM::test_via_script( @_ );
+s/\bPERL_DL_NON_LAZY=1 +//g;
+return $_;
+}
===
RCS file: /cvs/e/e17/proto/etk-perl/test.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- test.pl 18 Aug 2006 20:22:59 - 1.8
+++ test.pl 1 Sep 2006 18:08:07 - 1.9
@@ -1,4 +1,5 @@
use strict;
+BEGIN { $ENV{PERL_DL_NONLAZY} = 0 }
use Etk;
use Etk::Constants qw/:box/;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto leviathan
Enlightenment CVS committal Author : leviathan Project : e17 Module : proto Dir : e17/proto/etk-perl Modified Files: TODO Log Message: make test now works === RCS file: /cvs/e/e17/proto/etk-perl/TODO,v retrieving revision 1.17 retrieving revision 1.18 diff -u -3 -r1.17 -r1.18 --- TODO26 Aug 2006 17:54:09 - 1.17 +++ TODO1 Sep 2006 18:09:33 - 1.18 @@ -7,9 +7,6 @@ - Fix Combobox append functions (waiting for some functionality in etk) BUGS: - - make test is defining PERL_DL_NONLAZY=1 for some reason and - fails to load the library, for now you can run: - $ perl -MExtUtils::Command::MM -e test_harness(0, 'blib/lib', 'blib/arch') t/Etk/*.t Pending: -etk_canvas.h - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl/lib/Etk
Modified Files:
Constants.pm
Log Message:
add toolbar support
===
RCS file: /cvs/e/e17/proto/etk-perl/lib/Etk/Constants.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- Constants.pm26 Aug 2006 17:54:09 - 1.5
+++ Constants.pm1 Sep 2006 18:34:36 - 1.6
@@ -51,6 +51,8 @@
mouse = [qw/ModifierNone ModifierCtrl ModifierAlt ModifierShift
ModifierWin
LockNone LockNum LockCaps LockScroll
MouseNone MouseDoubleClick MouseTripleClick/],
+ toolbar = [qw/ToolbarIcons ToolbarText ToolbarBothVert
ToolbarBothHoriz
+ToolbarDefault ToolbarHoriz ToolbarVert/],
);
my @all = ();
@@ -211,6 +213,21 @@
MouseDoubleClick = 1 0,
MouseTripleClick = 1 1,
};
+
+
+# toolbar
+use constant {
+ ToolbarIcons = 0,
+ ToolbarText = 1,
+ ToolbarBothVert = 2,
+ ToolbarBothHoriz = 3,
+ ToolbarDefault = 4,
+
+ ToolbarHoriz = 0,
+ ToolbarVert = 1,
+
+};
+
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl/etk_test
Modified Files:
etk_test.pl
Log Message:
add toolbar support
===
RCS file: /cvs/e/e17/proto/etk-perl/etk_test/etk_test.pl,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -3 -r1.38 -r1.39
--- etk_test.pl 26 Aug 2006 17:54:09 - 1.38
+++ etk_test.pl 1 Sep 2006 18:34:36 - 1.39
@@ -616,12 +616,28 @@
{
my $win = Etk::Window-new();
$win-TitleSet(Etk-Perl Menu Test);
-$win-SizeRequestSet(300, 200);
+$win-SizeRequestSet(325, 240);
my $box = Etk::VBox-new(0, 0);
my $menubar = Etk::Menu::Bar-new();
$box-Append($menubar);
+
+my $toolbar = Etk::Toolbar-new();
+$box-Append($toolbar);
+
+$toolbar-Append(Etk::Button::new_from_stock(EditCopy));
+$toolbar-Append(Etk::Button::new_from_stock(EditCut));
+$toolbar-Append(Etk::Button::new_from_stock(EditPaste));
+
+$toolbar-Append(Etk::VSeparator-new());
+
+$toolbar-Append(Etk::Button::new_from_stock(EditUndo));
+$toolbar-Append(Etk::Button::new_from_stock(EditRedo));
+
+$toolbar-Append(Etk::VSeparator-new());
+
+$toolbar-Append(Etk::Button::new_from_stock(EditFind));
my $label = Etk::Label-new(Click me :));
$label-AlignmentSet(0.5, 0.5);
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto leviathan
Enlightenment CVS committal
Author : leviathan
Project : e17
Module : proto
Dir : e17/proto/etk-perl
Modified Files:
Etk.xs EtkTypes.c EtkTypes.h typemap
Log Message:
add toolbar support
===
RCS file: /cvs/e/e17/proto/etk-perl/Etk.xs,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- Etk.xs 20 Aug 2006 09:34:33 - 1.46
+++ Etk.xs 1 Sep 2006 18:34:36 - 1.47
@@ -3259,6 +3259,69 @@
ALIAS:
Resize=1
+MODULE = Etk::Toolbar PACKAGE = Etk::Toolbar PREFIX = etk_toolbar_
+
+Etk_Toolbar *
+new(class)
+ SV * class
+ CODE:
+ RETVAL = ETK_TOOLBAR(etk_toolbar_new());
+ OUTPUT:
+ RETVAL
+
+void
+etk_toolbar_append(toolbar, widget)
+ Etk_Toolbar * toolbar
+ Etk_Widget * widget
+ ALIAS:
+ Append=1
+
+void
+etk_toolbar_prepend(toolbar, widget)
+ Etk_Toolbar * toolbar
+ Etk_Widget * widget
+ ALIAS:
+ Prepend=1
+
+void
+etk_toolbar_orientation_set(toolbar, orientation)
+ Etk_Toolbar * toolbar
+ Etk_Toolbar_Orientation orientation
+ ALIAS:
+ OrientationSet=1
+
+Etk_Toolbar_Orientation
+etk_toolbar_orientation_get(toolbar)
+ Etk_Toolbar * toolbar
+ ALIAS:
+ OrientationGet=1
+
+void
+etk_toolbar_style_set(toolbar, style)
+ Etk_Toolbar * toolbar
+ Etk_Toolbar_Style style
+ ALIAS:
+ StyleSet=1
+
+Etk_Toolbar_Style
+etk_toolbar_style_get(toolbar)
+ Etk_Toolbar * toolbar
+ ALIAS:
+ StyleGet=1
+
+void
+etk_toolbar_stock_size_set(toolbar, size)
+ Etk_Toolbar * toolbar
+ Etk_Stock_Size size
+ ALIAS:
+ StockSizeSet=1
+
+Etk_Stock_Size
+etk_toolbar_stock_size_get(toolbar)
+ Etk_Toolbar * toolbar
+ ALIAS:
+ StockSizeGet=1
+
MODULE = Etk::TextView PACKAGE = Etk::TextView PREFIX = etk_text_view_
===
RCS file: /cvs/e/e17/proto/etk-perl/EtkTypes.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- EtkTypes.c 26 Aug 2006 17:54:09 - 1.12
+++ EtkTypes.c 1 Sep 2006 18:34:36 - 1.13
@@ -174,6 +174,7 @@
__(Drag, Window);
__(Viewport, Bin);
__(Box, Container);
+ __(Toolbar, Box);
__(HBox, Box);
__(VBox, Box);
__(Notebook, Container);
@@ -480,6 +481,8 @@
Etk_Statusbar * SvEtkStatusbarPtr(SV *data) { return SvObj(data,
Etk::StatusBar); }
SV * newSVEtkTablePtr(Etk_Table *o) { return newSVObj(o, Etk::Table, 0); }
Etk_Table * SvEtkTablePtr(SV *data) { return SvObj(data, Etk::Table); }
+SV * newSVEtkToolbarPtr(Etk_Toolbar *o) { return newSVObj(o, Etk::Toolbar,
0);}
+Etk_Toolbar * SvEtkToolbarPtr(SV *data) { return SvObj(data, Etk::Toolbar);}
SV * newSVEtkTextblockPtr(Etk_Textblock *o) { return newSVObj(o,
Etk::TextBlock, 0); }
Etk_Textblock * SvEtkTextblockPtr(SV *data) { return SvObj(data,
Etk::TextBlock); }
SV * newSVEtkTextblockIterPtr(Etk_Textblock_Iter *o) { return newSVObj(o,
Etk::TextBlock::Iter, 0); }
===
RCS file: /cvs/e/e17/proto/etk-perl/EtkTypes.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- EtkTypes.h 26 Aug 2006 16:03:43 - 1.8
+++ EtkTypes.h 1 Sep 2006 18:34:36 - 1.9
@@ -104,6 +104,8 @@
Etk_Statusbar *SvEtkStatusbarPtr(SV *data);
SV * newSVEtkTablePtr(Etk_Table *o);
Etk_Table *SvEtkTablePtr(SV *data);
+SV * newSVEtkToolbarPtr(Etk_Toolbar *o);
+Etk_Toolbar * SvEtkToolbarPtr(SV *data);
SV * newSVEtkTextblockPtr(Etk_Textblock *o);
Etk_Textblock *SvEtkTextblockPtr(SV *data);
SV * newSVEtkTextblockIterPtr(Etk_Textblock_Iter *o);
===
RCS file: /cvs/e/e17/proto/etk-perl/typemap,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- typemap 16 Aug 2006 20:21:56 - 1.13
+++ typemap 1 Sep 2006 18:34:36 - 1.14
@@ -91,6 +91,9 @@
Etk_Textblock_Gravity T_IV
Etk_Toggle_Button *T_PTROBJ_ETK
Etk_Toplevel_Widget * T_PTROBJ_ETK
+Etk_Toolbar * T_PTROBJ_ETK
+Etk_Toolbar_Style T_IV
+Etk_Toolbar_OrientationT_IV
Etk_Tree * T_PTROBJ_ETK
Etk_Tree_Col * T_PTROBJ_ETK
Etk_Tree_Mode T_IV
E CVS: apps/e rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_shelf.edc
Log Message:
oops, looks like i got distracted and forgot to finish these (thanks for
catching that sndev)
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_shelf.edc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- default_shelf.edc 31 Aug 2006 03:28:26 - 1.13
+++ default_shelf.edc 1 Sep 2006 19:31:32 - 1.14
@@ -870,96 +870,96 @@
programs {
program {
name:orient1;
-signal: e,state,orientation,;
-source: top;
+signal: e,state,orientation,top;
+source: e;
action: STATE_SET default 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient2;
-signal: e,state,orientation,;
-source: top_left;
+signal: e,state,orientation,top_left;
+source: e;
action: STATE_SET top_left 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient3;
-signal: e,state,orientation,;
-source: top_right;
+signal: e,state,orientation,top_right;
+source: e;
action: STATE_SET top_right 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient4;
-signal: e,state,orientation,;
-source: bottom;
+signal: e,state,orientation,bottom;
+source: e;
action: STATE_SET bottom 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient5;
-signal: e,state,orientation,;
-source: bottom_left;
+signal: e,state,orientation,bottom_left;
+source: e;
action: STATE_SET bottom_left 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient6;
-signal: e,state,orientation,;
-source: bottom_right;
+signal: e,state,orientation,bottom_right;
+source: e;
action: STATE_SET bottom_right 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient7;
-signal: e,state,orientation,;
-source: left;
+signal: e,state,orientation,left;
+source: e;
action: STATE_SET left 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient8;
-signal: e,state,orientation,;
-source: left_top;
+signal: e,state,orientation,left_top;
+source: e;
action: STATE_SET left_top 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient9;
-signal: e,state,orientation,;
-source: left_bottom;
+signal: e,state,orientation,left_bottom;
+source: e;
action: STATE_SET left_bottom 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient10;
-signal: e,state,orientation,;
-source: right;
+signal: e,state,orientation,right;
+source: e;
action: STATE_SET right 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient11;
-signal: e,state,orientation,;
-source: right_top;
+signal: e,state,orientation,right_top;
+source: e;
action: STATE_SET right_top 0.0;
target: base;
target: e.swallow.content;
}
program {
name:orient12;
-signal: e,state,orientation,;
-source: right_bottom;
+signal: e,state,orientation,right_bottom;
+source: e;
action: STATE_SET right_bottom 0.0;
target: base;
target: e.swallow.content;
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_image.c exhibit_main.c exhibit_main.h
exhibit_menus.c exhibit_options.c exhibit_tab.c
Log Message:
- Added monitoring for the dir/file -listing
- Some minor cleanup
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- exhibit.h 15 Aug 2006 22:21:47 - 1.31
+++ exhibit.h 1 Sep 2006 20:23:50 - 1.32
@@ -70,6 +70,13 @@
EX_SORT_BY_RESOLUTION = -4
} Ex_Sort;
+typedef enum _Ex_Tree_Update
+{
+ EX_TREE_UPDATE_FILES = -1,
+ EX_TREE_UPDATE_DIRS = -2,
+ EX_TREE_UPDATE_ALL = -3,
+} Ex_Tree_Update;
+
struct _Ex_Options
{
char *app1;
@@ -139,7 +146,8 @@
intnum;
- Etk_Bool fit_window;
+ Etk_Bool fit_window;
+ Ecore_File_Monitor *monitor;
Evas_List *images;
Evas_List *dirs;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -3 -r1.36 -r1.37
--- exhibit_image.c 25 Aug 2006 12:00:13 - 1.36
+++ exhibit_image.c 1 Sep 2006 20:23:50 - 1.37
@@ -582,16 +582,6 @@
/* Dont fork for the tree polulating to work */
evas_object_image_save(im-image_object, file, NULL, NULL);
- /* Refresh list if the file is saved in our dir */
- D((Image path: %s - Cur path: %s\n, fd-e-cur_tab-set_img_path,
-fd-e-cur_tab-cur_path));
- if (!strcmp(fd-e-cur_tab-set_img_path, fd-e-cur_tab-cur_path))
- {
- etk_tree_clear(ETK_TREE(fd-e-cur_tab-itree));
- etk_tree_clear(ETK_TREE(fd-e-cur_tab-dtree));
- _ex_main_populate_files(fd-e, NULL);
- }
-
etk_widget_hide(fd-win);
}
@@ -679,23 +669,13 @@
}
_ex_main_image_unset();
-
- /* Refresh the tree as we deleted the file first */
- etk_tree_clear(ETK_TREE(tab-itree));
- etk_tree_clear(ETK_TREE(tab-dtree));
- _ex_main_populate_files(e, NULL);
-
- D((Ex_Tab pointer in _ex_image_delete_cb %p\n, tab));
etk_object_destroy(ETK_OBJECT(tab-dialog));
-
- D((Deleted for %s\n, string));
+ D((Deleted %s\n, string));
}
static void
_ex_image_delete_dialog_response(Etk_Object *obj, int response_id, void *data)
{
- Exhibit *e = data;
-
switch(response_id)
{
case ETK_RESPONSE_OK:
@@ -715,9 +695,8 @@
Ex_Tab *tab = e-cur_tab;
char string[PATH_MAX];
- sprintf(string, Are you sure you want to delete this image? br%s%sbr
, tab-set_img_path, tab-cur_file);
-
- D((Ex_Tab pointer in _ex_image_delete %p\n, e-cur_tab));
+ sprintf(string, Are you sure you want to delete this image? br%s%sbr
,
+tab-set_img_path, tab-cur_file);
tab-dialog = etk_message_dialog_new(ETK_MESSAGE_DIALOG_QUESTION,
ETK_MESSAGE_DIALOG_OK_CANCEL,
@@ -731,11 +710,6 @@
_(Exhibit - Confirm delete));
etk_widget_show_all(tab-dialog);
-
- /* TODO
-* Center the dialog on top of the app.
- etk_window_center_on_window(ETK_WINDOW(tab-dialog), ETK_WINDOW(e-win));
- */
}
@@ -761,13 +735,8 @@
ret = rename(oldpath, newpath);
if (ret == -1)
_ex_main_dialog_show(Error renaming file!,
ETK_MESSAGE_DIALOG_ERROR);
-else
- {
- _ex_main_image_unset();
- etk_tree_clear(ETK_TREE(tab-itree));
- etk_tree_clear(ETK_TREE(tab-dtree));
- _ex_main_populate_files(e, NULL);
- }
+else
+ _ex_main_image_unset();
E_FREE(newpath);
E_FREE(oldpath);
@@ -1064,8 +1033,6 @@
char filename_s[PATH_MAX];
Ecore_X_Window *roots = NULL;
- D((Entered the foo\n));
-
if (!ecore_x_init(NULL))
exit(0);
@@ -1166,9 +1133,8 @@
{
char e_bg_set[PATH_MAX*2];
-snprintf(e_bg_set, PATH_MAX, enlightenment_remote -default-bg-set
%s, edj_file);
-
-D((FOO: %s\n, e_bg_set));
+snprintf(e_bg_set, PATH_MAX, enlightenment_remote -default-bg-set
%s,
+ edj_file);
system(e_bg_set);
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- exhibit_main.c 25 Aug 2006 12:00:13 - 1.69
+++ exhibit_main.c 1 Sep 2006 20:23:50 - 1.70
@@ -10,6 +10,7 @@
Exhibit *e;
Evas_List *event_handlers;
+static void _ex_main_monitor_dir(void *data, Ecore_File_Monitor
*ecore_file_monitor, Ecore_File_Event event, const char *path);
static int _ex_main_dtree_compare_cb(Etk_Tree *tree,
E CVS: proto balony
Enlightenment CVS committal Author : balony Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - Added monitoring for the dir/file -listing - Some minor cleanup === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.14 retrieving revision 1.15 diff -u -3 -r1.14 -r1.15 --- TODO13 Aug 2006 22:59:01 - 1.14 +++ TODO1 Sep 2006 20:23:50 - 1.15 @@ -9,10 +9,6 @@ - Create window - Close window -- menus - * release notes - - o DONE: -- + open in should be generated from options @@ -37,12 +33,12 @@ + comments visibile / hidden by default (with remembering last state) + provide tab for open in applications + key shotcuts - + x - fit / unfit to window - + s (slideshow) + + control-x - fit / unfit to window + + control-s (slideshow) + control-q (quit) = -* RELEASSE 0.2.0: +* RELEASE 0.2.0: = o TODO: - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_main.c exhibit_options.c exhibit_thumb.c
Log Message:
- Much better way of updating the thumblist when new images is added to your
current dir.
- A new option to choose if you want to autofocus the new image added, may be
cheesy if lots of images is added at once.. :-)
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- exhibit.h 1 Sep 2006 20:23:50 - 1.32
+++ exhibit.h 1 Sep 2006 21:51:38 - 1.33
@@ -16,6 +16,7 @@
#include stdio.h
#include stdlib.h
#include string.h
+#include libgen.h
#include dirent.h
#include limits.h
#include sys/types.h
@@ -100,6 +101,7 @@
int default_view;
int default_sort;
int default_sort_tmp;
+ int monitor_focus;
int last_w;
int last_h;
@@ -118,6 +120,7 @@
Etk_Widget *comments_visible;
Etk_Widget *rotate_autosave;
Etk_Widget *default_sort;
+ Etk_Widget *monitor_focus;
Etk_Combobox_Item *sort_date;
Etk_Combobox_Item *sort_size;
Etk_Combobox_Item *sort_name;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- exhibit_main.c 1 Sep 2006 20:23:50 - 1.70
+++ exhibit_main.c 1 Sep 2006 21:51:38 - 1.71
@@ -10,6 +10,7 @@
Exhibit *e;
Evas_List *event_handlers;
+static void _ex_main_itree_add(const char *file, const char *selected_file);
static void _ex_main_monitor_dir(void *data, Ecore_File_Monitor
*ecore_file_monitor, Ecore_File_Event event, const char *path);
static int _ex_main_dtree_compare_cb(Etk_Tree *tree, Etk_Tree_Row *row1,
Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data);
static void _ex_main_goto_dir_clicked_cb(Etk_Object *object, void *data);
@@ -157,7 +158,6 @@
char back[PATH_MAX];
DIR *dir;
struct dirent *dir_entry;
- Etk_Tree_Row *row, *selected_row = NULL;
chdir(e-cur_tab-dir);
@@ -195,7 +195,6 @@
char image[PATH_MAX];
char imagereal[PATH_MAX];
struct stat st;
- Epsilon *ep;
/* Do not include hidden files */
if (dir_entry-d_name[0] == '.')
@@ -227,37 +226,7 @@
if(!realpath(image, imagereal))
snprintf(imagereal, PATH_MAX, %s, image);
- ep = epsilon_new(imagereal);
- epsilon_thumb_size(ep, EPSILON_THUMB_NORMAL);
-
- if(epsilon_exists(ep) == EPSILON_OK)
- {
-char *thumb;
-
-thumb = (char*)epsilon_thumb_file_get(ep);
-row = etk_tree_append(ETK_TREE(e-cur_tab-itree),
e-cur_tab-icol, thumb, dir_entry-d_name, NULL);
-if(selected_file)
- if(!strcmp(selected_file, dir_entry-d_name))
-selected_row = row;
-E_FREE(thumb);
- }
- else {
- Ex_Thumb *thumb;
-
- thumb = calloc(1, sizeof(Ex_Thumb));
- thumb-ep = ep;
- thumb-e = e;
- thumb-name = strdup(dir_entry-d_name);
- thumb_list = evas_list_append(thumb_list, thumb);
- if(selected_file)
-{
- if(!strcmp(selected_file, dir_entry-d_name))
- thumb-selected = ETK_TRUE;
-}
- else
-thumb-selected = ETK_FALSE;
- if(pid == -1) _ex_thumb_generate();
- }
+ _ex_main_itree_add(imagereal, selected_file);
}
etk_tree_thaw(ETK_TREE(e-cur_tab-itree));
@@ -276,30 +245,75 @@
}
if (update == EX_TREE_UPDATE_ALL || update == EX_TREE_UPDATE_DIRS)
- {
etk_tree_sort(ETK_TREE(e-cur_tab-dtree), _ex_main_dtree_compare_cb,
ETK_TRUE, e-cur_tab-dcol, NULL);
- }
- if(selected_row)
+ if (!e-cur_tab-monitor)
{
- etk_tree_row_select(selected_row);
- etk_tree_row_scroll_to(selected_row, ETK_TRUE);
+ D((Adding monitoring to path %s\n, e-cur_tab-cur_path));
+ e-cur_tab-monitor = ecore_file_monitor_add(e-cur_tab-cur_path,
+ _ex_main_monitor_dir, NULL);
}
/* Set the dir to the current dir at the end so we avoid
stepdown like .. if we just call the refresh on
the listing like after a delete */
e-cur_tab-dir = strdup(.);
+
+ closedir(dir);
+}
- if (!e-cur_tab-monitor)
+static void
+_ex_main_itree_add(const char *file, const char *selected_file)
+{
+ Epsilon *ep;
+ Etk_Tree_Row *row;
+
+ if(!_ex_file_is_viewable(basename((char *) file)))
+ return;
+
+ ep = epsilon_new(file);
+ epsilon_thumb_size(ep, EPSILON_THUMB_NORMAL);
+
+ if(epsilon_exists(ep) == EPSILON_OK)
{
- D((Adding
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_main.c exhibit_main.h exhibit_slideshow.c
exhibit_slideshow.h
Log Message:
And some more cleanups ...
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -3 -r1.71 -r1.72
--- exhibit_main.c 1 Sep 2006 21:51:38 - 1.71
+++ exhibit_main.c 1 Sep 2006 22:41:37 - 1.72
@@ -469,7 +469,7 @@
tab = _ex_tab_new(e, e-cur_tab-cur_path);
-_ex_main_window_tab_append(e, tab);
+_ex_main_window_tab_append(tab);
_ex_main_populate_files(NULL, EX_TREE_UPDATE_ALL);
}
else if(!strcmp(ev-key, w))
@@ -500,7 +500,7 @@
}
else if(!strcmp(ev-key, s))
{
-_ex_main_window_slideshow_toggle(e);
+_ex_main_window_slideshow_toggle();
}
}
}
@@ -514,26 +514,24 @@
}
void
-_ex_main_window_slideshow_toggle(Exhibit *e)
+_ex_main_window_slideshow_toggle()
{
if(e-slideshow.active)
{
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
}
else
{
- _ex_slideshow_start(e);
+ _ex_slideshow_start();
}
}
static void
_ex_main_window_tab_toggled_cb(Etk_Object *object, void *data)
{
- Exhibit *e;
Ex_Tab *tab;
- e = data;
- _ex_slideshow_stop(e);
+ _ex_slideshow_stop();
tab = evas_list_nth(e-tabs,
etk_notebook_current_page_get(ETK_NOTEBOOK(object)));
@@ -547,7 +545,7 @@
}
void
-_ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab)
+_ex_main_window_tab_append(Ex_Tab *tab)
{
if(evas_list_count(e-tabs) == 1)
{
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- exhibit_main.h 1 Sep 2006 20:23:50 - 1.13
+++ exhibit_main.h 1 Sep 2006 22:41:37 - 1.14
@@ -7,8 +7,8 @@
void _ex_main_statusbar_zoom_update(Exhibit *e);
void _ex_main_populate_files(const char *selected_file, Ex_Tree_Update
update);
int _ex_main_window_slideshow_next(void *data);
-void _ex_main_window_slideshow_toggle(Exhibit *e);
-void _ex_main_window_tab_append(Exhibit *e, Ex_Tab *tab);
+void _ex_main_window_slideshow_toggle();
+void _ex_main_window_tab_append(Ex_Tab *tab);
void _ex_main_window_tab_remove(Ex_Tab *tab);
void _ex_main_dialog_show(char *text, Etk_Message_Dialog_Type type);
void _ex_main_window_show(char *dir);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_slideshow.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- exhibit_slideshow.c 15 Aug 2006 22:21:47 - 1.6
+++ exhibit_slideshow.c 1 Sep 2006 22:41:37 - 1.7
@@ -4,7 +4,7 @@
#include exhibit.h
void
-_ex_slideshow_stop(Exhibit *e)
+_ex_slideshow_stop()
{
if(e-slideshow.active)
{
@@ -15,7 +15,7 @@
}
void
-_ex_slideshow_start(Exhibit *e)
+_ex_slideshow_start()
{
if (e-options-slide_interval)
e-slideshow.interval = e-options-slide_interval;
@@ -23,7 +23,8 @@
if(!e-slideshow.active)
{
etk_statusbar_push(ETK_STATUSBAR(e-statusbar[3]), Slideshow running,
0);
- e-slideshow.timer = ecore_timer_add(e-slideshow.interval,
_ex_slideshow_next, e);
+ e-slideshow.timer = ecore_timer_add(e-slideshow.interval,
+ _ex_slideshow_next, NULL);
e-slideshow.active = ETK_TRUE;
}
}
@@ -31,13 +32,11 @@
int
_ex_slideshow_next(void *data)
{
- Exhibit *e;
Etk_Tree_Row *row, *last_row;
int i = 0;
int n = 0;
char string[80];
- e = data;
row = etk_tree_selected_row_get(ETK_TREE(e-cur_tab-itree));
last_row = etk_tree_last_row_get(ETK_TREE(e-cur_tab-itree), ETK_FALSE,
ETK_FALSE);
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_slideshow.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- exhibit_slideshow.h 14 Aug 2006 16:34:52 - 1.2
+++ exhibit_slideshow.h 1 Sep 2006 22:41:37 - 1.3
@@ -4,8 +4,8 @@
#ifndef _EX_SLIDESHOW_H
#define _EX_SLIDESHOW_H
-void _ex_slideshow_stop(Exhibit *e);
-void _ex_slideshow_start(Exhibit *e);
+void _ex_slideshow_stop();
+void _ex_slideshow_start();
int _ex_slideshow_next(void *data);
#endif
-
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated
E CVS: apps/e raster
Enlightenment CVS committal Author : raster Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_hints.c Log Message: set CLIENT window id, not border. === RCS file: /cvs/e/e17/apps/e/src/bin/e_hints.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -3 -r1.90 -r1.91 --- e_hints.c 26 Aug 2006 08:32:56 - 1.90 +++ e_hints.c 1 Sep 2006 22:42:11 - 1.91 @@ -244,7 +244,7 @@ c = cl-data; bl = e_container_border_list_first(c); while ((b = e_container_border_list_next(bl))) - clients[i++] = b-win; + clients[i++] = b-client.win; e_container_border_list_free(bl); } } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit.h exhibit_comment.c exhibit_main.c exhibit_menus.c
exhibit_tab.c
Log Message:
- remove our own notebook like logic and use a tab-less notebook when in single
view. show tabs when in tabbed view. note: tab deletion still not done
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- exhibit.h 1 Sep 2006 21:51:38 - 1.33
+++ exhibit.h 1 Sep 2006 23:39:22 - 1.34
@@ -206,7 +206,7 @@
Etk_Widget*app3_menu;
Etk_Widget*app4_menu;
Etk_Widget*submenu;
-
+
intzoom;
intbrightness;
intcontrast;
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- exhibit_comment.c 15 Aug 2006 18:45:51 - 1.11
+++ exhibit_comment.c 1 Sep 2006 23:39:22 - 1.12
@@ -10,17 +10,8 @@
_ex_comment_show(Exhibit *e)
{
e-cur_tab-comment.vbox = etk_vbox_new(ETK_FALSE, 0);
- if(evas_list_count(e-tabs) == 1)
- {
- /* we only have 1 tab, ie, no notebook */
- etk_paned_child2_set(ETK_PANED(e-hpaned), e-cur_tab-comment.vbox,
ETK_TRUE);
- }
- else
- {
- /* we have multiple tabs */
- etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-comment.vbox);
- }
-
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-comment.vbox);
+
if (e-cur_tab-fit_window)
etk_box_append(ETK_BOX(e-cur_tab-comment.vbox), e-cur_tab-alignment,
ETK_BOX_START, ETK_BOX_EXPAND_FILL, 0);
else
@@ -59,22 +50,10 @@
if(!e-cur_tab-comment.visible)
return;
- if(evas_list_count(e-tabs) == 1)
- {
- /* we only have 1 tab, ie, no notebook */
- if (e-cur_tab-fit_window)
- etk_paned_child2_set(ETK_PANED(e-hpaned), e-cur_tab-alignment,
ETK_TRUE);
- else
- etk_paned_child2_set(ETK_PANED(e-hpaned), e-cur_tab-scrolled_view,
ETK_TRUE);
- }
+ if (e-cur_tab-fit_window)
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-alignment);
else
- {
- /* we have multiple tabs */
- if (e-cur_tab-fit_window)
- etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook),
e-cur_tab-num, e-cur_tab-alignment);
- else
- etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook),
e-cur_tab-num, e-cur_tab-scrolled_view);
- }
+ etk_notebook_page_child_set(ETK_NOTEBOOK(e-notebook), e-cur_tab-num,
e-cur_tab-scrolled_view);
etk_object_destroy(ETK_OBJECT(e-cur_tab-comment.textview));
etk_object_destroy(ETK_OBJECT(e-cur_tab-comment.save));
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -3 -r1.72 -r1.73
--- exhibit_main.c 1 Sep 2006 22:41:37 - 1.72
+++ exhibit_main.c 1 Sep 2006 23:39:22 - 1.73
@@ -2,7 +2,6 @@
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
#include exhibit.h
-#include Ecore_File.h
extern pid_t pid;
extern Evas_List *thumb_list;
@@ -84,7 +83,8 @@
etk_window_title_set(ETK_WINDOW(e-win), title);
/* Save the path of where the image really is in case
- we browse more in the dtree */
+* we browse more in the dtree
+*/
e-cur_tab-set_img_path = malloc(PATH_MAX);
memset(e-cur_tab-set_img_path, 0, PATH_MAX);
e-cur_tab-cur_file = malloc(PATH_MAX);
@@ -96,7 +96,7 @@
e-cur_tab-image_loaded = ETK_TRUE;
etk_widget_show(ETK_WIDGET(e-cur_tab-image));
- if(_ex_file_is_ebg(image))
+ if (_ex_file_is_ebg(image))
{
/* can we do this without the size request? it doesnt look good */
etk_widget_size_request_set(ETK_WIDGET(e-cur_tab-image), 800, 600);
@@ -182,7 +182,7 @@
etk_tree_freeze(ETK_TREE(e-cur_tab-dtree));
getcwd(e-cur_tab-cur_path, PATH_MAX);
- if(strlen(e-cur_tab-cur_path) PATH_MAX - 2)
+ if (strlen(e-cur_tab-cur_path) PATH_MAX - 2)
{
int len = strlen(e-cur_tab-cur_path);
e-cur_tab-cur_path[len] = '/';
@@ -255,9 +255,9 @@
_ex_main_monitor_dir, NULL);
}
- /* Set the dir to the current dir at the end so we avoid
- stepdown like .. if we just call the refresh on
- the listing like after a delete */
+ /* Set the dir to the current dir at the end so we avoid stepdown
+* like .. if we just call the refresh on the listing like after a delete
+*/
e-cur_tab-dir = strdup(.);
closedir(dir);
@@ -364,7 +364,7 @@
{
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: - remove our own notebook like logic and use a tab-less notebook when in single view. show tabs when in tabbed view. note: tab deletion still not done === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.15 retrieving revision 1.16 diff -u -3 -r1.15 -r1.16 --- TODO1 Sep 2006 20:23:50 - 1.15 +++ TODO1 Sep 2006 23:39:22 - 1.16 @@ -8,9 +8,17 @@ - Close tab - Create window - Close window +- menus + * release notes + + +=== + 1.15 o DONE: -- ++ add monitor code to add / remove / reload images as they change on disk ++ use notebook all the time (hide tabs when not needed) + open in should be generated from options + andy's comments feature + sorting - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto codewarrior
Enlightenment CVS committal Author : codewarrior Project : e17 Module : proto Dir : e17/proto/exhibit Modified Files: TODO Log Message: clean === RCS file: /cvs/e/e17/proto/exhibit/TODO,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- TODO1 Sep 2006 23:39:22 - 1.16 +++ TODO1 Sep 2006 23:42:50 - 1.17 @@ -9,12 +9,8 @@ - Create window - Close window - menus - * release notes - - -=== + * release notes - 1.15 o DONE: -- + add monitor code to add / remove / reload images as they change on disk - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e sndev
Enlightenment CVS committal
Author : sndev
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
- no more slow moving on gadcon item dragging.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- e_gadcon.c 1 Sep 2006 10:40:54 - 1.43
+++ e_gadcon.c 2 Sep 2006 00:12:16 - 1.44
@@ -1633,14 +1633,12 @@
if (gcc-state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
gcc-state_info.resist = 0;
gcc-state_info.state = E_LAYOUT_ITEM_STATE_POS_INC;
-x = 1;
}
else if (x 0)
{
if (gcc-state_info.state != E_LAYOUT_ITEM_STATE_POS_DEC)
gcc-state_info.resist = 0;
gcc-state_info.state = E_LAYOUT_ITEM_STATE_POS_DEC;
-x = -1; // would like to move by one pixel to be safe
}
}
else
@@ -1650,14 +1648,12 @@
if (gcc-state_info.state != E_LAYOUT_ITEM_STATE_POS_INC)
gcc-state_info.resist = 0;
gcc-state_info.state = E_LAYOUT_ITEM_STATE_POS_INC;
-y = 1;
}
else if (y 0)
{
if (gcc-state_info.state != E_LAYOUT_ITEM_STATE_POS_DEC)
gcc-state_info.resist = 0;
gcc-state_info.state = E_LAYOUT_ITEM_STATE_POS_DEC;
-y = -1;
}
}
@@ -3350,7 +3346,7 @@
static void
_e_gadcon_layout_smart_gadcons_position(E_Smart_Data *sd, Evas_List **list)
{
- int ok;
+ int ok, lc_moving_prev_pos;
Evas_List *l, *l2, *l3;
E_Layout_Item_Container *lc_moving = NULL, *lc_back, *lc, *lc3;
E_Gadcon_Layout_Item *bi, *bi_moving;
@@ -3391,46 +3387,107 @@
return;
}
+ lc_moving_prev_pos = lc_moving-prev_pos;
if (lc_moving-state == E_LAYOUT_ITEM_CONTAINER_STATE_POS_DEC)
{
_e_gadcon_layout_smart_restore_gadcons_position_before_move(sd,
lc_moving, lc_back, list);
for (l = *list; (l) (l-data != lc_moving); l = l-next);
-
- ok = 0;
- if ((l) (l-prev))
- {
-lc = l-prev-data;
-if (LC_OVERLAP(lc, lc_moving))
- {
- bi = lc_moving-items-data;
- if (bi-gcc-state_info.resist =
E_LAYOUT_ITEM_DRAG_RESIST_LEVEL)
- {
- ok = 1;
- bi-gcc-state_info.resist++;
- lc_moving-pos = lc_moving-prev_pos;
-
_e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
- }
- else
- {
- bi-gcc-state_info.resist = 0;
- lc3 =
_e_gadcon_layout_smart_containers_position_adjust(sd, lc, lc_moving);
- if (lc3)
+
+ ok = 0;
+ if ((l) (l-prev))
+ {
+lc = l-prev-data;
+
+if (lc_moving-pos (lc-pos + lc-size))
+ {
+ bi = lc_moving-items-data;
+ if (bi-gcc-state_info.resist =
E_LAYOUT_ITEM_DRAG_RESIST_LEVEL)
+ {
+ if (lc_moving-prev_pos == (lc-pos + lc-size))
+ok = 1;
+ bi-gcc-state_info.resist++;
+ lc_moving-pos = lc-pos + lc-size;
+
_e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
+ }
+ else
+ {
+ bi-gcc-state_info.resist = 0;
+ if (lc_moving-pos lc-pos)
{
- ok = 1;
- l-data = lc3;
- *list = evas_list_remove_list(*list, l-prev);
- LC_FREE(lc_moving);
- LC_FREE(lc);
-}
- }
- }
- }
+ lc_moving-pos = (lc-pos + lc-size) - 1;
+
_e_gadcon_layout_smart_position_items_inside_container(sd, lc_moving);
+}
+ lc3 =
_e_gadcon_layout_smart_containers_position_adjust(sd, lc, lc_moving);
+ if (lc3)
+{
+ if (lc_moving-prev_pos == (lc-pos + lc-size))
+ ok = 1;
+
+ l-data = lc3;
+ *list = evas_list_remove_list(*list, l-prev);
+ LC_FREE(lc_moving);
+ LC_FREE(lc);
+ lc_moving = lc3;
+}
+ }
+ }
+ }
if (!ok)
{
+int pos, prev_pos, stop;
E CVS: wlan chaos
Enlightenment CVS committal
Author : chaos
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_main.c e_mod_main.h e_mod_config.c
Log Message:
* Shelf-ify wlan module
===
RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_mod_main.c18 Jul 2006 00:03:04 - 1.27
+++ e_mod_main.c2 Sep 2006 00:56:06 - 1.28
@@ -1,605 +1,496 @@
#include e.h
#include e_mod_main.h
-#include e_mod_config.h
-#include config.h
-static Wlan *_wlan_init (E_Module * m);
-static void _wlan_shutdown (Wlan * n);
-static void _wlan_config_menu_new (Wlan * n);
-
-static Wlan_Face *_wlan_face_init (Wlan * n, E_Container * con);
-static void _wlan_face_menu_new (Wlan_Face * nf);
-static void _wlan_face_enable (Wlan_Face * nf);
-static void _wlan_face_disable (Wlan_Face * nf);
-static void _wlan_face_free (Wlan_Face * nf);
-static void _wlan_face_cb_gmc_change (void *data, E_Gadman_Client * gmc,
- E_Gadman_Change change);
-static void _wlan_face_cb_mouse_down (void *data, Evas * evas,
- Evas_Object * obj, void *event_info);
-static void _wlan_face_cb_menu_edit (void *data, E_Menu * mn,
-E_Menu_Item * mi);
-static void _wlan_face_cb_menu_configure (void *data, E_Menu * mn,
- E_Menu_Item * mi);
-static int _wlan_face_update_values (void *data);
-static void _wlan_face_graph_values (Wlan_Face * wf, int val);
-
-static int wlan_count;
-static E_Config_DD *conf_edd;
-static E_Config_DD *conf_face_edd;
+typedef struct _Instance Instance;
+typedef struct _Wlan Wlan;
-EAPI E_Module_Api e_modapi = {
- E_MODULE_API_VERSION,
- Wlan
+struct _Instance
+{
+ E_Gadcon_Client *gcc;
+ Evas_Object *wlan_obj;
+ Wlan *wlan;
+ Ecore_Timer *check_timer;
};
-EAPI void *
-e_modapi_init (E_Module * m)
+struct _Wlan
{
- Wlan *n;
+ Instance *inst;
+ Evas_Object *wlan_obj;
+};
- /* Set up module's message catalogue */
- bindtextdomain (PACKAGE, LOCALEDIR);
- bind_textdomain_codeset (PACKAGE, UTF-8);
+/* Func Protos for Gadcon */
+static E_Gadcon_Client *_gc_init (E_Gadcon * gc, const char *name,
+ const char *id, const char *style);
+static void _gc_shutdown (E_Gadcon_Client * gcc);
+static void _gc_orient (E_Gadcon_Client * gcc);
+static char *_gc_label (void);
+static Evas_Object *_gc_icon (Evas * evas);
+
+/* Func Protos for Module */
+static void _wlan_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
+ void *event_info);
+static void _wlan_cb_mouse_in (void *data, Evas * e, Evas_Object * obj,
+ void *event_info);
+static void _wlan_cb_mouse_out (void *data, Evas * e, Evas_Object * obj,
+ void *event_info);
+static void _wlan_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
+static void _wlan_menu_cb_post (void *data, E_Menu * m);
+static Config_Item *_wlan_config_item_get (const char *id);
+static Wlan *_wlan_new (Evas * evas);
+static void _wlan_free (Wlan * wlan);
+static int _wlan_cb_check (void *data);
+
+static E_Config_DD *conf_edd = NULL;
+static E_Config_DD *conf_item_edd = NULL;
+
+Config *wlan_config = NULL;
+
+static const E_Gadcon_Client_Class _gc_class = {
+ GADCON_CLIENT_CLASS_VERSION,
+ wlan, {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon},
+ E_GADCON_CLIENT_STYLE_PLAIN
+};
- n = _wlan_init (m);
- if (!n)
-return NULL;
+static E_Gadcon_Client *
+_gc_init (E_Gadcon * gc, const char *name, const char *id, const char *style)
+{
+ E_Gadcon_Client *gcc;
+ Evas_Object *o;
+ Instance *inst;
+ Config_Item *ci;
+ Wlan *wlan;
+
+ inst = E_NEW (Instance, 1);
+
+ ci = _wlan_config_item_get (id);
+ if (!ci-id)
+ci-id = evas_stringshare_add (id);
+
+ wlan = _wlan_new (gc-evas);
+ wlan-inst = inst;
+ inst-wlan = wlan;
+
+ o = wlan-wlan_obj;
+ gcc = e_gadcon_client_new (gc, name, id, style, o);
+ gcc-data = inst;
+ inst-gcc = gcc;
+ inst-wlan_obj = o;
- n-module = m;
- return n;
-}
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_DOWN,
+ _wlan_cb_mouse_down, inst);
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_IN, _wlan_cb_mouse_in,
+ inst);
+ evas_object_event_callback_add (o, EVAS_CALLBACK_MOUSE_OUT,
+ _wlan_cb_mouse_out, inst);
-EAPI int
-e_modapi_shutdown (E_Module * m)
-{
- Wlan *n;
+ if (ci-always_text)
+edje_object_signal_emit (inst-wlan_obj, label_active, );
- n = m-data;
- if (!n)
-return 0;
+ _wlan_cb_check (inst);
- if (n-cfd)
-{
- e_object_del (E_OBJECT (n-cfd));
- n-cfd = NULL;
-}
- _wlan_shutdown (n);
- return 1;
+ inst-check_timer
E CVS: wlan chaos
Enlightenment CVS committal
Author : chaos
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
wlan.edc
Log Message:
* Shelf-ify wlan module
===
RCS file: /cvs/e/e_modules/wlan/wlan.edc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- wlan.edc9 Aug 2006 07:34:46 - 1.8
+++ wlan.edc2 Sep 2006 00:57:07 - 1.9
@@ -1,6 +1,28 @@
images
{
image: wlan.png COMP;
+ image: qual_00.png COMP;
+ image: qual_01.png COMP;
+ image: qual_02.png COMP;
+ image: qual_03.png COMP;
+ image: qual_04.png COMP;
+ image: qual_05.png COMP;
+ image: qual_06.png COMP;
+ image: qual_07.png COMP;
+ image: qual_08.png COMP;
+ image: qual_09.png COMP;
+ image: qual_10.png COMP;
+ image: level_00.png COMP;
+ image: level_01.png COMP;
+ image: level_02.png COMP;
+ image: level_03.png COMP;
+ image: level_04.png COMP;
+ image: level_05.png COMP;
+ image: level_06.png COMP;
+ image: level_07.png COMP;
+ image: level_08.png COMP;
+ image: level_09.png COMP;
+ image: level_10.png COMP;
}
fonts
@@ -13,24 +35,56 @@
group
{
name: modules/wlan/main;
+ min: 4 4;
+ max: 128 128;
+ script
+ {
+ public message(Msg_Type:type, id, ...)
+ {
+ if ((type == MSG_FLOAT) (id == 1))
+ {
+ new Float:value;
+
+ value = getfarg(2);
+ set_state(PART:qual_meter, default, value);
+ }
+ if ((type == MSG_FLOAT) (id == 2))
+ {
+ new Float:value;
+
+ value = getfarg(2);
+ set_state(PART:level_meter, default, value);
+ }
+ }
+ }
+
parts
{
part
{
- name: fade_clip;
- type: RECT;
- mouse_events: 0;
+ name: fade_clip;
+ type: RECT;
description
{
state: default 0.0;
color: 255 255 255 255;
+ rel1
+{
+ relative: 0.0 0.0;
+ offset: 0 0;
+}
+ rel2
+{
+ relative: 1.0 1.0;
+ offset: -1 -1;
+}
}
}
part
{
- name: wlan;
+ name: wlan;
+ type: IMAGE;
clip_to: fade_clip;
- mouse_events: 0;
description
{
state:default 0.0;
@@ -38,105 +92,373 @@
aspect: 1.0 1.0;
aspect_preference: BOTH;
align: 0.5 0.5;
+
rel1
{
relative: 0.0 0.0;
+ offset: 0 0;
}
rel2
{
relative: 1.0 1.0;
+ offset: -1 -1;
}
image
{
normal: wlan.png;
}
- fill
-{
- smooth: 0;
-}
+ color: 255 255 255 192;
}
}
part
{
- name, lines;
- mouse_events, 0;
- type, SWALLOW;
- clip_to: fade_clip;
+ name: qual_meter;
+ type: IMAGE;
+ clip_to: fade_clip;
description
{
- state,default 0.0;
+ state: default 0.0;
rel1
{
relative: 0.0 0.0;
+ offset: 0 0;
}
rel2
{
- relative: 1.0 1.0;
+ relative: 1.0 0.25;
+ offset: -1 -1;
+}
+ image
+{
+ normal: qual_00.png;
+}
+ color: 255 255 255 192;
+ }
+ description
+
E CVS: wlan chaos
Enlightenment CVS committal Author : chaos Project : e_modules Module : wlan Dir : e_modules/wlan Modified Files: module_icon.png Log Message: * Shelfify === RCS file: /cvs/e/e_modules/wlan/module_icon.png,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 Binary files /tmp/cvsFoEqfw and /tmp/cvsdZXoSM differ - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: wlan chaos
Enlightenment CVS committal Author : chaos Project : e_modules Module : wlan Dir : e_modules/wlan Added Files: level_00.png level_01.png level_02.png level_03.png level_04.png level_05.png level_06.png level_07.png level_08.png level_09.png level_10.png qual_00.png qual_01.png qual_02.png qual_03.png qual_04.png qual_05.png qual_06.png qual_07.png qual_08.png qual_09.png qual_10.png Log Message: * Add images - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src Modified Files: entropy_config.c Log Message: * Comment these out until auto-hide is done === RCS file: /cvs/e/e17/proto/entropy/src/entropy_config.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- entropy_config.c1 Sep 2006 11:07:51 - 1.23 +++ entropy_config.c2 Sep 2006 01:24:58 - 1.24 @@ -620,6 +620,7 @@ /*Default settings*/ entropy_config_misc_item_str_set(general.listviewer, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.iconviewer, 0,ENTROPY_CONFIG_LOC_LIST); + entropy_config_misc_item_str_set(general.treeviewer, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.trackback, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.presortfolders, 1,ENTROPY_CONFIG_LOC_LIST); entropy_config_misc_item_str_set(general.hiddenbackup, 1,ENTROPY_CONFIG_LOC_LIST); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/dialogs Modified Files: etk_options_dialog.c Log Message: * Comment these out until auto-hide is done === RCS file: /cvs/e/e17/proto/entropy/src/dialogs/etk_options_dialog.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- etk_options_dialog.c1 Sep 2006 11:59:45 - 1.9 +++ etk_options_dialog.c2 Sep 2006 01:24:58 - 1.10 @@ -211,6 +211,10 @@ etk_options_dialog_checkbox_new(Show trackback viewer, general.trackback), ETK_BOX_START, ETK_BOX_NONE, 0); + etk_box_append(ETK_BOX(ivbox), + etk_options_dialog_checkbox_new(Show tree view, general.treeview), + ETK_BOX_START, ETK_BOX_NONE, 0); + etk_box_append(ETK_BOX(ivbox), etk_options_dialog_checkbox_new(Show folders before files, general.presortfolders), ETK_BOX_START, ETK_BOX_NONE, 0); @@ -248,20 +252,20 @@ /*Advanced*/ - button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM); + /*button = etk_tool_button_new_from_stock(ETK_STOCK_PREFERENCES_SYSTEM); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); frame = etk_frame_new(Advanced Settings); - etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); + etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame);*/ /*Thumbnail*/ - button = etk_tool_button_new_from_stock(ETK_STOCK_IMAGE_X_GENERIC); + /*button = etk_tool_button_new_from_stock(ETK_STOCK_IMAGE_X_GENERIC); etk_toolbar_append(ETK_TOOLBAR(toolbar), button); frame = etk_frame_new(Thumbnail Settings); - etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); + etk_signal_connect(pressed, ETK_OBJECT(button), ETK_CALLBACK(entropy_etk_options_dialog_frame_set), frame); */ - etk_widget_size_request_set(_entropy_etk_options_dialog, 560, 460); + //etk_widget_size_request_set(_entropy_etk_options_dialog, 560, 460); hbox = etk_hbox_new(ETK_FALSE,5); @@ -292,6 +296,7 @@ entropy_etk_options_object_create(general.presortfolders); entropy_etk_options_object_create(general.hiddenbackup); entropy_etk_options_object_create(general.iconsize); + entropy_etk_options_object_create(general.treeview); entropy_etk_options_dialog_create(); } - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto chaos
Enlightenment CVS committal Author : chaos Project : e17 Module : proto Dir : e17/proto/entropy/src/plugins Modified Files: layout_etk_simple.c Log Message: * Disable debug menu === RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v retrieving revision 1.61 retrieving revision 1.62 diff -u -3 -r1.61 -r1.62 --- layout_etk_simple.c 1 Sep 2006 12:12:50 - 1.61 +++ layout_etk_simple.c 2 Sep 2006 01:34:25 - 1.62 @@ -813,11 +813,11 @@ /*Debug menu*/ - menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Debug), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL); + /*menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Debug), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL); menu = etk_menu_new(); etk_menu_item_submenu_set(ETK_MENU_ITEM(menu_item), ETK_MENU(menu)); menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(File Cache), ETK_STOCK_PLACES_FOLDER_SAVED_SEARCH, ETK_MENU_SHELL(menu), NULL); - etk_signal_connect(activated, ETK_OBJECT(menu_item), ETK_CALLBACK(etk_file_cache_dialog_cb), layout); + etk_signal_connect(activated, ETK_OBJECT(menu_item), ETK_CALLBACK(etk_file_cache_dialog_cb), layout);*/ /*Help menu*/ menu_item = _entropy_etk_menu_item_new(ETK_MENU_ITEM_NORMAL, _(Help), ETK_STOCK_NO_STOCK, ETK_MENU_SHELL(menubar), NULL); - 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=lnkkid=120709bid=263057dat=121642 ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: proto balony
Enlightenment CVS committal
Author : balony
Project : e17
Module : proto
Dir : e17/proto/exhibit/src/bin
Modified Files:
exhibit_comment_jpeg.c exhibit_file.c exhibit_file.h
exhibit_image.c exhibit_main.c exhibit_menus.c
exhibit_options.c exhibit_options.h exhibit_sort.c
exhibit_sort.h exhibit_thumb.c exhibit_thumb.h
Log Message:
- Only handle the viewable files and dirs when monitoring.
- Yet more code polishing...
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_comment_jpeg.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- exhibit_comment_jpeg.c 2 Aug 2006 17:31:03 - 1.5
+++ exhibit_comment_jpeg.c 2 Sep 2006 01:43:23 - 1.6
@@ -1,4 +1,11 @@
/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
+
+#include exhibit.h
+#include exhibit_comment_jpeg.h
+
+/*
* Updated by HandyAndE
*
* based on:
@@ -9,10 +16,18 @@
*
*/
-#include stdlib.h
-#include sys/types.h
-#include stdio.h
-#include string.h
+static int _ex_comment_jpeg_read_1_byte (FILE *infile, int *c);
+static int _ex_comment_jpeg_read_2_bytes (FILE *infile, unsigned int *c);
+static void _ex_comment_jpeg_write_1_byte (FILE *outfile, int c);
+static void _ex_comment_jpeg_write_2_bytes (FILE *outfile, unsigned int val);
+static void _ex_comment_jpeg_write_marker(FILE *outfile, int marker);
+static void _ex_comment_jpeg_copy_rest_of_file(FILE *infile, FILE *outfile);
+static int _ex_comment_jpeg_next_marker (FILE *infile, int *c);
+static int _ex_comment_jpeg_first_marker (FILE *infile, int *c);
+static int _ex_comment_jpeg_skip_variable (FILE *infile);
+static int _ex_comment_jpeg_copy_variable (FILE *infile, FILE *outfile);
+static int _ex_comment_jpeg_read_process_COM (FILE *infile, unsigned int *len,
char **com);
+static int _ex_comment_jpeg_write_scan_header (FILE *infile, FILE *outfile,
int *ret, int keep_COM);
/* Read one byte, testing for EOF */
static int
@@ -536,7 +551,7 @@
fclose(infile);
fclose(outfile);
rename((const char*) tmp_file, (const char*) file);
- free(tmp_file);
+ E_FREE(tmp_file);
return 1;
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_file.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- exhibit_file.c 28 Jul 2006 16:04:47 - 1.9
+++ exhibit_file.c 2 Sep 2006 01:43:23 - 1.10
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#include exhibit.h
#include Edje.h
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_file.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- exhibit_file.h 28 Jul 2006 16:04:47 - 1.7
+++ exhibit_file.h 2 Sep 2006 01:43:23 - 1.8
@@ -1,3 +1,6 @@
+/*
+ * vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
+ */
#ifndef _EX_FILE_H
#define _EX_FILE_H
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_image.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -3 -r1.37 -r1.38
--- exhibit_image.c 1 Sep 2006 20:23:50 - 1.37
+++ exhibit_image.c 2 Sep 2006 01:43:23 - 1.38
@@ -444,10 +444,10 @@
{
}
}
- free(as);
- free(rs);
- free(gs);
- free(bs);
+ E_FREE(as);
+ E_FREE(rs);
+ E_FREE(gs);
+ E_FREE(bs);
evas_object_image_data_set(im-image_object, data);
evas_object_image_data_update_add(im-image_object, 0, 0, w, h);
@@ -1149,7 +1149,7 @@
snprintf(esetroot, strlen(Esetroot ) + strlen(esetroot_opt) +
strlen(im-filename) + 2,
Esetroot %s %s, esetroot_opt, im-filename);
system(esetroot);
- free(esetroot);
+ E_FREE(esetroot);
exit(0);
}
}
===
RCS file: /cvs/e/e17/proto/exhibit/src/bin/exhibit_main.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -3 -r1.73 -r1.74
--- exhibit_main.c 1 Sep 2006 23:39:22 - 1.73
+++ exhibit_main.c 2 Sep 2006 01:43:23 - 1.74
@@ -269,8 +269,6 @@
Epsilon *ep;
Etk_Tree_Row *row;
- if(!_ex_file_is_viewable(basename((char *) file)))
- return;
ep = epsilon_new(file);
epsilon_thumb_size(ep, EPSILON_THUMB_NORMAL);
@@ -319,44 +317,52 @@
static void
_ex_main_monitor_dir(void *data, Ecore_File_Monitor *ecore_file_monitor,
Ecore_File_Event event, const char *path)
{
+ struct stat st;
+
+ /* TODO: update non-visible tabs too */
+
/* Only do changes if tree's are visible */
if (ecore_file_monitor != e-cur_tab-monitor)
return;
- /* TODO: update non-visible tabs too */
-
- switch (event)
+ stat(path,
E CVS: apps/e raster
Enlightenment CVS committal
Author : raster
Project : e17
Module : apps/e
Dir : e17/apps/e/data/themes
Modified Files:
default_exebuf.edc
Log Message:
small thing - but make the cursor in exebuf blink.
===
RCS file: /cvs/e/e17/apps/e/data/themes/default_exebuf.edc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- default_exebuf.edc 23 Aug 2006 03:39:01 - 1.6
+++ default_exebuf.edc 2 Sep 2006 02:06:47 - 1.7
@@ -306,6 +306,11 @@
normal: e17_entry_cursor.png;
}
}
+description {
+ state:faded 0.0;
+ inherit: default 0.0;
+ color:255 255 255 0;
+}
}
part {
name: e.swallow.icons;
@@ -348,6 +353,24 @@
border: 15 15 15 15;
}
}
+ }
+ }
+ programs {
+ program {
+name:blink1;
+signal: show;
+source: ;
+action: STATE_SET faded 0.0;
+transition: SINUSOIDAL 0.5;
+target: cursor;
+after: blink2;
+ }
+ program {
+name:blink2;
+action: STATE_SET default 0.0;
+transition: SINUSOIDAL 0.5;
+target: cursor;
+after: blink1;
}
}
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_theme_import.c
Log Message:
Theme Import can no longer copy bg edj files, or edj files without a border
defined, to theme location.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_int_config_theme_import.c 1 Sep 2006 17:38:25 - 1.2
+++ e_int_config_theme_import.c 2 Sep 2006 03:46:17 - 1.3
@@ -256,28 +256,36 @@
if (import-cfdata-file)
{
file = ecore_file_get_file(import-cfdata-file);
+ snprintf(buf, sizeof(buf), %s/.e/e/themes/%s, homedir, file);
+ E_FREE(homedir);
+
if (!ecore_file_strip_ext(file))
- {
-E_FREE(homedir);
-return;
- }
+ return;
if (!e_util_glob_case_match(file, *.edj))
+ return;
+
+ if (!edje_file_data_get(import-cfdata-file,
+ e/widgets/border/default/border))
{
-E_FREE(homedir);
-return;
+e_util_dialog_show(_(Theme Import Error),
+ _(Enlightenment was unable to import
+ the theme.brbrAre you sure this
+ is really a valid theme?));
}
-
- /* Copy File */
- snprintf(buf, sizeof(buf), %s/.e/e/themes/%s, homedir, file);
- if (!ecore_file_cp(import-cfdata-file, buf))
+ else
{
-e_util_dialog_show(_(Theme Import Error),
- _(Enlightenment was unable to import
- the themebrdue to a copy error));
+if (!ecore_file_cp(import-cfdata-file, buf))
+ {
+ e_util_dialog_show(_(Theme Import Error),
+_(Enlightenment was unable to import
+ the themebrdue to a copy error));
+ }
+else
+ e_int_config_theme_update(import-parent, buf);
}
- else
- e_int_config_theme_update(import-parent, buf);
}
+ else
+ E_FREE(homedir);
e_int_config_theme_del(import-win);
}
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_apps.c e_main.c e_menu.c
Log Message:
More icon tweaking. I have started to simplify and rationalise this as
it was starting to get silly. Searching the icon class in the wm theme
first, then searching fdo icon themes sometimes ends up with a less
specific icon. Menus make life tricky, as things are deferred there,
but not enough to avoid delays. Lots more tweaking to come, but this
commit should result in more icons on menus.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_apps.c,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -3 -r1.162 -r1.163
--- e_apps.c1 Sep 2006 15:06:30 - 1.162
+++ e_apps.c2 Sep 2006 04:20:10 - 1.163
@@ -1170,15 +1170,6 @@
if (desktop-startup)
a-startup_notify = *(desktop-startup);
- if ((desktop-icon) (!desktop-icon_path))
- {
-/* FIXME: Should do this only when needed, is it can be
expensive. */
-/* FIXME: Use a real icon size. */
-v = (char *) ecore_desktop_icon_find(desktop-icon, NULL,
e_config-icon_theme);
-if (v)
- a-icon_path = evas_stringshare_add(v);
- }
-
//if (desktop-type) a-type = evas_stringshare_add(desktop-type);
//if (desktop-categories) a-categories =
evas_stringshare_add(desktop-categories);
}
@@ -1557,7 +1548,17 @@
{
; /* It's a bit more obvious this way. */
}
- else if (a-icon_path) /* If that fails, then this might be an FDO
icon. */
+ else if (a-icon_class) /* If that fails, then this might be an FDO
icon. */
+ {
+ char *v;
+
+ /* FIXME: Use a real icon size. */
+ v = (char *) ecore_desktop_icon_find(a-icon_class, NULL,
e_config-icon_theme);
+ if (v)
+ a-icon_path = evas_stringshare_add(v);
+ }
+
+ if (a-icon_path)
{
/* Free the aborted object first. */
if (o) evas_object_del(o);
@@ -1565,33 +1566,39 @@
e_icon_file_set(o, a-icon_path);
e_icon_fill_inside_set(o, 1);
}
- /* FIXME: if we still haven't found an icon, feed icon_class into
the FDO lookup process. */
}
+
return o;
}
/* Search order? -
- *
+ *
* fixed path to icon
- * an .edje icon in ~/.e/e/icons
+ * an .edj icon in ~/.e/e/icons
* icon_class in theme
* icon from a-path in theme
- * FDO search
* FDO search for icon_class
*/
EAPI void
e_app_icon_add_to_menu_item(E_Menu_Item *mi, E_App *a)
{
- if (!e_util_menu_item_edje_icon_list_set(mi, a-icon_class))
+ if ((!a-icon_path) (a-icon_class))
{
- /* e_menu_item_icon_edje_set() just tucks away the params, the actual
call to edje_object_file_set() happens later. */
- /* e_menu_item_icon_file_set() just tucks away the params, the actual
call to e_icon_add() happens later. */
- e_menu_item_icon_edje_set(mi, a-path, icon);
- if (a-icon_path) /* If that fails, then this might be an FDO icon.
*/
- e_menu_item_icon_file_set(mi, a-icon_path);
- /* FIXME: if we still haven't found an icon, feed icon_class into the
FDO lookup process. */
+ char *v;
+
+/* FIXME: Use a real icon size. */
+v = (char *) ecore_desktop_icon_find(a-icon_class, NULL,
e_config-icon_theme);
+if (v)
+ a-icon_path = evas_stringshare_add(v);
}
+
+ e_util_menu_item_edje_icon_list_set(mi, a-icon_class);
+ /* e_menu_item_icon_edje_set() just tucks away the params, the actual call
to edje_object_file_set() happens later. */
+ /* e_menu_item_icon_file_set() just tucks away the params, the actual call
to e_icon_add() happens later. */
+ e_menu_item_icon_edje_set(mi, a-path, icon);
+ if (a-icon_path)
+ e_menu_item_icon_file_set(mi, a-icon_path);
return;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -3 -r1.181 -r1.182
--- e_main.c30 Aug 2006 18:20:50 - 1.181
+++ e_main.c2 Sep 2006 04:20:10 - 1.182
@@ -887,6 +887,12 @@
{
e_fdo_menu_to_order();
}
+ /* FIXME: Add another temporary hack to keep the users happy.
+* Move ~/.e/e/applications/all/*.eap to ~/.e/e/icons/*.edje
+* Read the non .edje info from them and construct a matching
~/.e/e/applications/all/*.desktop
+* Add an icon path to these .desktop files that points to the
~/.e/e/icons/*.edje files.
+* Add ~/.e/e/icons/ to the top of the icon search path.
+*/
/* FIXME: THIS is to get people started - shoudl be in a
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper_import.c e_int_config_theme_import.c
Log Message:
Wallpaper and Theme Import now both work correctly. Cannot Import a theme
into wallpaper, and cannot do a wallpaper into theme.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- e_int_config_wallpaper_import.c 1 Sep 2006 17:38:25 - 1.20
+++ e_int_config_wallpaper_import.c 2 Sep 2006 04:43:55 - 1.21
@@ -503,6 +503,9 @@
Import *import;
E_Win *win;
const char *path;
+ const char *file;
+ char buf[4096], *homedir;
+ int is_bg, is_theme;
win = data;
import = win-data;
@@ -512,7 +515,58 @@
if (path) import-cfdata-file = strdup(path);
if (import-cfdata-file)
{
- _import_edj_gen(import);
+ file = ecore_file_get_file(import-cfdata-file);
+ if (!e_util_glob_case_match(file, *.edj))
+ _import_edj_gen(import);
+ else
+ {
+homedir = e_user_homedir_get();
+if (!homedir) return;
+snprintf(buf, sizeof(buf), %s/.e/e/backgrounds/%s,
+ homedir, file);
+E_FREE(homedir);
+
+Evas_Object *o;
+
+o = edje_object_add(e_win_evas_get(import-win));
+is_bg = (edje_object_file_set(o, import-cfdata-file,
+ e/desktop/background));
+is_theme =
+ (edje_object_file_set(o, import-cfdata-file,
+e/widgets/border/default/border));
+evas_object_del(o);
+
+if ((is_bg) (!is_theme))
+ {
+ if (!ecore_file_cp(import-cfdata-file, buf))
+ {
+ e_int_config_wallpaper_del(win);
+ e_util_dialog_show(_(Wallpaper Import Error),
+ _(Enlightenment was unable to
+ import the wallpaperbrdue to a
+ copy error));
+ return;
+ }
+ else
+ {
+ e_int_config_wallpaper_update(import-parent, buf);
+ e_int_config_wallpaper_del(win);
+ return;
+ }
+ }
+else
+ {
+ e_int_config_wallpaper_del(win);
+ e_util_dialog_show(_(Wallpaper Import Error),
+_(Enlightenment was unable to
+ import the wallpaper.brbr
+ Are you sure this is a valid
+ wallpaper?));
+ return;
+ }
+
+ }
+
e_win_hide(win);
return;
}
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_int_config_theme_import.c 2 Sep 2006 03:46:17 - 1.3
+++ e_int_config_theme_import.c 2 Sep 2006 04:43:55 - 1.4
@@ -236,10 +236,12 @@
{
Import *import;
E_Win *win;
+ Evas_Object *o;
const char *path;
const char *file;
char *homedir;
char buf[4096];
+ int is_theme;
win = data;
import = win-data;
@@ -264,8 +266,12 @@
if (!e_util_glob_case_match(file, *.edj))
return;
- if (!edje_file_data_get(import-cfdata-file,
- e/widgets/border/default/border))
+ o = edje_object_add(e_win_evas_get(win));
+ is_theme = (edje_object_file_set(o, import-cfdata-file,
+e/widgets/border/default/border));
+ evas_object_del(o);
+
+ if (!is_theme)
{
e_util_dialog_show(_(Theme Import Error),
_(Enlightenment was unable to import
@@ -278,7 +284,7 @@
{
e_util_dialog_show(_(Theme Import Error),
_(Enlightenment was unable to import
- the themebrdue to a copy error));
+ the themebrdue to a copy error.));
}
else
e_int_config_theme_update(import-parent, buf);
-
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
E CVS: libs/ecore onefang
Enlightenment CVS committal
Author : onefang
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_desktop
Modified Files:
ecore_desktop_icon.c
Log Message:
Put .edj back in the icon search.
===
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_desktop/ecore_desktop_icon.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- ecore_desktop_icon.c2 Sep 2006 04:19:25 - 1.14
+++ ecore_desktop_icon.c2 Sep 2006 05:06:39 - 1.15
@@ -12,8 +12,8 @@
static int _ecore_desktop_icon_theme_list_add(void *data, const char *path);
void _ecore_desktop_icon_theme_destroy(Ecore_Desktop_Icon_Theme * icon_theme);
-
-static const char *ext[] = { .png, .svgz, .svg, .xpm, , NULL };
+/* FIXME: We need a way for the client to disable searching for any of these
that they don't support. */
+static const char *ext[] = { .edj, .png, .svgz, .svg, .xpm, ,
NULL };
static int init_count = 0;
static Ecore_Hash *icon_theme_cache;
static int loaded = 0;
@@ -38,7 +38,7 @@
* @param icon The name of the required icon.
* @param icon_size The size of the required icon.
* @param icon_theme The theme of the required icon.
- * @return The full path to an icon file.
+ * @return The full path to an icon file, or NULL.
* @ingroup Ecore_Desktop_Icon_Group
*/
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/edje rephorm
Enlightenment CVS committal
Author : rephorm
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/lib
Modified Files:
Edje.h edje_load.c
Log Message:
convenience function for testing if groups are in an edje
===
RCS file: /cvs/e/e17/libs/edje/src/lib/Edje.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- Edje.h 19 Aug 2006 18:22:01 - 1.47
+++ Edje.h 2 Sep 2006 05:10:17 - 1.48
@@ -169,6 +169,7 @@
/* edje_load.c */
EAPI Evas_List *edje_file_collection_list (const char *file);
EAPI void edje_file_collection_list_free (Evas_List *lst);
+ EAPI int edje_file_group_exists (const char *file, const
char *glob);
EAPI char*edje_file_data_get (const char *file, const
char *key);
EAPI void edje_file_cache_set (int count);
EAPI int edje_file_cache_get (void);
===
RCS file: /cvs/e/e17/libs/edje/src/lib/edje_load.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- edje_load.c 27 Aug 2006 12:38:09 - 1.91
+++ edje_load.c 2 Sep 2006 05:10:17 - 1.92
@@ -433,6 +433,41 @@
}
}
+/** Determine whether a group matching glob exists in an edje file.
+ * @param file The file path
+ * @param glob A glob to match on
+ *
+ * @return 1 if a match is found, 0 otherwise
+ */
+EAPI int
+edje_file_group_exists(const char *file, const char *glob)
+{
+ Evas_List *lst = NULL;
+ Edje_File *edf;
+ int error_ret = 0;
+
+ if ((!file) || (!*file)) return NULL;
+ edf = _edje_cache_file_coll_open(file, NULL, error_ret, NULL);
+ if (edf != NULL)
+ {
+ if (edf-collection_dir)
+ {
+Evas_List *l;
+
+for (l = edf-collection_dir-entries; l; l = l-next)
+ {
+ Edje_Part_Collection_Directory_Entry *ce;
+
+ ce = l-data;
+ if (_edje_glob_match(ce-entry, glob)) return 1;
+ }
+ }
+ _edje_cache_file_unref(edf);
+ }
+ return 0;
+}
+
+
/* FIXDOC: Verify/Expand */
/** Get edje file data
* @param file The file
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_int_config_wallpaper_import.c e_int_config_theme_import.c
Log Message:
Use the new edje_file_group_exists function, rather than evas_objects.
Thanks rephorm :)
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_wallpaper_import.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_int_config_wallpaper_import.c 2 Sep 2006 04:43:55 - 1.21
+++ e_int_config_wallpaper_import.c 2 Sep 2006 05:15:01 - 1.22
@@ -525,16 +525,12 @@
snprintf(buf, sizeof(buf), %s/.e/e/backgrounds/%s,
homedir, file);
E_FREE(homedir);
-
-Evas_Object *o;
-o = edje_object_add(e_win_evas_get(import-win));
-is_bg = (edje_object_file_set(o, import-cfdata-file,
- e/desktop/background));
+is_bg = edje_file_group_exists(import-cfdata-file,
+ e/desktop/background);
is_theme =
- (edje_object_file_set(o, import-cfdata-file,
-e/widgets/border/default/border));
-evas_object_del(o);
+ edje_file_group_exists(import-cfdata-file,
+ e/widgets/border/default/border);
if ((is_bg) (!is_theme))
{
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_int_config_theme_import.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_int_config_theme_import.c 2 Sep 2006 04:43:55 - 1.4
+++ e_int_config_theme_import.c 2 Sep 2006 05:15:01 - 1.5
@@ -236,7 +236,6 @@
{
Import *import;
E_Win *win;
- Evas_Object *o;
const char *path;
const char *file;
char *homedir;
@@ -266,12 +265,8 @@
if (!e_util_glob_case_match(file, *.edj))
return;
- o = edje_object_add(e_win_evas_get(win));
- is_theme = (edje_object_file_set(o, import-cfdata-file,
-e/widgets/border/default/border));
- evas_object_del(o);
-
- if (!is_theme)
+ if (!edje_file_group_exists(import-cfdata-file,
+ e/widgets/border/default/border))
{
e_util_dialog_show(_(Theme Import Error),
_(Enlightenment was unable to import
-
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=lnkkid=120709bid=263057dat=121642
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
