1
0
Fork 0

now tested and working

This commit is contained in:
Raatty 2020-04-27 08:47:49 +00:00
parent b0db4805a8
commit c566c508ae
1 changed files with 23 additions and 13 deletions

View File

@ -22,6 +22,12 @@ fn main() {
handler_borrowed.setup_greeter(handler.clone()); handler_borrowed.setup_greeter(handler.clone());
handler_borrowed.setup_de_select(handler.clone()); handler_borrowed.setup_de_select(handler.clone());
} }
{
let handler_borrowed = handler.borrow();
let greeter = handler_borrowed.greeter.as_ref().expect("no greeter");
let user = handler_borrowed.user.as_ref().expect("no user");
greeter.authenticate(Some(&user)).ok();
}
let handler_builder_clone = handler.clone(); let handler_builder_clone = handler.clone();
builder.connect_signals(move |_, name| { builder.connect_signals(move |_, name| {
let h_login_cb_clone = handler_builder_clone.clone(); let h_login_cb_clone = handler_builder_clone.clone();
@ -158,22 +164,19 @@ impl Handler {
.set_text(msg); .set_text(msg);
}); });
greeter.connect_to_daemon_sync().ok(); greeter.connect_to_daemon_sync().ok();
greeter.authenticate(Some(&self.user.clone().unwrap())).ok();
self.greeter = Some(greeter); self.greeter = Some(greeter);
} }
fn setup_de_select(&self, handler: Rc<RefCell<Self>>) { fn setup_de_select(&mut self, handler: Rc<RefCell<Self>>) {
{ {
let mut handler_borrowed = handler.borrow_mut(); let session = self
let session = handler_borrowed
.greeter .greeter
.as_ref() .as_ref()
.expect("wheres the greeter at") .expect("wheres the greeter at")
.get_default_session_hint() .get_default_session_hint()
.expect("no default session"); .expect("no default session");
handler_borrowed.session = Some(String::from(session)); self.session = Some(String::from(session));
} }
let first_handler = handler.clone();
let vbox = gtk::BoxBuilder::new() let vbox = gtk::BoxBuilder::new()
.orientation(gtk::Orientation::Vertical) .orientation(gtk::Orientation::Vertical)
.visible(true) .visible(true)
@ -187,22 +190,29 @@ impl Handler {
}); });
let (name, key) = sessions.next().expect("no session"); let (name, key) = sessions.next().expect("no session");
let first = gtk::RadioButtonBuilder::new().label(&name).build(); let first = gtk::RadioButtonBuilder::new().label(&name).build();
first.connect_toggled(move |_| { let mut keys = Vec::new();
first_handler.borrow_mut().session = Some(key.clone()); let mut rbs = Vec::new();
}); keys.push(key);
rbs.push(first.clone());
vbox.add(&first); vbox.add(&first);
for (name, key) in sessions { for (name, key) in sessions {
let handler_clone = handler.clone();
let key_clone = key.clone(); let key_clone = key.clone();
let rb = gtk::RadioButton::new_with_label_from_widget(&first, &name); let rb = gtk::RadioButton::new_with_label_from_widget(&first, &name);
rb.connect_toggled(move |_| { keys.push(key);
handler_clone.borrow_mut().session = Some(key.clone()); rbs.push(rb.clone());
});
vbox.add(&rb); vbox.add(&rb);
if self.session.clone().expect("session not found") == key_clone { if self.session.clone().expect("session not found") == key_clone {
rb.set_active(true); rb.set_active(true);
} }
} }
let keys_iter = keys.iter();
for (rb, key) in rbs.iter().zip(keys_iter) {
let handler_clone = handler.clone();
let key_clone = key.clone();
rb.connect_toggled(move |_| {
handler_clone.borrow_mut().session = Some(key_clone.clone());
});
};
self.de_select.as_ref().expect("no de select").add(&vbox); self.de_select.as_ref().expect("no de select").add(&vbox);
vbox.show_all() vbox.show_all()
} }