Enlightenment CVS committal
Author : rephorm
Project : e17
Module : apps/elicit
Dir : e17/apps/elicit/src
Modified Files:
Elicit.h Makefile.am callbacks.c callbacks.h elicit.c
Added Files:
shots.c shots.h swatches.c swatches.h themes.c themes.h
Log Message:
Hopefully this will catch everything. I may still be missing a few files so wait a bit
before updating.
LOTS of changes. Elicit can now save/load swatches and shots. Just click on the main
swatch/shot to add it to the respective panels. click on the ones in the panel to load
them back up. There is still some work to be done, but i'm not sure when i'll be able
to get to it, so i figured i'd commit what i have :)
Currently only the winter theme has been updated to use the new features.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Elicit.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Elicit.h 22 Apr 2004 01:23:38 -0000 1.10
+++ Elicit.h 12 May 2004 19:13:30 -0000 1.11
@@ -8,6 +8,7 @@
#include <Ecore_Config.h>
#include <Edje.h>
#include <Esmart/Esmart_Draggies.h>
+#include <Esmart/Esmart_Container.h>
#include <X11/Xlib.h>
#include <Imlib2.h>
#include <stdlib.h>
@@ -20,10 +21,15 @@
#define DATADIR PACKAGE_DATA_DIR
typedef struct _Elicit Elicit;
+typedef struct _Elicit_Swatch Elicit_Swatch;
+typedef struct _Elicit_Shot Elicit_Shot;
#include "callbacks.h"
#include "util.h"
#include "conf.h"
+#include "swatches.h"
+#include "shots.h"
+#include "themes.h"
struct _Elicit
@@ -51,12 +57,37 @@
int shooting;
int changed;
int changing;
+ int swatch_scrolling;
+ int shot_scrolling;
} flags;
+ struct {
+ Evas_Object *cont;
+ double length;
+ int scrolling;
+ } swatches, shots, themes;
+
Ecore_Timer *change_timer;
char *change_sig;
};
+struct _Elicit_Swatch
+{
+ Evas_Object *obj;
+ Evas_Object *rect;
+
+ char *name;
+ int r, g, b;
+};
+
+struct _Elicit_Shot
+{
+ Evas_Object *obj;
+ Evas_Object *shot;
+
+ char *name;
+};
+
void elicit_ui_theme_set(Elicit *el, char *name, char *group);
void elicit_ui_update(Elicit *el); /* this does the next two */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Makefile.am 5 May 2004 16:46:44 -0000 1.4
+++ Makefile.am 12 May 2004 19:13:30 -0000 1.5
@@ -9,8 +9,11 @@
elicit.c Elicit.h \
callbacks.c callbacks.h \
util.c util.h \
+ swatches.c swatches.h \
+ shots.c shots.h \
+ themes.c themes.h \
conf.c conf.h
elicit_LDADD = @edje_libs@ @ecore_libs@ @edb_libs@ @evas_libs@ \
[EMAIL PROTECTED]@ @imlib2_libs@ -lesmart_draggies
[EMAIL PROTECTED]@ @imlib2_libs@ -lesmart_draggies -lesmart_container
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- callbacks.c 5 May 2004 16:46:44 -0000 1.12
+++ callbacks.c 12 May 2004 19:13:30 -0000 1.13
@@ -9,6 +9,22 @@
ecore_main_loop_quit();
}
+void
+elicit_cb_enter(Ecore_Evas *ee)
+{
+ Evas_Object *gui;
+ gui = evas_object_name_find(ecore_evas_get(ee), "gui");
+ edje_object_signal_emit(gui, "window,enter", "Elicit");
+}
+
+void
+elicit_cb_leave(Ecore_Evas *ee)
+{
+ Evas_Object *gui;
+ gui = evas_object_name_find(ecore_evas_get(ee), "gui");
+ edje_object_signal_emit(gui, "window,leave", "Elicit");
+}
+
void
elicit_cb_resize(Ecore_Evas *ee)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/callbacks.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- callbacks.h 12 Feb 2004 05:37:05 -0000 1.5
+++ callbacks.h 12 May 2004 19:13:30 -0000 1.6
@@ -4,6 +4,10 @@
#include "math.h"
void elicit_cb_exit(Ecore_Evas *ee);
+
+void elicit_cb_enter(Ecore_Evas *ee);
+void elicit_cb_leave(Ecore_Evas *ee);
+
void elicit_cb_resize(Ecore_Evas *ee);
void elicit_cb_pick(void *data, Evas_Object *o, const char *sig, const char *src);
void elicit_cb_shoot(void *data, Evas_Object *o, const char *sig, const char *src);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/elicit/src/elicit.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- elicit.c 29 Apr 2004 04:46:29 -0000 1.14
+++ elicit.c 12 May 2004 19:13:30 -0000 1.15
@@ -58,6 +58,8 @@
ecore_evas_callback_destroy_set(el->ee, elicit_cb_exit);
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, elicit_cb_exit, el->ee);
+ ecore_evas_callback_mouse_in_set(el->ee, elicit_cb_enter);
+ ecore_evas_callback_mouse_out_set(el->ee, elicit_cb_leave);
ecore_evas_callback_resize_set(el->ee, elicit_cb_resize);
/* do everything app specific in here */
@@ -124,6 +126,9 @@
evas_object_show(el->draggie);
elicit_ui_theme_set(el, elicit_config_theme_get(el), "elicit");
+ elicit_swatches_init(el);
+ elicit_shots_init(el);
+ elicit_themes_init(el);
elicit_ui_update(el);
return 0;
}
@@ -139,6 +144,8 @@
printf("Error: can't set theme to %s\n", theme);
return;
}
+ /* update the config */
+ //elicit_config_theme_set(theme);
/* set the default window size */
edje_object_size_min_get(el->gui, &mw, &mh);
@@ -176,6 +183,21 @@
edje_object_signal_callback_add(el->gui, "elicit,thaw", "*", elicit_cb_thaw, el);
edje_object_signal_callback_add(el->gui, "elicit,size,min,*", "*",
elicit_cb_size_min, el);
+ edje_object_signal_callback_add(el->gui, "elicit,swatch,save", "*",
elicit_swatch_save_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,shot,save", "*",
elicit_shot_save_cb, el);
+
+ edje_object_signal_callback_add(el->gui, "drag", "swatch.scroll.bar",
elicit_swatch_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,up,start", "*",
elicit_swatch_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,up,stop", "*",
elicit_swatch_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,down,start", "*",
elicit_swatch_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,swatch,scroll,down,stop", "*",
elicit_swatch_scroll_cb, el);
+
+ edje_object_signal_callback_add(el->gui, "drag", "shot.scroll.bar",
elicit_shot_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,up,start", "*",
elicit_shot_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,up,stop", "*",
elicit_shot_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,down,start", "*",
elicit_shot_scroll_cb, el);
+ edje_object_signal_callback_add(el->gui, "elicit,shot,scroll,down,stop", "*",
elicit_shot_scroll_cb, el);
+
evas_object_hide(el->gui);
evas_object_show(el->gui);
}
-------------------------------------------------------
This SF.Net email is sponsored by Sleepycat Software
Learn developer strategies Cisco, Motorola, Ericsson & Lucent use to
deliver higher performing products faster, at low TCO.
http://www.sleepycat.com/telcomwpreg.php?From=osdnemail3
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs