Enlightenment CVS committal
Author : monkeyiq
Project : misc
Module : gevas2
Dir : misc/gevas2/demo
Modified Files:
.cvsignore gevasedje.c raptor.png raptor2.jpg signalconnect.c
testgevas.c
Log Message:
A flurry of updates. Syned to work with latest evas event _feed_() functions
amoung other misc changes.
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- .cvsignore 15 Aug 2002 02:38:06 -0000 1.1
+++ .cvsignore 4 Aug 2005 04:12:15 -0000 1.2
@@ -1,4 +1,7 @@
*~
+*.flc
+raptor.old.png
+raptor2.old.jpg
.libs
.deps
*.lo
@@ -8,4 +11,9 @@
imagesize
testgevas
gwinmaptest
+signalconnect
+rawimage
+gevasedje
+gevasanim
+
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/gevasedje.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- gevasedje.c 29 Apr 2005 05:20:29 -0000 1.1
+++ gevasedje.c 4 Aug 2005 04:12:15 -0000 1.2
@@ -64,6 +64,7 @@
window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
gevas_new_gtkscrolledwindow( (GtkgEvas**)(&gevas), &wtoy );
+ gevas_setup_ecore( (GtkgEvas*)gevas );
gevas_add_fontpath( GTK_GEVAS(gevas), g_get_current_dir() );
gevas_add_fontpath( GTK_GEVAS(gevas),
"/usr/X11R6/lib/X11/fonts/msttcorefonts" );
@@ -85,7 +86,7 @@
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gevas_set_checked_bg(gevas, 1);
- gtk_window_set_title(GTK_WINDOW(window), "test window");
+ gtk_window_set_title(GTK_WINDOW(window), "gevasedje: edje objects on a
gevas");
gevas_set_middleb_scrolls(GTK_GEVAS(gevas), 1,
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(wtoy)),
@@ -114,8 +115,7 @@
gevasobj_set_layer( go, 2 );
gevasobj_show( go );
-
- GtkgEvasEdje* gedje = gevasedje_new_with_canvas( gevas );
+ GtkgEvasEdje* gedje = gevasedje_new_with_canvas( gevas );
gevasedje_set_file( gedje, "e_logo.eet", "test" );
go = GTK_GEVASOBJ(gedje);
gevasobj_move( go, 300, 300 );
@@ -126,7 +126,6 @@
gtk_widget_show_all(window);
- gevas_setup_ecore( (GtkgEvas*)gevas );
return window;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/raptor.png,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsAevkLU and /tmp/cvsfpZUBM differ
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/raptor2.jpg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
Binary files /tmp/cvsBpY1m4 and /tmp/cvspdJRiW differ
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/signalconnect.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- signalconnect.c 29 Apr 2005 05:20:29 -0000 1.2
+++ signalconnect.c 4 Aug 2005 04:12:15 -0000 1.3
@@ -46,8 +46,8 @@
GtkWidget* y_coord_tracker = 0;
GtkWidget* e_logo_label = 0;
-int CANVAS_WIDTH = 1000;
-int CANVAS_HEIGHT = 1000;
+int CANVAS_WIDTH = 500;
+int CANVAS_HEIGHT = 500;
static gint delete_event_cb(GtkWidget * window, GdkEventAny * e, gpointer data)
@@ -85,6 +85,7 @@
gevasobj_get_location( go, &x, &y );
gevasobj_move( go, x, v );
+// printf("Moving to x:%d y:%d\n", x, v );
}
@@ -155,7 +156,7 @@
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gevas_set_checked_bg(gevas, 1);
- gtk_window_set_title(GTK_WINDOW(window), "test window");
+ gtk_window_set_title(GTK_WINDOW(window), "Evas object talking with
GTK+2 widgets");
gevas_set_middleb_scrolls(GTK_GEVAS(gevas), 1,
gtk_scrolled_window_get_hadjustment(GTK_SCROLLED_WINDOW(wtoy)),
@@ -178,7 +179,7 @@
gtk_signal_connect( go, "move_absolute",
GTK_SIGNAL_FUNC( raptor_moved ), go );
- gtk_signal_connect(GTK_OBJECT (w), "value-changed",
+ gtk_signal_connect(GTK_OBJECT ( y_coord_tracker ), "value-changed",
GTK_SIGNAL_FUNC(y_coord_changed), go );
/* gtk_signal_connect_swapped( go, "move_absolute", */
===================================================================
RCS file: /cvsroot/enlightenment/misc/gevas2/demo/testgevas.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- testgevas.c 27 Apr 2005 13:22:22 -0000 1.6
+++ testgevas.c 4 Aug 2005 04:12:15 -0000 1.7
@@ -290,7 +290,8 @@
gtk_widget_show_all(GTK_WIDGET(menu));
/** To keep evas happy about the mouse state **/
- evas_event_feed_mouse_up( _e, _b, EVAS_BUTTON_NONE, 0 );
+ time_t tt = time( 0 );
+ evas_event_feed_mouse_up( _e, _b, EVAS_BUTTON_NONE, tt, 0 );
gtk_menu_popup(menu, NULL, NULL, NULL, NULL, _b,
gev->button.time);
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
