1
0
Fork 0

Compare commits

..

No commits in common. "master" and "4" have entirely different histories.
master ... 4

4 changed files with 15 additions and 36 deletions

4
Cargo.lock generated
View File

@ -362,7 +362,7 @@ dependencies = [
[[package]] [[package]]
name = "light-dm-sys" name = "light-dm-sys"
version = "0.0.1" version = "0.0.1"
source = "git+https://git.raatty.club/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11" source = "git+https://raatty.club:3000/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11"
dependencies = [ dependencies = [
"gio-sys", "gio-sys",
"glib-sys", "glib-sys",
@ -374,7 +374,7 @@ dependencies = [
[[package]] [[package]]
name = "lightdm" name = "lightdm"
version = "0.1.0" version = "0.1.0"
source = "git+https://git.raatty.club/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11" source = "git+https://raatty.club:3000/raatty/lightdm-rs.git#a3c669583bb932e2b25372048b1e9dbda1f10e11"
dependencies = [ dependencies = [
"gio", "gio",
"gio-sys", "gio-sys",

View File

@ -9,7 +9,7 @@ edition = "2018"
libhandy = "0.5.0" libhandy = "0.5.0"
gdk = "0.12.1" gdk = "0.12.1"
gtk = "0.8.1" gtk = "0.8.1"
lightdm = { git = "https://git.raatty.club/raatty/lightdm-rs.git"} lightdm = { git = "https://raatty.club:3000/raatty/lightdm-rs.git"}
[profile.release] [profile.release]
panic = "abort" panic = "abort"

View File

@ -14,6 +14,3 @@ lightdm.conf
greeter-session=lightdm-mobile-greeter greeter-session=lightdm-mobile-greeter
user-session=<THE CHOSEN DE TO LAUNCH AFTER SUCCESSFUL LOGIN> user-session=<THE CHOSEN DE TO LAUNCH AFTER SUCCESSFUL LOGIN>
``` ```
## Theming
If you have a file at `/etc/lightdm/lightdm_mobile_greeter.css` styling will be read from it falling back to the backed in styling, checkout style.css to get ideas on what to change

View File

@ -5,10 +5,9 @@ use libhandy;
use lightdm; use lightdm;
use lightdm::{GreeterExt, SessionExt, UserExt, UserListExt}; use lightdm::{GreeterExt, SessionExt, UserExt, UserListExt};
use std::cell::RefCell; use std::cell::RefCell;
use std::io::prelude::*;
use std::path::*;
use std::rc::Rc; use std::rc::Rc;
use std::{fs,io}; use std::{fs,io};
use std::io::prelude::*;
fn main() { fn main() {
if gtk::init().is_err() { if gtk::init().is_err() {
@ -28,11 +27,7 @@ fn main() {
{ {
let handler_borrowed = handler.borrow(); let handler_borrowed = handler.borrow();
if let Ok(os_str) = pretty_name() { if let Ok(os_str) = pretty_name() {
handler_borrowed handler_borrowed.msg_label.as_ref().expect("no msg label").set_text(&os_str);
.msg_label
.as_ref()
.expect("no msg label")
.set_text(&os_str);
} }
} }
{ {
@ -99,27 +94,14 @@ fn main() {
(screen_size.height as f32 * 0.8) as i32, (screen_size.height as f32 * 0.8) as i32,
); );
let style = gtk::CssProvider::new(); let style = gtk::CssProvider::new();
let screen = gdk::Screen::get_default().expect("cant get screen");
style style
.load_from_data(include_bytes!("../style.css")) .load_from_data(include_bytes!("../style.css"))
.expect("failed to load style"); .expect("failed to load style");
gtk::StyleContext::add_provider_for_screen( gtk::StyleContext::add_provider_for_screen(
&screen, &gdk::Screen::get_default().expect("cant get screen"),
&style, &style,
gtk::STYLE_PROVIDER_PRIORITY_APPLICATION, gtk::STYLE_PROVIDER_PRIORITY_APPLICATION,
); );
let custom_conf = Path::new("/etc/lightdm/lightdm_mobile_greeter.css");
if custom_conf.exists() {
let style2 = gtk::CssProvider::new();
if let Some(path) = custom_conf.to_str() {
style2.load_from_path(path).expect("failed to load style2");
}
gtk::StyleContext::add_provider_for_screen(
&screen,
&style2,
gtk::STYLE_PROVIDER_PRIORITY_USER,
)
}
} }
window.show(); window.show();
gtk::main(); gtk::main();
@ -238,7 +220,7 @@ impl Handler {
rb.connect_toggled(move |_| { rb.connect_toggled(move |_| {
handler_clone.borrow_mut().session = Some(key_clone.clone()); 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()
} }