From 7155754e5d0270fcbcbf8d9152111be7861cc840 Mon Sep 17 00:00:00 2001 From: Marcus Behrendt Date: Fri, 11 Oct 2024 12:30:34 +0200 Subject: [PATCH 1/6] feat(containers-panel): Improve adaptability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit rearranges the controls of the header bar into a bottom bar if space becomes too tight. In addition, a toggle button is used for the selection mode instead of a separate “Cancel” button. --- src/view/containers_panel.rs | 31 +- src/view/containers_panel.ui | 622 +++++++++++++++++------------------ 2 files changed, 333 insertions(+), 320 deletions(-) diff --git a/src/view/containers_panel.rs b/src/view/containers_panel.rs index 2ccad345..b16d9d1c 100644 --- a/src/view/containers_panel.rs +++ b/src/view/containers_panel.rs @@ -59,10 +59,14 @@ mod imp { #[property(get, set = Self::set_container_list, nullable)] pub(super) container_list: glib::WeakRef, #[property(get, set)] + pub(super) collapsed: Cell, + #[property(get, set)] pub(super) show_only_running_containers: Cell, #[template_child] pub(super) main_stack: TemplateChild, #[template_child] + pub(super) toolbar_view: TemplateChild, + #[template_child] pub(super) header_stack: TemplateChild, #[template_child] pub(super) window_title: TemplateChild, @@ -76,6 +80,8 @@ mod imp { pub(super) filter_stack: TemplateChild, #[template_child] pub(super) flow_box: TemplateChild, + #[template_child] + pub(super) overhang_action_bar: TemplateChild, } #[glib::object_subclass] @@ -187,6 +193,7 @@ mod imp { let not_selection_mode_expr = selection_mode_expr.chain_closure::(closure!( |_: Self::Type, selection_mode: bool| { !selection_mode } )); + let collapsed_expr = Self::Type::this_expression("collapsed"); gtk::ClosureExpression::new::>( [ @@ -261,6 +268,28 @@ mod imp { not_selection_mode_expr.bind(&self.search_bar.get(), "visible", Some(obj)); + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + not_selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, not_selection_mode: bool| { + collapsed && not_selection_mode + }), + ) + .bind(&self.overhang_action_bar.get(), "revealed", Some(obj)); + + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, selection_mode: bool| { + collapsed || selection_mode + }), + ) + .bind(&self.toolbar_view.get(), "reveal-bottom-bars", Some(obj)); + let search_filter = gtk::CustomFilter::new(clone!( #[weak] obj, @@ -351,8 +380,6 @@ mod imp { fn on_notify_search_mode_enabled(&self) { if self.search_bar.is_search_mode() { self.search_entry.grab_focus(); - } else { - self.search_entry.set_text(""); } } diff --git a/src/view/containers_panel.ui b/src/view/containers_panel.ui index d6ba3c9e..95aa1616 100644 --- a/src/view/containers_panel.ui +++ b/src/view/containers_panel.ui @@ -1,17 +1,6 @@ - - - _Create Container - containers-panel.create-container - - - _Prune Stopped Containers - containers-panel.prune-unused-containers - - - _Select Visible @@ -31,382 +20,349 @@ - - 180 - 360 - - - - max-width: 400sp - False - False - - - - - - min-width: 400sp - False - - + - + + spinner - - - spinner + + - - - - - - - - Containers - - - - - - - - center - center - 30 - 30 + + + + + Containers - - + + + + + + + center + center + 30 + 30 - + - + - - - containers - - - + + - - + + + containers - - - main + + - - + + - - - - system-search-symbolic - Search - - + + + main - - - containers-panel.create-container - list-add-symbolic - Create Container - - + + - - - containers-panel.prune-unused-containers - eraser5-symbolic - Prune Stopped Containers - - + + + + system-search-symbolic + Search + + - - - overhang-menu - More Actions - - + + + + containers-panel.create-container + list-add-symbolic + Create Container + + - - - Containers - - + + + + containers-panel.prune-unused-containers + eraser5-symbolic + Prune Stopped Containers + + - - - containers-panel.toggle-show-only-running-containers - funnel-symbolic - Show Only Running Containers - - + + + Containers + + - - - containers-panel.enter-selection-mode - selection-mode-symbolic - Multi-Selection - - + + + containers-panel.enter-selection-mode + selection-mode-symbolic + Start Multi-Selection + + + + + + containers-panel.toggle-show-only-running-containers + funnel-symbolic + Show Only Running Containers - + - - - - - selection - - - - - - - containers-panel.exit-selection-mode - Cancel - - + - - - - True - selection-menu - - + + - - - containers-panel.toggle-show-only-running-containers - funnel-symbolic - Show Only Running Containers - - + + + selection + + + + + + + + True + selection-menu + + + + + True + containers-panel.exit-selection-mode + selection-mode-symbolic + Exit Multi-Selection - + - + - - - + + - - - - 28 - - + + + + + + + 28 - - + + - - - list + + - - + + + list - - - 21 - center - True - 5 - 21 - none - start - - 30 - 30 - 36 - 36 + + - - + + + 21 + center + True + 5 + 21 + none + start + + 30 + 30 + 36 + 36 - + - + - - - empty + + - - - package-x-generic-symbolic - No Matching Containers + + + empty - - - - containers-panel.show-all-containers - center - _Show All Containers - True - - + + + package-x-generic-symbolic + No Matching Containers + + + + containers-panel.show-all-containers + center + _Show All Containers + True - + - + - - - - - PdsContainersPanel - - + + - - - 400 - 300 + + + + + PdsContainersPanel + + - - + + + 400 + 300 + + + + True + + + + + containers-panel.kill-selection + skull-symbolic + Kill + center + + + + + + center True + 12 - + - containers-panel.kill-selection - skull-symbolic - Kill + containers-panel.restart-selection + view-refresh-symbolic + Restart center - + - + - center - True - 12 + - + - containers-panel.restart-selection - view-refresh-symbolic - Restart + containers-panel.start-or-resume-selection + Start/Resume center - - - - - - - - - - - containers-panel.start-or-resume-selection - Start/Resume - center - - - - media-playback-start-symbolic - - - - - - - containers-panel.stop-selection - Stop - center - - - - media-playback-stop-symbolic - - + + media-playback-start-symbolic - - + - containers-panel.pause-selection - media-playback-pause-symbolic - Pause + containers-panel.stop-selection + Stop center + + + + media-playback-stop-symbolic + + - + - + - containers-panel.delete-selection - user-trash-symbolic - Delete + containers-panel.pause-selection + media-playback-pause-symbolic + Pause center - + - + + + + + + containers-panel.delete-selection + user-trash-symbolic + Delete + center + + @@ -415,54 +371,84 @@ - + - - + + - - - empty + + + containers-panel.create-container + list-add-symbolic + Create Container + + - - + + + containers-panel.prune-unused-containers + eraser5-symbolic + Prune Stopped Containers + + - - - - - Containers - - + + + containers-panel.toggle-show-only-running-containers + funnel-symbolic + Show Only Running Containers - - - package-x-generic-symbolic - No Containers Available + + - - - - containers-panel.create-container - center - _Create Container - True - - + + + + + + + + empty + + + + + + + + + Containers + + + + + + + + package-x-generic-symbolic + No Containers Available + + + + + containers-panel.create-container + center + _Create Container + True - + - + From 3e3f2f8f1f701b1a1e550d00ec7b17423d7b5e29 Mon Sep 17 00:00:00 2001 From: Marcus Behrendt Date: Fri, 11 Oct 2024 12:30:45 +0200 Subject: [PATCH 2/6] feat(pods-panel): Improve adaptability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit rearranges the controls of the header bar into a bottom bar if space becomes too tight. In addition, a toggle button is used for the selection mode instead of a separate “Cancel” button. --- src/view/pods_panel.rs | 31 ++- src/view/pods_panel.ui | 612 ++++++++++++++++++++--------------------- 2 files changed, 328 insertions(+), 315 deletions(-) diff --git a/src/view/pods_panel.rs b/src/view/pods_panel.rs index d79578c6..4fa9dfab 100644 --- a/src/view/pods_panel.rs +++ b/src/view/pods_panel.rs @@ -58,10 +58,14 @@ mod imp { #[property(get, set = Self::set_pod_list, nullable)] pub(super) pod_list: glib::WeakRef, #[property(get, set)] + pub(super) collapsed: Cell, + #[property(get, set)] pub(super) show_only_running_pods: Cell, #[template_child] pub(super) main_stack: TemplateChild, #[template_child] + pub(super) toolbar_view: TemplateChild, + #[template_child] pub(super) header_stack: TemplateChild, #[template_child] pub(super) window_title: TemplateChild, @@ -75,6 +79,8 @@ mod imp { pub(super) filter_stack: TemplateChild, #[template_child] pub(super) list_box: TemplateChild, + #[template_child] + pub(super) overhang_action_bar: TemplateChild, } #[glib::object_subclass] @@ -181,6 +187,7 @@ mod imp { let not_selection_mode_expr = selection_mode_expr.chain_closure::(closure!( |_: Self::Type, selection_mode: bool| { !selection_mode } )); + let collapsed_expr = Self::Type::this_expression("collapsed"); gtk::ClosureExpression::new::>( [ @@ -253,6 +260,28 @@ mod imp { ))) .bind(&self.selected_pods_button.get(), "label", Some(obj)); + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + not_selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, not_selection_mode: bool| { + collapsed && not_selection_mode + }), + ) + .bind(&self.overhang_action_bar.get(), "revealed", Some(obj)); + + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, selection_mode: bool| { + collapsed || selection_mode + }), + ) + .bind(&self.toolbar_view.get(), "reveal-bottom-bars", Some(obj)); + let search_filter = gtk::CustomFilter::new(clone!( #[weak] obj, @@ -316,8 +345,6 @@ mod imp { fn on_notify_search_mode_enabled(&self) { if self.search_bar.is_search_mode() { self.search_entry.grab_focus(); - } else { - self.search_entry.set_text(""); } } diff --git a/src/view/pods_panel.ui b/src/view/pods_panel.ui index 5736ad64..5ef4024e 100644 --- a/src/view/pods_panel.ui +++ b/src/view/pods_panel.ui @@ -1,17 +1,6 @@ - - - _Create Pod - pods-panel.create-pod - - - _Prune Stopped Pods - pods-panel.prune-pods - - - _Select Visible @@ -31,380 +20,347 @@ - - 180 - 360 + - - max-width: 400sp - False - False - - + + spinner - - - min-width: 400sp - False - - + + - - - - - - spinner - - - - - - - - - Pods - - + + + + + Pods - - - - - center - center - 30 - 30 - - - + + + + + + + center + center + 30 + 30 - + - + - - - pods + + - - + + + pods - - + + - - - main + + - - + + + main - - - - system-search-symbolic - Search - - + + - - - pods-panel.create-pod - list-add-symbolic - Create Pod - - - - - - pods-panel.prune-pods - eraser5-symbolic - Prune Stopped Pods - - + + + + system-search-symbolic + Search + + - - - overhang-menu - More Actions - - + + + + pods-panel.create-pod + list-add-symbolic + Create Pod + + - - - Pods - - + + + + pods-panel.prune-pods + eraser5-symbolic + Prune Stopped Pods + + - - - pods-panel.toggle-show-only-running-pods - funnel-symbolic - Show Only Running Pods - - + + + Pods + + - - - pods-panel.enter-selection-mode - selection-mode-symbolic - Multi-Selection - - + + + pods-panel.enter-selection-mode + selection-mode-symbolic + Start Multi-Selection + + + + + + pods-panel.toggle-show-only-running-pods + funnel-symbolic + Show Only Running Pods - + - - - - - selection - - - - - - - pods-panel.exit-selection-mode - Cancel - - + - - - - True - selection-menu - - + + - - - pods-panel.toggle-show-only-running-pods - funnel-symbolic - Show Only Running Pods - - + + + selection + + + + + + + + True + selection-menu + + + + + True + pods-panel.exit-selection-mode + selection-mode-symbolic + Exit Multi-Selection - + - + - - - + + - - - - 28 - - + + + + + + + 28 - - + + - - - list + + - - - True + + + list - - + + + True - - - - none - - + + + + + + none - + - + - - - empty + + - - - pods-symbolic - No Matching Pods + + + empty - - - - pods-panel.show-all-pods - center - _Show All Pods - True - - + + + pods-symbolic + No Matching Pods + + + + pods-panel.show-all-pods + center + _Show All Pods + True - + - + - - - - - PdsPodsPanel - - + + - - - 400 - 300 + + + + + PdsPodsPanel + + - - + + + 400 + 300 + + + + True + + + + + pods-panel.kill-selection + skull-symbolic + Kill + center + + + + + + center True + 12 - + - pods-panel.kill-selection - skull-symbolic - Kill + pods-panel.restart-selection + view-refresh-symbolic + Restart center - + - + - center - True - 12 + - + - pods-panel.restart-selection - view-refresh-symbolic - Restart + pods-panel.start-or-resume-selection + Start/Resume center - - - - - - - - - - - pods-panel.start-or-resume-selection - Start/Resume - center - - - - media-playback-start-symbolic - - - - - - - pods-panel.stop-selection - Stop - center - - - - media-playback-stop-symbolic - - + + media-playback-start-symbolic - - + - pods-panel.pause-selection - media-playback-pause-symbolic - Pause + pods-panel.stop-selection + Stop center + + + + media-playback-stop-symbolic + + - + - + - pods-panel.delete-selection - user-trash-symbolic - Delete + pods-panel.pause-selection + media-playback-pause-symbolic + Pause center - + - + + + + + + pods-panel.delete-selection + user-trash-symbolic + Delete + center + + @@ -413,54 +369,84 @@ - + - - + + - - - empty + + + pods-panel.create-pod + list-add-symbolic + Create Pod + + - - + + + pods-panel.prune-pods + eraser5-symbolic + Prune Stopped Pods + + - - - - - Pods - - + + + pods-panel.toggle-show-only-running-pods + funnel-symbolic + Show Only Running Pods - - - pods-symbolic - No Pods Available + + - - - - pods-panel.create-pod - center - _Create Pod - True - - + + + + + + + + + empty + + + + + + + + Pods + + + + + + + + pods-symbolic + No Pods Available + + + + + pods-panel.create-pod + center + _Create Pod + True - + - + From a6301ac9e955bab054f751ecf2f99b8c1add933f Mon Sep 17 00:00:00 2001 From: Marcus Behrendt Date: Fri, 11 Oct 2024 12:30:59 +0200 Subject: [PATCH 3/6] feat(images-panel): Improve adaptability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit rearranges the controls of the header bar into a bottom bar if space becomes too tight. In addition, a toggle button is used for the selection mode instead of a separate “Cancel” button. --- src/view/images_panel.rs | 31 ++- src/view/images_panel.ui | 547 +++++++++++++++++++-------------------- 2 files changed, 294 insertions(+), 284 deletions(-) diff --git a/src/view/images_panel.rs b/src/view/images_panel.rs index 0cedc388..7d68b663 100644 --- a/src/view/images_panel.rs +++ b/src/view/images_panel.rs @@ -44,10 +44,14 @@ mod imp { #[property(get, set = Self::set_image_list, nullable)] pub(super) image_list: glib::WeakRef, #[property(get, set)] + pub(super) collapsed: Cell, + #[property(get, set)] pub(super) hide_intermediate_images: Cell, #[template_child] pub(super) main_stack: TemplateChild, #[template_child] + pub(super) toolbar_view: TemplateChild, + #[template_child] pub(super) header_stack: TemplateChild, #[template_child] pub(super) window_title: TemplateChild, @@ -63,6 +67,8 @@ mod imp { pub(super) filter_stack: TemplateChild, #[template_child] pub(super) list_box: TemplateChild, + #[template_child] + pub(super) overhang_action_bar: TemplateChild, } #[glib::object_subclass] @@ -153,6 +159,7 @@ mod imp { let not_selection_mode_expr = selection_mode_expr.chain_closure::(closure!( |_: Self::Type, selection_mode: bool| { !selection_mode } )); + let collapsed_expr = Self::Type::this_expression("collapsed"); gtk::ClosureExpression::new::>( [ @@ -234,6 +241,28 @@ mod imp { not_selection_mode_expr.bind(&self.search_bar.get(), "visible", Some(obj)); + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + not_selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, not_selection_mode: bool| { + collapsed && not_selection_mode + }), + ) + .bind(&self.overhang_action_bar.get(), "revealed", Some(obj)); + + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, selection_mode: bool| { + collapsed || selection_mode + }), + ) + .bind(&self.toolbar_view.get(), "reveal-bottom-bars", Some(obj)); + let search_filter = gtk::CustomFilter::new(clone!( #[weak] obj, @@ -310,8 +339,6 @@ mod imp { fn on_notify_search_mode_enabled(&self) { if self.search_bar.is_search_mode() { self.search_entry.grab_focus(); - } else { - self.search_entry.set_text(""); } } diff --git a/src/view/images_panel.ui b/src/view/images_panel.ui index 5ce511b1..7aaa9c6c 100644 --- a/src/view/images_panel.ui +++ b/src/view/images_panel.ui @@ -22,21 +22,6 @@ - - - _Download - images-panel.pull-image - - - _Build - images-panel.build-image - - - _Prune Unused Images - images-panel.prune-unused-images - - - _Select Visible @@ -56,352 +41,349 @@ - - 180 - 360 - - - - max-width: 400sp - False - False - - - - - - min-width: 400px - False - - + - - - - - spinner + + spinner - - + + - - - - - Images - - + + + + + Images - - - - - center - center - 30 - 30 - - - + + + + + + + center + center + 30 + 30 - + - - - - - images + - - + + - - + + + images - - - main + + - - + + - - - - system-search-symbolic - Search - - + + + main - - - list-add-symbolic - Create Image - create-menu - - + + - - - images-panel.prune-unused-images - eraser5-symbolic - Prune Unused Images - - + + + + system-search-symbolic + Search + + - - - overhang-menu - More Actions - - + + + + list-add-symbolic + Create Image + create-menu + + - - - Images - - + + + + images-panel.prune-unused-images + eraser5-symbolic + Prune Unused Images + + - - - images-panel.toggle-hide-intermediate-images - funnel-symbolic - Show Only Tagged Images - - + + + Images + + - - - images-panel.enter-selection-mode - selection-mode-symbolic - Multi-Selection - - + + + images-panel.enter-selection-mode + selection-mode-symbolic + Start Multi-Selection + + + + + + images-panel.toggle-hide-intermediate-images + funnel-symbolic + Show Only Tagged Images - + - - - - - selection - - - - - - - images-panel.exit-selection-mode - Cancel - - + - - - - True - selection-menu - - + + - - - images-panel.toggle-hide-intermediate-images - funnel-symbolic - Show Only Tagged Images - - + + + selection + + + + + + + + True + selection-menu + + + + + True + images-panel.exit-selection-mode + selection-mode-symbolic + Start Multi-Selection - + - + - - - + + - - - - 28 - - + + + + + + + 28 - - + + - - - list + + - - - True + + + list - - + + + True - - - - none - - + + + + + + none - + - + - - - empty + + - - - image-x-generic-symbolic - No Matching Images + + + empty - - - - images-panel.show-all-images - center - _Show All Images - True - - + + + image-x-generic-symbolic + No Matching Images + + + + images-panel.show-all-images + center + _Show All Images + True - + - + - - - - - PdsImagesPanel - - - - - - - images-panel.delete-selection - Delete - 200 - Delete - center - - + + + + + + + + PdsImagesPanel + + + + + + + images-panel.delete-selection + Delete + 200 + Delete + center + + + + + + + + + + + + list-add-symbolic + Create Image + create-menu + + + + + + images-panel.prune-unused-images + eraser5-symbolic + Prune Unused Images + + + + + images-panel.toggle-hide-intermediate-images + funnel-symbolic + Show Only Tagged Images - + - + - - - empty + + - - + + + empty - - - - - Images - - + + + + + + + + Images - + + + + + + + image-x-generic-symbolic + No Images Available - - image-x-generic-symbolic - No Images Available + + 1 + 336 - - 1 - 336 + + min-width: 500sp + horizontal + + + + + + vertical + 18 + center - - min-width: 500sp - horizontal + + + images-panel.pull-image + True + center + _Download Image + True - - vertical - 18 - center - - - - - images-panel.pull-image - True - center - _Download Image - True - - - - - - - images-panel.build-image - True - center - _Build Image - True - - - + + + images-panel.build-image + True + center + _Build Image + True @@ -412,15 +394,16 @@ - + - + + From 827127454490721cb88acc58364ac6a6d47ea3d0 Mon Sep 17 00:00:00 2001 From: Marcus Behrendt Date: Fri, 11 Oct 2024 12:31:22 +0200 Subject: [PATCH 4/6] feat(volumes-panel): Improve adaptability MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit rearranges the controls of the header bar into a bottom bar if space becomes too tight. In addition, a toggle button is used for the selection mode instead of a separate “Cancel” button. --- src/view/volumes_panel.rs | 31 ++- src/view/volumes_panel.ui | 506 ++++++++++++++++++-------------------- 2 files changed, 275 insertions(+), 262 deletions(-) diff --git a/src/view/volumes_panel.rs b/src/view/volumes_panel.rs index 742c3626..7289cc84 100644 --- a/src/view/volumes_panel.rs +++ b/src/view/volumes_panel.rs @@ -43,10 +43,14 @@ mod imp { #[property(get, set = Self::set_volume_list, explicit_notify, nullable)] pub(super) volume_list: glib::WeakRef, #[property(get, set)] + pub(super) collapsed: Cell, + #[property(get, set)] pub(super) show_only_used_volumes: Cell, #[template_child] pub(super) main_stack: TemplateChild, #[template_child] + pub(super) toolbar_view: TemplateChild, + #[template_child] pub(super) header_stack: TemplateChild, #[template_child] pub(super) window_title: TemplateChild, @@ -60,6 +64,8 @@ mod imp { pub(super) filter_stack: TemplateChild, #[template_child] pub(super) list_box: TemplateChild, + #[template_child] + pub(super) overhang_action_bar: TemplateChild, } #[glib::object_subclass] @@ -147,6 +153,7 @@ mod imp { let not_selection_mode_expr = selection_mode_expr.chain_closure::(closure!( |_: Self::Type, selection_mode: bool| { !selection_mode } )); + let collapsed_expr = Self::Type::this_expression("collapsed"); gtk::ClosureExpression::new::>( [ @@ -221,6 +228,28 @@ mod imp { not_selection_mode_expr.bind(&self.search_bar.get(), "visible", Some(obj)); + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + not_selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, not_selection_mode: bool| { + collapsed && not_selection_mode + }), + ) + .bind(&self.overhang_action_bar.get(), "revealed", Some(obj)); + + gtk::ClosureExpression::new::( + [ + collapsed_expr.upcast_ref(), + selection_mode_expr.upcast_ref(), + ], + closure!(|_: Self::Type, collapsed: bool, selection_mode: bool| { + collapsed || selection_mode + }), + ) + .bind(&self.toolbar_view.get(), "reveal-bottom-bars", Some(obj)); + let search_filter = gtk::CustomFilter::new(clone!( #[weak] obj, @@ -287,8 +316,6 @@ mod imp { fn on_notify_search_mode_enabled(&self) { if self.search_bar.is_search_mode() { self.search_entry.grab_focus(); - } else { - self.search_entry.set_text(""); } } diff --git a/src/view/volumes_panel.ui b/src/view/volumes_panel.ui index 511ac8ca..365585f5 100644 --- a/src/view/volumes_panel.ui +++ b/src/view/volumes_panel.ui @@ -1,17 +1,6 @@ - - - _Create Volume - volumes-panel.create-volume - - - _Prune Volumes - volumes-panel.prune-volumes - - - _Select Visible @@ -31,328 +20,325 @@ - - 180 - 360 + - - max-width: 400sp - False - False - - - - - - min-width: 400sp - False - - - - - - - - - spinner + + spinner - - + + - - - - - Volumes - - - - - - - - center - center - 30 - 30 + + + + + Volumes - - + - + + + + + center + center + 30 + 30 + + - - - - - volumes - - - - - - - - - - main + - - + + - - - - system-search-symbolic - Search - - + + + volumes - - - volumes-panel.create-volume - list-add-symbolic - Create Volume - - + + - - - volumes-panel.prune-volumes - eraser5-symbolic - Prune Volumes - - + + - - - overhang-menu - More Actions - - + + + main - - - Volumes - - + + - - - volumes-panel.toggle-show-only-used-volumes - funnel-symbolic - Show Only Used Volumes - - + + + + system-search-symbolic + Search + + + + + + + volumes-panel.create-volume + list-add-symbolic + Create Volume + + + + + + + volumes-panel.prune-volumes + eraser5-symbolic + Prune Volumes + + - - - volumes-panel.enter-selection-mode - selection-mode-symbolic - Multi-Selection - - + + + Volumes + + + + + volumes-panel.enter-selection-mode + selection-mode-symbolic + Start Multi-Selection + + + + + + + volumes-panel.toggle-show-only-used-volumes + funnel-symbolic + Show Only Used Volumes - + - - - - - selection - - - - - - - volumes-panel.exit-selection-mode - Cancel - - - - - - - True - selection-menu - - + - - - volumes-panel.toggle-show-only-used-volumes - funnel-symbolic - Show Only Used Volumes - - + + + + + selection + + + + + + + + True + selection-menu + + + + + + True + volumes-panel.exit-selection-mode + selection-mode-symbolic + Exit Multi-Selection - + - + - - - + + - - - - 28 - - + + + + + + + 28 - - + + - - - list + + - - - True + + + list - - + + + True - - - - none - - + + + + + + none - + - - - - - empty - - - - drive-harddisk-symbolic - No Matching Volumes + - - - - volumes-panel.show-all-volumes - center - _Show All Volumes - True - - + + + + + empty + + + + drive-harddisk-symbolic + No Matching Volumes + + + + + volumes-panel.show-all-volumes + center + _Show All Volumes + True - + - + - - - - - PdsVolumesPanel - - - - - - - volumes-panel.delete-selection - Delete - 200 - Delete - center - - + + + + + + + + PdsVolumesPanel + + + + + + + volumes-panel.delete-selection + Delete + 200 + Delete + center + + + + + + + + + + + volumes-panel.create-volume + list-add-symbolic + Create Volume + + + + + + volumes-panel.prune-volumes + eraser5-symbolic + Prune Volumes + + + + + + volumes-panel.toggle-show-only-used-volumes + funnel-symbolic + Show Only Used Volumes - + - + - - - empty + + - - + + + empty - - - - - Volumes - - + + + + + + + + Volumes - + + + - - - drive-harddisk-symbolic - No Volumes Available - - - - - volumes-panel.create-volume - center - _Create Volume - True - - + + + drive-harddisk-symbolic + No Volumes Available + + + + volumes-panel.create-volume + center + _Create Volume + True - + - + From 724fb49f2fd4f4ec219b8d492f10972460aca8cf Mon Sep 17 00:00:00 2001 From: Marcus Behrendt Date: Fri, 11 Oct 2024 12:32:47 +0200 Subject: [PATCH 5/6] feat(client-view): Collapse panels if space is too tight --- src/view/client_view.ui | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/view/client_view.ui b/src/view/client_view.ui index ab328728..8a9ee539 100644 --- a/src/view/client_view.ui +++ b/src/view/client_view.ui @@ -15,7 +15,7 @@ - min-width: 600sp + min-width: 668sp False @@ -256,6 +256,7 @@ containers + PdsClientView @@ -271,6 +272,7 @@ pods + PdsClientView @@ -286,6 +288,7 @@ images + PdsClientView @@ -301,6 +304,7 @@ volumes + PdsClientView From b7f9f8756775e869fb17ef05f4799179dab5917f Mon Sep 17 00:00:00 2001 From: Marcus Behrendt Date: Fri, 11 Oct 2024 12:39:24 +0200 Subject: [PATCH 6/6] docs(appdata): Update changelog --- data/com.github.marhkb.Pods.metainfo.xml.in.in | 1 + 1 file changed, 1 insertion(+) diff --git a/data/com.github.marhkb.Pods.metainfo.xml.in.in b/data/com.github.marhkb.Pods.metainfo.xml.in.in index 89780409..0a6f8203 100644 --- a/data/com.github.marhkb.Pods.metainfo.xml.in.in +++ b/data/com.github.marhkb.Pods.metainfo.xml.in.in @@ -45,6 +45,7 @@
  • The search entry to a toggle button in the headerbar. (#830)
  • Search is now possible in the connection chooser page. (#830)
    • +
  • The control elements of the header bar are now moved to a lower bar if space becomes too tight. (#837)