Merge pull request #717 from marhkb/feat/gnome-45

feat: Updates for GNOME 45

Cargo.toml

@@ -1,33 +1,31 @@
 [package]
 name = "pods"
-version = "1.3.0-dev"
+version = "2.0.0-dev"
 authors = ["Marcus Behrendt <[email protected]>"]
 edition = "2021"
 
 [dependencies]
-adw = { version = "0.3", package = "libadwaita", features = ["v1_3"] }
+adw = { git = "https://gitlab.gnome.org/World/Rust/libadwaita-rs", package = "libadwaita", features = ["v1_4"] }
 anyhow = "1"
-ashpd = { version = "0.4", default-features = false, features = ["gtk4", "tokio"] }
+ashpd = { git = "https://github.com/bilelmoussaoui/ashpd.git", default-features = false, features = ["gtk4", "tokio"] }
 futures = { version = "0.3", default-features = false }
 gettext-rs = { version = "0.7", features = ["gettext-system"] }
-gtk = { version = "0.6", package = "gtk4", features = ["gnome_44"] }
-indexmap = { version = "1", features = ["serde"] }
+gtk = { git = "https://github.com/gtk-rs/gtk4-rs.git", package = "gtk4", features = ["gnome_45"] }
+indexmap = { version = "2", features = ["serde"] }
 log = "0.4"
 names = { version = "0.14", default-features = false }
-once_cell = "1"
-oo7 = { version = "0.1", default-features = false, features = ["native_crypto", "tokio"] }
-panel = { version = "0.2", package = "libpanel" }
+oo7 = { version = "0.2", default-features = false, features = ["native_crypto", "tokio"] }
+panel = { git = "https://gitlab.gnome.org/World/Rust/libpanel-rs.git", package = "libpanel", features = ["adw_v1_2"] }
 paste = "1"
 podman-api = { git = "https://github.com/vv9k/podman-api-rs.git", commit = "363d945b9b9905c50dfa0bfe0f9331f9fdeef079", default-features = false }
-regex = "1"
 serde = "1"
 serde_json = "1"
-sourceview5 = "0.6"
+sourceview5 = { git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs.git", features = ["gtk_v4_12"] }
 syslog = "6"
 tokio = "1"
-tokio-tar = "0.3"
+tokio-tar = { version = "0.3", default-features = false }
 vte = { version = "0.11", default-features = false }
-vte4 = "0.6"
+vte4 = { git = "https://gitlab.gnome.org/World/Rust/vte4-rs.git" }
 
 [profile.release]
 lto = true

README.md

@@ -28,7 +28,8 @@
 <br>
 
 <p align="center">
-  <img src="data/resources/screenshots/preview.png" alt="Preview"/>
+  <img src="data/screenshots/preview_light.png#gh-light-mode-only" alt="Preview"/>
+  <img src="data/screenshots/preview_dark.png#gh-dark-mode-only" alt="Preview"/>
 </p>
 
 Pods is a frontend for podman. It uses libadwaita for its user interface and strives to meet the design principles of GNOME.

build-aux/com.github.marhkb.Pods.Devel.json

@@ -1,11 +1,11 @@
 {
     "id": "com.github.marhkb.Pods.Devel",
     "runtime": "org.gnome.Platform",
-    "runtime-version": "44",
+    "runtime-version": "45",
     "sdk": "org.gnome.Sdk",
     "sdk-extensions": [
         "org.freedesktop.Sdk.Extension.rust-stable",
-        "org.freedesktop.Sdk.Extension.llvm15"
+        "org.freedesktop.Sdk.Extension.llvm16"
     ],
     "command": "pods",
     "finish-args": [
@@ -21,7 +21,7 @@
         "--filesystem=xdg-run/podman:ro"
     ],
     "build-options": {
-        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm15/bin",
+        "append-path": "/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm16/bin",
         "env": {
             "CARGO_REGISTRIES_CRATES_IO_PROTOCOL": "sparse",
             "CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER": "clang",
@@ -62,7 +62,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/libpanel.git",
-                    "tag": "1.2.0"
+                    "tag": "1.4.0"
                 }
             ]
         },
@@ -81,7 +81,7 @@
                 {
                     "type": "git",
                     "url": "https://gitlab.gnome.org/GNOME/vte.git",
-                    "tag": "0.72.1"
+                    "tag": "0.74.0"
                 }
             ]
         },

