Add pronouns editing
This commit is contained in:
parent
63ba378bf7
commit
d0185842b3
61
src/main.rs
61
src/main.rs
|
|
@ -47,6 +47,67 @@ pub struct UserInfo {
|
|||
pub about: String,
|
||||
}
|
||||
|
||||
#[derive(Debug, Decode, Encode)]
|
||||
pub struct Pronouns {
|
||||
pub case_sensitive: bool,
|
||||
pub plural: bool,
|
||||
|
||||
/// Ex. he, she, they, fae.
|
||||
pub subject: String,
|
||||
|
||||
/// Ex. him, her, them, faer.
|
||||
pub object: String,
|
||||
|
||||
/// Ex. his, her, their, faer.
|
||||
pub possessive: String,
|
||||
|
||||
/// Ex. his, hers, theirs, faers.
|
||||
pub possessive_pronoun: String,
|
||||
|
||||
/// Ex. himself, herself, themself, faerself.
|
||||
pub reflexive: String,
|
||||
}
|
||||
|
||||
impl Pronouns {
|
||||
pub fn format_short(&self) -> String {
|
||||
format!("{}/{}", self.subject, self.object)
|
||||
}
|
||||
|
||||
pub fn format_pronouns(&self) -> String {
|
||||
format!(
|
||||
"{}/{}/{}/{}/{}",
|
||||
self.subject, self.object, self.possessive, self.possessive_pronoun, self.reflexive
|
||||
)
|
||||
}
|
||||
|
||||
pub fn format_usage(&self) -> Option<String> {
|
||||
let mut usages = Vec::new();
|
||||
|
||||
if self.plural {
|
||||
usages.push("plural");
|
||||
}
|
||||
|
||||
if self.case_sensitive {
|
||||
usages.push("case-sensitive");
|
||||
}
|
||||
|
||||
if usages.len() > 0 {
|
||||
Some(usages.join(", "))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
pub fn format_full(&self) -> String {
|
||||
let pronouns = self.format_pronouns();
|
||||
if let Some(usage) = self.format_usage() {
|
||||
format!("{} [{}]", pronouns, usage)
|
||||
} else {
|
||||
pronouns
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, Decode, Encode)]
|
||||
pub struct RoomInfo {
|
||||
pub id: String,
|
||||
|
|
|
|||
206
src/tui.rs
206
src/tui.rs
|
|
@ -1,3 +1,4 @@
|
|||
use crate::Pronouns;
|
||||
use crossbeam_channel::{Receiver, Sender};
|
||||
use cursive::theme::*;
|
||||
use cursive::traits::*;
|
||||
|
|
@ -7,6 +8,7 @@ use cursive::{Cursive, CursiveExt};
|
|||
pub enum EditEvent {
|
||||
Name(String),
|
||||
About(String),
|
||||
Pronouns(Option<Pronouns>),
|
||||
}
|
||||
|
||||
pub struct Tui {
|
||||
|
|
@ -37,104 +39,158 @@ impl Tui {
|
|||
identity: Identity {
|
||||
name: "<display name>".into(),
|
||||
about: "<short about text>".into(),
|
||||
pronouns: None,
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn run(&mut self) {
|
||||
self.edit_identity();
|
||||
Self::edit_identity(&mut self.cursive);
|
||||
self.cursive.run();
|
||||
|
||||
while let Ok(edit) = self.edit_receiver.try_recv() {
|
||||
match edit {
|
||||
EditEvent::Name(name) => self.identity.name = name,
|
||||
EditEvent::About(about) => self.identity.about = about,
|
||||
EditEvent::Pronouns(pronouns) => self.identity.pronouns = pronouns,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn edit_identity(&mut self) {
|
||||
self.identity.edit(&mut self.cursive);
|
||||
self.cursive.run();
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Identity {
|
||||
pub name: String,
|
||||
pub about: String,
|
||||
}
|
||||
|
||||
impl Identity {
|
||||
pub fn edit(&mut self, siv: &mut Cursive) {
|
||||
let labels = LinearLayout::vertical()
|
||||
.child(TextView::new("Name"))
|
||||
.child(TextView::new("About"))
|
||||
.fixed_width(10);
|
||||
pub fn edit_identity(siv: &mut Cursive) {
|
||||
let labels = make_vertical_labels(&["Name:", "About:", "Pronouns:"]).fixed_width(10);
|
||||
|
||||
let values = LinearLayout::vertical()
|
||||
.child(TextView::new(&self.name).with_name("name_text"))
|
||||
.child(TextView::new(&self.about).with_name("about_text"))
|
||||
.child(EditView::new().with_name("name_edit"))
|
||||
.child(EditView::new().with_name("about_edit"))
|
||||
.child(TextView::new("<none>").with_name("pronouns_text"))
|
||||
.fixed_width(45);
|
||||
|
||||
let buttons = LinearLayout::vertical()
|
||||
.child(Button::new("Edit", |siv| {
|
||||
siv.add_layer(
|
||||
Dialog::around(
|
||||
EditView::new()
|
||||
.on_submit(|s, text| {
|
||||
s.call_on_name("name_text", |view: &mut TextView| {
|
||||
view.set_content(text);
|
||||
})
|
||||
.unwrap();
|
||||
s.with_user_data(|sender: &mut Sender<EditEvent>| {
|
||||
sender.send(EditEvent::Name(text.to_string())).unwrap();
|
||||
});
|
||||
s.pop_layer();
|
||||
})
|
||||
.with_name("name_edit")
|
||||
.fixed_width(32),
|
||||
)
|
||||
.title("Edit Name")
|
||||
.button("Cancel", |s| {
|
||||
s.pop_layer();
|
||||
}),
|
||||
);
|
||||
}))
|
||||
.child(Button::new("Edit", |siv| {
|
||||
siv.add_layer(
|
||||
Dialog::around(
|
||||
EditView::new()
|
||||
.on_submit(|s, text| {
|
||||
s.call_on_name("about_text", |view: &mut TextView| {
|
||||
view.set_content(text);
|
||||
})
|
||||
.unwrap();
|
||||
s.with_user_data(|sender: &mut Sender<EditEvent>| {
|
||||
sender.send(EditEvent::About(text.to_string())).unwrap();
|
||||
});
|
||||
s.pop_layer();
|
||||
})
|
||||
.with_name("about_edit")
|
||||
.fixed_width(32),
|
||||
)
|
||||
.title("Edit About")
|
||||
.button("Cancel", |s| {
|
||||
s.pop_layer();
|
||||
}),
|
||||
);
|
||||
}));
|
||||
|
||||
let mut dialog = Dialog::around(
|
||||
LinearLayout::horizontal()
|
||||
.child(labels)
|
||||
.child(values)
|
||||
.child(buttons),
|
||||
)
|
||||
.title("Edit Identity");
|
||||
let columns = LinearLayout::horizontal().child(labels).child(values);
|
||||
let mut dialog = Dialog::around(columns);
|
||||
dialog.set_title("Edit Identity");
|
||||
dialog.add_button("Select Pronouns...", |siv| Self::select_pronouns(siv));
|
||||
dialog.add_button("Ok", |siv| {
|
||||
let name = get_edit_contents(siv, "name_edit");
|
||||
let about = get_edit_contents(siv, "about_edit");
|
||||
siv.with_user_data(|sender: &mut Sender<EditEvent>| {
|
||||
sender.send(EditEvent::Name(name)).unwrap();
|
||||
sender.send(EditEvent::About(about)).unwrap();
|
||||
});
|
||||
siv.pop_layer();
|
||||
});
|
||||
dialog.add_button("Quit", |siv| siv.quit());
|
||||
|
||||
siv.add_layer(dialog);
|
||||
}
|
||||
|
||||
pub fn select_pronouns(siv: &mut Cursive) {
|
||||
let mut dialog = Dialog::new();
|
||||
dialog.set_title("Select Pronouns");
|
||||
dialog.add_button("Custom...", |siv| {
|
||||
siv.pop_layer();
|
||||
Self::edit_pronouns(siv);
|
||||
});
|
||||
dialog.add_button("None", |siv| {
|
||||
siv.with_user_data(|sender: &mut Sender<EditEvent>| {
|
||||
sender.send(EditEvent::Pronouns(None)).unwrap();
|
||||
});
|
||||
siv.call_on_name("pronouns_text", |view: &mut TextView| {
|
||||
view.set_content("<none>");
|
||||
})
|
||||
.unwrap();
|
||||
siv.pop_layer();
|
||||
});
|
||||
dialog.add_button("Cancel", |siv| {
|
||||
siv.pop_layer().unwrap();
|
||||
});
|
||||
siv.add_layer(dialog);
|
||||
}
|
||||
|
||||
pub fn edit_pronouns(siv: &mut Cursive) {
|
||||
let labels = make_vertical_labels(&[
|
||||
"Case-sensitive:",
|
||||
"Plural:",
|
||||
"Subject:",
|
||||
"Object:",
|
||||
"Possessive:",
|
||||
"Possessive pronoun:",
|
||||
"Reflexive:",
|
||||
])
|
||||
.fixed_width(20);
|
||||
|
||||
let values = LinearLayout::vertical()
|
||||
.child(Checkbox::new().with_name("case_sensitive_edit"))
|
||||
.child(Checkbox::new().with_name("plural_edit"))
|
||||
.child(EditView::new().with_name("subject_edit"))
|
||||
.child(EditView::new().with_name("object_edit"))
|
||||
.child(EditView::new().with_name("possessive_edit"))
|
||||
.child(EditView::new().with_name("possessive_pronoun_edit"))
|
||||
.child(EditView::new().with_name("reflexive_edit"))
|
||||
.fixed_width(12);
|
||||
|
||||
let columns = LinearLayout::horizontal().child(labels).child(values);
|
||||
let mut dialog = Dialog::around(columns);
|
||||
dialog.set_title("Edit Pronouns");
|
||||
dialog.add_button("Ok", |siv| {
|
||||
let case_sensitive = get_checkbox_contents(siv, "case_sensitive_edit");
|
||||
let plural = get_checkbox_contents(siv, "plural_edit");
|
||||
let subject = get_edit_contents(siv, "subject_edit");
|
||||
let object = get_edit_contents(siv, "object_edit");
|
||||
let possessive = get_edit_contents(siv, "possessive_edit");
|
||||
let possessive_pronoun = get_edit_contents(siv, "possessive_pronoun_edit");
|
||||
let reflexive = get_edit_contents(siv, "reflexive_edit");
|
||||
|
||||
let pronouns = Pronouns {
|
||||
case_sensitive,
|
||||
plural,
|
||||
subject,
|
||||
object,
|
||||
possessive,
|
||||
possessive_pronoun,
|
||||
reflexive,
|
||||
};
|
||||
|
||||
siv.call_on_name("pronouns_text", |view: &mut TextView| {
|
||||
view.set_content(pronouns.format_full());
|
||||
})
|
||||
.unwrap();
|
||||
|
||||
siv.with_user_data(|sender: &mut Sender<EditEvent>| {
|
||||
sender.send(EditEvent::Pronouns(Some(pronouns))).unwrap();
|
||||
});
|
||||
|
||||
siv.pop_layer();
|
||||
});
|
||||
dialog.add_button("Cancel", |siv| {
|
||||
siv.pop_layer().unwrap();
|
||||
});
|
||||
|
||||
siv.add_layer(dialog);
|
||||
}
|
||||
}
|
||||
|
||||
pub struct Identity {
|
||||
pub name: String,
|
||||
pub about: String,
|
||||
pub pronouns: Option<Pronouns>,
|
||||
}
|
||||
|
||||
fn get_edit_contents(siv: &mut Cursive, name: &str) -> String {
|
||||
siv.call_on_name(name, |view: &mut EditView| view.get_content())
|
||||
.unwrap()
|
||||
.to_string()
|
||||
}
|
||||
|
||||
fn get_checkbox_contents(siv: &mut Cursive, name: &str) -> bool {
|
||||
siv.call_on_name(name, |view: &mut Checkbox| view.is_checked())
|
||||
.unwrap()
|
||||
}
|
||||
|
||||
fn make_vertical_labels(labels: &[&str]) -> LinearLayout {
|
||||
let mut layout = LinearLayout::vertical();
|
||||
for label in labels.iter() {
|
||||
layout.add_child(TextView::new(label.to_string()));
|
||||
}
|
||||
layout
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue