toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Initial implementation of #6 Gresource support.

Browse Source
This commit is contained in:
Jordan Petridis 2017-11-06 12:19:10 +02:00
parent 36271afcdd
commit 60a3b39339
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
10 changed files with 50 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Cargo.lock generated
View File

@ -552,7 +552,7 @@ dependencies = [
"rand 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)",
"rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
"reqwest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
"rfc822_sanitizer 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
"rfc822_sanitizer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
"rss 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"tempdir 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -580,10 +580,13 @@ dependencies = [
"gdk 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gdk-pixbuf 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gio 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gio-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glib 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
"glib-sys 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gtk 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"hammond-data 0.1.0",
"hammond-downloader 0.1.0",
"libc 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
"loggerv 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
"open 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1136,7 +1139,7 @@ dependencies = [
[[package]]
name = "rfc822_sanitizer"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"chrono 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1692,7 +1695,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
"checksum relay 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f301bafeb60867c85170031bdb2fcf24c8041f33aee09e7b116a58d4e9f781c5"
"checksum reqwest 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1d56dbe269dbe19d716b76ec8c3efce8ef84e974f5b7e5527463e8c0507d4e17"
"checksum reqwest 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "194fe0d39dea7f89738707bf70e9f3ed47e8aca47d4b2eeaad6ac7831d2d390b"
"checksum rfc822_sanitizer 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "28423a6dc1c7d5db3ab5b540965149302cdf355e5ccaa05f38e25c97a568a6fd"
"checksum rfc822_sanitizer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "680e8305c1e0cdf836dc4bec5424e045f278c975a3cac36d1ca01c4695f9d815"
"checksum rss 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "70294b2be2d620fed3939032067684c53b8ccae18e8ca0b8410447f0f07228c5"
"checksum rustc-demangle 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "aee45432acc62f7b9a108cc054142dac51f979e69e71ddce7d6fc7adf29e817e"
"checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"

4
hammond-gtk/Cargo.toml
View File

@ -10,6 +10,10 @@ gdk = "0.6"
glib = "0.3"
gio = "0.2"
gdk-pixbuf = "0.2"
libc = "0.2"
gio-sys = "0.4"
glib-sys = "^0.4"
loggerv = "0.4"
log = "0.3"

9
hammond-gtk/build.rs Normal file
View File

@ -0,0 +1,9 @@
use std::process::Command;
fn main() {
Command::new("glib-compile-resources")
.args(&["--generate", "resources.xml"])
.current_dir("src/resources")
.status()
.unwrap();
}

2
hammond-gtk/gtk/podcasts_view.ui
View File

@ -19,7 +19,7 @@
<object class="GtkFlowBox" id="flowbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="halign">baseline</property>
<property name="valign">start</property>
<property name="homogeneous">True</property>
<property name="column_spacing">5</property>

1
hammond-gtk/src/main.rs
View File

@ -47,6 +47,7 @@ mod widgets;
mod headerbar;
mod utils;
mod static_resource;
use views::podcasts_view;

0
hammond-gtk/gtk/banner.png → hammond-gtk/src/resources/banner.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

BIN
hammond-gtk/src/resources/resources.gresource Normal file
View File

Binary file not shown.

6
hammond-gtk/src/resources/resources.xml Normal file
View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<gresources>
<gresource prefix="/org/gtk/hammond">
<file>banner.png</file>
</gresource>
</gresources>

18
hammond-gtk/src/static_resource.rs Normal file
View File

@ -0,0 +1,18 @@
extern crate gio_sys;
extern crate glib_sys;
extern crate libc;
use std;
// https://github.com/sunnyone/gresource-gtkrs-example/blob/master/src/static_resource.rs
// TODO: slomo mentioned that the unsafe could be removed and use a safe API instead.
pub fn init() {
let res_bytes = include_bytes!("resources/resources.gresource");
unsafe {
// gbytes and resource will not be freed
let gbytes =
glib_sys::g_bytes_new(res_bytes.as_ptr() as *const libc::c_void, res_bytes.len());
let resource = gio_sys::g_resource_new_from_data(gbytes, std::ptr::null_mut());
gio_sys::g_resources_register(resource);
}
}

7
hammond-gtk/src/views/podcasts_view.rs
View File

@ -7,6 +7,7 @@ use hammond_data::models::Podcast;
use hammond_data::index_feed::Database;
use widgets::podcast::*;
use static_resource;
fn show_empty_view(stack: &gtk::Stack) {
let builder = gtk::Builder::new_from_string(include_str!("../../gtk/empty_view.ui"));
@ -61,8 +62,10 @@ fn create_flowbox_child(db: &Database, pd: &Podcast) -> gtk::FlowBoxChild {
}
fn configure_banner(db: &Database, pd: &Podcast, banner: &gtk::Image, banner_title: &gtk::Label) {
// TODO: use GResource instead.
let bann = Pixbuf::new_from_file_at_scale("hammond-gtk/gtk/banner.png", 256, 256, true);
// TODO: move .ui files into gresources and refactor.
static_resource::init();
let bann = Pixbuf::new_from_resource_at_scale("/org/gtk/hammond/banner.png", 256, 256, true);
if let Ok(b) = bann {
banner.set_from_pixbuf(&b);