Merge pull request #783 from mjakeman/refresh-error-dialog

error-dialog: Refresh style

Author: oscfdezdz

src/exm-comment-tile.blp

@@ -3,22 +3,23 @@ using Gtk 4.0;
 template $ExmCommentTile: Gtk.Widget {
   Gtk.Box {
     orientation: vertical;
+    spacing: 6;
 
     Gtk.Box {
       orientation: horizontal;
 
       Gtk.Label author {
         styles [
-          "heading"
+          "heading",
         ]
 
-        xalign: 0;
         label: bind template.comment as <$ExmComment>.author;
+        xalign: 0;
       }
 
       Gtk.Label author_badge {
         styles [
-          "author-badge"
+          "author-badge",
         ]
 
         label: _("Author");
@@ -35,11 +36,10 @@ template $ExmCommentTile: Gtk.Widget {
 
     Gtk.Label {
       styles [
-        "multiline"
+        "multiline",
       ]
 
       label: bind template.comment as <$ExmComment>.comment;
-      margin-top: 6;
       use-markup: true;
       wrap: true;
       wrap-mode: word_char;
@@ -48,10 +48,9 @@ template $ExmCommentTile: Gtk.Widget {
 
     Gtk.Label date {
       styles [
-        "dim-label"
+        "dim-label",
       ]
 
-      margin-top: 6;
       xalign: 0;
     }
   }

src/exm-error-dialog.blp

@@ -2,91 +2,84 @@ using Gtk 4.0;
 using Adw 1;
 
 template $ExmErrorDialog: Adw.Window {
-  default-width: 450;
-  default-height: 450;
+  default-width: 500;
+  default-height: 500;
   title: _("Error Report");
 
   Adw.ToolbarView {
     [top]
     Adw.HeaderBar {}
 
-    content: Gtk.Box {
-      styles [
-        "content"
-      ]
-
-      orientation: vertical;
-      spacing: 12;
-
-      Gtk.Image {
-        icon-name: "dialog-error-symbolic";
-        icon-size: large;
-        focusable: true;
-
-        accessibility {
-          labelled-by: title;
-          described-by: instructions;
+    content: Adw.ToastOverlay toast_overlay {
+      child: Adw.PreferencesPage {
+        Adw.PreferencesGroup {
+          Gtk.Label {
+            styles [
+              "title-4",
+            ]
+
+            justify: center;
+            label: _("An unexpected error occurred in Extension Manager");
+            selectable: true;
+            wrap: true;
+          }
         }
-      }
-
-      Gtk.Label title {
-        styles [
-          "heading"
-        ]
-
-        label: _("An unexpected error occurred in Extension Manager");
-        wrap: true;
-      }
-
-      Gtk.Label instructions {
-        xalign: 0;
-        wrap: true;
-      }
-
-      Gtk.ScrolledWindow {
-        styles [
-          "card"
-        ]
-
-        overflow: hidden;
-        vexpand: true;
-
-        child: Gtk.TextView text_view {
-          wrap-mode: word_char;
-          editable: false;
-          vexpand: true;
-          top-margin: 12;
-          left-margin: 12;
-          right-margin: 12;
-          bottom-margin: 12;
-          monospace: true;
-        };
-      }
-
-      Gtk.Box {
-        orientation: horizontal;
-        homogeneous: true;
-        halign: center;
-        spacing: 6;
-
-        Gtk.Button copy_button {
-          can-shrink: true;
-          label: _("_Copy to Clipboard");
-          use-underline: true;
-          clicked => $on_copy_button_clicked();
-        }
-
-        Gtk.Button new_issue_button {
-          styles [
-            "suggested-action"
-          ]
 
-          can-shrink: true;
-          label: _("_New Issue");
-          use-underline: true;
-          clicked => $on_new_issue_button_clicked() swapped;
+        Adw.PreferencesGroup instructions {
+          header-suffix: Gtk.Button copy_button {
+            styles [
+              "flat",
+            ]
+
+            clicked => $on_copy_button_clicked();
+            icon-name: "edit-copy-symbolic";
+            tooltip-text: _("Copy to Clipboard");
+            valign: center;
+          };
+
+          Gtk.ScrolledWindow {
+            styles [
+              "card",
+            ]
+
+            overflow: hidden;
+            vexpand: true;
+
+            child: Gtk.TextView text_view {
+              styles [
+                "inline",
+              ]
+
+              bottom-margin: 12;
+              editable: false;
+              left-margin: 12;
+              monospace: true;
+              right-margin: 12;
+              top-margin: 12;
+              vexpand: true;
+              wrap-mode: word_char;
+
+              accessibility {
+                labelled-by: instructions;
+              }
+            };
+          }
+
+          Gtk.Button new_issue_button {
+            styles [
+              "pill",
+              "suggested-action",
+            ]
+
+            can-shrink: true;
+            clicked => $on_new_issue_button_clicked() swapped;
+            halign: center;
+            label: _("_New Issue");
+            margin-top: 12;
+            use-underline: true;
+          }
         }
-      }
+      };
     };
   }
 }

src/exm-error-dialog.c

@@ -28,9 +28,10 @@ struct _ExmErrorDialog
 {
     AdwWindow parent_instance;
 
+    AdwToastOverlay *toast_overlay;
+    AdwPreferencesGroup *instructions;
     char *error_string;
     GtkTextView *text_view;
-    GtkLabel *instructions;
     GtkButton *new_issue_button;
 };
 
@@ -108,8 +109,8 @@ exm_error_dialog_set_property (GObject      *object,
 }
 
 static void
-on_copy_button_clicked (GtkButton      *button,
-                        ExmErrorDialog *window)
+on_copy_button_clicked (GtkButton      *button G_GNUC_UNUSED,
+                        ExmErrorDialog *self)
 {
     GdkDisplay *display;
     GdkClipboard *clipboard;
@@ -118,19 +119,19 @@ on_copy_button_clicked (GtkButton      *button,
     display = gdk_display_get_default ();
     clipboard = gdk_display_get_clipboard (display);
 
-    gdk_clipboard_set_text (clipboard, window->error_string);
+    gdk_clipboard_set_text (clipboard, self->error_string);
 
     // Success indicator
-    gtk_button_set_label (button, _("Copied"));
-    gtk_widget_set_sensitive (GTK_WIDGET (button), FALSE);
+    adw_toast_overlay_add_toast (self->toast_overlay, adw_toast_new (_("Copied")));
 }
 
 static void
-on_new_issue_button_clicked (ExmErrorDialog *window)
+on_new_issue_button_clicked (GtkButton      *button G_GNUC_UNUSED,
+                             ExmErrorDialog *self)
 {
     GtkUriLauncher *uri = gtk_uri_launcher_new ("https://github.com/mjakeman/extension-manager/issues");
 
-    gtk_uri_launcher_launch (uri, GTK_WINDOW (window), NULL, NULL, NULL);
+    gtk_uri_launcher_launch (uri, GTK_WINDOW (self), NULL, NULL, NULL);
 }
 
 static void
@@ -154,8 +155,9 @@ exm_error_dialog_class_init (ExmErrorDialogClass *klass)
 
     gtk_widget_class_set_template_from_resource (widget_class, g_strdup_printf ("%s/exm-error-dialog.ui", RESOURCE_PATH));
 
-    gtk_widget_class_bind_template_child (widget_class, ExmErrorDialog, text_view);
+    gtk_widget_class_bind_template_child (widget_class, ExmErrorDialog, toast_overlay);
     gtk_widget_class_bind_template_child (widget_class, ExmErrorDialog, instructions);
+    gtk_widget_class_bind_template_child (widget_class, ExmErrorDialog, text_view);
     gtk_widget_class_bind_template_child (widget_class, ExmErrorDialog, new_issue_button);
 
     gtk_widget_class_bind_template_callback (widget_class, on_copy_button_clicked);
@@ -167,15 +169,13 @@ exm_error_dialog_init (ExmErrorDialog *self)
 {
     gtk_widget_init_template (GTK_WIDGET (self));
 
-    gtk_label_set_use_markup (self->instructions, TRUE);
-
 #if IS_OFFICIAL
-    gtk_label_set_text (self->instructions, _("Please open a new issue and attach the following information:"));
+    adw_preferences_group_set_description (self->instructions, _("Please open a new issue and attach the following information:"));
     gtk_widget_set_visible (GTK_WIDGET (self->new_issue_button), TRUE);
 #else
     // Translators: '%s' = Name of Distributor (e.g. "Packager123")
     char *text = g_markup_printf_escaped (_("You are using a third-party build of Extension Manager. Please <span weight=\"bold\">contact the package distributor (%s) first</span> before filing an issue. Be sure to attach the following information:"), PKG_DISTRIBUTOR);
-    gtk_label_set_markup (self->instructions, text);
+    adw_preferences_group_set_description (self->instructions, text);
     gtk_widget_set_visible (GTK_WIDGET (self->new_issue_button), FALSE);
     g_free (text);
 #endif

src/exm-upgrade-assistant.blp

@@ -23,7 +23,7 @@ template $ExmUpgradeAssistant: Adw.Dialog {
           content: Adw.Clamp {
             child: Gtk.Box {
               styles [
-                "detail"
+                "detail",
               ]
 
               orientation: vertical;
@@ -50,13 +50,7 @@ template $ExmUpgradeAssistant: Adw.Dialog {
                   wrap: true;
                 }
 
-                Gtk.ListBox {
-                  styles [
-                    "boxed-list"
-                  ]
-
-                  selection-mode: none;
-
+                Adw.PreferencesGroup {
                   Adw.ComboRow drop_down {
                     title: "GNOME";
                   }
@@ -66,7 +60,7 @@ template $ExmUpgradeAssistant: Adw.Dialog {
               Gtk.Button run_button {
                 styles [
                   "pill",
-                  "suggested-action"
+                  "suggested-action",
                 ]
 
                 label: _("_Check Compatibility");
@@ -141,7 +135,7 @@ template $ExmUpgradeAssistant: Adw.Dialog {
                   Gtk.ListBox user_list_box {
                     styles [
                       "boxed-list",
-                      "boxed-list-placeholder"
+                      "boxed-list-placeholder",
                     ]
 
                     selection-mode: none;
@@ -168,7 +162,7 @@ template $ExmUpgradeAssistant: Adw.Dialog {
                   Gtk.ListBox system_list_box {
                     styles [
                       "boxed-list",
-                      "boxed-list-placeholder"
+                      "boxed-list-placeholder",
                     ]
 
                     selection-mode: none;

src/style.css

@@ -1,7 +1,3 @@
-.content {
-  margin: 24px 12px;
-}
-
 .detail {
   margin: 24px;
 }