Enlightenment CVS committal
Author : codewarrior
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_argument.c etk_argument.h etk_label.c etk_textblock.c
Log Message:
- add <b> and <i> to our text widgets
- add rudimentary help support for Etk_Argument
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_argument.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- etk_argument.c 14 Mar 2006 11:42:12 -0000 1.4
+++ etk_argument.c 15 Mar 2006 10:04:35 -0000 1.5
@@ -9,6 +9,7 @@
#define ETK_ARGUMENT_FLAG_PRIV_SET (1 << 4)
static Evas_Hash *_etk_argument_extra = NULL;
+static int _etk_argument_status = 0;
/**
* @brief Parses the arguments as described by the user
@@ -69,7 +70,7 @@
}
++i; ++arg;
}
- return ETK_ARGUMENT_RETURN_OK;
+ return ETK_ARGUMENT_RETURN_OK_NONE_PARSED;
}
for(i = 1; i < argc; i++)
@@ -111,6 +112,7 @@
arg->data = evas_list_append(arg->data, val);
arg->flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
+ _etk_argument_status = 1;
++i;
}
else if (arg->flags & ETK_ARGUMENT_FLAG_VALUE_REQUIRED
@@ -121,7 +123,11 @@
return ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND;
}
else if(!(arg->flags & ETK_ARGUMENT_FLAG_VALUE_REQUIRED))
- arg->flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
+ {
+ arg->flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
+ _etk_argument_status = 1;
+ }
+
}
++arg;
}
@@ -173,6 +179,7 @@
arg->data = evas_list_append(arg->data, val);
arg->flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
+ _etk_argument_status = 1;
if(!tmp)
++i;
@@ -185,7 +192,10 @@
return ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND;
}
else if(!(arg->flags & ETK_ARGUMENT_FLAG_VALUE_REQUIRED))
- arg->flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
+ {
+ arg->flags |= ETK_ARGUMENT_FLAG_PRIV_SET;
+ _etk_argument_status = 1;
+ }
}
if(tmp)
@@ -266,8 +276,30 @@
arg->func(args, i);
++i; ++arg;
}
+
+ if(_etk_argument_status == 0)
+ return ETK_ARGUMENT_RETURN_OK_NONE_PARSED;
+ else
+ return ETK_ARGUMENT_RETURN_OK;
+}
+
+void etk_argument_help_show(Etk_Argument *args)
+{
+ Etk_Argument *arg;
- return ETK_ARGUMENT_RETURN_OK;
+ arg = args;
+ while(arg->short_name != -1)
+ {
+ if(arg->long_name)
+ printf("--%s ", arg->long_name);
+ if(arg->short_name != -1 && arg->short_name != ' ')
+ printf("-%c", arg->short_name);
+ printf("\t");
+ if(arg->description)
+ printf("%s", arg->description);
+ printf("\n");
+ ++arg;
+ }
}
Evas_List *etk_argument_extra_find(const char *key)
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_argument.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_argument.h 14 Mar 2006 11:42:13 -0000 1.3
+++ etk_argument.h 15 Mar 2006 10:04:35 -0000 1.4
@@ -12,9 +12,10 @@
enum _Etk_Argument_Returns
{
ETK_ARGUMENT_RETURN_OK = 1, /* no problems */
- ETK_ARGUMENT_RETURN_REQUIRED_NOT_FOUND = 2, /* required arg not found */
- ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND = 3, /* required value for arg
no found */
- ETK_ARGUMENT_RETURN_MALFORMED = 4 /* malformed argument */
+ ETK_ARGUMENT_RETURN_OK_NONE_PARSED = 2, /* no problems, no arguments
or no valid args */
+ ETK_ARGUMENT_RETURN_REQUIRED_NOT_FOUND = 3, /* required arg not found */
+ ETK_ARGUMENT_RETURN_REQUIRED_VALUE_NOT_FOUND = 4, /* required value for arg
no found */
+ ETK_ARGUMENT_RETURN_MALFORMED = 5 /* malformed argument */
};
enum _Etk_Argument_Flags
@@ -38,6 +39,7 @@
};
int etk_arguments_parse(Etk_Argument *args, int argc, char **argv);
+void etk_argument_help_show(Etk_Argument *arg);
Evas_List *etk_argument_extra_find(const char *key);
/** @} */
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_label.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- etk_label.c 15 Mar 2006 00:11:08 -0000 1.10
+++ etk_label.c 15 Mar 2006 10:04:35 -0000 1.11
@@ -298,8 +298,10 @@
"right='+ align=right'"
"/right='- \n'"
"h1='+ font_size=20'"
+ "b='+font=Vera-Bold'"
+ "i='+font=Vera-Italic'"
"glow='+ style=glow color=#fff glow2_color=#fe87 glow_color=#fa14'"
- "link='+ style=underline underline_color=#0000cc
underline2_color=#0000cc color=#0000cc '"
+ "link='+ underline=on underline_color=#0000aa color=#0000aa'"
"red='+ color=#ff0000'"
"br='\n'"
"tab='\t'");
===================================================================
RCS file: /cvsroot/enlightenment/e17/proto/etk/src/lib/etk_textblock.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- etk_textblock.c 4 Mar 2006 18:04:10 -0000 1.7
+++ etk_textblock.c 15 Mar 2006 10:04:35 -0000 1.8
@@ -305,6 +305,10 @@
"/right='- \n'"
"blockquote='+ left_margin=+24 right_margin=+24 font=Vera
font_size=10 align=left'"
"h1='+ font_size=20'"
+ "b='+font=Vera-Bold'"
+ "i='+font=Vera-Italic'"
+ "glow='+ style=glow color=#fff glow2_color=#fe87 glow_color=#fa14'"
+ "link='+ underline=on underline_color=#0000aa color=#0000aa'"
"red='+ color=#ff0000'"
"p='+ font=Vera font_size=10 align=left'"
"/p='- \n'"
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
