[Rasta-commits] rev 215 - in trunk: . clrasta
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Thu Oct 23 19:30:04 CDT 2003
Author: jlbec
Date: 2003-10-23 18:30:02 -0500 (Thu, 23 Oct 2003)
New Revision: 215
Modified:
trunk/ChangeLog
trunk/clrasta/clrasta.c
trunk/configure.in
Log:
intuitive <ENTER>
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2003-10-23 18:02:33 UTC (rev 214)
+++ trunk/ChangeLog 2003-10-23 23:30:02 UTC (rev 215)
@@ -1,5 +1,10 @@
2003-10-23 Joel Becker <joel.becker at oracle.com>
+ * configure.in: Bump to 0.1.3.
+ * clrasta/clrasta.c: Add intuitive bits to field prompts.
+
+2003-10-23 Joel Becker <joel.becker at oracle.com>
+
* configure.in: Bump to 0.1.2.
* redhat/rasta.spec.in: Fix stupid RPM error-on-unpackaged.
Add .la files to rasta-devel package.
Modified: trunk/clrasta/clrasta.c
===================================================================
--- trunk/clrasta/clrasta.c 2003-10-23 18:02:33 UTC (rev 214)
+++ trunk/clrasta/clrasta.c 2003-10-23 23:30:02 UTC (rev 215)
@@ -98,7 +98,8 @@
CLR_QUERY_FLAG_CHANGE = (1<<4), /* change value */
CLR_QUERY_FLAG_MORE = (1<<5), /* more choices */
CLR_QUERY_FLAG_CANCEL = (1<<6), /* cancel list */
- CLR_QUERY_FLAG_DONE = (1<<7) /* done with list */
+ CLR_QUERY_FLAG_DONE = (1<<7), /* done with list */
+ CLR_QUERY_FLAG_CONT = (1<<8) /* continue with default */
} CLRQueryFlags;
@@ -200,7 +201,7 @@
value = rasta_symbol_lookup(ctxt, sym_name);
flags = CLR_QUERY_FLAG_QUIT | CLR_QUERY_FLAG_BACK |
- CLR_QUERY_FLAG_LIST;
+ CLR_QUERY_FLAG_LIST | CLR_QUERY_FLAG_CONT;
if (rasta_dialog_field_is_required(field))
flags |= CLR_QUERY_FLAG_REQUIRED;
@@ -213,6 +214,13 @@
{
clr_print_field(name, new_value ? new_value : "",
flags & CLR_QUERY_FLAG_REQUIRED);
+ if (flags & CLR_QUERY_FLAG_REQUIRED)
+ {
+ if (!new_value || !*new_value)
+ flags &= ~CLR_QUERY_FLAG_CONT;
+ else
+ flags |= CLR_QUERY_FLAG_CONT;
+ }
prompt = clr_build_prompt(flags, -1, -1);
ret = clr_query_response(prompt, flags, NULL, -1, -1);
g_free(prompt);
@@ -401,7 +409,8 @@
format = NULL;
flags = CLR_QUERY_FLAG_QUIT | CLR_QUERY_FLAG_BACK |
- CLR_QUERY_FLAG_LIST | CLR_QUERY_FLAG_CHANGE;
+ CLR_QUERY_FLAG_LIST | CLR_QUERY_FLAG_CHANGE |
+ CLR_QUERY_FLAG_CONT;
if (rasta_dialog_field_is_required(field))
flags |= CLR_QUERY_FLAG_REQUIRED;
@@ -414,6 +423,13 @@
{
clr_print_field(name, new_value ? new_value : "",
flags & CLR_QUERY_FLAG_REQUIRED);
+ if (flags & CLR_QUERY_FLAG_REQUIRED)
+ {
+ if (!new_value || !*new_value)
+ flags &= ~CLR_QUERY_FLAG_CONT;
+ else
+ flags |= CLR_QUERY_FLAG_CONT;
+ }
prompt = clr_build_prompt(flags, -1, -1);
ret = clr_query_response(prompt, flags, NULL, -1, -1);
g_free(prompt);
@@ -725,7 +741,7 @@
value = rasta_symbol_lookup(ctxt, sym_name);
flags = CLR_QUERY_FLAG_QUIT | CLR_QUERY_FLAG_BACK |
- CLR_QUERY_FLAG_LIST;
+ CLR_QUERY_FLAG_LIST | CLR_QUERY_FLAG_CONT;
if (rasta_dialog_field_is_required(field))
flags |= CLR_QUERY_FLAG_REQUIRED;
@@ -749,6 +765,13 @@
{
clr_print_field(name, disp_val ? disp_val : "",
flags & CLR_QUERY_FLAG_REQUIRED);
+ if (flags & CLR_QUERY_FLAG_REQUIRED)
+ {
+ if (!new_value || !*new_value)
+ flags &= ~CLR_QUERY_FLAG_CONT;
+ else
+ flags |= CLR_QUERY_FLAG_CONT;
+ }
prompt = clr_build_prompt(flags, -1, -1);
ret = clr_query_response(prompt, flags, NULL, -1, -1);
g_free(prompt);
@@ -889,7 +912,7 @@
format = NULL;
flags = CLR_QUERY_FLAG_QUIT | CLR_QUERY_FLAG_BACK |
- CLR_QUERY_FLAG_CHANGE;
+ CLR_QUERY_FLAG_CHANGE | CLR_QUERY_FLAG_CONT;
if (rasta_dialog_field_is_required(field))
flags |= CLR_QUERY_FLAG_REQUIRED;
@@ -900,6 +923,13 @@
{
clr_print_field(name, new_value ? new_value : "",
flags & CLR_QUERY_FLAG_REQUIRED);
+ if (flags & CLR_QUERY_FLAG_REQUIRED)
+ {
+ if (!new_value || !*new_value)
+ flags &= ~CLR_QUERY_FLAG_CONT;
+ else
+ flags |= CLR_QUERY_FLAG_CONT;
+ }
prompt = clr_build_prompt(flags, -1, -1);
ret = clr_query_response(prompt, flags, NULL, -1, -1);
g_free(prompt);
@@ -999,7 +1029,7 @@
value = rasta_symbol_lookup(ctxt, sym_name);
flags = CLR_QUERY_FLAG_QUIT | CLR_QUERY_FLAG_BACK |
- CLR_QUERY_FLAG_CHANGE;
+ CLR_QUERY_FLAG_CHANGE | CLR_QUERY_FLAG_CONT;
if (rasta_dialog_field_is_required(field))
flags |= CLR_QUERY_FLAG_REQUIRED;
@@ -1010,6 +1040,13 @@
{
clr_print_field(name, new_value ? new_value : "",
flags & CLR_QUERY_FLAG_REQUIRED);
+ if (flags & CLR_QUERY_FLAG_REQUIRED)
+ {
+ if (!new_value || !*new_value)
+ flags &= ~CLR_QUERY_FLAG_CONT;
+ else
+ flags |= CLR_QUERY_FLAG_CONT;
+ }
prompt = clr_build_prompt(flags, -1, -1);
ret = clr_query_response(prompt, flags, NULL, -1, -1);
g_free(prompt);
@@ -1540,6 +1577,8 @@
g_string_append(str, "[b]ack, ");
if (flags & CLR_QUERY_FLAG_QUIT)
g_string_append(str, "[q]uit, ");
+ if (flags & CLR_QUERY_FLAG_CONT)
+ g_string_append(str, "<ENTER> to continue, ");
g_string_append(str, "[h]elp): ");
@@ -2478,7 +2517,9 @@
*/
static gboolean run_hidden(RastaContext *ctxt, RastaScreen *screen)
{
+#if DEBUG
gchar *title;
+#endif
g_return_val_if_fail(ctxt != NULL, FALSE);
g_return_val_if_fail(screen != NULL, FALSE);
Modified: trunk/configure.in
===================================================================
--- trunk/configure.in 2003-10-23 18:02:33 UTC (rev 214)
+++ trunk/configure.in 2003-10-23 23:30:02 UTC (rev 215)
@@ -22,9 +22,9 @@
#
MAJOR_VERSION=0
MINOR_VERSION=1
-MICRO_VERSION=2
-INTERFACE_AGE=1
-BINARY_AGE=1
+MICRO_VERSION=3
+INTERFACE_AGE=2
+BINARY_AGE=2
VERSION="${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}"
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
More information about the Rasta-commits
mailing list