[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Antiright-devel] antiright ACE-desktop/guidl/IDE.gdl gtkshell/ad...
|
From: |
Jeffrey Bedard |
|
Subject: |
[Antiright-devel] antiright ACE-desktop/guidl/IDE.gdl gtkshell/ad... |
|
Date: |
Mon, 30 Apr 2007 18:15:22 +0000 |
CVSROOT: /sources/antiright
Module name: antiright
Changes by: Jeffrey Bedard <jefbed> 07/04/30 18:15:22
Modified files:
ACE-desktop/guidl: IDE.gdl
gtkshell : add_options.c button.c guidl_options.c label.c
label.h macros.h option_options.c row.c row.h
text.c updated_progress.c
Log message:
Changed management fill behavior. Option to affect fill of label
now affects everything. Options "no label fill" and "label fill" have
been changed to "no fill" and "fill", respectively.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/ACE-desktop/guidl/IDE.gdl?cvsroot=antiright&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/add_options.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/button.c?cvsroot=antiright&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/guidl_options.c?cvsroot=antiright&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.c?cvsroot=antiright&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/label.h?cvsroot=antiright&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/macros.h?cvsroot=antiright&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/option_options.c?cvsroot=antiright&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.c?cvsroot=antiright&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/row.h?cvsroot=antiright&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/text.c?cvsroot=antiright&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/updated_progress.c?cvsroot=antiright&r1=1.9&r2=1.10
Patches:
Index: ACE-desktop/guidl/IDE.gdl
===================================================================
RCS file: /sources/antiright/antiright/ACE-desktop/guidl/IDE.gdl,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ACE-desktop/guidl/IDE.gdl 27 Apr 2007 02:02:06 -0000 1.12
+++ ACE-desktop/guidl/IDE.gdl 30 Apr 2007 18:15:22 -0000 1.13
@@ -7,7 +7,9 @@
option "rows" 3;
+option "no fill";
add "system label" "pwd";
+option "fill";
option "terminal font" "Mono 12";
option "terminal width" 80;
@@ -28,8 +30,8 @@
"gshterm -e cvs commit # CVS_Commit",
"gshterm -e cvs -q -z3 update -dP # CVS_Update";
-option "no label fill";
+option "no fill";
add "label" " TODO: ";
-
+option "fill";
add "text";
Index: gtkshell/add_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/add_options.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/add_options.c 27 Apr 2007 02:02:06 -0000 1.21
+++ gtkshell/add_options.c 30 Apr 2007 18:15:22 -0000 1.22
@@ -32,28 +32,30 @@
}
static void
-add_piped_label(struct GSH * gsh, gchar * output)
+add_piped_label(struct GSH * gsh, const gchar * output)
{
gsh_add_label(gsh, output);
}
static void
-add_piped_text(struct GSH * gsh, gchar * output)
+add_piped_text(struct GSH * gsh, const gchar * output)
{
- GtkWidget * widget;
-
- widget=gsh_text_area(gsh);
- gsh_text_area_set_text(widget, output);
+ gsh_text_area_set_text(gsh_text_area(gsh), output);
}
static void
-add_piped_generic(struct GSH * gsh, void (*add)(struct GSH *, gchar *))
+generic_file_contents(struct GSH * gsh,
+ void (*add)(struct GSH *, const gchar *),
+ gchar * input)
{
- gchar *output;
+ (*add)(gsh, input);
+ g_free(input);
+}
- output=antiright_read_file(stdin);
- (*add)(gsh, output);
- g_free(output);
+static void
+add_piped_generic(struct GSH * gsh, void (*add)(struct GSH *, const gchar *))
+{
+ generic_file_contents(gsh, add, antiright_read_file(stdin));
}
static void
@@ -61,25 +63,18 @@
{
GtkWidget * separator;
- if(gsh->rows.rows == 1)
- separator=gtk_vseparator_new();
- else
- separator=gtk_hseparator_new();
+ separator = (gsh->rows.rows == 1)
+ ? gtk_vseparator_new() : gtk_hseparator_new();
- gsh_manage_unexpanded(gsh, separator);
+ gsh_manage(gsh, separator);
gtk_widget_show(separator);
}
static void
generic_commanded_add(struct GSH * gsh, const gchar * command,
- GtkWidget * (*add)(struct GSH *,
- const gchar * ))
+ void (*add)(struct GSH *, const gchar * ))
{
- gchar * result;
-
- result=antiright_pipe_read(command);
- (*add)(gsh, result);
- g_free(result);
+ generic_file_contents(gsh, add, antiright_pipe_read(command));
}
void
@@ -96,12 +91,11 @@
{
case 'b':
generic_commanded_add(gsh, argv[*counter],
- &gsh_add_button);
+ &gsh_new_button);
break;
case 'l':
generic_commanded_add(gsh, argv[*counter],
- &gsh_add_label);
- break;
+ &gsh_new_label);
}
break;
case 'e':
Index: gtkshell/button.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/button.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- gtkshell/button.c 27 Apr 2007 21:46:06 -0000 1.30
+++ gtkshell/button.c 30 Apr 2007 18:15:22 -0000 1.31
@@ -85,11 +85,22 @@
void
gsh_command_button(struct GSH * gsh, const gchar *command)
{
+#ifdef DEBUG
ARPASSERT(gsh);
+#endif /* DEBUG */
create_button(gsh);
setup_command_button(gsh, command);
- gsh_manage_unexpanded(gsh, gsh->button);
+ {
+ gboolean no_expand_set;
+
+ no_expand_set=GSH_FLAG(GSH_NO_EXPAND);
+ if(!no_expand_set)
+ GSH_SET(GSH_NO_EXPAND);
+ gsh_manage(gsh, gsh->button);
+ if(!no_expand_set)
+ GSH_UNSET(GSH_NO_EXPAND);
+ }
}
static gboolean
Index: gtkshell/guidl_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/guidl_options.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gtkshell/guidl_options.c 28 Apr 2007 22:26:23 -0000 1.2
+++ gtkshell/guidl_options.c 30 Apr 2007 18:15:22 -0000 1.3
@@ -34,8 +34,8 @@
DEF("exit on activate", "-oe");
DEF("horizontal labels", "-oh");
DEF("scrolled", "-os");
- DEF("no label fill", "-ol");
- DEF("label fill", "-oL");
+ DEF("no fill", "-ol");
+ DEF("fill", "-oL");
DEF("geometry", "-og");
DEF("title", "-oT");
DEF("terminal font", "-otf");
Index: gtkshell/label.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- gtkshell/label.c 27 Apr 2007 02:02:06 -0000 1.15
+++ gtkshell/label.c 30 Apr 2007 18:15:22 -0000 1.16
@@ -27,8 +27,7 @@
set_options(struct GSH * gsh, GtkWidget *label)
{
gtk_label_set_single_line_mode(GTK_LABEL(label), FALSE);
-
- if((gsh->bflags & GSH_HORIZONTAL_LABELS) == GSH_HORIZONTAL_LABELS)
+ if(GSH_FLAG(GSH_HORIZONTAL_LABELS))
gtk_label_set_angle(GTK_LABEL(label), 90.0);
else
gtk_label_set_line_wrap(GTK_LABEL(label), TRUE);
@@ -50,7 +49,7 @@
set_options(gsh, label);
- if ((gsh->bflags & GSH_FRAMED_LABELS) == GSH_FRAMED_LABELS)
+ if(GSH_FLAG(GSH_FRAMED_LABELS))
{
GtkWidget *frame;
@@ -62,20 +61,18 @@
else
to_be_managed = label;
- /*
- * This uses expanded management by default , as the label may be
- * displaying a large text area. Behavior is unexpanded if
- * corresponding option is set.
- */
- if(GSH_FLAG(GSH_NO_LABEL_EXPAND))
- gsh_manage_unexpanded(gsh, to_be_managed);
- else /* default */
gsh_manage(gsh, to_be_managed);
return label;
}
void
+gsh_new_label(struct GSH * gsh, const gchar *text)
+{
+ (void) gsh_add_label(gsh, text);
+}
+
+void
gsh_set_label(GtkWidget *label, const gchar *text)
{
ARPASSERT(label);
Index: gtkshell/label.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/label.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- gtkshell/label.h 27 Apr 2007 02:02:06 -0000 1.6
+++ gtkshell/label.h 30 Apr 2007 18:15:22 -0000 1.7
@@ -27,6 +27,9 @@
gsh_add_label(struct GSH * gsh, const gchar *text);
void
+gsh_new_label(struct GSH * gsh, const gchar *text);
+
+void
gsh_set_label(GtkWidget *label, const gchar *text);
#endif
Index: gtkshell/macros.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/macros.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gtkshell/macros.h 21 Apr 2007 22:21:57 -0000 1.3
+++ gtkshell/macros.h 30 Apr 2007 18:15:22 -0000 1.4
@@ -32,7 +32,7 @@
#define GSH_FRAMED_LABELS 32
#define GSH_MENU_BUTTON 64
#define GSH_NO_BASE_FRAME 128
-#define GSH_NO_LABEL_EXPAND 256
+#define GSH_NO_EXPAND 256
#define GSH_GUIDL_NO_DUMMY 512
typedef guint Bitmask;
Index: gtkshell/option_options.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/option_options.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- gtkshell/option_options.c 21 Apr 2007 22:21:57 -0000 1.20
+++ gtkshell/option_options.c 30 Apr 2007 18:15:22 -0000 1.21
@@ -91,11 +91,11 @@
break;
case 'l':
- GSH_SET(GSH_NO_LABEL_EXPAND);
+ GSH_SET(GSH_NO_EXPAND);
break;
case 'L':
- GSH_UNSET(GSH_NO_LABEL_EXPAND);
+ GSH_UNSET(GSH_NO_EXPAND);
break;
case 'n': /* no decorations, desktop panel not to be touched by the
Index: gtkshell/row.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- gtkshell/row.c 28 Apr 2007 22:26:23 -0000 1.17
+++ gtkshell/row.c 30 Apr 2007 18:15:22 -0000 1.18
@@ -51,18 +51,13 @@
static void
manage_normal(struct GSH * gsh, GtkWidget * widget)
{
+ if(test_manage_menu_item(gsh->rows.v, widget))
+ return;
gsh_check_row(gsh);
gtk_container_add(GTK_CONTAINER(gsh->rows.v), widget);
gsh_manage_generic(gsh, widget);
}
-void
-gsh_manage(struct GSH * gsh, GtkWidget *widget)
-{
- if(!test_manage_menu_item(gsh->rows.v, widget))
- manage_normal(gsh, widget);
-}
-
static gboolean
test_manage_unexpanded(struct GSH * gsh)
{
@@ -74,7 +69,9 @@
* maintain a decent appearance.
*/
- return ((gsh->rows.rows != 1) && !GTK_IS_MENU(container)
+ return (GSH_FLAG(GSH_NO_EXPAND)
+ &&(gsh->rows.rows != 1)
+ && !GTK_IS_MENU(container)
&& !GTK_IS_MENU_BAR(container)
&& !GTK_IS_MENU_ITEM(container));
}
@@ -89,12 +86,12 @@
}
void
-gsh_manage_unexpanded(struct GSH * gsh, GtkWidget *widget)
+gsh_manage(struct GSH * gsh, GtkWidget *widget)
{
if(test_manage_unexpanded(gsh))
manage_unexpanded(gsh, widget);
else
- gsh_manage(gsh, widget);
+ manage_normal(gsh, widget);
}
void
Index: gtkshell/row.h
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/row.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gtkshell/row.h 28 Feb 2007 03:53:51 -0000 1.7
+++ gtkshell/row.h 30 Apr 2007 18:15:22 -0000 1.8
@@ -24,16 +24,12 @@
#define GSH_ROW_H
void
- gsh_manage(struct GSH * gsh, GtkWidget *widget);
+gsh_manage(struct GSH * gsh, GtkWidget *widget);
void
- gsh_manage_unexpanded(struct GSH * gsh, GtkWidget *widget);
-
-
-void
- gsh_new_row(struct GSH * gsh);
+gsh_new_row(struct GSH * gsh);
void
- gsh_check_row(struct GSH * gsh);
+gsh_check_row(struct GSH * gsh);
#endif /* GSH_ROW_H */
Index: gtkshell/text.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/text.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- gtkshell/text.c 28 Apr 2007 22:26:23 -0000 1.21
+++ gtkshell/text.c 30 Apr 2007 18:15:22 -0000 1.22
@@ -69,7 +69,7 @@
setup_entry_cb(gsh, entry, command);
append_sample_entries(GTK_COMBO_BOX(entry));
/* Do not fill remaining container area. */
- gsh_manage_unexpanded(gsh, entry);
+ gsh_manage(gsh, entry);
return entry;
}
Index: gtkshell/updated_progress.c
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/updated_progress.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- gtkshell/updated_progress.c 2 Mar 2007 19:12:00 -0000 1.9
+++ gtkshell/updated_progress.c 30 Apr 2007 18:15:22 -0000 1.10
@@ -45,7 +45,7 @@
ARPASSERT(command);
widget = gtk_progress_bar_new();
- gsh_manage_unexpanded(gsh, widget);
+ gsh_manage(gsh, widget);
gsh_add_updater(gsh, &gsh_update_progress,
command, widget);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Antiright-devel] antiright ACE-desktop/guidl/IDE.gdl gtkshell/ad...,
Jeffrey Bedard <=