2000-06-20 Jacob Berkman <jacob@helixcode.com>

* gtkdtree.c (gtk_dtree_construct):
	* gscreen.c (panel_create_tree_view): don't set the tree's line
	style

	* gprefs.[ch] (create_prop_box): only set the parent if the parent
	exists
	(create_prop_box): only show the custom tab if we have a parent
	panel
	(gnome_configure_box_with_desktop): add a param for optionally
	doing the desktop prefs
	(gnome_configure_box): wrap the other function

	* gdesktop.c (set_desktop_icons): show icon properties
	(desktop_popup_items): add an item to configure icons

gnome/ChangeLog

@@ -1,3 +1,26 @@
+2000-06-20  Jacob Berkman  <jacob@helixcode.com>
+
+	* gtkdtree.c (gtk_dtree_construct): 
+	* gscreen.c (panel_create_tree_view): don't set the tree's line
+	style
+
+	* gprefs.[ch] (create_prop_box): only set the parent if the parent
+	exists
+	(create_prop_box): only show the custom tab if we have a parent
+	panel
+	(gnome_configure_box_with_desktop): add a param for optionally
+	doing the desktop prefs
+	(gnome_configure_box): wrap the other function
+
+	* gdesktop.c (set_desktop_icons): show icon properties
+	(desktop_popup_items): add an item to configure icons
+
+2000-05-06  Jacob Berkman  <jacob@helixcode.com>
+
+	* gmain.c (xtoolkit_get_main_dialog):
+	(xtoolkit_create_dialog): 
+	(x_create_panel_container): set the default icon
+
 2000-06-16  Jonathan Blandford  <jrb@redhat.com>
 
 	* gpopup2.c (handle_empty_trash): Finished trash can.  Now I just

gnome/gdesktop.c

@@ -2838,6 +2838,12 @@ set_background_image (GtkWidget *widget, gpointer data)
 	}
 }
 
