Index: plugins/actions/actions.c =================================================================== --- plugins/actions/actions.c (revision 21729) +++ plugins/actions/actions.c (working copy) @@ -376,33 +376,29 @@ static void actions_properties_dialog (XfcePanelPlugin *plugin, Action *action) { - GtkWidget *dlg, *header, *vbox, *hbox, *label, *box; + GtkWidget *dlg, *vbox, *hbox, *label, *box; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Panel Actions")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (actions_dialog_response), action); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("Panel Actions")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_widget_show (vbox); Index: plugins/separator/separator.c =================================================================== --- plugins/separator/separator.c (revision 21729) +++ plugins/separator/separator.c (working copy) @@ -248,33 +248,29 @@ static void separator_properties_dialog (XfcePanelPlugin *plugin) { - GtkWidget *dlg, *header, *vbox, *tb; + GtkWidget *dlg, *vbox, *tb; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Separator or Spacing")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (separator_dialog_response), plugin); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("Separator or Spacing")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_widget_show (vbox); Index: plugins/iconbox/iconbox.c =================================================================== --- plugins/iconbox/iconbox.c (revision 21729) +++ plugins/iconbox/iconbox.c (working copy) @@ -779,33 +779,29 @@ static void iconbox_properties_dialog (XfcePanelPlugin *plugin, Iconbox *iconbox) { - GtkWidget *dlg, *header, *vbox, *cb; + GtkWidget *dlg, *vbox, *cb; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Icon Box")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (iconbox_dialog_response), iconbox); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("Icon Box")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_widget_show (vbox); Index: plugins/launcher/launcher-dialog.c =================================================================== --- plugins/launcher/launcher-dialog.c (revision 21729) +++ plugins/launcher/launcher-dialog.c (working copy) @@ -1294,7 +1294,7 @@ launcher_properties_dialog (XfcePanelPlugin *plugin, LauncherPlugin * launcher) { LauncherDialog *ld; - GtkWidget *header, *vbox, *hbox; + GtkWidget *vbox, *hbox; ld = g_new0 (LauncherDialog, 1); @@ -1304,27 +1304,23 @@ xfce_panel_plugin_block_menu (ld->plugin); - ld->dlg = gtk_dialog_new_with_buttons (_("Properties"), + ld->dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (ld->dlg), + _("Program Launcher")); g_object_set_data (G_OBJECT (plugin), "dialog", ld->dlg); g_object_set_data (G_OBJECT (plugin), "launcher-dialog", ld); gtk_window_set_position (GTK_WINDOW (ld->dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (ld->dlg), GTK_STOCK_PROPERTIES); gtk_container_set_border_width (GTK_CONTAINER (ld->dlg), 2); - header = xfce_create_header (NULL, _("Program Launcher")); - 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 (ld->dlg)->vbox), header, - FALSE, TRUE, 0); - launcher_dialog_add_explanation (GTK_BOX (GTK_DIALOG (ld->dlg)->vbox)); hbox = gtk_hbox_new (FALSE, BORDER); Index: plugins/windowlist/windowlist-dialog.c =================================================================== --- plugins/windowlist/windowlist-dialog.c (revision 21729) +++ plugins/windowlist/windowlist-dialog.c (working copy) @@ -92,11 +92,11 @@ } static void -windowlist_properties_response (GtkWidget *dialog, +windowlist_properties_response (GtkWidget *dlg, int response, WindowlistDialog *wd) { - gtk_widget_destroy (dialog); + gtk_widget_destroy (dlg); xfce_panel_plugin_unblock_menu (wd->wl->plugin); @@ -109,7 +109,7 @@ { WindowlistDialog *wd; - GtkWidget *dialog, *header, *vbox, *vbox2, *frame, *hbox, + GtkWidget *dlg, *vbox, *vbox2, *frame, *hbox, *alignment, *label, *button, *image; wd = g_new0 (WindowlistDialog, 1); @@ -118,27 +118,25 @@ xfce_panel_plugin_block_menu (wd->wl->plugin); - dialog = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); - gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER); - gtk_container_set_border_width (GTK_CONTAINER (dialog), 2); - gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_PROPERTIES); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Window List")); + + gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); - header = xfce_create_header (NULL, _("Window List")); - gtk_widget_set_size_request (GTK_BIN (header)->child, -1, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), BORDER - 2); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), header, - FALSE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); vbox = gtk_vbox_new (FALSE, BORDER); gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER - 2); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); - + /* Urgency help */ hbox = gtk_hbox_new (FALSE, 6); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0); @@ -248,8 +246,8 @@ G_CALLBACK (windowlist_button_toggled), wd); /* Show Dialog */ - g_signal_connect (dialog, "response", + g_signal_connect (dlg, "response", G_CALLBACK (windowlist_properties_response), wd); - gtk_widget_show_all (dialog); + gtk_widget_show_all (dlg); } Index: plugins/clock/clock.c =================================================================== --- plugins/clock/clock.c (revision 21729) +++ plugins/clock/clock.c (working copy) @@ -401,33 +401,29 @@ static void clock_properties_dialog (XfcePanelPlugin *plugin, Clock *clock) { - GtkWidget *dlg, *header, *frame, *bin, *vbox, *cb; + GtkWidget *dlg, *frame, *bin, *vbox, *cb; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Clock")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (clock_dialog_response), clock); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("Clock")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - frame = xfce_create_framebox (_("Appearance"), &bin); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); gtk_widget_show (frame); Index: plugins/pager/pager.c =================================================================== --- plugins/pager/pager.c (revision 21729) +++ plugins/pager/pager.c (working copy) @@ -277,34 +277,30 @@ static void pager_properties_dialog (XfcePanelPlugin *plugin, Pager *pager) { - GtkWidget *dlg, *header, *vbox, *hbox, *label, *spin; + GtkWidget *dlg, *vbox, *hbox, *label, *spin; int max; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Pager")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (pager_dialog_response), pager); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("Pager")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_widget_show (vbox); Index: plugins/systray/systray.c =================================================================== --- plugins/systray/systray.c (revision 21729) +++ plugins/systray/systray.c (working copy) @@ -371,33 +371,29 @@ static void systray_properties_dialog (XfcePanelPlugin *plugin, Systray *systray) { - GtkWidget *dlg, *header, *vbox, *cb; + GtkWidget *dlg, *vbox, *cb; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("System Tray")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (systray_dialog_response), systray); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("System Tray")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - vbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_widget_show (vbox); Index: plugins/tasklist/tasklist.c =================================================================== --- plugins/tasklist/tasklist.c (revision 21729) +++ plugins/tasklist/tasklist.c (working copy) @@ -377,34 +377,30 @@ static void tasklist_properties_dialog (XfcePanelPlugin *plugin, Tasklist *tasklist) { - GtkWidget *dlg, *header, *mainvbox, *vbox, *frame, *cb, + GtkWidget *dlg, *mainvbox, *vbox, *frame, *cb, *hbox, *label, *spin; xfce_panel_plugin_block_menu (plugin); - dlg = gtk_dialog_new_with_buttons (_("Properties"), + dlg = xfce_titled_dialog_new_with_buttons (_("Properties"), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (plugin))), - GTK_DIALOG_DESTROY_WITH_PARENT | - GTK_DIALOG_NO_SEPARATOR, + GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_NO_SEPARATOR, GTK_STOCK_CLOSE, GTK_RESPONSE_OK, NULL); + + xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dlg), + _("Task List")); g_object_set_data (G_OBJECT (plugin), "dialog", dlg); gtk_window_set_position (GTK_WINDOW (dlg), GTK_WIN_POS_CENTER); + gtk_window_set_icon_name (GTK_WINDOW (dlg), GTK_STOCK_PROPERTIES); g_signal_connect (dlg, "response", G_CALLBACK (tasklist_dialog_response), tasklist); gtk_container_set_border_width (GTK_CONTAINER (dlg), 2); - header = xfce_create_header (NULL, _("Task List")); - gtk_widget_set_size_request (GTK_BIN (header)->child, 200, 32); - gtk_container_set_border_width (GTK_CONTAINER (header), 6); - gtk_widget_show (header); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), header, - FALSE, TRUE, 0); - mainvbox = gtk_vbox_new (FALSE, 8); gtk_container_set_border_width (GTK_CONTAINER (mainvbox), 5); gtk_widget_show (mainvbox);