mirror of
https://github.com/morgan9e/warehouse
synced 2026-04-14 00:04:08 +09:00
Fully complete the Install From The Web window, for installing new paks
This commit is contained in:
heliguy4599
2
data/icons/left-large-symbolic.svg
Normal file
2
data/icons/left-large-symbolic.svg
Normal file
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" height="16px" viewBox="0 0 16 16" width="16px"><filter id="a" height="100%" width="100%" x="0%" y="0%"><feColorMatrix color-interpolation-filters="sRGB" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/></filter><mask id="b"><g filter="url(#a)"><path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.5"/></g></mask><clipPath id="c"><path d="m 0 0 h 1600 v 1200 h -1600 z"/></clipPath><mask id="d"><g filter="url(#a)"><path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.7"/></g></mask><clipPath id="e"><path d="m 0 0 h 1600 v 1200 h -1600 z"/></clipPath><mask id="f"><g filter="url(#a)"><path d="m -1.6 -1.6 h 19.2 v 19.2 h -19.2 z" fill-opacity="0.35"/></g></mask><clipPath id="g"><path d="m 0 0 h 1600 v 1200 h -1600 z"/></clipPath><g mask="url(#b)"><g clip-path="url(#c)" transform="matrix(1 0 0 1 -980 -140)"><path d="m 550 182 c -0.351562 0.003906 -0.695312 0.101562 -1 0.28125 v 3.4375 c 0.304688 0.179688 0.648438 0.277344 1 0.28125 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 c -0.339844 0 -0.679688 0.058594 -1 0.175781 v 6.824219 h 4 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/></g></g><g mask="url(#d)"><g clip-path="url(#e)" transform="matrix(1 0 0 1 -980 -140)"><path d="m 569 182 v 4 c 1.105469 0 2 -0.894531 2 -2 s -0.894531 -2 -2 -2 z m 0 5 v 7 h 3 v -4 c 0 -1.65625 -1.34375 -3 -3 -3 z m 0 0"/></g></g><g mask="url(#f)"><g clip-path="url(#g)" transform="matrix(1 0 0 1 -980 -140)"><path d="m 573 182.269531 v 3.449219 c 0.613281 -0.355469 0.996094 -1.007812 1 -1.71875 c 0 -0.714844 -0.382812 -1.375 -1 -1.730469 z m 0 4.90625 v 6.824219 h 2 v -4 c 0 -1.269531 -0.800781 -2.402344 -2 -2.824219 z m 0 0"/></g></g><path d="m 10.9375 0.996094 c -0.292969 0 -0.558594 0.128906 -0.742188 0.328125 l -6.671874 6.671875 l 6.671874 6.675781 c 0.011719 0.011719 0.023438 0.023437 0.035157 0.03125 c 0.179687 0.183594 0.429687 0.292969 0.707031 0.292969 h 1 v -1 c 0 -0.273438 -0.113281 -0.523438 -0.292969 -0.707032 c -0.011719 -0.007812 -0.019531 -0.019531 -0.035156 -0.03125 l -5.257813 -5.257812 l 5.292969 -5.292969 c 0.179688 -0.183593 0.292969 -0.433593 0.292969 -0.707031 v -1 z m 0 0" fill="#222222"/></svg>
|
||||
|
After Width: | Height: | Size: 2.2 KiB |
@@ -87,7 +87,7 @@ template $OrphansWindow: Adw.Window {
|
||||
}
|
||||
|
||||
Label installing_status {
|
||||
label: _("");
|
||||
label: "";
|
||||
justify: center;
|
||||
|
||||
styles [
|
||||
|
||||
@@ -4,121 +4,195 @@ using Adw 1;
|
||||
template $SearchInstallWindow: Adw.Window {
|
||||
default-width: 500;
|
||||
default-height: 450;
|
||||
title: _("Install From The Web…");
|
||||
title: "";
|
||||
modal: true;
|
||||
|
||||
Adw.ToolbarView main_toolbar_view {
|
||||
[top]
|
||||
HeaderBar header_bar {
|
||||
show-title-buttons: false;
|
||||
|
||||
[start]
|
||||
Button cancel_button {
|
||||
label: _("Cancel");
|
||||
}
|
||||
|
||||
[end]
|
||||
Button install_button {
|
||||
label: _("Install");
|
||||
|
||||
styles [
|
||||
"suggested-action"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
[top]
|
||||
Adw.Clamp {
|
||||
Box {
|
||||
margin-top: 6;
|
||||
margin-start: 6;
|
||||
margin-end: 6;
|
||||
|
||||
styles [
|
||||
"linked"
|
||||
]
|
||||
|
||||
[start]
|
||||
SearchEntry search_entry {
|
||||
hexpand: true;
|
||||
placeholder-text: _("Search for Flatpaks…");
|
||||
}
|
||||
|
||||
[start]
|
||||
MenuButton remotes_dropdown {
|
||||
label: _("All Remotes");
|
||||
}
|
||||
|
||||
[start]
|
||||
Button search_button {
|
||||
tooltip-text: _("Search");
|
||||
icon-name: "system-search-symbolic";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
content: Adw.ToastOverlay toast_overlay {
|
||||
Stack main_stack {
|
||||
Overlay main_overlay {
|
||||
[overlay]
|
||||
ProgressBar progress_bar {
|
||||
pulse-step: 0.7;
|
||||
can-target: false;
|
||||
|
||||
styles [
|
||||
"osd"
|
||||
]
|
||||
}
|
||||
|
||||
ScrolledWindow {
|
||||
Adw.Clamp {
|
||||
ListBox results_list_box {
|
||||
margin-top: 12;
|
||||
margin-bottom: 12;
|
||||
margin-start: 12;
|
||||
margin-end: 12;
|
||||
hexpand: true;
|
||||
valign: start;
|
||||
selection-mode: none;
|
||||
|
||||
styles [
|
||||
"boxed-list"
|
||||
]
|
||||
content:
|
||||
Stack outer_stack {
|
||||
Adw.NavigationView nav_view {
|
||||
Adw.NavigationPage search_page {
|
||||
title: _("Search Criteria");
|
||||
Adw.ToastOverlay toast_overlay {
|
||||
Adw.ToolbarView {
|
||||
[top]
|
||||
HeaderBar {
|
||||
}
|
||||
content:
|
||||
Adw.StatusPage {
|
||||
title: _("Choose a Remote to Search");
|
||||
valign: start;
|
||||
child:
|
||||
Adw.Clamp {
|
||||
ListBox remotes_list {
|
||||
selection-mode: none;
|
||||
styles ["boxed-list"]
|
||||
}
|
||||
};
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
Adw.NavigationPage results_page {
|
||||
title: _("Results");
|
||||
Adw.ToolbarView {
|
||||
[top]
|
||||
HeaderBar {
|
||||
[start]
|
||||
Button back_button {
|
||||
tooltip-text: _("Back");
|
||||
icon-name: "left-large-symbolic";
|
||||
}
|
||||
}
|
||||
[bottom]
|
||||
ActionBar action_bar {
|
||||
revealed: false;
|
||||
[center]
|
||||
Button install_button {
|
||||
margin-top: 6;
|
||||
margin-bottom: 6;
|
||||
styles[
|
||||
"pill",
|
||||
"suggested-action"
|
||||
]
|
||||
|
||||
Adw.StatusPage no_results {
|
||||
icon-name: "system-search-symbolic";
|
||||
title: _("No Results Found");
|
||||
description: _("Try a different search term");
|
||||
}
|
||||
Adw.ButtonContent {
|
||||
label: _("Install");
|
||||
icon-name: "plus-large-symbolic";
|
||||
}
|
||||
}
|
||||
}
|
||||
[top]
|
||||
Adw.Clamp {
|
||||
Box search_box {
|
||||
margin-top: 4;
|
||||
margin-start: 12;
|
||||
margin-end: 12;
|
||||
margin-bottom: 6;
|
||||
SearchEntry search_entry {
|
||||
hexpand: true;
|
||||
}
|
||||
Button search_button {
|
||||
icon-name: "right-large-symbolic";
|
||||
tooltip-text: _("Start Search");
|
||||
}
|
||||
styles ["linked"]
|
||||
}
|
||||
}
|
||||
content:
|
||||
Stack inner_stack {
|
||||
|
||||
Adw.StatusPage blank_page {
|
||||
title: _("Search for Flatpaks");
|
||||
icon-name: "flatpak-symbolic";
|
||||
description: _("Search for Flatpaks that you want to install");
|
||||
}
|
||||
Adw.StatusPage blank_page {
|
||||
title: _("Search for Flatpaks");
|
||||
icon-name: "flatpak-symbolic";
|
||||
description: _("Search for Flatpaks that you want to install");
|
||||
}
|
||||
|
||||
Adw.StatusPage loading_page {
|
||||
title: C_("Shown with a spinner while search operation is pending", "Searching");
|
||||
Adw.StatusPage no_results {
|
||||
icon-name: "system-search-symbolic";
|
||||
title: _("No Results Found");
|
||||
description: _("Try a different search term");
|
||||
}
|
||||
|
||||
Spinner {
|
||||
spinning: true;
|
||||
height-request: 32;
|
||||
width-request: 32;
|
||||
margin-top: 0;
|
||||
halign: center;
|
||||
valign: center;
|
||||
Box loading_page {
|
||||
orientation: vertical;
|
||||
spacing: 10;
|
||||
margin-top: 40;
|
||||
margin-bottom: 20;
|
||||
halign: center;
|
||||
valign: center;
|
||||
|
||||
Spinner {
|
||||
margin-bottom: 35;
|
||||
width-request: 30;
|
||||
height-request: 30;
|
||||
opacity: 0.5;
|
||||
spinning: true;
|
||||
}
|
||||
|
||||
Label {
|
||||
label: _("Searching");
|
||||
|
||||
styles [
|
||||
"title-1",
|
||||
"title"
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
Adw.StatusPage too_many {
|
||||
icon-name: "error-symbolic";
|
||||
title: _("Too Many Results");
|
||||
description: _("Try being more specific with your search");
|
||||
}
|
||||
|
||||
ScrolledWindow results_scroll {
|
||||
vexpand: true;
|
||||
Adw.Clamp {
|
||||
ListBox results_list {
|
||||
margin-top: 6;
|
||||
margin-bottom: 12;
|
||||
margin-start: 12;
|
||||
margin-end: 12;
|
||||
hexpand: true;
|
||||
valign: start;
|
||||
selection-mode: none;
|
||||
styles ["boxed-list"]
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
Adw.StatusPage too_many {
|
||||
icon-name: "error-symbolic";
|
||||
title: _("Too Many Results");
|
||||
description: _("Try being more specific with your search");
|
||||
}
|
||||
Adw.ToolbarView installing {
|
||||
[top]
|
||||
HeaderBar {
|
||||
}
|
||||
content:
|
||||
Overlay overlay {
|
||||
[overlay]
|
||||
ProgressBar progress_bar {
|
||||
visible: false;
|
||||
can-target: false;
|
||||
styles ["osd"]
|
||||
}
|
||||
Box {
|
||||
orientation: vertical;
|
||||
spacing: 10;
|
||||
margin-top: 40;
|
||||
margin-bottom: 20;
|
||||
halign: center;
|
||||
valign: center;
|
||||
|
||||
Spinner {
|
||||
margin-bottom: 35;
|
||||
width-request: 30;
|
||||
height-request: 30;
|
||||
opacity: 0.5;
|
||||
spinning: true;
|
||||
}
|
||||
|
||||
Label {
|
||||
label: _("Installing");
|
||||
|
||||
styles [
|
||||
"title-1",
|
||||
"title"
|
||||
]
|
||||
}
|
||||
|
||||
Label installing_status {
|
||||
label: "";
|
||||
justify: center;
|
||||
|
||||
styles [
|
||||
"description",
|
||||
"body"
|
||||
]
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
@@ -36,6 +36,13 @@ template $WarehouseWindow: Adw.ApplicationWindow {
|
||||
icon-name: "selection-mode-symbolic";
|
||||
tooltip-text: _("Toggle Selection Mode");
|
||||
}
|
||||
|
||||
[end]
|
||||
MenuButton install_button {
|
||||
icon-name: "plus-large-symbolic";
|
||||
tooltip-text: _("Install New Flatpak");
|
||||
menu-model: install_menu;
|
||||
}
|
||||
}
|
||||
|
||||
[top]
|
||||
@@ -137,7 +144,7 @@ template $WarehouseWindow: Adw.ApplicationWindow {
|
||||
}
|
||||
|
||||
Label uninstalling_status {
|
||||
label: _("");
|
||||
label: "";
|
||||
justify: center;
|
||||
styles ["description", "body"]
|
||||
}
|
||||
@@ -237,11 +244,6 @@ template $WarehouseWindow: Adw.ApplicationWindow {
|
||||
|
||||
menu primary_menu {
|
||||
section {
|
||||
item {
|
||||
label: _("Install From File…");
|
||||
action: "app.install-from-file";
|
||||
}
|
||||
|
||||
item {
|
||||
label: _("Manage Leftover Data…");
|
||||
action: "app.manage-data-folders";
|
||||
@@ -256,11 +258,6 @@ menu primary_menu {
|
||||
action: "app.show-remotes-window";
|
||||
}
|
||||
|
||||
// item {
|
||||
// label: _("Install From The Web…");
|
||||
// action: "app.open-search-install";
|
||||
// }
|
||||
|
||||
item {
|
||||
label: _("_Keyboard Shortcuts");
|
||||
action: "win.show-help-overlay";
|
||||
@@ -292,11 +289,16 @@ menu copy_menu {
|
||||
}
|
||||
}
|
||||
|
||||
menu row_menu {
|
||||
menu install_menu {
|
||||
section {
|
||||
item {
|
||||
label: _("Open App");
|
||||
//action: "win.open-app";
|
||||
label: _("Install From File…");
|
||||
action: "app.install-from-file";
|
||||
}
|
||||
|
||||
item {
|
||||
label: _("Install From The Web…");
|
||||
action: "app.open-search-install";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user