use style classes for dialog buttons (#257)

Author: NikoKrause

shell/ev-annotation-properties-dialog.c

@@ -131,16 +131,17 @@ ev_annotation_properties_dialog_init (EvAnnotationPropertiesDialog *annot_dialog
 	GtkWidget *label;
 	GtkWidget *grid;
 	GtkWidget *hbox;
+	GtkWidget *button;
 	gchar     *markup;
         const GdkRGBA yellow = { 1., 1., 0., 1. };
 
 	gtk_window_set_title (GTK_WINDOW (annot_dialog), _("Annotation Properties"));
 	gtk_window_set_destroy_with_parent (GTK_WINDOW (annot_dialog), TRUE);
 	gtk_container_set_border_width (GTK_CONTAINER (annot_dialog), 5);
-	gtk_dialog_add_buttons (dialog,
-				GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
-				GTK_STOCK_APPLY, GTK_RESPONSE_APPLY,
-				NULL);
+	gtk_dialog_add_button (dialog, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
+	button = gtk_dialog_add_button (dialog, GTK_STOCK_APPLY, GTK_RESPONSE_APPLY);
+
+	gtk_style_context_add_class (gtk_widget_get_style_context (button), GTK_STYLE_CLASS_SUGGESTED_ACTION);
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_APPLY);
 
 	content_area = gtk_dialog_get_content_area (dialog);

shell/ev-password-view.c

@@ -147,6 +147,7 @@ ev_password_view_init (EvPasswordView *password_view)
 	gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
 	button = gtk_button_new_with_mnemonic (_("_Unlock Document"));
+	gtk_style_context_add_class (gtk_widget_get_style_context (button), GTK_STYLE_CLASS_SUGGESTED_ACTION);
 	g_signal_connect (button, "clicked", G_CALLBACK (ev_password_view_clicked_cb), password_view);
 	gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
 
@@ -189,15 +190,15 @@ ev_password_dialog_got_response (GtkDialog      *dialog,
 				 EvPasswordView *password_view)
 {
 	gtk_widget_set_sensitive (GTK_WIDGET (password_view), TRUE);
-	
+
 	if (response_id == GTK_RESPONSE_OK) {
 		g_free (password_view->priv->password);
 		password_view->priv->password =
 			g_strdup (gtk_entry_get_text (GTK_ENTRY (password_view->priv->password_entry)));
-		
+
 		g_signal_emit (password_view, password_view_signals[UNLOCK], 0);
 	}
-	
+
 	gtk_widget_destroy (GTK_WIDGET (dialog));
 }
 
@@ -207,7 +208,7 @@ ev_password_dialog_remember_button_toggled (GtkToggleButton *button,
 {
 	if (gtk_toggle_button_get_active (button)) {
 		gpointer data;
-		
+
 		data = g_object_get_data (G_OBJECT (button), "password-save");
 		password_view->priv->password_save = GPOINTER_TO_INT (data);
 	}
@@ -240,10 +241,11 @@ ev_password_view_ask_password (EvPasswordView *password_view)
 	GtkWidget *hbox, *main_vbox, *vbox, *icon;
 	GtkWidget *grid;
 	GtkWidget *label;
+	GtkWidget *button;
 	gchar     *text, *markup, *file_name;
 
 	gtk_widget_set_sensitive (GTK_WIDGET (password_view), FALSE);
-	
+
 	dialog = GTK_DIALOG (gtk_dialog_new ());
 	content_area = gtk_dialog_get_content_area (dialog);
 	action_area = gtk_dialog_get_action_area (dialog);
@@ -260,10 +262,10 @@ ev_password_view_ask_password (EvPasswordView *password_view)
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), password_view->priv->parent_window);
 	gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
 
-	gtk_dialog_add_buttons (dialog,
-				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-				_("_Unlock Document"), GTK_RESPONSE_OK,
-				NULL);
+	gtk_dialog_add_button (dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+	button = gtk_dialog_add_button (dialog, _("_Unlock Document"), GTK_RESPONSE_OK);
+
+	gtk_style_context_add_class (gtk_widget_get_style_context (button), GTK_STYLE_CLASS_SUGGESTED_ACTION);
 	gtk_dialog_set_default_response (dialog, GTK_RESPONSE_OK);
 	gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
 					   GTK_RESPONSE_OK, FALSE);
@@ -343,7 +345,7 @@ ev_password_view_ask_password (EvPasswordView *password_view)
 	gtk_grid_attach (GTK_GRID (grid), password_view->priv->password_entry, 1, 0, 1, 1);
 	gtk_widget_set_hexpand (password_view->priv->password_entry, TRUE);
 	gtk_widget_show (password_view->priv->password_entry);
-	
+
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label),
 				       password_view->priv->password_entry);
 
