[Xfce4-commits] r26482 - xfwm4/trunk/mcs-plugin

[Jean-François Wauthy]

Author: pollux
Date: 2007-12-15 17:37:27 +0000 (Sat, 15 Dec 2007)
New Revision: 26482

Modified:
   xfwm4/trunk/mcs-plugin/workspaces.c
   xfwm4/trunk/mcs-plugin/workspaces.h
   xfwm4/trunk/mcs-plugin/workspaces_plugin.c
   xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c
Log:
* use XfceTitledDialog instead of xfce_create_header
* fix a multiscreen bug by giving a parent to the edit workspace 
name dialog


Modified: xfwm4/trunk/mcs-plugin/workspaces.c
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces.c	2007-12-15 16:38:37 UTC (rev 26481)
+++ xfwm4/trunk/mcs-plugin/workspaces.c	2007-12-15 17:37:27 UTC (rev 26482)
@@ -60,6 +60,8 @@
 static GtkWidget *treeview;
 static int treerows;
 
+static GtkDialog *parent_dialog;
+
 enum
 {
     NUMBER_COLUMN,
@@ -321,24 +323,22 @@
 edit_name_dialog (GtkTreeModel * model, GtkTreeIter * iter,
     int number, const char *name, McsManager * manager)
 {
-    GtkWidget *dialog, *mainvbox, *header, *hbox, *label, *entry;
+    GtkWidget *dialog, *mainvbox, *hbox, *label, *entry;
     char title[512];
     int response;
     const char *tmp;
 
-    dialog = gtk_dialog_new_with_buttons (_("Change name"), NULL,
+    dialog = xfce_titled_dialog_new_with_buttons (_("Change name"), GTK_WINDOW (parent_dialog),
         GTK_DIALOG_NO_SEPARATOR,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_APPLY, GTK_RESPONSE_OK, NULL);
-
+    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_EDIT);
     gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 
     mainvbox = GTK_DIALOG (dialog)->vbox;
 
     sprintf (title, _("Workspace %d"), number);
-    header = xfce_create_header (NULL, title);
-    gtk_widget_show (header);
-    gtk_box_pack_start (GTK_BOX (mainvbox), header, TRUE, FALSE, 0);
+    xfce_titled_dialog_set_subtitle (XFCE_TITLED_DIALOG (dialog), title);
 
     hbox = gtk_hbox_new (FALSE, BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (hbox), BORDER);
@@ -504,10 +504,12 @@
 }
 
 void
-add_workspaces_page (GtkBox * box)
+add_workspaces_page (GtkDialog * dialog, GtkBox * box)
 {
     GtkWidget *frame, *vbox;
 
+    parent_dialog = dialog;
+    
     /* Number of workspaces */
     vbox = gtk_vbox_new (FALSE, BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);

Modified: xfwm4/trunk/mcs-plugin/workspaces.h
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces.h	2007-12-15 16:38:37 UTC (rev 26481)
+++ xfwm4/trunk/mcs-plugin/workspaces.h	2007-12-15 17:37:27 UTC (rev 26482)
@@ -26,7 +26,7 @@
 
 void create_workspaces_channel (McsPlugin * mcs_plugin);
 
-void add_workspaces_page (GtkBox *box);
+void add_workspaces_page (GtkDialog *dialog, GtkBox *box);
 
 #endif  /* INC_WORKSPACES_H */
 

Modified: xfwm4/trunk/mcs-plugin/workspaces_plugin.c
===================================================================
--- xfwm4/trunk/mcs-plugin/workspaces_plugin.c	2007-12-15 16:38:37 UTC (rev 26481)
+++ xfwm4/trunk/mcs-plugin/workspaces_plugin.c	2007-12-15 17:37:27 UTC (rev 26482)
@@ -158,7 +158,7 @@
     vbox = gtk_vbox_new (FALSE, BORDER);
     gtk_container_set_border_width (GTK_CONTAINER (vbox), BORDER);
     gtk_widget_show (vbox);
-    add_workspaces_page (GTK_BOX (vbox));
+    add_workspaces_page (GTK_DIALOG (dialog), GTK_BOX (vbox));
     gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, gtk_label_new (_("Workspaces")));
 
     wm_name = gdk_x11_screen_get_window_manager_name (gdk_screen_get_default ());

Modified: xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c
===================================================================
--- xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c	2007-12-15 16:38:37 UTC (rev 26481)
+++ xfwm4/trunk/mcs-plugin/xfwm4_shortcuteditor.c	2007-12-15 17:37:27 UTC (rev 26482)
@@ -116,8 +116,6 @@
     GtkWidget *hbox;
     GtkWidget *label;
     GtkWidget *entry;
-    GtkWidget *header_image;
-    GtkWidget *header;
     GtkTreeSelection *selection;
     GtkTreeModel *model;
     GtkTreeIter iter;
@@ -131,15 +129,12 @@
     FILE *new_theme;
     FILE *default_theme;
 
-    dialog = gtk_dialog_new_with_buttons (_("Add keybinding theme"), GTK_WINDOW (itf->xfwm4_dialog),
+    dialog = xfce_titled_dialog_new_with_buttons (_("Add keybinding theme"), GTK_WINDOW (itf->xfwm4_dialog),
         GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
+    gtk_window_set_icon_name (GTK_WINDOW (dialog), GTK_STOCK_ADD);
 
-    header_image = gtk_image_new_from_stock (GTK_STOCK_ADD, GTK_ICON_SIZE_LARGE_TOOLBAR);
-    header = xfce_create_header_with_image (header_image, _("Add keybinding theme"));
-    gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), header, FALSE, FALSE, 0);
-
     hbox = gtk_hbox_new (FALSE, BORDER);
     label = gtk_label_new (_("Enter a name for the theme:"));
     entry = gtk_entry_new ();