morgan/warehouse
1
0
Fork 0
mirror of https://github.com/morgan9e/warehouse synced 2026-04-14 00:04:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

Clean up code and remove unneeded button

Browse Source
This commit is contained in:
Heliguy
2024-09-22 14:09:55 -04:00
parent 549778a99b
commit 9b6405a73c
4 changed files with 46 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/install_page/install_page.blp
View File

@@ -9,11 +9,6 @@ template $InstallPage : Adw.BreakpointBin {
condition ("max-width: 600")
setters {
// split_view.collapsed: true;
// split_view.show-content: false;
// results_action_bar.visible: true;
// pending_action_bar.visible: true;
// pending_page.child: null;
multi_view.layout: skinny;
}
}
@@ -21,80 +16,62 @@ template $InstallPage : Adw.BreakpointBin {
Adw.NavigationPage {
title: _("Install Packages");
Adw.ToastOverlay toast_overlay {
Stack {
// Adw.MultiLayoutView {
// Adw.Layout {
// name: "test1";
// Adw.LayoutSlot {
// id: "secondary";
// }
// }
// [primary]
// Adw.StatusPage {
// title: "one";
// }
// [secondary]
// Adw.StatusPage {
// title: "two";
// }
// }
Stack status_stack {
Adw.ToolbarView loading_view {
[top]
Adw.HeaderBar {
[start]
$SidebarButton {}
}
Stack status_stack {
Adw.ToolbarView loading_view {
[top]
Adw.HeaderBar {
[start]
$SidebarButton {}
}
Adw.MultiLayoutView multi_view {
Adw.Layout wide {
Adw.NavigationSplitView split_view {
sidebar-width-fraction: 0.5;
max-sidebar-width: 999999999;
sidebar:
Adw.NavigationPage {
title: _("Select Source");
Adw.LayoutSlot {
id: "select_page";
}
}
;
content:
Adw.NavigationPage {
title: _("Pending Packages");
Adw.LayoutSlot {
id: "pending_page";
}
}
;
}
}
Adw.Layout skinny {
Adw.BottomSheet bottom_sheet {
[content]
Box {
margin-bottom: bind bottom_sheet.bottom-bar-height;
}
Adw.MultiLayoutView multi_view {
Adw.Layout wide {
Adw.NavigationSplitView split_view {
sidebar-width-fraction: 0.5;
max-sidebar-width: 999999999;
sidebar:
Adw.NavigationPage {
title: _("Select Source");
Adw.LayoutSlot {
id: "select_page";
}
}
[sheet]
Adw.LayoutSlot {
id: "pending_page";
;
content:
Adw.NavigationPage {
title: _("Pending Packages");
Adw.LayoutSlot {
id: "pending_page";
}
}
[bottom-bar]
Label {
label: _("Pending Packages");
margin-top: 12;
margin-bottom: 12;
;
}
}
Adw.Layout skinny {
Adw.BottomSheet bottom_sheet {
[content]
Box {
margin-bottom: bind bottom_sheet.bottom-bar-height;
Adw.LayoutSlot {
id: "select_page";
}
}
[sheet]
Adw.LayoutSlot {
id: "pending_page";
}
[bottom-bar]
Label {
label: _("Pending Packages");
margin-top: 12;
margin-bottom: 12;
}
}
[select_page]
$SelectPage select_page {}
[pending_page]
$PendingPage pending_page {}
}
[select_page]
$SelectPage select_page {}
[pending_page]
$PendingPage pending_page {}
}
}
}

6
src/install_page/install_page.py
View File

@@ -35,9 +35,6 @@ class InstallPage(Adw.BreakpointBin):
self.select_page.end_loading()
self.status_stack.set_visible_child(self.multi_view)
def breakpoint_handler(self, bp, is_applied):
self.select_page.results_page.action_bar.set_revealed(is_applied)
def __init__(self, main_window, **kwargs):
super().__init__(**kwargs)
self.instance = self
@@ -47,9 +44,6 @@ class InstallPage(Adw.BreakpointBin):
# ======== self.pending_page = PendingPage()
# Connections
self.break_point.connect("apply", self.breakpoint_handler, True)
self.break_point.connect("unapply", self.breakpoint_handler, False)
self.select_page.results_page.review_button.connect("clicked", lambda *_: self.split_view.set_show_content(True))
# Apply
# ======== self.split_view.set_sidebar(self.select_page)

13
src/install_page/results_page.blp
View File

@@ -65,18 +65,5 @@ template $ResultsPage : Adw.NavigationPage {
description: _("Try a different search term");
}
}
[bottom]
ActionBar action_bar {
[center]
Button review_button {
margin-top: 3;
margin-bottom: 3;
styles ["pill", "suggested-action"]
Adw.ButtonContent {
icon-name: "view-list-bullet-symbolic";
label: _("Review and Install");
}
}
}
}
}

2
src/install_page/results_page.py
View File

@@ -36,8 +36,6 @@ class ResultsPage(Adw.NavigationPage):
__gtype_name__ = "ResultsPage"
gtc = Gtk.Template.Child
action_bar = gtc()
review_button = gtc()
search_entry = gtc()
search_apply_button = gtc()
results_list = gtc()