data/com.github.marhkb.Pods.gschema.xml.in

@@ -36,9 +36,9 @@
       <summary>The last used view</summary>
       <description></description>
     </key>
-    <key name="show-intermediate-images" type="b">
+    <key name="hide-intermediate-images" type="b">
       <default>false</default>
-      <summary>Whether to show intermediate images</summary>
+      <summary>Whether to hide intermediate images</summary>
       <description></description>
     </key>
     <key name="last-used-container-file-path" type="s">

data/com.github.marhkb.Pods.metainfo.xml.in.in

@@ -26,16 +26,16 @@
   </description>
   <screenshots>
     <screenshot type="default">
-      <image>https://github.com/marhkb/pods/raw/main/data/resources/screenshots/screenshot1.png</image>
-      <caption>Images Overview</caption>
+      <image>https://github.com/marhkb/pods/raw/main/data/screenshots/screenshot1_dark.png</image>
+      <caption>Container Overview</caption>
     </screenshot>
     <screenshot>
-      <image>https://github.com/marhkb/pods/raw/main/data/resources/screenshots/screenshot2.png</image>
-      <caption>Containers Overview</caption>
+      <image>https://github.com/marhkb/pods/raw/main/data/screenshots/screenshot2_dark.png</image>
+      <caption>Containers Details in Compact Mode</caption>
     </screenshot>
     <screenshot>
-      <image>https://github.com/marhkb/pods/raw/main/data/resources/screenshots/screenshot3.png</image>
-      <caption>Pods Overview</caption>
+      <image>https://github.com/marhkb/pods/raw/main/data/screenshots/screenshot3_dark.png</image>
+      <caption>Search Results</caption>
     </screenshot>
   </screenshots>
   <url type="homepage">https://github.com/marhkb/pods</url>

data/resources/resources.gresource.xml

@@ -3,12 +3,14 @@
   <gresource prefix="/com/github/marhkb/Pods/">
     <file preprocess="xml-stripblanks">assets/welcome.svg</file>
 
-    <file compressed="true" preprocess="xml-stripblanks" alias="gtk/help-overlay.ui">ui/shortcuts.ui</file>
-
+    <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/about-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/arrow1-right-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/bell-outline-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/build-configure-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/code-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/cross-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/eraser5-symbolic.svg</file>
+    <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/funnel-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/get-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/hospital-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/memory-symbolic.svg</file>
@@ -23,7 +25,6 @@
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/stacked-plates-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/uppercase-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/whole-word-symbolic.svg</file>
-    <file compressed="true" preprocess="xml-stripblanks">icons/scalable/status/bell-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/status/degraded-pod-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/status/error-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/status/local-connection-symbolic.svg</file>
@@ -32,7 +33,5 @@
     <file compressed="true">style.css</file>
     <file compressed="true">style-dark.css</file>
     <file compressed="true">style-hc.css</file>
-
-    <file>glsl/mask.glsl</file>
   </gresource>
 </gresources>

data/resources/style-dark.css

@@ -11,7 +11,9 @@
 }
 
 .container-status-running,
-.pod-status-running {
+.pod-status-running,
+.image-used,
+.volume-used {
 	color: @blue_1;
 	background-color: alpha(@blue_2, .35);
 }

data/resources/style-hc.css

@@ -6,6 +6,7 @@
   font-weight: bold;
 }
 
+.version,
 .container-status-configured,
 .container-status-created,
 .container-status-exited,
@@ -15,6 +16,8 @@
 .pod-status-created,
 .pod-status-exited,
 .pod-status-stopped,
+.image-unused,
+.volume-unused,
 .container-health-status-checking,
 .container-health-status-unconfigured,
 .rich-expander-row-header #badge {
@@ -35,7 +38,9 @@
 }
 
 .container-status-running,
