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

Add show disabled remotes button in manage remotes

Browse Source
This commit is contained in:
heliguy
2023-12-10 00:54:48 -05:00
parent e62e51e973
commit 5eb5403ac0
6 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/icons/eye-not-looking-symbolic.svg Normal file
View 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 -140 -240)"><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 -140 -240)"><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 -140 -240)"><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 13.980469 1.988281 c -0.261719 0.007813 -0.507813 0.117188 -0.6875 0.304688 l -0.984375 0.984375 c -1.285156 -0.828125 -2.78125 -1.273438 -4.308594 -1.277344 c -3.648438 0.003906 -6.832031 2.476562 -7.738281 6.011719 c 0.460937 1.746093 1.496093 3.285156 2.945312 4.371093 l -0.914062 0.910157 c -0.261719 0.25 -0.367188 0.625 -0.273438 0.972656 c 0.089844 0.351563 0.363281 0.625 0.714844 0.714844 c 0.347656 0.09375 0.722656 -0.011719 0.972656 -0.273438 l 11 -11 c 0.296875 -0.289062 0.382813 -0.726562 0.222657 -1.105469 c -0.160157 -0.382812 -0.535157 -0.625 -0.949219 -0.613281 z m -5.980469 2.011719 c 0.960938 0 1.886719 0.347656 2.613281 0.976562 l -1.421875 1.417969 c -0.34375 -0.257812 -0.761718 -0.394531 -1.191406 -0.394531 c -1.105469 0 -2 0.894531 -2 2 c 0 0.429688 0.140625 0.847656 0.394531 1.1875 l -1.417969 1.421875 c -0.628906 -0.726563 -0.972656 -1.652344 -0.976562 -2.609375 c 0 -2.210938 1.789062 -4 4 -4 z m 7.03125 2.207031 l -3.34375 3.34375 c -0.40625 0.960938 -1.171875 1.722657 -2.128906 2.128907 l -2.277344 2.277343 c 0.238281 0.027344 0.476562 0.039063 0.71875 0.042969 c 3.648438 -0.003906 6.832031 -2.476562 7.738281 -6.011719 c -0.164062 -0.617187 -0.402343 -1.214843 -0.707031 -1.78125 z m -7.53125 0.792969 c 0.277344 0 0.5 0.222656 0.5 0.5 s -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 s 0.222656 -0.5 0.5 -0.5 z m 0 0" fill="#222222"/></svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

2
data/icons/eye-open-negative-filled-symbolic.svg Normal file
View 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 -100 -240)"><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 -100 -240)"><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 -100 -240)"><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><g fill="#222222"><path d="m 8 2 c -3.648438 0.003906 -6.832031 2.476562 -7.738281 6.007812 c 0.914062 3.527344 4.097656 5.988282 7.738281 5.992188 c 3.648438 -0.003906 6.832031 -2.476562 7.738281 -6.011719 c -0.914062 -3.523437 -4.097656 -5.984375 -7.738281 -5.988281 z m 0 2 c 2.210938 0 4 1.789062 4 4 s -1.789062 4 -4 4 s -4 -1.789062 -4 -4 s 1.789062 -4 4 -4 z m 0 0"/><path d="m 10 8 c 0 1.105469 -0.894531 2 -2 2 s -2 -0.894531 -2 -2 s 0.894531 -2 2 -2 s 2 0.894531 2 2 z m 0 0"/></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

23
data/ui/remotes.blp
View File

