Xetibo/ReSet
1
0
Fork 0
mirror of https://github.com/Xetibo/ReSet.git synced 2025-04-15 09:28:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24 from Xetibo/ina

Browse source 
show main category when filtering to subcategory
This commit is contained in:
tranfelix 2023-10-24 17:47:01 +02:00 committed by GitHub
parent ddc9f2e462 4c3209deae
commit 5ca82ed926
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/window/mod.rs
View file

@ -64,15 +64,26 @@ impl Window {
fn filterList(&self) { fn filterList(&self) {
let text = self.imp().resetSearchEntry.text().to_string(); let text = self.imp().resetSearchEntry.text().to_string();
for sidebarEntry in self.imp().sidebarEntries.borrow().iter() { for (mainEntry, subEntries) in self.imp().sidebarEntries.borrow().iter() {
if text == "" { if text == "" {
sidebarEntry.set_visible(true); mainEntry.set_visible(true);
for subEntry in subEntries {
subEntry.set_visible(true);
}
continue; continue;
} }
if sidebarEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) { if mainEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
sidebarEntry.set_visible(true); mainEntry.set_visible(true);
} else { } else {
sidebarEntry.set_visible(false); mainEntry.set_visible(false);
}
for subEntry in subEntries {
if subEntry.imp().name.borrow().to_lowercase().contains(&text.to_lowercase()) {
subEntry.set_visible(true);
mainEntry.set_visible(true);
} else {
subEntry.set_visible(false);
}
} }
} }
} }
@ -86,45 +97,54 @@ impl Window {
} }
fn setupSidebarEntries(&self) { fn setupSidebarEntries(&self) {
let mut sidebarEntries = self.imp().sidebarEntries.borrow_mut(); let selfImp = self.imp();
sidebarEntries.push(SidebarEntry::new("Connectivity", let mut sidebarEntries = selfImp.sidebarEntries.borrow_mut();
"network-wired-symbolic",
Categories::Connectivity,
false,
HANDLE_CONNECTIVITY_CLICK));
sidebarEntries.push(SidebarEntry::new("WiFi",
"network-wireless-symbolic",
Categories::Connectivity,
true,
HANDLE_WIFI_CLICK));
sidebarEntries.push(SidebarEntry::new("Bluetooth",
"bluetooth-symbolic",
Categories::Connectivity,
true,
HANDLE_BLUETOOTH_CLICK));
sidebarEntries.push(SidebarEntry::new("VPN",
"network-vpn-symbolic",
Categories::Connectivity,
true,
HANDLE_VPN_CLICK));
sidebarEntries.push(SidebarEntry::new("Audio",
"audio-headset-symbolic",
Categories::Audio,
false,
HANDLE_AUDIO_CLICK));
sidebarEntries.push(SidebarEntry::new("Volume",
"audio-volume-high-symbolic",
Categories::Audio,
true,
HANDLE_VOLUME_CLICK));
sidebarEntries.push(SidebarEntry::new("Microphone",
"audio-input-microphone-symbolic",
Categories::Audio,
true,
HANDLE_MICROPHONE_CLICK));
for entry in sidebarEntries.iter() { let mut connectivityList = vec![SidebarEntry::new("WiFi",
self.imp().resetSidebarList.append(entry); "network-wireless-symbolic",
Categories::Connectivity,
true,
HANDLE_WIFI_CLICK),
SidebarEntry::new("Bluetooth",
"bluetooth-symbolic",
Categories::Connectivity,
true,
HANDLE_BLUETOOTH_CLICK),
SidebarEntry::new("VPN",
"network-vpn-symbolic",
Categories::Connectivity,
true,
HANDLE_VPN_CLICK)];
sidebarEntries.push((SidebarEntry::new("Connectivity",
"network-wired-symbolic",
Categories::Connectivity,
false,
HANDLE_CONNECTIVITY_CLICK), connectivityList));
let mut audioList = vec![SidebarEntry::new("Volume",
"audio-volume-high-symbolic",
Categories::Audio,
true,
HANDLE_VOLUME_CLICK),
SidebarEntry::new("Microphone",
"audio-input-microphone-symbolic",
Categories::Audio,
true,
HANDLE_MICROPHONE_CLICK)];
sidebarEntries.push((SidebarEntry::new("Audio",
"audio-headset-symbolic",
Categories::Audio,
false,
HANDLE_AUDIO_CLICK), audioList));
for (mainEntry, subEntries) in sidebarEntries.iter() {
selfImp.resetSidebarList.append(mainEntry);
for subEntry in subEntries {
selfImp.resetSidebarList.append(subEntry);
}
} }
} }
} }

2
src/window/window.rs
View file

@ -27,7 +27,7 @@ pub struct Window {
pub resetSideBarToggle: TemplateChild<Button>, pub resetSideBarToggle: TemplateChild<Button>,
#[template_child] #[template_child]
pub resetPath: TemplateChild<Box>, pub resetPath: TemplateChild<Box>,
pub sidebarEntries: RefCell<Vec<SidebarEntry>>, pub sidebarEntries: RefCell<Vec<(SidebarEntry, Vec<SidebarEntry>)>>,
} }
#[glib::object_subclass] #[glib::object_subclass]