Enlightenment CVS committal
Author : handyande
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
controlcentre.c main.c note.c storage.h welcome.c welcome.h
Log Message:
Fixups for Enotes - it compiles :)
not only does it compile, but it works too :) :) :)
and ewl has multiline mostly sorted :)
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/controlcentre.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- controlcentre.c 23 Mar 2005 10:41:42 -0000 1.20
+++ controlcentre.c 10 Sep 2005 21:06:13 -0000 1.21
@@ -68,17 +68,11 @@
ecore_evas_title_set(cc->win, "Enotes");
ecore_evas_name_class_set(cc->win, "Enotes", "Enotes");
- if (main_config->ontop == 1)
- if (!strcmp(main_config->render_method, "gl")) {
- ecore_x_window_prop_layer_set
- (ecore_evas_gl_x11_window_get(cc->win),
- ECORE_X_WINDOW_LAYER_ABOVE);
- } else {
- ecore_x_window_prop_layer_set
- (ecore_evas_software_x11_window_get(cc->win),
- ECORE_X_WINDOW_LAYER_ABOVE);
- }
-
+ if (main_config->ontop == 1)
+ ecore_evas_layer_set(cc->win, 7);
+ else
+ ecore_evas_layer_set(cc->win, 2);
+
if (main_config->sticky == 1)
ecore_evas_sticky_set(cc->win, 1);
else
@@ -94,11 +88,11 @@
/* Moving the damn thing */
if (!strcmp(main_config->render_method, "gl"))
- ecore_x_window_prop_xy_set(ecore_evas_gl_x11_window_get
- (cc->win), pos->x, pos->y);
+ ecore_x_window_move(ecore_evas_gl_x11_window_get(cc->win),
+ pos->x, pos->y);
else
- ecore_x_window_prop_xy_set(ecore_evas_software_x11_window_get
- (cc->win), pos->x, pos->y);
+ ecore_x_window_move(ecore_evas_software_x11_window_get(cc->win),
+ pos->x, pos->y);
/* Setup the Canvas, Render-Method and Font Path */
cc->evas = ecore_evas_get(cc->win);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- main.c 6 Apr 2005 11:52:39 -0000 1.21
+++ main.c 10 Sep 2005 21:06:13 -0000 1.22
@@ -29,7 +29,6 @@
{
char *spec_conf;
int note_count;
- DIR *dir;
int a;
/* IPC Check */
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/note.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- note.c 6 Apr 2005 14:03:27 -0000 1.48
+++ note.c 10 Sep 2005 21:06:14 -0000 1.49
@@ -93,7 +93,7 @@
/**
* FIXME: When you can get the row and its child text, compare
- * it to the ewl_entry_text_get(p->title) value and remove the row
+ * it to the ewl_text_text_get(p->title) value and remove the row
* from the tree at this point. Reporting that you've done so with
* dml ("Removed note from save/load list", 2); or something. When ewl
* will let you do these things.
@@ -164,18 +164,12 @@
ecore_evas_borderless_set(p->win, 1);
ecore_evas_shaped_set(p->win, 1);
ecore_evas_title_set(p->win, "An E-Note");
- ecore_evas_name_class_set(p->win, "Enotes", "Enotes");
+ ecore_evas_name_class_set(p->win, "Enotes", "Enotes");
if (main_config->ontop == 1)
- if (!strcmp(main_config->render_method, "gl")) {
- ecore_x_window_prop_layer_set
- (ecore_evas_gl_x11_window_get(p->win),
- ECORE_X_WINDOW_LAYER_ABOVE);
- } else {
- ecore_x_window_prop_layer_set
- (ecore_evas_software_x11_window_get(p->win),
- ECORE_X_WINDOW_LAYER_ABOVE);
- }
+ ecore_evas_layer_set(p->win, 7);
+ else
+ ecore_evas_layer_set(p->win, 2);
if (main_config->sticky == 1)
ecore_evas_sticky_set(p->win, 1);
@@ -187,11 +181,11 @@
/* Move the damn thing */
if (!strcmp(main_config->render_method, "gl"))
- ecore_x_window_prop_xy_set(ecore_evas_gl_x11_window_get(p->win),
- x, y);
+ ecore_x_window_move(ecore_evas_gl_x11_window_get(p->win),
+ x, y);
else
- ecore_x_window_prop_xy_set(ecore_evas_software_x11_window_get
- (p->win), x, y);
+ ecore_x_window_move(ecore_evas_software_x11_window_get(p->win),
+ x, y);
