mirror of
https://github.com/johrpan/musicus.git
synced 2025-10-26 11:47:25 +01:00
Enable main search bar
This commit is contained in:
Elias Projahn
parent
caf7681322
commit
9101fb053d
2 changed files with 74 additions and 27 deletions
|
|
@ -432,6 +432,17 @@
|
|||
<object class="GtkListBox" id="work_list">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child type="placeholder">
|
||||
<object class="GtkLabel">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="margin_top">6</property>
|
||||
<property name="margin_bottom">6</property>
|
||||
<property name="margin_start">6</property>
|
||||
<property name="margin_end">6</property>
|
||||
<property name="label" translatable="yes">No works found.</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
@ -480,6 +491,17 @@
|
|||
<object class="GtkListBox" id="recording_list">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<child type="placeholder">
|
||||
<object class="GtkLabel">
|
||||
<property name="visible">True</property>
|
||||
<property name="can-focus">False</property>
|
||||
<property name="margin_top">6</property>
|
||||
<property name="margin_bottom">6</property>
|
||||
<property name="margin_start">6</property>
|
||||
<property name="margin_end">6</property>
|
||||
<property name="label" translatable="yes">No recordings found.</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
|
|||
|
|
@ -7,19 +7,21 @@ use gtk::prelude::*;
|
|||
use gtk_macros::{action, get_widget};
|
||||
use libhandy::prelude::*;
|
||||
use libhandy::HeaderBarExt;
|
||||
use std::cell::Cell;
|
||||
use std::cell::{Cell, RefCell};
|
||||
use std::convert::TryInto;
|
||||
use std::rc::Rc;
|
||||
|
||||
#[derive(Clone)]
|
||||
enum WindowState {
|
||||
Loading,
|
||||
Persons(Vec<Person>),
|
||||
PersonLoading(Person),
|
||||
Person(Vec<WorkDescription>, Vec<RecordingDescription>),
|
||||
Person(Vec<WorkDescription>, Vec<RecordingDescription>, String),
|
||||
}
|
||||
|
||||
pub struct Window {
|
||||
window: libhandy::ApplicationWindow,
|
||||
state: RefCell<WindowState>,
|
||||
backend: Rc<Backend>,
|
||||
leaflet: libhandy::Leaflet,
|
||||
sidebar_stack: gtk::Stack,
|
||||
|
|
@ -28,6 +30,7 @@ pub struct Window {
|
|||
stack: gtk::Stack,
|
||||
header: libhandy::HeaderBar,
|
||||
header_menu_button: gtk::MenuButton,
|
||||
search_entry: gtk::SearchEntry,
|
||||
content_stack: gtk::Stack,
|
||||
work_box: gtk::Box,
|
||||
work_list: gtk::ListBox,
|
||||
|
|
@ -57,6 +60,7 @@ impl Window {
|
|||
get_widget!(builder, gtk::Stack, stack);
|
||||
get_widget!(builder, libhandy::HeaderBar, header);
|
||||
get_widget!(builder, gtk::MenuButton, header_menu_button);
|
||||
get_widget!(builder, gtk::SearchEntry, search_entry);
|
||||
get_widget!(builder, gtk::Stack, content_stack);
|
||||
get_widget!(builder, gtk::Box, work_box);
|
||||
get_widget!(builder, gtk::ListBox, work_list);
|
||||
|
|
@ -70,6 +74,7 @@ impl Window {
|
|||
|
||||
let result = Rc::new(Window {
|
||||
window: window,
|
||||
state: RefCell::new(Loading),
|
||||
backend: Rc::new(backend),
|
||||
leaflet: leaflet,
|
||||
sidebar_stack: sidebar_stack,
|
||||
|
|
@ -78,6 +83,7 @@ impl Window {
|
|||
stack: stack,
|
||||
header: header,
|
||||
header_menu_button: header_menu_button,
|
||||
search_entry: search_entry,
|
||||
content_stack: content_stack,
|
||||
work_box: work_box,
|
||||
work_list: work_list,
|
||||
|
|
@ -182,6 +188,15 @@ impl Window {
|
|||
result.person_list.invalidate_filter();
|
||||
}));
|
||||
|
||||
result.search_entry.connect_search_changed(clone!(@strong result => move |_| {
|
||||
match result.get_state() {
|
||||
Person(works, recordings, _) => {
|
||||
result.clone().set_state(Person(works.clone(), recordings.clone(), result.search_entry.get_text().to_string()));
|
||||
}
|
||||
_ => (),
|
||||
}
|
||||
}));
|
||||
|
||||
result.window.set_application(Some(app));
|
||||
result.clone().set_state(Loading);
|
||||
|
||||
|
|
@ -192,9 +207,15 @@ impl Window {
|
|||
self.window.present();
|
||||
}
|
||||
|
||||
fn get_state(&self) -> WindowState {
|
||||
self.state.borrow().clone()
|
||||
}
|
||||
|
||||
fn set_state(self: Rc<Self>, state: WindowState) {
|
||||
use WindowState::*;
|
||||
|
||||
self.state.replace(state.clone());
|
||||
|
||||
match state {
|
||||
Loading => {
|
||||
self.backend
|
||||
|
|
@ -259,6 +280,7 @@ impl Window {
|
|||
}
|
||||
PersonLoading(person) => {
|
||||
self.header.set_title(Some(&person.name_fl()));
|
||||
self.search_entry.set_text("");
|
||||
|
||||
let edit_menu_item = gio::MenuItem::new(Some("Edit person"), None);
|
||||
edit_menu_item.set_action_and_target_value(
|
||||
|
|
@ -284,7 +306,7 @@ impl Window {
|
|||
self_.backend.get_recordings_for_person(
|
||||
person.id,
|
||||
clone!(@strong self_ => move |recordings| {
|
||||
self_.clone().set_state(Person(works.clone(), recordings));
|
||||
self_.clone().set_state(Person(works.clone(), recordings, String::from("")));
|
||||
}),
|
||||
);
|
||||
}),
|
||||
|
|
@ -295,7 +317,7 @@ impl Window {
|
|||
self.stack.set_visible_child_name("person_screen");
|
||||
self.leaflet.set_visible_child_name("content");
|
||||
}
|
||||
Person(works, recordings) => {
|
||||
Person(works, recordings, search) => {
|
||||
for child in self.work_list.get_children() {
|
||||
self.work_list.remove(&child);
|
||||
}
|
||||
|
|
@ -311,6 +333,7 @@ impl Window {
|
|||
}
|
||||
|
||||
for (index, work) in works.iter().enumerate() {
|
||||
if search.is_empty() || work.title.to_lowercase().contains(&search) {
|
||||
let label = gtk::Label::new(Some(&work.title));
|
||||
label.set_ellipsize(pango::EllipsizeMode::End);
|
||||
label.set_halign(gtk::Align::Start);
|
||||
|
|
@ -318,6 +341,7 @@ impl Window {
|
|||
row.show_all();
|
||||
self.work_list.insert(&row, -1);
|
||||
}
|
||||
}
|
||||
|
||||
match self.work_list_row_activated_handler_id.take() {
|
||||
Some(id) => self.work_list.disconnect(id),
|
||||
|
|
@ -376,16 +400,16 @@ impl Window {
|
|||
}
|
||||
|
||||
for (index, recording) in recordings.iter().enumerate() {
|
||||
let work_label = gtk::Label::new(Some(&format!(
|
||||
"{}: {}",
|
||||
recording.work.composer.name_fl(),
|
||||
recording.work.title
|
||||
)));
|
||||
let work_text = format!("{}: {}", recording.work.composer.name_fl(), recording.work.title);
|
||||
let performers_text = recording.get_performers();
|
||||
|
||||
if search.is_empty() || (work_text.to_lowercase().contains(&search) || performers_text.to_lowercase().contains(&search)) {
|
||||
let work_label = gtk::Label::new(Some(&work_text));
|
||||
|
||||
work_label.set_ellipsize(pango::EllipsizeMode::End);
|
||||
work_label.set_halign(gtk::Align::Start);
|
||||
|
||||
let performers_label = gtk::Label::new(Some(&recording.get_performers()));
|
||||
let performers_label = gtk::Label::new(Some(&performers_text));
|
||||
performers_label.set_ellipsize(pango::EllipsizeMode::End);
|
||||
performers_label.set_opacity(0.5);
|
||||
performers_label.set_halign(gtk::Align::Start);
|
||||
|
|
@ -398,6 +422,7 @@ impl Window {
|
|||
row.show_all();
|
||||
self.recording_list.insert(&row, -1);
|
||||
}
|
||||
}
|
||||
|
||||
match self.recording_list_row_activated_handler_id.take() {
|
||||
Some(id) => self.recording_list.disconnect(id),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue