[GnomeMeeting-devel-list] [PATCH] Minor UI fixes

[Eskil Bylund <eskil_bylund fastmail fm>]

[Resending to the list, now as a subscriber]

Hi,

The attached patch changes the following:

      * Use the gnome_app_set_statusbar/menus functions (removes the
        handle from the status- and menubar (unless the
        menubar_detachable key is set))
      * Respect the /desktop/gnome/interface/toolbar_detachable setting
        at startup
      * Don't display an empty speed dial menu if there are no speed
        dials

-- 
Eskil Bylund <eskil_bylund fastmail fm>

--- gnomemeeting-1.2.0/src/main_window.cpp.uifix	2004-12-19 20:21:35.000000000 +0100
+++ gnomemeeting-1.2.0/src/main_window.cpp	2004-12-20 13:56:31.780414752 +0100
@@ -635,6 +635,10 @@
 
   GtkWidget *addressbook_window = NULL;
 
+#ifndef DISABLE_GNOME
+  int behavior;
+  bool toolbar_detachable;
+#endif
   
   addressbook_window = GnomeMeeting::Process ()->GetAddressbookWindow ();
 
@@ -646,6 +650,10 @@
   g_return_if_fail (mw != NULL);
 
   
+#ifndef DISABLE_GNOME
+  toolbar_detachable = gm_conf_get_bool ("/desktop/gnome/interface/toolbar_detachable");
+#endif
+
   /* The main horizontal toolbar */
   toolbar = gtk_toolbar_new ();
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_ICONS);
@@ -721,8 +729,14 @@
   gtk_widget_show_all (GTK_WIDGET (toolbar));
   
 #ifndef DISABLE_GNOME
+  behavior = (BONOBO_DOCK_ITEM_BEH_EXCLUSIVE
+    | BONOBO_DOCK_ITEM_BEH_NEVER_VERTICAL);
+    
+  if (!toolbar_detachable)
+    behavior |= BONOBO_DOCK_ITEM_BEH_LOCKED;
+
   gnome_app_add_docked (GNOME_APP (main_window), toolbar, "main_toolbar",
-  			BONOBO_DOCK_ITEM_BEH_EXCLUSIVE,
+  			BonoboDockItemBehavior (behavior),
   			BONOBO_DOCK_TOP, 1, 0, 0);
 #else
   gtk_box_pack_start (GTK_BOX (mw->window_vbox), toolbar, 
@@ -873,8 +887,13 @@
 
   /* Add the toolbar to the UI */
 #ifndef DISABLE_GNOME
+  behavior = BONOBO_DOCK_ITEM_BEH_EXCLUSIVE;
+  
+  if (!toolbar_detachable)
+    behavior |= BONOBO_DOCK_ITEM_BEH_LOCKED;
+
   gnome_app_add_toolbar (GNOME_APP (main_window), GTK_TOOLBAR (toolbar),
- 			 "left_toolbar", BONOBO_DOCK_ITEM_BEH_EXCLUSIVE,
+ 			 "left_toolbar", BonoboDockItemBehavior (behavior),
  			 BONOBO_DOCK_LEFT, 2, 0, 0);
 #else
   gtk_box_pack_start (GTK_BOX (mw->window_hbox), toolbar, 
@@ -3368,12 +3387,19 @@
     gtk_container_remove (GTK_CONTAINER (menu),
 			  GTK_WIDGET (old_glist_iter->data));
 
+  item = gtk_menu_get_attach_widget (GTK_MENU (menu));
+  if (!g_slist_length (glist)) {
+    gtk_widget_set_sensitive (item, FALSE);
+    return;
+  }
+  gtk_widget_set_sensitive (item, TRUE);
+
   glist_iter = glist;
   while (glist_iter && glist_iter->data) {
 
     contact = GM_CONTACT (glist_iter->data);
 
-    ml = g_strdup_printf ("<b>%s#</b>   <i>%s</i>", 
+    ml = g_strdup_printf ("<b>%s#</b> <i>%s</i>", 
 			  contact->speeddial, 
 			  contact->fullname);
 
@@ -3748,11 +3774,8 @@
 
 
 #ifndef DISABLE_GNOME
-  gnome_app_add_docked (GNOME_APP (window), 
-			mw->main_menu,
-			"menubar",
-			BONOBO_DOCK_ITEM_BEH_EXCLUSIVE,
-  			BONOBO_DOCK_TOP, 0, 0, 0);
+  gnome_app_set_menus (GNOME_APP (window), 
+			GTK_MENU_BAR (mw->main_menu));
 #else
   gtk_box_pack_start (GTK_BOX (mw->window_vbox), mw->window_hbox, 
 		      FALSE, FALSE, 0);
@@ -3842,9 +3865,7 @@
   gtk_box_pack_start (GTK_BOX (mw->window_vbox), event_box, 
 		      FALSE, FALSE, 0);
 #else
-  gnome_app_add_docked (GNOME_APP (window), event_box, "statusbar",
-  			BONOBO_DOCK_ITEM_BEH_EXCLUSIVE,
-  			BONOBO_DOCK_BOTTOM, 3, 0, 0);
+  gnome_app_set_statusbar_custom (GNOME_APP (window), event_box, mw->statusbar);
 #endif
   gtk_widget_show_all (event_box);
   
--- gnomemeeting-1.2.0/src/log_window.cpp.uifix	2004-12-20 13:12:30.571939472 +0100
+++ gnomemeeting-1.2.0/src/log_window.cpp	2004-12-20 13:14:43.096792632 +0100
@@ -146,6 +146,7 @@
 				      "current-position", &end, FALSE);
 
   scr = gtk_scrolled_window_new (NULL, NULL);
+  gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scr), GTK_SHADOW_IN);
   gtk_container_set_border_width (GTK_CONTAINER (scr), 6);
   
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scr),