-.pod-status-running {
+.pod-status-running,
+.image-used,
+.volume-used {
   background-color: @accent_bg_color;
   color: @accent_fg_color;
 }

data/resources/style.css

@@ -1,14 +1,5 @@
-.flat-headerbar-content scrollbar.vertical {
-  /* The size a typical headerbar takes: 46px + 1px for the bottom border. */
-  margin-top: 47px;
-
-  /* Relevant for scrollbars without .overlay-indicator. */
-  background: none;
-  box-shadow: none;
-}
-
-.flat-headerbar-normal-scrollbar scrollbar.vertical {
-  margin-top: 0;
+.navigation-sidebar .list-separator {
+  margin: -12px 0;
 }
 
 .text-box textview {
@@ -19,6 +10,11 @@
   border-radius: 9999px;
 }
 
+.circle-big {
+  border-radius: 9999px;
+  padding: 8px;
+}
+
 .dim-icon {
   color: alpha(@window_fg_color, .75);
 }
@@ -28,8 +24,14 @@ entry button {
   padding: 0 3px;
 }
 
+button.medium {
+  padding: 6px;
+  -gtk-icon-size: 24px;
+}
+
 button.large {
   padding: 9px;
+  -gtk-icon-size: 24px;
 }
 
 .action-bar {
@@ -40,6 +42,47 @@ button.large {
   color: @destructive_color;
 }
 
+.sidebar-row {
+  margin: 12px 6px;
+}
+
+actionsbutton .action-count-mask {
+  background-color: @headerbar_bg_color;
+  border-radius: 9999px;
+  margin-left: 10px;
+  padding: 7px;
+}
+
+actionsbutton .action-count-badge {
+  border-radius: 9999px;
+  font-feature-settings: "tnum";
+  font-size: x-small;
+  font-weight: bold;
+  margin-top: 1px;
+  margin-left: 10px;
+  padding: 6px;
+}
+
+actionsbutton.good .action-count-badge {
+  background-color: @accent_bg_color;
+  color: @accent_fg_color;
+}
+
+actionsbutton.finished .action-count-badge {
+  background-color: @success_bg_color;
+  color: @success_fg_color;
+}
+
+actionsbutton.cancelled .action-count-badge {
+  background-color: @warning_bg_color;
+  color: @warning_fg_color;
+}
+
+actionsbutton.failed .action-count-badge {
+  background-color: @error_bg_color;
+  color: @error_fg_color;
+}
+
 connectionswitcher row #selection-indicator #background,
 actionssidebar #type {
   background-color: @shade_color;
@@ -100,18 +143,28 @@ connectionchooserpage connectionswitcher row {
 }
 
 .status-badge {
-  font-size: 0.8em;
+  font-size: 0.9em;
   font-weight: bold;
   min-width: 1.7em;
   border-radius: 9999px;
   padding: 5px 7px;
 }
 
+.status-badge-small {
+  font-size: small;
+  font-weight: bold;
+  font-feature-settings: "tnum";
+  min-width: 10px;
+  border-radius: 9999px;
+  padding: 1px 4px;
+}
+
 .repo-tags-small {
   background-color: transparent;
   margin: 0 0 -4px -2px;
 }
 
+.version,
 .container-status-configured,
 .container-status-created,
 .container-status-exited,
@@ -122,6 +175,8 @@ connectionchooserpage connectionswitcher row {
 .pod-status-created,
 .pod-status-exited,
 .pod-status-stopped,
+.image-unused,
+.volume-unused,
 .container-health-status-checking,
 .container-health-status-unconfigured,
 .rich-expander-row-header #badge {
@@ -142,7 +197,9 @@ connectionchooserpage connectionswitcher row {
 }
 
 .container-status-running,
-.pod-status-running {
+.pod-status-running,
+.image-used,
+.volume-used {
   color: @blue_4;
   background-color: alpha(@blue_3, .25);
 }

meson.build

@@ -1,7 +1,7 @@
 project(
   'pods',
   'rust',
-  version: '1.3.0-dev',
+  version: '2.0.0-dev',
   meson_version: '>= 0.59',
   license: 'GPL3+',
 )
@@ -13,8 +13,8 @@ base_id = 'com.github.marhkb.Pods'
 
 dependency('glib-2.0', version: '>= 2.66')
 dependency('gio-2.0', version: '>= 2.66')
-dependency('gtk4', version: '>= 4.10.0')
-dependency('libadwaita-1', version: '>= 1.3')
+dependency('gtk4', version: '>= 4.12.0')
+dependency('libadwaita-1', version: '>= 1.4')
 dependency('libpanel-1', version: '>= 1.2.0')
 dependency('gtksourceview-5', version: '>= 4.90')
 dependency('vte-2.91-gtk4', version: '>= 0.70.0')