@@ -9,6 +9,10 @@ template RemotesWindow: Adw.Window {
Adw.ToolbarView main_toolbar_view {
[top]
HeaderBar header_bar {
Button refresh {
icon-name: "view-refresh-symbolic";
tooltip-text: "Refresh list of remotes";
}
}
content: Adw.ToastOverlay toast_overlay {
@@ -17,12 +21,21 @@ template RemotesWindow: Adw.Window {
Adw.PreferencesPage main_group {
Adw.PreferencesGroup remotes_list {
title: _("Installed Remotes");
header-suffix: Button refresh {
Adw.ButtonContent {
label: _("Refresh");
icon-name: "view-refresh-symbolic";
}
header-suffix: ToggleButton show_disabled_button {
Adw.ButtonContent show_disabled_button_button_content {
icon-name: "eye-not-looking-symbolic";
label: _("Show disabled");
styles["flat"]
}
// spacing: 6;
// margin-end: 6;
// Label {
// label: _("Show Disabled");
// styles["heading", "h4"]
// }
// Switch show_disabled {
// valign: center;
// }
};
Adw.ActionRow no_remotes {
title: _("No remotes on the system, add some from below");

10
src/common.py
View File

@@ -116,14 +116,12 @@ class myUtils:
try:
for i in range(len(data)):
data[i][7] = data[i][7].split(",")
for j in range(len(data[i])):
if data[i][7][j] == "user":
if "disabled" in data[i][7]:
data[i][7] = "disabled"
if "user" in data[i][7]:
data[i][7] = "user"
break
if data[i][7][j] == "system":
if "system" in data[i][7]:
data[i][7] = "system"
break
except:
print("error getting remote installation types")
return data

24
src/remotes_window.py
View File

@@ -18,6 +18,9 @@ class RemotesWindow(Adw.Window):
custom_remote = Gtk.Template.Child()
refresh = Gtk.Template.Child()
adding = Gtk.Template.Child()
show_disabled_button = Gtk.Template.Child()
show_disabled_button_button_content = Gtk.Template.Child()
show_disabled = False
# progress_bar = Gtk.Template.Child()
rows_in_list = []
@@ -76,6 +79,11 @@ class RemotesWindow(Adw.Window):
self.close()
def generate_list(self):
if self.show_disabled_button.get_active():
self.show_disabled_button_button_content.set_icon_name("eye-open-negative-filled-symbolic")
else:
self.show_disabled_button_button_content.set_icon_name("eye-not-looking-symbolic")
self.host_remotes = self.my_utils.getHostRemotes()
self.host_flatpaks = self.get_host_flatpaks()
for i in range(len(self.rows_in_list)):
@@ -94,12 +102,23 @@ class RemotesWindow(Adw.Window):
name = self.host_remotes[i][0]
title = self.host_remotes[i][1]
install_type = self.host_remotes[i][7]
url = self.host_remotes[i][2]
remote_row = Adw.ActionRow(title=title, subtitle=name)
if install_type == "disabled":
if not self.show_disabled_button.get_active():
continue
remote_row.add_css_class("warning")
url = self.host_remotes[i][2]
if title == "-":
remote_row.set_title(name)
self.remotes_list.add(remote_row)
label = Gtk.Label(label=("{} wide").format(install_type), valign=Gtk.Align.CENTER)
label = Gtk.Label(valign=Gtk.Align.CENTER)
if install_type == "disabled":
remote_row.set_subtitle(_("Disabled"))
else:
remote_row.set_subtitle(_("{} wide").format(install_type))
label.add_css_class("subtitle")
# subprocess.run(['wget', f'{self.host_remotes[i][11]}']) Idea to display remote icons... Need internet connection. Not sure if that is worth it
remote_row.add_suffix(label)
@@ -409,6 +428,7 @@ class RemotesWindow(Adw.Window):
self.add_from_file.connect("activated", self.addFromFileHandler)
self.custom_remote.add_suffix(Gtk.Image.new_from_icon_name("right-large-symbolic"))
self.custom_remote.connect("activated", self.add_handler)
self.show_disabled_button.connect("clicked", lambda *_: self.generate_list())
# Calls
self.generate_list()

2
src/warehouse.gresource.xml
View File

@@ -32,5 +32,7 @@
<file preprocess="xml-stripblanks" alias="software-update-urgent-symbolic.svg">../data/icons/software-update-urgent-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="cross-filled-symbolic.svg">../data/icons/cross-filled-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="important-small-symbolic.svg">../data/icons/important-small-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="eye-not-looking-symbolic.svg">../data/icons/eye-not-looking-symbolic.svg</file>
<file preprocess="xml-stripblanks" alias="eye-open-negative-filled-symbolic.svg">../data/icons/eye-open-negative-filled-symbolic.svg</file>
</gresource>
</gresources>