rust/playmat
1
0
Fork 0
Code Issues 2 Pull Requests Releases 1 Wiki Activity

reuse include_str for cross-device compatibilty

Browse Source
This commit is contained in:
Arthur Gerbaud
2019-06-06 16:38:06 +02:00
parent 60312be5d8
commit c67c4145a7
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/grid.rs
View File

@@ -35,8 +35,8 @@ struct CellWidget {
impl CellWidget { impl CellWidget {
fn new(pos: CellPosition, header_text: &str) -> Self { fn new(pos: CellPosition, header_text: &str) -> Self {
let cell_src = "/home/artus/Projets/rust/playmat/res/cell.glade"; let cell_src = include_str!("../res/cell.glade");
let builder = gtk::Builder::new_from_file(cell_src); let builder = gtk::Builder::new_from_string(cell_src);
// Set up reactivity on buttons // Set up reactivity on buttons
let eventbox: gtk::EventBox = let eventbox: gtk::EventBox =

4
src/main.rs
View File

@@ -61,8 +61,8 @@ impl App {
self.inner.connect_activate( self.inner.connect_activate(
move |app| { move |app| {
println!("Activate App"); println!("Activate App");
let main_src = "/home/artus/Projets/rust/playmat/res/main.glade"; let main_src = include_str!("../res/main.glade");
let builder = gtk::Builder::new_from_file(main_src); let builder = gtk::Builder::new_from_string(main_src);
let win: gtk::ApplicationWindow = let win: gtk::ApplicationWindow =
builder builder
.get_object("app") .get_object("app")

4
src/pawn.rs
View File

@@ -39,8 +39,8 @@ pub struct Pawn {
impl Pawn { impl Pawn {
pub fn new<S: Into<String>>(name: S) -> Self { pub fn new<S: Into<String>>(name: S) -> Self {
let pawn_src = "/home/artus/Projets/rust/playmat/res/pawn.glade"; let pawn_src = include_str!("../res/pawn.glade");
let builder = gtk::Builder::new_from_file(pawn_src); let builder = gtk::Builder::new_from_string(pawn_src);
let name = name.into(); let name = name.into();
let label: gtk::Label = let label: gtk::Label =
builder builder