Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
Makefile.am compile evasfuncs.c funcs_evas.h main.h menubar.c
newentry.c notecmds.c notengui.c notenum.c setdefconf.c
titlewin.c usage.h var_eprog_evas.h variables.c
Log Message:
This will be nuked soon anyways, the working older build (not the edje rewrite).
It'll be under misc/enotes/old and misc/enotes/new when its nuked. This can be
installed alongside the edje build btw, its known as enotes_old.
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- Makefile.am 1 May 2003 19:08:38 -0000 1.8
+++ Makefile.am 13 Jan 2004 18:35:36 -0000 1.9
@@ -3,9 +3,9 @@
INCLUDES = \
@ecore_cflags@ @evas_cflags@ @ewl_cflags@ @estyle_cflags@ @imlib2_cflags@
-bin_PROGRAMS = enotes
+bin_PROGRAMS = enotes_old
-enotes_SOURCES = \
+enotes_old_SOURCES = \
allocmem.c \
funcs_cmds.h \
main.c \
@@ -30,4 +30,4 @@
setdefconf.c \
var_eprog_evas.h
-enotes_LDADD = @ewl_libs@ @ecore_libs@ @evas_libs@ @estyle_libs@ @imlib2_libs@
+enotes_old_LDADD = @ewl_libs@ @ecore_libs@ @evas_libs@ @estyle_libs@ @imlib2_libs@
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/compile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- compile 1 May 2003 19:08:39 -0000 1.1
+++ compile 13 Jan 2004 18:35:36 -0000 1.2
@@ -1 +1 @@
-cc *.c -L/usr/include/X11 -lX11 `imlib2-config --cflags --libs` `ecore-config
--cflags --libs` `evas-config --cflags --libs` `ewl-config --cflags --libs`
`estyle-config --cflags --libs`
+cc *.c -L/usr/include/X11 -lX11 `imlib2-config --cflags --libs` `ecore-config
--cflags --libs` `evas-config --cflags --libs` `ewl-config --cflags --libs`
`estyle-config --cflags --libs` -o enotes
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/evasfuncs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- evasfuncs.c 30 Apr 2003 16:30:30 -0000 1.5
+++ evasfuncs.c 13 Jan 2004 18:35:36 -0000 1.6
@@ -55,17 +55,17 @@
return (tmp);
}
-Estyle *
+Evas_Object *
new_text (Evas * evas, char *font, int size, char *text, int r,
int g, int b, int alpha, int x, int y, int layer)
{
- Estyle *tmp;
+ Evas_Object *tmp;
tmp = estyle_new (evas, text, style);
estyle_set_font (tmp, font, size);
- estyle_set_color (tmp, r, g, b, alpha);
- estyle_set_layer (tmp, layer);
- estyle_move (tmp, x, y);
+ evas_object_color_set (tmp, r, g, b, alpha);
+ evas_object_layer_set (tmp, layer);
+ evas_object_move (tmp, x, y);
return (tmp);
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/funcs_evas.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- funcs_evas.h 5 May 2003 10:34:53 -0000 1.5
+++ funcs_evas.h 13 Jan 2004 18:35:36 -0000 1.6
@@ -31,8 +31,8 @@
Evas_Object *new_rectangle (Evas * evas, int r, int g, int b, int alpha,
int width_x, int width_y, int x, int y,
int layer);
-Estyle *new_text (Evas * evas, char *font, int size, char *text, int r,
- int g, int b, int alpha, int x, int y, int layer);
+Evas_Object *new_text (Evas * evas, char *font, int size, char *text, int r,
+ int g, int b, int alpha, int x, int y, int layer);
Evas_Object *get_pseudo_bg (Evas * evas, Evas_Object * old, int x, int y,
int w, int h);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- main.h 5 May 2003 10:34:54 -0000 1.26
+++ main.h 13 Jan 2004 18:35:36 -0000 1.27
@@ -30,7 +30,6 @@
#include <X11/Xlib.h>
#include <X11/Xatom.h>
#include <Imlib2.h>
-#include <Eprog.h>
#include <Ecore_Evas.h>
#include <Ecore_X.h>
#include <Ewl.h>
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/menubar.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- menubar.c 5 May 2003 10:34:55 -0000 1.4
+++ menubar.c 13 Jan 2004 18:35:36 -0000 1.5
@@ -44,10 +44,10 @@
change_alpha (nubtnob, 255 - transval);
change_alpha (newbtnob, 255 - transval);
- onclick (lastbtnob, system, "enotes -l&");
- onclick (firstbtnob, system, "enotes -o&");
- onclick (nubtnob, system, "enotes --nu&");
- onclick (newbtnob, system, "enotes -N&");
+ onclick (lastbtnob, system, "enotes_old -l&");
+ onclick (firstbtnob, system, "enotes_old -o&");
+ onclick (nubtnob, system, "enotes_old --nu&");
+ onclick (newbtnob, system, "enotes_old -N&");
}
void *
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/newentry.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- newentry.c 4 Mar 2003 16:14:14 -0000 1.9
+++ newentry.c 13 Jan 2004 18:35:36 -0000 1.10
@@ -32,15 +32,13 @@
int wloop = -1;
char *wtmp = malloc (str_size);
- ewl_init (argc, argv);
+ ewl_init (&argc, argv);
main_win = ewl_window_new ();
ewl_window_set_title (EWL_WINDOW (main_win), "Add Note");
ewl_callback_append (main_win, EWL_CALLBACK_DELETE_WINDOW,
kill_main_window, NULL);
- ewl_window_set_min_size (EWL_WINDOW (main_win), 100, 100);
- ewl_window_set_auto_size (EWL_WINDOW (main_win), TRUE);
ewl_widget_show (main_win);
main_box = ewl_vbox_new ();
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notecmds.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- notecmds.c 30 Apr 2003 16:30:32 -0000 1.12
+++ notecmds.c 13 Jan 2004 18:35:36 -0000 1.13
@@ -45,7 +45,7 @@
a++;
}
fclose (file);
- fnotenum (a / 13);
+ fnotenum ((a / 13) - 1);
}
void
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notengui.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- notengui.c 1 Mar 2003 10:34:52 -0000 1.1
+++ notengui.c 13 Jan 2004 18:35:36 -0000 1.2
@@ -20,13 +20,14 @@
void
notengui ()
{
- ewl_init (1, NULL);
+ int a = 0;
+
+ ewl_init (&a, NULL);
ewlwin = ewl_window_new ();
ewl_window_set_title (EWL_WINDOW (ewlwin), "View Note Number?");
ewl_callback_append (ewlwin, EWL_CALLBACK_DELETE_WINDOW,
kill_main_window, NULL);
- ewl_window_set_auto_size (EWL_WINDOW (ewlwin), TRUE);
ewl_widget_show (ewlwin);
ewlbox = ewl_vbox_new ();
@@ -67,7 +68,7 @@
}
strncpy (number, number, strlen (number) - 1);
- strcpy (cmdstr, "enotes -n ");
+ strcpy (cmdstr, "enotes_old -n ");
strcat (cmdstr, number);
strcat (cmdstr, "&");
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/notenum.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- notenum.c 5 May 2003 10:34:55 -0000 1.23
+++ notenum.c 13 Jan 2004 18:35:36 -0000 1.24
@@ -42,7 +42,7 @@
root = ecore_evas_software_x11_new (NULL, 0, 0, 0, w, h);
root_evas = ecore_evas_get (root);
ecore_evas_title_set (root, "E-Notes");
- ecore_evas_name_class_set (root, "enotes", "Eprog");
+ ecore_evas_name_class_set (root, "enotes", "wuteva");
ecore_evas_borderless_set (root, 1);
ecore_evas_size_min_set (root, w, h);
ecore_evas_size_max_set (root, w, h);
@@ -115,11 +115,11 @@
looper = 0;
fadeloop = fadeloop + 10;
- estyle_get_color (title, &r, &g, &b, &a);
- estyle_set_color (title, r, g, b, fadeloop - transval);
- estyle_show (title);
+ evas_object_color_get (title, &r, &g, &b, &a);
+ evas_object_color_set (title, r, g, b, fadeloop - transval);
+ evas_object_show (title);
- change_alpha (exitbtn, fadeloop);
+ change_alpha (exitbtn, fadeloop - transval);
evas_object_show (exitbtn);
while (looper < 12)
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/setdefconf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- setdefconf.c 5 May 2003 10:34:56 -0000 1.5
+++ setdefconf.c 13 Jan 2004 18:35:36 -0000 1.6
@@ -23,17 +23,17 @@
strcat (fontdir, ".");
strcpy (fn, getenv ("HOME"));
strcat (fn, "/.e/enotes/notes");
- strcpy (bgfile, "/usr/local/share/enotes/data/bg.jpg");
- strcpy (font, "/usr/local/share/enotes/data/arial.ttf");
+ strcpy (bgfile, "/usr/local/share/enotes_old/data/bg.jpg");
+ strcpy (font, "/usr/local/share/enotes_old/data/arial.ttf");
strcpy (configfn, getenv ("HOME"));
strcat (configfn, "/.e/enotes/config");
- strcpy (xbtnfn, "/usr/local/share/enotes/data/x.png");
- strcpy (openwinimg, "/usr/local/share/enotes/data/titleimg.jpg");
- strcpy (lastbtn, "/usr/local/share/enotes/data/lastbtn.png");
- strcpy (firstbtn, "/usr/local/share/enotes/data/firstbtn.png");
- strcpy (nubtn, "/usr/local/share/enotes/data/nubtn.png");
- strcpy (newbtn, "/usr/local/share/enotes/data/newbtn.png");
- strcpy (barimg, "/usr/local/share/enotes/data/panel.png");
+ strcpy (xbtnfn, "/usr/local/share/enotes_old/data/x.png");
+ strcpy (openwinimg, "/usr/local/share/enotes_old/data/titleimg.jpg");
+ strcpy (lastbtn, "/usr/local/share/enotes_old/data/lastbtn.png");
+ strcpy (firstbtn, "/usr/local/share/enotes_old/data/firstbtn.png");
+ strcpy (nubtn, "/usr/local/share/enotes_old/data/nubtn.png");
+ strcpy (newbtn, "/usr/local/share/enotes_old/data/newbtn.png");
+ strcpy (barimg, "/usr/local/share/enotes_old/data/panel.png");
strcpy (style, "plain");
r = 0;
g = 0;
@@ -75,13 +75,16 @@
exitbtn_width = 17;
exitbtn_height = 21;
- strcpy (bgimg, "/usr/local/share/enotes/data/barbg.png");
+ strcpy (bgimg, "/usr/local/share/enotes_old/data/barbg.png");
strcpy (firstbtnimg,
- "/usr/local/share/enotes/data/barfirstbtnimg.png");
- strcpy (lastbtnimg, "/usr/local/share/enotes/data/barlastbtnimg.png");
- strcpy (nubtnimg, "/usr/local/share/enotes/data/barnubtnimg.png");
- strcpy (newbtnimg, "/usr/local/share/enotes/data/barnewbtnimg.png");
- strcpy (exitbtnimg, "/usr/local/share/enotes/data/barexitbtnimg.png");
+ "/usr/local/share/enotes_old/data/barfirstbtnimg.png");
+ strcpy (lastbtnimg,
+ "/usr/local/share/enotes_old/data/barlastbtnimg.png");
+ strcpy (nubtnimg, "/usr/local/share/enotes_old/data/barnubtnimg.png");
+ strcpy (newbtnimg,
+ "/usr/local/share/enotes_old/data/barnewbtnimg.png");
+ strcpy (exitbtnimg,
+ "/usr/local/share/enotes_old/data/barexitbtnimg.png");
return;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/titlewin.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- titlewin.c 5 May 2003 10:34:56 -0000 1.4
+++ titlewin.c 13 Jan 2004 18:35:36 -0000 1.5
@@ -29,9 +29,6 @@
ecore_evas_size_max_set (root, w, h);
-
-
-
bg = new_image (root_evas, openwinimg, 1, w, h, w, h, 0, 0);
change_alpha (bg, 255 - transval);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- usage.h 1 May 2003 19:08:39 -0000 1.4
+++ usage.h 13 Jan 2004 18:35:36 -0000 1.5
@@ -14,7 +14,7 @@
|_________________________________________________________|
*/
-#define usage "E-Notes Usage:\n\
+#define usage "E-Notes [OLD] Usage:\n\
enotes [options] [command]\n\
enotes [command] [options]\n\
enotes [options]\n\
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/var_eprog_evas.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- var_eprog_evas.h 1 May 2003 19:08:40 -0000 1.4
+++ var_eprog_evas.h 13 Jan 2004 18:35:36 -0000 1.5
@@ -29,8 +29,8 @@
extern Ecore_Evas *root;
extern Evas *root_evas;
extern Evas_Object *bg;
-extern Estyle *title;
-extern Estyle *txt[11];
+extern Evas_Object *title;
+extern Evas_Object *txt[11];
extern Evas_Object *exitbtn;
extern Evas_Object *rectbar;
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/variables.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -3 -r1.6 -r1.7
--- variables.c 1 May 2003 19:08:40 -0000 1.6
+++ variables.c 13 Jan 2004 18:35:36 -0000 1.7
@@ -117,8 +117,8 @@
Ecore_Evas *root;
Evas *root_evas;
Evas_Object *bg;
-Estyle *title;
-Estyle *txt[11];
+Evas_Object *title;
+Evas_Object *txt[11];
Evas_Object *exitbtn;
Evas_Object *rectbar;
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
