Merge pull request #778 from marhkb/feat/container-card

feat(containers-panel): Show cards instead of rows
marhkb · Jan 3, 2024 · fafd444 · fafd444
2 parents 8315589 + 45b12e1
commit fafd444
Show file tree

Hide file tree

Showing 16 changed files with 1,382 additions and 284 deletions.
diff --git a/data/com.github.marhkb.Pods.metainfo.xml.in.in b/data/com.github.marhkb.Pods.metainfo.xml.in.in
@@ -47,6 +47,7 @@
         <p>Pods 2.1.0 contains the following changes:</p>
         <p>Features</p>
         <ul>
+          <li>Containers are now represented by cards in the container panel. (#778)</li>
           <li>
             The image search has been completely revised and is now much more streamlined.
             In addition, the tags of an image are suggested. (#758)

diff --git a/data/resources/icons/scalable/actions/pod-circle-symbolic.svg b/data/resources/icons/scalable/actions/pod-circle-symbolic.svg
diff --git a/data/resources/resources.gresource.xml b/data/resources/resources.gresource.xml
@@ -16,7 +16,6 @@
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/memory-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/merge-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/pip-out-symbolic.svg</file>
-    <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/pod-circle-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/pods-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/processor-symbolic.svg</file>
     <file compressed="true" preprocess="xml-stripblanks">icons/scalable/actions/put-symbolic.svg</file>
@@ -36,5 +35,6 @@
     <file compressed="true">style.css</file>
     <file compressed="true">style-dark.css</file>
     <file compressed="true">style-hc.css</file>
+    <file compressed="true">style-hc-dark.css</file>
   </gresource>
 </gresources>
diff --git a/data/resources/style-dark.css b/data/resources/style-dark.css
@@ -1,3 +1,7 @@
+containercard separator {
+	background-color: @window_bg_color;
+}
+
 .container-status-paused,
 .pod-status-paused {
 	color: @brown_1;

diff --git a/data/resources/style-hc-dark.css b/data/resources/style-hc-dark.css
@@ -0,0 +1,7 @@
+containercard separator {
+	background-color: @borders;
+}
+
+containercard.not-running {
+	background-color: transparent;
+}
diff --git a/data/resources/style-hc.css b/data/resources/style-hc.css
@@ -1,3 +1,7 @@
+containercard.not-running {
+	background-color: @sidebar_bg_color;
+}
+
 .dim-icon {
   color: #ffffff;
 }

diff --git a/data/resources/style.css b/data/resources/style.css
@@ -1,3 +1,7 @@
+containercard.not-running {
+  background-color: @secondary_sidebar_bg_color;
+}
+
 flowbox > flowboxchild {
   padding: 0;
 }
@@ -153,6 +157,13 @@ connectionchooserpage connectionrow {
   padding: 1px 4px;
 }
 
+.status-badge-normal {
+  font-weight: bold;
+  min-width: 1.7em;
+  border-radius: 9999px;
+  padding: 5px 7px;
+}
+
 .repo-tags-small {
   background-color: transparent;
   margin: 0 0 -4px -2px;

diff --git a/src/main.rs b/src/main.rs
@@ -187,6 +187,7 @@ fn init() {
     view::ConnectionCustomInfoDialog::static_type();
     view::ConnectionRow::static_type();
     view::ConnectionsSidebar::static_type();
+    view::ContainerCard::static_type();
     view::ContainerCommitPage::static_type();
     view::ContainerFilesGetPage::static_type();
     view::ContainerFilesPutPage::static_type();

diff --git a/src/resources.gresource.xml b/src/resources.gresource.xml
@@ -12,6 +12,7 @@
     <file compressed="true" preprocess="xml-stripblanks">view/connection_custom_info_dialog.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">view/connection_row.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">view/connections_sidebar.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">view/container_card.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">view/container_commit_page.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">view/container_creation_page.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">view/container_details_page.ui</file>