Re: libbonoboui patch

[Anders Carlsson <andersca gnu org>]

On Mon, 2001-12-31 at 11:36, Michael Meeks wrote:
[snip]

> 	Thanks for updating the docs, can you re-post the revised patch as you
> commit ?
> 

I've committed the attached patch.

//andersca
andersca gnu org

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libbonoboui/ChangeLog,v
retrieving revision 1.220
diff -u -r1.220 ChangeLog
--- ChangeLog	2001/12/30 17:51:50	1.220
+++ ChangeLog	2001/12/31 10:57:28
@@ -1,3 +1,15 @@
+2001-12-29  Anders Carlsson  <andersca gnu org>
+
+	* doc/ui-xml.txt (Example): Update docs.
+
+	* bonobo/bonobo-ui-sync-status.c (impl_bonobo_ui_sync_status_state): 
+	Check for resize_grip property.
+	(impl_bonobo_ui_sync_status_build): Likewise.
+
+	* bonobo/bonobo-ui-sync-toolbar.c (cmd_get_toolbar_image): 
+	Use GTK_ICON_SIZE_LARGE_TOOLBAR since that's what everyone
+	else uses.
+
 2001-12-28  Jens Finke <jens triq net>
 
 	* bonobo/bonobo-property-control.c
Index: bonobo/bonobo-ui-sync-status.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-sync-status.c,v
retrieving revision 1.13
diff -u -r1.13 bonobo-ui-sync-status.c
--- bonobo/bonobo-ui-sync-status.c	2001/12/20 16:15:32	1.13
+++ bonobo/bonobo-ui-sync-status.c	2001/12/31 10:57:28
@@ -76,7 +76,15 @@
 
 	if (!strcmp (name, "main")) {
 		const char *id_str;
+		const char *resize_grip;
 
+		resize_grip = bonobo_ui_node_peek_attr (node, "resize_grip");
+
+		if (resize_grip) {
+			gtk_statusbar_set_has_resize_grip (msync->main_status,
+							   atoi (resize_grip));
+		}
+		
 		id_str = bonobo_ui_engine_node_get_id (sync->engine, node);
 
 		msync->main_status = GTK_STATUSBAR (widget);
@@ -135,8 +143,9 @@
 		return NULL;
 
 	if (!strcmp (name, "main")) {
-
 		widget = gtk_statusbar_new ();
+		
+		/* We disable the resize grip by default */
 		gtk_statusbar_set_has_resize_grip (
 			GTK_STATUSBAR (widget), FALSE);
 
Index: bonobo/bonobo-ui-sync-toolbar.c
===================================================================
RCS file: /cvs/gnome/libbonoboui/bonobo/bonobo-ui-sync-toolbar.c,v
retrieving revision 1.28
diff -u -r1.28 bonobo-ui-sync-toolbar.c
--- bonobo/bonobo-ui-sync-toolbar.c	2001/12/21 11:52:48	1.28
+++ bonobo/bonobo-ui-sync-toolbar.c	2001/12/31 10:57:28
@@ -43,11 +43,11 @@
 {
 	if (bonobo_ui_node_peek_attr (node, "pixtype"))
 		return bonobo_ui_util_xml_get_pixbuf (
-			widget, node, GTK_ICON_SIZE_SMALL_TOOLBAR);
+			widget, node, GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 	if (bonobo_ui_node_peek_attr (cmd_node, "pixtype"))
 		return bonobo_ui_util_xml_get_pixbuf (
-			widget, cmd_node, GTK_ICON_SIZE_SMALL_TOOLBAR);
+			widget, cmd_node, GTK_ICON_SIZE_LARGE_TOOLBAR);
 
 	return NULL;
 }
Index: doc/ui-xml.txt
===================================================================
RCS file: /cvs/gnome/libbonoboui/doc/ui-xml.txt,v
retrieving revision 1.1
diff -u -r1.1 ui-xml.txt
--- doc/ui-xml.txt	2001/07/12 18:12:38	1.1
+++ doc/ui-xml.txt	2001/12/31 10:57:28
@@ -165,15 +165,16 @@
     <control name="Foo"/> 
    </status>
 
-<status>     - encloses stuff to go in statusbar
+<status>            - encloses stuff to go in statusbar
 
-<item>       - a plain text statusbar; contents of node are the text to display
- name="main" - name of the standard statusbar 
+<item>              - a plain text statusbar; contents of node are the text to display
+ name="main"        - name of the standard statusbar 
+ resize_grip="1"    - 0 or 1, whether a resize grip should be visible or not.
 
-<control>    - a control to be inserted into the status area. If name="main" 
-	       it overrides the standard bar. Otherwise it gets packed
-	       into the right side of the status area.
- name="Foo"  - name of statusbar
+<control>           - a control to be inserted into the status area. If name="main" 
+		      it overrides the standard bar. Otherwise it gets packed
+	              into the right side of the status area.
+ name="Foo"         - name of statusbar
 
 * Key bindings