mirror of
https://github.com/johrpan/musicus.git
synced 2025-10-26 11:47:25 +01:00
Use libhandy for the main window
This also reverts a part of the changes from the last commit. They will be replaced by a new solution.
This commit is contained in:
Elias Projahn
parent
21ad91d9a9
commit
af1d7c4a01
4 changed files with 147 additions and 123 deletions
|
|
@ -10,5 +10,6 @@ gio = "0.9.1"
|
|||
glib = "0.10.2"
|
||||
gtk = { version = "0.9.2", features = ["v3_24"] }
|
||||
gtk-macros = "0.2.0"
|
||||
libhandy = "0.7.0"
|
||||
pango = "0.9.1"
|
||||
rand = "0.7.3"
|
||||
|
|
|
|||
186
res/ui/window.ui
186
res/ui/window.ui
|
|
@ -2,19 +2,69 @@
|
|||
<!-- Generated with glade 3.36.0 -->
|
||||
<interface>
|
||||
<requires lib="gtk+" version="3.22" />
|
||||
<object class="GtkApplicationWindow" id="window">
|
||||
<requires lib="libhandy" version="1.0" />
|
||||
<object class="HdyApplicationWindow" id="window">
|
||||
<property name="can_focus">False</property>
|
||||
<property name="default_width">800</property>
|
||||
<property name="default_height">566</property>
|
||||
<child>
|
||||
<object class="GtkPaned">
|
||||
<object class="HdyLeaflet" id="leaflet">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="visible_child">sidebar_box</property>
|
||||
<property name="can_swipe_back">True</property>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<object class="GtkBox" id="sidebar_box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<property name="width_request">220</property>
|
||||
<child>
|
||||
<object class="HdyHeaderBar" id="left_header">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="show_close_button">True</property>
|
||||
<child>
|
||||
<object class="GtkMenuButton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="menu_model">add_menu</property>
|
||||
<child>
|
||||
<object class="GtkImage">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="icon_name">list-add-symbolic</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkMenuButton">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="focus_on_click">False</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="menu_model">add_menu</property>
|
||||
<child>
|
||||
<object class="GtkImage">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="icon_name">open-menu-symbolic</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="pack_type">end</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkSearchEntry" id="person_search_entry">
|
||||
<property name="visible">True</property>
|
||||
|
|
@ -26,12 +76,12 @@
|
|||
<property name="primary_icon_name">edit-find-symbolic</property>
|
||||
<property name="primary_icon_activatable">False</property>
|
||||
<property name="primary_icon_sensitive">False</property>
|
||||
<property name="placeholder_text" translatable="yes">Search composers …</property>
|
||||
<property name="placeholder_text" translatable="yes">Search persons and ensembles …</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
|
|
@ -62,111 +112,67 @@
|
|||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
<property name="position">2</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="resize">False</property>
|
||||
<property name="shrink">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkPaned">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<child>
|
||||
<object class="GtkBox">
|
||||
<object class="GtkSeparator">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkSearchEntry" id="work_search_entry">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="margin_left">6</property>
|
||||
<property name="margin_right">6</property>
|
||||
<property name="margin_start">6</property>
|
||||
<property name="margin_end">6</property>
|
||||
<property name="margin_top">6</property>
|
||||
<property name="margin_bottom">6</property>
|
||||
<property name="primary_icon_name">edit-find-symbolic</property>
|
||||
<property name="primary_icon_activatable">False</property>
|
||||
<property name="primary_icon_sensitive">False</property>
|
||||
<property name="placeholder_text" translatable="yes">Search works …</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">0</property>
|
||||
<property name="navigatable">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow">
|
||||
<object class="GtkBox" id="content_box">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="orientation">vertical</property>
|
||||
<child>
|
||||
<object class="GtkViewport">
|
||||
<object class="GtkStack" id="header_stack">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="shadow_type">none</property>
|
||||
<property name="transition_type">crossfade</property>
|
||||
<child>
|
||||
<object class="GtkListBox" id="work_list">
|
||||
<object class="HdyHeaderBar" id="empty_header">
|
||||
<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="label" translatable="yes">No works found.</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<property name="hexpand">true</property>
|
||||
<property name="title" translatable="yes">Musicus</property>
|
||||
<property name="show_close_button">True</property>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="position">1</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="resize">False</property>
|
||||
<property name="shrink">True</property>
|
||||
<property name="name">empty_header</property>
|
||||
<property name="title">empty_header</property>
|
||||
</packing>
|
||||
</child>
|
||||
<child>
|
||||
<placeholder/>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="resize">True</property>
|
||||
<property name="shrink">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child type="titlebar">
|
||||
<object class="GtkHeaderBar">
|
||||
<object class="HdyHeaderBar" id="header">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="title" translatable="yes">Musicus Editor</property>
|
||||
<property name="hexpand">true</property>
|
||||
<property name="title" translatable="yes">Musicus</property>
|
||||
<property name="show_close_button">True</property>
|
||||
<child>
|
||||
<object class="GtkMenuButton">
|
||||
<object class="GtkRevealer">
|
||||
<property name="reveal-child" bind-source="leaflet" bind-property="folded" bind-flags="sync-create" />
|
||||
<property name="transition-duration" bind-source="leaflet" bind-property="mode-transition-duration" bind-flags="bidirectional|sync-create" />
|
||||
<property name="transition-type">crossfade</property>
|
||||
<property name="visible">True</property>
|
||||
<child>
|
||||
<object class="GtkButton" id="back_button">
|
||||
<property name="action_name">win.back</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="focus_on_click">False</property>
|
||||
<property name="receives_default">True</property>
|
||||
<property name="menu_model">add_menu</property>
|
||||
<child>
|
||||
<object class="GtkImage">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
<property name="icon_name">list-add-symbolic</property>
|
||||
<property name="icon_name">go-previous-symbolic</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
|
|
@ -174,6 +180,36 @@
|
|||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<packing>
|
||||
<property name="name">header</property>
|
||||
<property name="title">header</property>
|
||||
</packing>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
<child>
|
||||
<object class="GtkScrolledWindow" id="content">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">False</property>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
</child>
|
||||
</object>
|
||||
<object class="HdyHeaderGroup" id="inner_header_group">
|
||||
<headerbars>
|
||||
<headerbar name="empty_header" />
|
||||
<headerbar name="header" />
|
||||
</headerbars>
|
||||
</object>
|
||||
<object class="HdyHeaderGroup">
|
||||
<headerbars>
|
||||
<headerbar name="left_header" />
|
||||
<headerbar name="inner_header_group" />
|
||||
</headerbars>
|
||||
</object>
|
||||
<menu id="add_menu">
|
||||
<section>
|
||||
<item>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,9 @@ mod window;
|
|||
use window::Window;
|
||||
|
||||
fn main() {
|
||||
gtk::init().expect("Failed to initialize GTK!");
|
||||
libhandy::init();
|
||||
|
||||
let bytes = glib::Bytes::from(include_bytes!("../res/resources.gresource").as_ref());
|
||||
let resource = gio::Resource::from_data(&bytes).expect("Failed to load resources!");
|
||||
gio::resources_register(&resource);
|
||||
|
|
|
|||
|
|
@ -4,29 +4,37 @@ use gio::prelude::*;
|
|||
use glib::clone;
|
||||
use gtk::prelude::*;
|
||||
use gtk_macros::{action, get_widget};
|
||||
use libhandy::prelude::*;
|
||||
use libhandy::HeaderBarExt;
|
||||
use std::cell::RefCell;
|
||||
use std::convert::TryInto;
|
||||
use std::rc::Rc;
|
||||
|
||||
pub struct Window {
|
||||
window: gtk::ApplicationWindow,
|
||||
window: libhandy::ApplicationWindow,
|
||||
db: Rc<Database>,
|
||||
leaflet: libhandy::Leaflet,
|
||||
persons: RefCell<Vec<Person>>,
|
||||
person_search_entry: gtk::SearchEntry,
|
||||
person_list: gtk::ListBox,
|
||||
works: RefCell<Vec<WorkDescription>>,
|
||||
work_search_entry: gtk::SearchEntry,
|
||||
work_list: gtk::ListBox,
|
||||
header_stack: gtk::Stack,
|
||||
header: libhandy::HeaderBar,
|
||||
content_box: gtk::Box,
|
||||
content: gtk::ScrolledWindow,
|
||||
}
|
||||
|
||||
impl Window {
|
||||
pub fn new(app: >k::Application) -> Rc<Self> {
|
||||
let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/window.ui");
|
||||
get_widget!(builder, gtk::ApplicationWindow, window);
|
||||
|
||||
get_widget!(builder, libhandy::ApplicationWindow, window);
|
||||
get_widget!(builder, libhandy::Leaflet, leaflet);
|
||||
get_widget!(builder, gtk::SearchEntry, person_search_entry);
|
||||
get_widget!(builder, gtk::ListBox, person_list);
|
||||
get_widget!(builder, gtk::SearchEntry, work_search_entry);
|
||||
get_widget!(builder, gtk::ListBox, work_list);
|
||||
get_widget!(builder, gtk::Stack, header_stack);
|
||||
get_widget!(builder, libhandy::HeaderBar, header);
|
||||
get_widget!(builder, gtk::Box, content_box);
|
||||
get_widget!(builder, gtk::ScrolledWindow, content);
|
||||
|
||||
let db = Rc::new(Database::new("test.sqlite"));
|
||||
let persons = db.get_persons();
|
||||
|
|
@ -34,12 +42,14 @@ impl Window {
|
|||
let result = Rc::new(Window {
|
||||
window: window,
|
||||
db: db,
|
||||
leaflet: leaflet,
|
||||
persons: RefCell::new(persons),
|
||||
person_list: person_list,
|
||||
person_search_entry: person_search_entry,
|
||||
works: RefCell::new(Vec::new()),
|
||||
work_search_entry: work_search_entry,
|
||||
work_list: work_list,
|
||||
header_stack: header_stack,
|
||||
header: header,
|
||||
content_box: content_box,
|
||||
content: content,
|
||||
});
|
||||
|
||||
result
|
||||
|
|
@ -47,10 +57,8 @@ impl Window {
|
|||
.connect_row_activated(clone!(@strong result => move |_, row| {
|
||||
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
|
||||
let index: usize = row.get_index().try_into().unwrap();
|
||||
|
||||
let works = result.db.get_work_descriptions(result.persons.borrow()[index].id);
|
||||
result.works.replace(works);
|
||||
result.show_works();
|
||||
let person = result.persons.borrow()[index].clone();
|
||||
result.show_person(person);
|
||||
}));
|
||||
|
||||
result
|
||||
|
|
@ -72,32 +80,6 @@ impl Window {
|
|||
result.person_list.invalidate_filter();
|
||||
}));
|
||||
|
||||
// result
|
||||
// .work_list
|
||||
// .connect_row_activated(clone!(@strong result => move |_, row| {
|
||||
// let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
|
||||
// let index: usize = row.get_index().try_into().unwrap();
|
||||
// }));
|
||||
|
||||
result
|
||||
.work_list
|
||||
.set_filter_func(Some(Box::new(clone!(@strong result => move |row| {
|
||||
let row = row.get_child().unwrap().downcast::<SelectorRow>().unwrap();
|
||||
let index: usize = row.get_index().try_into().unwrap();
|
||||
let search = result.work_search_entry.get_text().to_string().to_lowercase();
|
||||
|
||||
search.is_empty() || result.works.borrow()[index]
|
||||
.title
|
||||
.to_lowercase()
|
||||
.contains(&search)
|
||||
}))));
|
||||
|
||||
result
|
||||
.work_search_entry
|
||||
.connect_search_changed(clone!(@strong result => move |_| {
|
||||
result.work_list.invalidate_filter();
|
||||
}));
|
||||
|
||||
action!(
|
||||
result.window,
|
||||
"add-person",
|
||||
|
|
@ -168,17 +150,19 @@ impl Window {
|
|||
}
|
||||
}
|
||||
|
||||
fn show_works(&self) {
|
||||
for child in self.work_list.get_children() {
|
||||
self.work_list.remove(&child);
|
||||
fn show_person(&self, person: Person) {
|
||||
self.header.set_title(Some(&person.name_fl()));
|
||||
self.header_stack.set_visible_child_name("header");
|
||||
self.set_view(>k::Label::new(Some(&person.name_fl())));
|
||||
}
|
||||
|
||||
for (index, work) in self.works.borrow().iter().enumerate() {
|
||||
let label = gtk::Label::new(Some(&work.title));
|
||||
label.set_halign(gtk::Align::Start);
|
||||
let row = SelectorRow::new(index.try_into().unwrap(), &label);
|
||||
row.show_all();
|
||||
self.work_list.insert(&row, -1);
|
||||
}
|
||||
fn set_view<T: IsA<gtk::Widget>>(&self, widget: &T) {
|
||||
match self.content.get_child() {
|
||||
Some(child) => self.content.remove(&child),
|
||||
None => (),
|
||||
}
|
||||
|
||||
self.content.add(widget);
|
||||
self.leaflet.set_visible_child(&self.content_box);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue