Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
config.c config.h main.c settings.c settings.h usage.c usage.h
Log Message:
Control Centre is optional. IPC Close added.
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/config.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config.c 6 Feb 2004 07:36:30 -0000 1.2
+++ config.c 7 Feb 2004 22:14:28 -0000 1.3
@@ -97,6 +97,8 @@
if (p->theme != NULL)
free(p->theme);
p->theme = strdup(info->value);
+ } else if (!strcmp(info->name, "controlcentre")) {
+ p->controlcentre=atoi(info->value);
} else if (!strcmp(info->name, "intro")) {
p->intro = atoi(info->value);
} else if (!strcmp(info->name, "debug")) {
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- config.h 6 Feb 2004 07:36:30 -0000 1.2
+++ config.h 7 Feb 2004 22:14:28 -0000 1.3
@@ -29,6 +29,7 @@
typedef struct {
char *render_method;
char *theme;
+ int controlcentre;
int intro;
int debug;
struct _conf_note {
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- main.c 7 Feb 2004 22:01:56 -0000 1.3
+++ main.c 7 Feb 2004 22:14:28 -0000 1.4
@@ -61,8 +61,10 @@
dml("Efl Successfully Initiated", 1);
/* Begin the Control Centre */
- setup_cc();
- dml("Control Centre Setup", 1);
+ if (main_config->controlcentre==1) {
+ setup_cc();
+ dml("Control Centre Setup", 1);
+ }
/* Display the Introduction Note */
if (main_config->intro == 1) {
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- settings.c 6 Feb 2004 07:36:30 -0000 1.2
+++ settings.c 7 Feb 2004 22:14:28 -0000 1.3
@@ -133,6 +133,7 @@
setup_settings_opt_int(settings->tree, "Note - Height:",
main_config->note->height);
+ settings->cc = setup_settings_opt_int (settings->tree, "Control Centre [0=No
1=Yes]:", main_config->controlcentre);
settings->cc_x =
setup_settings_opt_int(settings->tree, "Control Centre - X:",
main_config->cc->x);
@@ -150,6 +151,7 @@
settings->debug =
setup_settings_opt_int(settings->tree, "Debugging Level [0-2]:",
main_config->debug);
+
return;
}
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- settings.h 6 Feb 2004 07:36:30 -0000 1.2
+++ settings.h 7 Feb 2004 22:14:28 -0000 1.3
@@ -48,7 +48,7 @@
Ewl_Widget *revertbtn;
Ewl_Widget *closebtn;
Settings_Opt render_method, theme, intro, note_x, note_y, note_w,
- note_h, cc_x, cc_y, cc_w, cc_h, debug;
+ note_h, cc_x, cc_y, cc_w, cc_h, debug, cc;
} Settings;
extern MainConfig *main_config;
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- usage.c 7 Feb 2004 22:01:56 -0000 1.3
+++ usage.c 7 Feb 2004 22:14:28 -0000 1.4
@@ -65,6 +65,9 @@
free(main_config->theme);
main_config->theme = strdup(optarg);
break;
+ case 'C':
+ main_config->controlcentre = atoi (optarg);
+ break;
case 'i':
main_config->intro = atoi(optarg);
break;
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- usage.h 6 Feb 2004 07:36:31 -0000 1.2
+++ usage.h 7 Feb 2004 22:14:28 -0000 1.3
@@ -41,6 +41,8 @@
\n\
-r --render-method STR Render Method\n\
-t --theme STR Theme\n\
+-C --control-centre INT Enable/Disable the Control\n\
+ Centre.\n\
-i --intro INT Display the Intro.\n\
\n\
-X --cc-x INT Control Centre X Positioning.\n\
@@ -66,6 +68,7 @@
{"config-file", 1, 0, 'c'},
{"render-method", 1, 0, 'r'},
{"theme", 1, 0, 't'},
+ {"control-centre", 1, 0, 'C'},
{"intro", 1, 0, 'i'},
{"debug", 1, 0, 'd'},
{"cc-x", 1, 0, 'X'},
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
