[Goodies-commits] r2298 - in xfce4-systemload-plugin/trunk: . panel-plugin

[Mike Massonnet]

Author: mmassonnet
Date: 2007-01-05 01:33:21 +0000 (Fri, 05 Jan 2007)
New Revision: 2298

Modified:
   xfce4-systemload-plugin/trunk/ChangeLog
   xfce4-systemload-plugin/trunk/panel-plugin/systemload.c
Log:
	* panel-plugin/systemload.c(monitor_create_options): use xfce titled
	  dialog for the options.

Modified: xfce4-systemload-plugin/trunk/ChangeLog
===================================================================
--- xfce4-systemload-plugin/trunk/ChangeLog	2007-01-05 01:15:52 UTC (rev 2297)
+++ xfce4-systemload-plugin/trunk/ChangeLog	2007-01-05 01:33:21 UTC (rev 2298)
@@ -1,3 +1,8 @@
+2007-01-05 Mike Massonnet
+
+	* panel-plugin/systemload.c(monitor_create_options): use xfce titled
+	  dialog for the options.
+
 2005-01-15 11:53  ricpersi
 
 	* aclocal.m4, compile, config.guess, config.sub, configure.ac,

Modified: xfce4-systemload-plugin/trunk/panel-plugin/systemload.c
===================================================================
--- xfce4-systemload-plugin/trunk/panel-plugin/systemload.c	2007-01-05 01:15:52 UTC (rev 2297)
+++ xfce4-systemload-plugin/trunk/panel-plugin/systemload.c	2007-01-05 01:33:21 UTC (rev 2298)
@@ -753,27 +753,20 @@
 
     xfce_panel_plugin_block_menu (plugin);
     
-    dlg = gtk_dialog_new_with_buttons (_("Properties"), 
-                GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))),
-                GTK_DIALOG_DESTROY_WITH_PARENT |
-                GTK_DIALOG_NO_SEPARATOR,
-                GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
-                NULL);
+    dlg = xfce_titled_dialog_new_with_buttons (_("System Load Monitor"), NULL,
+                                               GTK_DIALOG_DESTROY_WITH_PARENT |
+                                               GTK_DIALOG_NO_SEPARATOR,
+                                               GTK_STOCK_CLOSE, GTK_RESPONSE_OK,
+                                               NULL);
     
     global->opt_dialog = dlg;
 
+    gtk_window_set_icon_name (GTK_WINDOW (dlg), "xfce4-settings");
     g_signal_connect (dlg, "response", G_CALLBACK (monitor_dialog_response),
                       global);
 
     gtk_container_set_border_width (GTK_CONTAINER (dlg), 2);
     
-    header = xfce_create_header (NULL, _("System Load Monitor"));
-    gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32);
-    gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2);
-    gtk_widget_show (header);
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header,
-                        FALSE, TRUE, 0);
-    
     global_vbox = GTK_BOX (gtk_vbox_new(FALSE, BORDER));
     gtk_container_set_border_width (GTK_CONTAINER (global_vbox), BORDER - 2);
     gtk_widget_show(GTK_WIDGET (global_vbox));