Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
config.c config.h main.c main.h settings.c settings.h usage.c
usage.h
Log Message:
Got rid of intro note, and postit is now default theme in config.
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/config.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- config.c 14 Sep 2004 21:03:04 -0000 1.10
+++ config.c 15 Sep 2004 21:01:22 -0000 1.11
@@ -29,7 +29,6 @@
p->theme = NULL;
p->debug = 0;
- p->intro = 0;
p->controlcentre = 1;
p->autosave = 0;
p->welcome = 0;
@@ -130,9 +129,6 @@
} else if (!strcmp(info->name, "controlcentre")) {
if (info->value != NULL)
p->controlcentre = atoi(info->value);
- } else if (!strcmp(info->name, "intro")) {
- if (info->value != NULL)
- p->intro = atoi(info->value);
} else if (!strcmp(info->name, "debug")) {
if (info->value != NULL)
p->debug = atoi(info->value);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- config.h 12 Sep 2004 15:33:57 -0000 1.7
+++ config.h 15 Sep 2004 21:01:22 -0000 1.8
@@ -30,7 +30,6 @@
char *render_method;
char *theme;
int controlcentre;
- int intro;
int debug;
int autosave;
int welcome;
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- main.c 12 Sep 2004 15:33:57 -0000 1.14
+++ main.c 15 Sep 2004 21:01:22 -0000 1.15
@@ -83,41 +83,6 @@
autoload();
}
- /* Display the Introduction Note */
- if (main_config->intro == 1) {
- FILE *file;
- char *tmpstr = malloc(MAX_TEMPLATE_SIZE);
- char *template_path = malloc(PATH_MAX);
- NoteStor *tmpn = NULL;
-
- snprintf(template_path, PATH_MAX, TEMPLATE_LOC,
- getenv("HOME"));
- if ((file = fopen(template_path, "r")) != NULL) {
- dml("Using the supplied note template", 2);
- fgets(tmpstr, MAX_TEMPLATE_SIZE, file);
- if ((tmpn =
- get_notestor_from_value(tmpstr)) != NULL)
- new_note_with_values(tmpn->x,
- tmpn->y,
- tmpn->width,
- tmpn->height,
- tmpn->content);
- } else {
- dml("Using default note template", 2);
- new_note_with_values(0, 0, 0, 0, INTRO_CONTENT);
- }
-
- dml("Introduction Note Created", 1);
- if (file != NULL)
- fclose(file);
- if (tmpstr != NULL)
- free(tmpstr);
- if (template_path != NULL)
- free(template_path);
- if (tmpn != NULL)
- free_note_stor(tmpn);
- }
-
if (main_config->welcome == 1) {
open_welcome();
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- main.h 9 Sep 2004 10:38:15 -0000 1.7
+++ main.h 15 Sep 2004 21:01:23 -0000 1.8
@@ -34,8 +34,6 @@
#define MAX_TEMPLATE_SIZE 999
#define TEMPLATE_LOC "%s/.e/notes/defnote"
-#define INTRO_CONTENT "Welcome to E-Notes\nBy Thomas Fletcher.\n\nReport bugs
to:[EMAIL PROTECTED]"
-
/* The Main Function */
int main(int argc, char *argv[]);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- settings.c 12 Sep 2004 15:33:57 -0000 1.14
+++ settings.c 15 Sep 2004 21:01:23 -0000 1.15
@@ -112,10 +112,6 @@
settings->theme =
setup_settings_opt(settings->tree, "Theme:",
main_config->theme);
- settings->intro =
- setup_settings_opt_int(settings->tree, "Intro:",
- main_config->intro);
-
settings->cc =
setup_settings_opt_int(settings->tree,
"Control Centre [0=No 1=Yes]:",
@@ -289,9 +285,6 @@
xml_write_append_entry(p, "theme",
ewl_entry_text_get((Ewl_Entry *) settings->theme.
entry));
- xml_write_append_entry(p, "intro",
- ewl_entry_text_get((Ewl_Entry *) settings->intro.
- entry));
xml_write_append_entry(p, "controlcentre",
ewl_entry_text_get((Ewl_Entry *) settings->
cc.entry));
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- settings.h 12 Sep 2004 15:33:57 -0000 1.9
+++ settings.h 15 Sep 2004 21:01:23 -0000 1.10
@@ -39,7 +39,7 @@
Ewl_Widget *savebtn;
Ewl_Widget *revertbtn;
Ewl_Widget *closebtn;
- Settings_Opt render_method, theme, intro, debug, cc, autosave,
+ Settings_Opt render_method, theme, debug, cc, autosave,
welcome, sticky, ontop;
} Settings;
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- usage.c 12 Sep 2004 15:33:57 -0000 1.8
+++ usage.c 15 Sep 2004 21:01:23 -0000 1.9
@@ -89,10 +89,6 @@
if (atoi(optarg) == 0 || atoi(optarg) == 1)
main_config->autosave = atoi(optarg);
break;
- case 'i':
- if (atoi(optarg) == 0 || atoi(optarg) == 1)
- main_config->intro = atoi(optarg);
- break;
case 's':
if (atoi(optarg) == 0 || atoi(optarg) == 1)
main_config->sticky = atoi(optarg);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- usage.h 12 Sep 2004 15:33:57 -0000 1.9
+++ usage.h 15 Sep 2004 21:01:23 -0000 1.10
@@ -49,14 +49,13 @@
| | | loading of notes.\n\
-s | --sticky | INT | Make the notes sticky?\n\
-o | --ontop | INT | Keep the note ontop?\n\n\
--i | --intro | INT | Display the Intro.\n\
-w | --welcome | INT | Welcome You?\n\
\
\n"
#define USAGE_VERSION "E-Notes Version:\n%s\n"
-#define OPTSTR "v?hc:r:t:i:R:d:A:w:C:s:o:"
+#define OPTSTR "v?hc:r:t:R:d:A:w:C:s:o:"
static struct option long_options[] = {
{"help", 0, 0, '?'},
@@ -66,7 +65,6 @@
{"render-method", 1, 0, 'r'},
{"theme", 1, 0, 't'},
{"control-centre", 1, 0, 'C'},
- {"intro", 1, 0, 'i'},
{"debug", 1, 0, 'd'},
{"auto-save", 1, 0, 'A'},
{"welcome", 1, 0, 'w'},
-------------------------------------------------------
This SF.Net email is sponsored by: thawte's Crypto Challenge Vl
Crack the code and win a Sony DCRHC40 MiniDV Digital Handycam
Camcorder. More prizes in the weekly Lunch Hour Challenge.
Sign up NOW http://ad.doubleclick.net/clk;10740251;10262165;m
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