@@ -396,7 +398,7 @@ ev_password_view_ask_password (EvPasswordView *password_view)
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (ev_password_dialog_got_response),
 			  password_view);
-	
+
 	gtk_widget_show (GTK_WIDGET (dialog));
 }
 

shell/ev-properties-dialog.c

@@ -55,7 +55,8 @@ ev_properties_dialog_class_init (EvPropertiesDialogClass *properties_class)
 static void
 ev_properties_dialog_init (EvPropertiesDialog *properties)
 {
-	GtkBox *content_area;
+	GtkBox    *content_area;
+	GtkWidget *button;
 
 	content_area = GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (properties)));
 
@@ -64,9 +65,11 @@ ev_properties_dialog_init (EvPropertiesDialog *properties)
 	gtk_container_set_border_width (GTK_CONTAINER (properties), 5);
 	gtk_box_set_spacing (content_area, 2);
 
-	gtk_dialog_add_button (GTK_DIALOG (properties), GTK_STOCK_CLOSE,
+	button = gtk_dialog_add_button (GTK_DIALOG (properties), GTK_STOCK_CLOSE,
 			       GTK_RESPONSE_CANCEL);
-	gtk_dialog_set_default_response (GTK_DIALOG (properties), 
+	gtk_style_context_add_class (gtk_widget_get_style_context (button),
+				     GTK_STYLE_CLASS_DESTRUCTIVE_ACTION);
+	gtk_dialog_set_default_response (GTK_DIALOG (properties),
 			                 GTK_RESPONSE_CANCEL);
 
 	properties->notebook = gtk_notebook_new ();

shell/ev-window.c

@@ -3522,6 +3522,7 @@ ev_window_check_document_modified (EvWindow *ev_window)
 {
     EvDocument  *document = ev_window->priv->document;
     GtkWidget   *dialog;
+    GtkWidget   *button;
     gchar       *text, *markup;
     const gchar *secondary_text;
 
@@ -3559,14 +3560,12 @@ ev_window_check_document_modified (EvWindow *ev_window)
     gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
             "%s", secondary_text);
 
-    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-            _("Close _without Saving"),
-            GTK_RESPONSE_NO,
-            GTK_STOCK_CANCEL,
-            GTK_RESPONSE_CANCEL,
-            _("Save a _Copy"),
-            GTK_RESPONSE_YES,
-            NULL);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close _without Saving"), GTK_RESPONSE_NO);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+    button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Save a _Copy"), GTK_RESPONSE_YES);
+
+    gtk_style_context_add_class (gtk_widget_get_style_context (button),
+                                 GTK_STYLE_CLASS_SUGGESTED_ACTION);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
 
     g_signal_connect (dialog, "response",
@@ -3612,6 +3611,7 @@ static gboolean
 ev_window_check_print_queue (EvWindow *ev_window)
 {
     GtkWidget *dialog;
+    GtkWidget *button;
     gchar     *text, *markup;
     gint       n_print_jobs;
 
@@ -3657,14 +3657,12 @@ ev_window_check_print_queue (EvWindow *ev_window)
             _("If you close the window, pending print "
                     "jobs will not be printed."));
 
-    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-            _("Cancel _print and Close"),
-            GTK_RESPONSE_NO,
-            GTK_STOCK_CANCEL,
-            GTK_RESPONSE_CANCEL,
-            _("Close _after Printing"),
-            GTK_RESPONSE_YES,
-            NULL);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), _("Cancel _print and Close"), GTK_RESPONSE_NO);
+    gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+    button = gtk_dialog_add_button (GTK_DIALOG (dialog), _("Close _after Printing"), GTK_RESPONSE_YES);
+
+    gtk_style_context_add_class (gtk_widget_get_style_context (button),
+                                 GTK_STYLE_CLASS_DESTRUCTIVE_ACTION);
     gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_YES);
 
     g_signal_connect (dialog, "response",