Merge pull request #689 from mjakeman/gnome-47

GNOME 47
mjakeman · Oct 25, 2024 · a463aca · a463aca
2 parents c82ed2f + 70a3d42
commit a463aca
Show file tree

Hide file tree

Showing 8 changed files with 64 additions and 64 deletions.
diff --git a/build-aux/com.mattjakeman.ExtensionManager.json b/build-aux/com.mattjakeman.ExtensionManager.json
@@ -1,7 +1,7 @@
 {
     "id" : "com.mattjakeman.ExtensionManager",
     "runtime" : "org.gnome.Platform",
-    "runtime-version" : "46",
+    "runtime-version" : "47",
     "sdk" : "org.gnome.Sdk",
     "command" : "extension-manager",
     "finish-args" : [
@@ -57,12 +57,14 @@
             "name" : "text-engine",
             "builddir" : true,
             "buildsystem" : "meson",
+            "config-opts" : [
+                "--libdir=/app/lib"
+            ],
             "sources" : [
                 {
                     "type" : "git",
                     "url" : "https://github.com/mjakeman/text-engine.git",
-                    "commit" : "379437b2b589a9414985dec9136b7b48bae76f9e",
-                    "tag" : "v0.1.0"
+                    "branch" : "master"
                 }
             ]
         },

diff --git a/src/exm-browse-page.blp b/src/exm-browse-page.blp
@@ -56,10 +56,9 @@ template $ExmBrowsePage: Gtk.Widget {
             Gtk.StackPage {
               name: "page_spinner";
 
-              child: Gtk.Spinner {
+              child: Adw.Spinner {
                 valign: center;
                 halign: center;
-                spinning: true;
                 height-request: 32;
                 width-request: 32;
               };
@@ -70,22 +69,28 @@ template $ExmBrowsePage: Gtk.Widget {
 
               child: Gtk.Box {
                 orientation: vertical;
+                spacing: 12;
 
                 Gtk.ListBox search_results {
                   styles [
                     "boxed-list"
                   ]
 
-                  valign: start;
                   selection-mode: none;
                 }
 
-                Gtk.Button more_results_btn {
-                  label: _("_Load More Results");
-                  halign: center;
-                  margin-top: 24;
-                  use-underline: true;
-                  clicked => $on_load_more_results();
+                Gtk.ListBox more_results_list {
+                  styles [
+                    "boxed-list"
+                  ]
+
+                  selection-mode: none;
+
+                  Adw.ButtonRow more_results_btn {
+                    title: _("_Load More Results");
+                    use-underline: true;
+                    activated => $on_load_more_results();
+                  }
                 }
               };
             }

diff --git a/src/exm-browse-page.c b/src/exm-browse-page.c
@@ -56,7 +56,8 @@ struct _ExmBrowsePage
     GtkListBox          *search_results;
     GtkStack            *search_stack;
     GtkDropDown         *search_dropdown;
-    GtkButton           *more_results_btn;
+    GtkListBox          *more_results_list;
+    AdwButtonRow        *more_results_btn;
 };
 
 G_DEFINE_FINAL_TYPE (ExmBrowsePage, exm_browse_page, GTK_TYPE_WIDGET)
@@ -146,7 +147,7 @@ static void
 update_load_more_btn (ExmBrowsePage *self)
 {
     // Hide button if we are the last page
-    gtk_widget_set_visible (GTK_WIDGET (self->more_results_btn), self->current_page != self->max_pages);
+    gtk_widget_set_visible (GTK_WIDGET (self->more_results_list), self->current_page != self->max_pages);
 
     // Make it clickable
     gtk_widget_set_sensitive (GTK_WIDGET (self->more_results_btn), TRUE);
@@ -231,7 +232,7 @@ on_next_page_result (GObject       *source,
 }
 
 static void
-on_load_more_results (GtkButton     *btn,
+on_load_more_results (AdwButtonRow  *row,
                       ExmBrowsePage *self)
 {
     const char *query;
@@ -390,6 +391,7 @@ exm_browse_page_class_init (ExmBrowsePageClass *klass)
     gtk_widget_class_bind_template_child (widget_class, ExmBrowsePage, search_results);
     gtk_widget_class_bind_template_child (widget_class, ExmBrowsePage, search_stack);
     gtk_widget_class_bind_template_child (widget_class, ExmBrowsePage, search_dropdown);
+    gtk_widget_class_bind_template_child (widget_class, ExmBrowsePage, more_results_list);
     gtk_widget_class_bind_template_child (widget_class, ExmBrowsePage, more_results_btn);
 
     gtk_widget_class_bind_template_callback (widget_class, on_search_entry_realize);

diff --git a/src/exm-comment-dialog.blp b/src/exm-comment-dialog.blp
@@ -1,15 +1,14 @@
 using Gtk 4.0;
 using Adw 1;
 
-template $ExmCommentDialog : Adw.Dialog {
+template $ExmCommentDialog: Adw.Dialog {
   content-width: 600;
   content-height: 600;
   width-request: 360;
   height-request: 294;
   title: _("Comments");
 
   child: Adw.ToolbarView {
-
     [top]
     Adw.HeaderBar {}
 
@@ -26,15 +25,19 @@ template $ExmCommentDialog : Adw.Dialog {
               spacing: 12;
               valign: center;
 
-              Gtk.Spinner {
-                spinning: true;
+              Adw.Spinner {
+                halign: center;
+                valign: center;
                 height-request: 32;
                 width-request: 32;
               }
 
               Gtk.Label {
-              	styles["title-2"]
-              	label: _("Loading Comments");
+                styles [
+                  "title-2"
+                ]
+
+                label: _("Loading Comments");
               }
             };
           }
@@ -43,7 +46,10 @@ template $ExmCommentDialog : Adw.Dialog {
             name: "page_error";
 
             child: Adw.StatusPage {
-              styles ["content"]
+              styles [
+                "content"
+              ]
+
               title: _("An Error Occurred");
               icon-name: "dialog-question-symbolic";
             };
@@ -53,7 +59,11 @@ template $ExmCommentDialog : Adw.Dialog {
             name: "page_comments";
 
             child: Gtk.ListBox list_box {
-              styles ["content", "boxed-list"]
+              styles [
+                "content",
+                "boxed-list"
+              ]
+
               valign: start;
               selection-mode: none;
             };

diff --git a/src/exm-detail-view.blp b/src/exm-detail-view.blp
@@ -37,9 +37,10 @@ template $ExmDetailView: Adw.NavigationPage {
             spacing: 24;
             valign: center;
 
-            Gtk.Spinner {
-              spinning: true;
+            Adw.Spinner {
               focusable: true;
+              halign: center;
+              valign: center;
               height-request: 32;
               width-request: 32;
 

diff --git a/src/exm-upgrade-assistant.blp b/src/exm-upgrade-assistant.blp
@@ -72,9 +72,10 @@ template $ExmUpgradeAssistant: Adw.Dialog {
           spacing: 12;
           valign: center;
 
-          Gtk.Spinner {
-            spinning: true;
+          Adw.Spinner {
             focusable: true;
+            halign: center;
+            valign: center;
             height-request: 32;
             width-request: 32;
           }

diff --git a/src/exm-window.blp b/src/exm-window.blp
@@ -115,6 +115,7 @@ Adw.AlertDialog unsupported_dialog {
   body: _("This extension does not support your GNOME Shell version. It may cause errors if installed.");
   default-response: "back";
   close-response: "back";
+  prefer-wide-layout: true;
 
   responses [
     install: _("_Install Anyway") destructive,

diff --git a/src/style.css b/src/style.css
@@ -16,7 +16,7 @@
 
 .tint {
   /* Dark view_bg_color */
-  background-color: rgba(30, 30, 30, 1);
+  background-color: rgb(30 30 30);
   color: white;
 }
 
@@ -38,7 +38,7 @@
 }
 
 rating {
-  color: @yellow_4;
+  color: var(--yellow-4);
 }
 
 .info-bar.horizontal > :not(:first-child),
@@ -62,50 +62,28 @@ rating {
 }
 
 .author-badge {
-	background-color: @blue_3;
-	border-radius: 999px;
-	color: @white_1;
-	margin-left: 6px;
-	padding: 2px 6px;
+  background-color: var(--accent-color);
+  border-radius: 999px;
+  color: var(--window-bg-color);
+  margin-left: 6px;
+  padding: 2px 6px;
 }
 
-/* Progress Bar Colours */
-progressbar.error progress {
-    background-color: @red_1;
-}
-
-progressbar.error text {
-    color: @red_1;
-    opacity: 0.8;
-}
-
-progressbar.warning progress {
-    background-color: @yellow_4;
-}
-
-progressbar.warning text {
-    color: @window_fg_color;
-}
-
-progressbar.success progress {
-    background-color: @green_1;
-}
-
-progressbar.success text {
-    color: @green_1;
-    opacity: 0.8;
+progressbar text {
+  font-size: 14px;
+  font-weight: bold;
 }
 
 /* Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5309 */
 .boxed-list-placeholder > row:nth-last-child(2),
 .boxed-list-placeholder > row.expander:nth-last-child(2):not(:checked) > box > list > row.header,
 .boxed-list-placeholder > row.expander:nth-last-child(2) > box > revealer > list.nested > row:last-child {
-    border-bottom: 0;
-    border-bottom-left-radius: 12px;
-    border-bottom-right-radius: 12px;
+  border-bottom: 0;
+  border-bottom-left-radius: 12px;
+  border-bottom-right-radius: 12px;
 }
 
 .boxed-list-placeholder > row.expander:nth-last-child(2) > box > revealer > list.nested {
-    border-bottom-left-radius: 12px;
-    border-bottom-right-radius: 12px;
+  border-bottom-left-radius: 12px;
+  border-bottom-right-radius: 12px;
 }