+static void
+set_desktop_icons (GtkWidget *widget, gpointer data)
+{
+	gnome_configure_box_with_desktop (NULL, NULL, TRUE);
+}
+
 /* Callback from menus to create a terminal.  If the user creates a terminal
  * from the desktop, he usually wants the cwd to be his home directory, not the
  * desktop directory.
@@ -2884,6 +2890,7 @@ GnomeUIInfo desktop_popup_items[] = {
 	GNOMEUIINFO_ITEM_NONE (N_("Recreate Default _Icons"), NULL, handle_recreate_default_icons),
 	GNOMEUIINFO_SEPARATOR,
 	GNOMEUIINFO_ITEM_NONE (N_("Configure _Background Image"), NULL, set_background_image),
+	GNOMEUIINFO_ITEM_NONE (N_("Des_ktop Properties"), NULL, set_desktop_icons),
 	GNOMEUIINFO_END
 };
 

gnome/gmain.c

@@ -224,6 +224,9 @@ xtoolkit_create_dialog (Dlg_head *h, int flags)
 		else {
 			win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 			gtk_window_set_position (GTK_WINDOW (win), GTK_WIN_POS_MOUSE);
+#ifdef HAVE_GNOME_WINDOW_ICON
+			gnome_window_icon_set_from_default (GTK_WINDOW (win));
+#endif
 		}
 	} else
 		win = 0;
@@ -268,6 +271,9 @@ xtoolkit_get_main_dialog (Dlg_head *h)
 	GtkWidget *win;
 
 	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+#ifdef HAVE_GNOME_WINDOW_ICON
+	gnome_window_icon_set_from_default (GTK_WINDOW (win));
+#endif
 	return (widget_data) win;
 }
 
@@ -278,6 +284,9 @@ x_create_panel_container (int which)
 	GtkWidget *win;
 
 	win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+#ifdef HAVE_GNOME_WINDOW_ICON
+	gnome_window_icon_set_from_default (GTK_WINDOW (win));
+#endif
 	return (widget_data) 0;
 }
 

gnome/gprefs.c

@@ -473,7 +473,9 @@ create_prop_box (PrefsDlg *dlg)
         PrefsPage *cur_page;
 
 	dlg->prop_box = gnome_property_box_new ();
-	gnome_dialog_set_parent (GNOME_DIALOG (dlg->prop_box), GTK_WINDOW (dlg->panel->xwindow));
+	if (dlg->panel)
+		gnome_dialog_set_parent (GNOME_DIALOG (dlg->prop_box), 
+					 GTK_WINDOW (dlg->panel->xwindow));
 	gtk_window_set_modal (GTK_WINDOW (dlg->prop_box), TRUE);
 	gtk_window_set_title (GTK_WINDOW (dlg->prop_box), _("Preferences"));
 
@@ -488,8 +490,10 @@ create_prop_box (PrefsDlg *dlg)
 	dlg->desktop_prefs = desktop_prefs_new (GNOME_PROPERTY_BOX (dlg->prop_box));
 	dlg->desktop_prefs_page = i++;
 
-	dlg->custom_layout = custom_layout_create_page (GNOME_PROPERTY_BOX (dlg->prop_box),
-							dlg->panel);
+	if (dlg->panel)
+		dlg->custom_layout = custom_layout_create_page (
+			GNOME_PROPERTY_BOX (dlg->prop_box), dlg->panel);
+
 	dlg->custom_layout_page = i;
 
         gtk_signal_connect (GTK_OBJECT (dlg->prop_box), "apply",
@@ -499,7 +503,8 @@ create_prop_box (PrefsDlg *dlg)
 }
 
 void
-gnome_configure_box (GtkWidget *widget, WPanel *panel)
+gnome_configure_box_with_desktop (GtkWidget *widget, WPanel *panel, 
+				  gboolean desktop)
 {
 	static PrefsDlg dlg;
 
@@ -507,5 +512,17 @@ gnome_configure_box (GtkWidget *widget, WPanel *panel)
         dlg.prefs_pages = prefs_pages;
 
         create_prop_box (&dlg);
+
+	if (desktop)
+		gtk_notebook_set_page (
+			GTK_NOTEBOOK (GNOME_PROPERTY_BOX (
+				dlg.prop_box)->notebook),
+			dlg.desktop_prefs_page);
         gtk_widget_show (dlg.prop_box);
 }
+
+void
+gnome_configure_box (GtkWidget *widget, WPanel *panel)
+{
+	gnome_configure_box_with_desktop (widget, panel, FALSE);
+}

gnome/gprefs.h

@@ -2,6 +2,7 @@
 #define __GPREFS_H__
 
 void gnome_configure_box (GtkWidget *widget, WPanel *panel);
+void gnome_configure_box_with_desktop (GtkWidget *widget, WPanel *panel, gboolean desktop);
 
 
 #endif

gnome/gscreen.c

@@ -2151,8 +2151,8 @@ panel_create_tree_view (WPanel *panel)
 	GtkWidget *tree;
 
 	tree = gtk_dtree_new ();
-	gtk_ctree_set_line_style (GTK_CTREE (tree), GTK_CTREE_LINES_DOTTED);
-        gtk_ctree_set_expander_style (GTK_CTREE (tree), GTK_CTREE_EXPANDER_SQUARE);
+	/*gtk_ctree_set_line_style (GTK_CTREE (tree), GTK_CTREE_LINES_DOTTED);*/
+        /*gtk_ctree_set_expander_style (GTK_CTREE (tree), GTK_CTREE_EXPANDER_SQUARE);*/
         gtk_ctree_set_indent (GTK_CTREE (tree), 10);
 
 	/* DTree signals */

gnome/gtkdtree.c

@@ -776,7 +776,7 @@ gtk_dtree_construct (GtkDTree *dtree)
 	gtk_clist_set_column_auto_resize (clist, 0, TRUE);
 	gtk_clist_columns_autosize (clist);
 
-	gtk_ctree_set_line_style (ctree, GTK_CTREE_LINES_DOTTED);
+	/*gtk_ctree_set_line_style (ctree, GTK_CTREE_LINES_DOTTED);*/
 	gtk_clist_set_reorderable (GTK_CLIST (ctree), FALSE);
 
 	gdk_dtree_load_pixmaps (dtree);