Enlightenment CVS committal
Author : fletch3k
Project : misc
Module : enotes
Dir : misc/enotes/src
Modified Files:
main.c msgbox.c msgbox.h saveload.c settings.c usage.h
Log Message:
Bug Fixes and the A-OK msg on control centre disabled
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/main.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- main.c 26 Aug 2004 20:50:24 -0000 1.9
+++ main.c 28 Aug 2004 13:09:08 -0000 1.10
@@ -71,6 +71,10 @@
if (main_config->controlcentre == 1) {
setup_cc();
dml("Control Centre Setup", 1);
+ } else {
+ dml("No Control Centre - Displaying Notice", 1);
+ msgbox("E-Notes is Running",
+ "Since the Control Centre is turned off,\nthis message
is being displayed to say:\n\nE-Notes is running.");
}
/* Display the Introduction Note */
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- msgbox.c 27 Aug 2004 20:40:37 -0000 1.5
+++ msgbox.c 28 Aug 2004 13:09:08 -0000 1.6
@@ -18,18 +18,6 @@
/**
* @param title: The titlebar content of the window.
* @param content: The content string to display in the window.
- * @brief: Opens up a message box.
- */
-void
-msgbox(char *title, char *content)
-{
- msgbox_manual(title, content, 0, 0, 300, 50);
- return;
-}
-
-/**
- * @param title: The titlebar content of the window.
- * @param content: The content string to display in the window.
* @param x: X co-ordinate to place the window at.
* @param y: Y co-ordinate to place the window at.
* @param width: Width of window.
@@ -37,23 +25,22 @@
* @brief: Opens up a message box.
*/
void
-msgbox_manual(char *title, char *content, int x, int y, int width, int height)
+msgbox(char *title, char *content)
{
MsgBox *mb = malloc(sizeof(MsgBox));
/* Setup the Window */
- mb->win=ewl_window_new();
- ewl_window_title_set((Ewl_Window*)mb->win, title);
+ mb->win = ewl_window_new();
+ ewl_window_title_set((Ewl_Window *) mb->win, title);
ewl_widget_show(mb->win);
mb->vbox = ewl_vbox_new();
ewl_container_child_append((Ewl_Container *) mb->win, mb->vbox);
- ewl_object_fill_policy_set((Ewl_Object *) mb->vbox, EWL_FLAG_FILL_FILL);
+ ewl_object_padding_set((Ewl_Object *) mb->vbox, 5, 10, 5, 10);
ewl_widget_show(mb->vbox);
mb->msg = ewl_text_new(content);
ewl_container_child_append((Ewl_Container *) mb->vbox, mb->msg);
- ewl_object_fill_policy_set((Ewl_Object *) mb->msg, EWL_FLAG_FILL_FILL);
ewl_widget_show(mb->msg);
mb->hbox = ewl_hbox_new();
@@ -81,7 +68,7 @@
* @brief: Closes the msgbox window ee.
*/
void
-msgbox_close(MsgBox *p)
+msgbox_close(MsgBox * p)
{
ewl_widget_destroy(p->win);
free(p);
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/msgbox.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- msgbox.h 27 Aug 2004 20:40:37 -0000 1.4
+++ msgbox.h 28 Aug 2004 13:09:08 -0000 1.5
@@ -33,12 +33,10 @@
/* Making a Message Box */
void msgbox(char *title, char *content);
-void msgbox_manual(char *title, char *content, int x, int y,
- int width, int height);
/* Callbacks */
void msgbox_okbtn_clicked(Ewl_Widget * widget, void *ev_data,
void *data);
-void msgbox_close(MsgBox *p);
+void msgbox_close(MsgBox * p);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/saveload.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- saveload.c 27 Aug 2004 20:40:37 -0000 1.13
+++ saveload.c 28 Aug 2004 13:09:08 -0000 1.14
@@ -53,14 +53,16 @@
/* Setup the Window */
saveload->win = ewl_window_new();
ewl_window_title_set((Ewl_Window *) saveload->win, "E-Notes Save/Load");
- ewl_object_fill_policy_set((Ewl_Object*)saveload->win, EWL_FLAG_FILL_ALL);
- ewl_object_size_request((Ewl_Object*)saveload->win, 400,350);
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->win,
+ EWL_FLAG_FILL_ALL);
+ ewl_object_size_request((Ewl_Object *) saveload->win, 400, 350);
ewl_widget_show(saveload->win);
saveload->vbox = ewl_vbox_new();
ewl_container_child_append((Ewl_Container *) saveload->win,
saveload->vbox);
- ewl_object_fill_policy_set((Ewl_Object*)saveload->vbox, EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->vbox,
+ EWL_FLAG_FILL_ALL);
ewl_widget_show(saveload->vbox);
ewl_callback_append(saveload->win, EWL_CALLBACK_CONFIGURE,
@@ -84,8 +86,10 @@
saveload->hbox = ewl_hbox_new();
ewl_container_child_append((Ewl_Container *) saveload->vbox,
saveload->hbox);
- ewl_object_fill_policy_set((Ewl_Object*)saveload->hbox,EWL_FLAG_FILL_VSHRINK);
- ewl_object_fill_policy_set((Ewl_Object*)saveload->hbox,EWL_FLAG_FILL_HFILL);
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->hbox,
+ EWL_FLAG_FILL_VSHRINK);
+ ewl_object_fill_policy_set((Ewl_Object *) saveload->hbox,
+ EWL_FLAG_FILL_HFILL);
ewl_widget_show(saveload->hbox);
saveload_setup_button(saveload->hbox, &saveload->savebtn, "Save.");
@@ -170,11 +174,12 @@
capt = (Ewl_Widget *) ewl_text_new(caption);
ewl_callback_append(capt, EWL_CALLBACK_CLICKED,
(void *) ewl_saveload_listitem_click, NULL);
- ewl_object_fill_policy_set((Ewl_Object*)capt, EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set((Ewl_Object *) capt, EWL_FLAG_FILL_ALL);
ewl_widget_show(capt);
d->saveload_row =
(Ewl_Row *) ewl_tree_row_add((Ewl_Tree *) tree, 0, &capt);
- ewl_object_fill_policy_set((Ewl_Object*)d->saveload_row, EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set((Ewl_Object *) d->saveload_row,
+ EWL_FLAG_FILL_ALL);
return;
}
@@ -321,8 +326,8 @@
/* Setup the Window */
load->win = ewl_window_new();
ewl_window_title_set((Ewl_Window *) load->win, "E-Notes Load");
- ewl_object_fill_policy_set((Ewl_Object*)load->win, EWL_FLAG_FILL_ALL);
- ewl_object_size_request((Ewl_Object*)load->win, 400,350);
+ ewl_object_fill_policy_set((Ewl_Object *) load->win, EWL_FLAG_FILL_ALL);
+ ewl_object_size_request((Ewl_Object *) load->win, 400, 350);
ewl_widget_show(load->win);
load->vbox = ewl_vbox_new();
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/settings.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- settings.c 27 Aug 2004 20:40:37 -0000 1.11
+++ settings.c 28 Aug 2004 13:09:08 -0000 1.12
@@ -50,13 +50,13 @@
/* Setup the Window */
s->win = ewl_window_new();
ewl_window_title_set((Ewl_Window *) s->win, "E-Notes Settings");
- ewl_object_fill_policy_set((Ewl_Object*)s->win, EWL_FLAG_FILL_ALL);
- ewl_object_size_request((Ewl_Object*)s->win, 400,350);
+ ewl_object_fill_policy_set((Ewl_Object *) s->win, EWL_FLAG_FILL_ALL);
+ ewl_object_size_request((Ewl_Object *) s->win, 400, 350);
ewl_widget_show(s->win);
s->vbox = ewl_vbox_new();
ewl_container_child_append((Ewl_Container *) s->win, s->vbox);
- ewl_object_fill_policy_set((Ewl_Object*)s->vbox, EWL_FLAG_FILL_ALL);
+ ewl_object_fill_policy_set((Ewl_Object *) s->vbox, EWL_FLAG_FILL_ALL);
ewl_widget_show(s->vbox);
ewl_callback_append(s->win, EWL_CALLBACK_CONFIGURE, settings_move_embed,
@@ -75,8 +75,9 @@
s->hbox = ewl_hbox_new();
ewl_container_child_append((Ewl_Container *) s->vbox, s->hbox);
- ewl_object_fill_policy_set ((Ewl_Object*) s->hbox, EWL_FLAG_FILL_VSHRINK);
- ewl_object_fill_policy_set ((Ewl_Object*) s->hbox, EWL_FLAG_FILL_HFILL);
+ ewl_object_fill_policy_set((Ewl_Object *) s->hbox,
+ EWL_FLAG_FILL_VSHRINK);
+ ewl_object_fill_policy_set((Ewl_Object *) s->hbox, EWL_FLAG_FILL_HFILL);
ewl_widget_show(s->hbox);
settings_setup_button(s->hbox, &(s->savebtn), "Save.");
@@ -281,6 +282,9 @@
xml_write_append_entry(p, "intro",
ewl_entry_get_text((Ewl_Entry *) settings->intro.
entry));
+ xml_write_append_entry(p, "controlcentre",
+ ewl_entry_get_text((Ewl_Entry *) settings->
+ cc.entry));
xml_write_append_entry(p, "debug",
ewl_entry_get_text((Ewl_Entry *) settings->debug.
entry));
===================================================================
RCS file: /cvsroot/enlightenment/misc/enotes/src/usage.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- usage.h 26 Aug 2004 20:50:24 -0000 1.7
+++ usage.h 28 Aug 2004 13:09:08 -0000 1.8
@@ -54,7 +54,7 @@
#define USAGE_VERSION "E-Notes Version:\n%s\n"
-#define OPTSTR "v?hc:r:t:i:R:d:A:w:"
+#define OPTSTR "v?hc:r:t:i:R:d:A:w:C:"
static struct option long_options[] = {
{"help", 0, 0, '?'},
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=5047&alloc_id=10808&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
