Merge pull request #251 from gtk-rs/pending

[release] merging pending into master

Author: GuillaumeGomez

.travis.yml

@@ -3,7 +3,7 @@ language: rust
 rust:
 - nightly
 - beta
-- 1.31.0 # stable
+- 1.34.0 # stable
 addons:
   apt:
     packages:

CONTRIBUTING.md

@@ -7,24 +7,45 @@ autobins = false
 [dependencies]
 chrono = "0.4"
 url = "1.4"
-futures-preview = { version = "0.2", optional = true }
-atk = "^0"
-glib-sys = "^0"
-gobject-sys = "^0"
-glib = "^0"
-gio = "^0"
-gdk = "^0"
-gdk-pixbuf = "^0"
-gtk = "^0"
-pango = "^0"
-cairo-rs = { version = "^0", features = ["png"] }
+futures-preview = { version = "0.3.0-alpha.15", optional = true}
+
+[dependencies.atk]
+git = "https://github.com/gtk-rs/atk"
+
+[dependencies.glib-sys]
+git = "https://github.com/gtk-rs/sys"
+
+[dependencies.gobject-sys]
+git = "https://github.com/gtk-rs/sys"
+
+[dependencies.glib]
+git = "https://github.com/gtk-rs/glib"
+
+[dependencies.gio]
+git = "https://github.com/gtk-rs/gio"
+
+[dependencies.cairo-rs]
+git = "https://github.com/gtk-rs/cairo"
+features = ["png"]
+
+[dependencies.pango]
+git = "https://github.com/gtk-rs/pango"
+
+[dependencies.gdk-pixbuf]
+git = "https://github.com/gtk-rs/gdk-pixbuf"
+
+[dependencies.gdk]
+git = "https://github.com/gtk-rs/gdk"
+
+[dependencies.gtk]
+git = "https://github.com/gtk-rs/gtk"
 
 [features]
-#default = ["gtk_3_22_30", "futures-stable", "subclassing"]
+#default = ["gtk_3_22_30", "futures", "subclassing"]
 gtk_3_18 = ["gtk/v3_18", "gdk-pixbuf/v2_32", "gdk/v3_18", "gio/v2_46", "glib/v2_46", "pango/v1_38"] #for CI tools
 gtk_3_22_30 = ["gtk_3_18", "gtk/v3_22_30", "gdk-pixbuf/v2_36", "gdk/v3_22", "gio/v2_56", "glib/v2_56", "pango/v1_42"] #for CI tools
 gtk_3_24 = ["gtk_3_22_30", "gtk/v3_24", "atk/v2_30", "gdk-pixbuf/v2_36_8", "gdk/v3_24", "gio/v2_58", "glib/v2_58"] #for CI tools
-futures-stable = ["futures-preview", "glib/futures", "gio/futures"]
+futures = ["futures-preview", "glib/futures", "gio/futures"]
 subclassing = ["glib/subclassing"]
 
 [[bin]]
@@ -36,6 +57,9 @@ name = "basic"
 [[bin]]
 name = "builder_basics"
 
+[[bin]]
+name = "builders"
+
 [[bin]]
 name = "cairo_png"
 
@@ -48,6 +72,9 @@ name = "cairotest"
 [[bin]]
 name = "child-properties"
 
+[[bin]]
+name = "clipboard_simple"
+
 [[bin]]
 name = "clock"
 
@@ -62,11 +89,12 @@ name = "drag_and_drop_textview"
 
 [[bin]]
 name = "gio_futures"
-required-features = ["futures-stable"]
+required-features = ["futures"]
 
-#[[bin]]
-#name = "gio_futures_await"
-#required-features = ["futures-nightly"]
+[[bin]]
+name = "gio_futures_await"
+required-features = ["futures"]
+edition = "2018"
 
 [[bin]]
 name = "grid"
@@ -123,3 +151,6 @@ name = "treeview"
 
 [[bin]]
 name = "list_store"
+
+[[bin]]
+name = "entry_completion"

Cargo.toml

@@ -6,23 +6,23 @@ set -e
 if [ "$GTK" = latest -o "$GTK" = "3.24" ]; then
 	BUNDLE="gtk-3.24.0-1"
 	if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-		FEATURES=gtk_3_24,futures-stable,gio/v2_44,subclassing
+		FEATURES=gtk_3_24,futures,gio/v2_44,subclassing
 	else
-		FEATURES=gtk_3_24,futures-stable,gio/v2_44,subclassing
+		FEATURES=gtk_3_24,gio/v2_44,subclassing
 	fi
 elif [ "$GTK" = "3.22.30" ]; then
 	BUNDLE="gtk-3.22.30-1"
 	if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-		FEATURES=gtk_3_22_30,futures-stable,gio/v2_44,subclassing
+		FEATURES=gtk_3_22_30,futures,gio/v2_44,subclassing
 	else
-		FEATURES=gtk_3_22_30,futures-stable,gio/v2_44,subclassing
+		FEATURES=gtk_3_22_30,gio/v2_44,subclassing
 	fi
 elif [ "$GTK" = "3.18" ]; then
 	BUNDLE="gtk-3.18.1-2"
 	if [ "$TRAVIS_RUST_VERSION" = "nightly" ]; then
-		FEATURES=gtk_3_18,futures-stable,gio/v2_44,subclassing
+		FEATURES=gtk_3_18,futures,gio/v2_44,subclassing
 	else
-		FEATURES=gtk_3_18,futures-stable,gio/v2_44,subclassing
+		FEATURES=gtk_3_18,gio/v2_44,subclassing
 	fi
 fi
 

build_travis.sh

@@ -21,15 +21,17 @@ fn build_ui(application: &gtk::Application) {
     window.set_position(gtk::WindowPosition::Center);
 
     let button = gtk::Button::new_with_label("Click me!");
-    let label = gtk::Label::new("0");
+    let label = gtk::Label::new(Some("0"));
     let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0);
 
     if let (Some(button_obj), Some(label_obj)) = (button.get_accessible(), label.get_accessible()) {
         // We set the description
         button_obj.set_description("Button to increase label value");
 
         // Then we setup the relation saying that the label is linked to the button.
-        let relation_set = label_obj.ref_relation_set().expect("Failed to get relation for label");
+        let relation_set = label_obj
+            .ref_relation_set()
+            .expect("Failed to get relation for label");
         let relation = atk::Relation::new(&[button_obj], atk::RelationType::LabelFor);
 
         relation_set.add(&relation);
@@ -41,19 +43,23 @@ fn build_ui(application: &gtk::Application) {
     window.add(&vbox);
 
     button.connect_clicked(move |_| {
-        let value = label.get_text()
+        let value = label
+            .get_text()
             .and_then(|s| u32::from_str_radix(&s, 10).ok())
-            .unwrap_or(0) + 1;
+            .unwrap_or(0)
+            + 1;
         label.set_text(&value.to_string());
     });
 
     window.show_all();
 }
 
 fn main() {
-    let application = gtk::Application::new("com.github.accessibility",
-                                            gio::ApplicationFlags::empty())
-                                       .expect("Initialization failed...");
+    let application = gtk::Application::new(
+        Some("com.github.accessibility"),
+        gio::ApplicationFlags::empty(),
+    )
+    .expect("Initialization failed...");
 
     application.connect_activate(|app| {
         // We build the application UI.

src/bin/accessibility.rs

@@ -28,9 +28,9 @@ fn build_ui(application: &gtk::Application) {
 }
 
 fn main() {
-    let application = gtk::Application::new("com.github.gtk-rs.examples.basic",
-                                            Default::default())
-                                       .expect("Initialization failed...");
+    let application =
+        gtk::Application::new(Some("com.github.gtk-rs.examples.basic"), Default::default())
+            .expect("Initialization failed...");
 
     application.connect_activate(|app| {
         build_ui(app);

src/bin/basic.rs

@@ -12,15 +12,15 @@ use gtk::{ApplicationWindow, Builder, Button, MessageDialog};
 
 use std::env::args;
 
-
 fn build_ui(application: &gtk::Application) {
     let glade_src = include_str!("builder_basics.glade");
     let builder = Builder::new_from_string(glade_src);
 
     let window: ApplicationWindow = builder.get_object("window1").expect("Couldn't get window1");
-    window.set_application(application);
+    window.set_application(Some(application));
     let bigbutton: Button = builder.get_object("button1").expect("Couldn't get button1");
-    let dialog: MessageDialog = builder.get_object("messagedialog1")
+    let dialog: MessageDialog = builder
+        .get_object("messagedialog1")
         .expect("Couldn't get messagedialog1");
 
     bigbutton.connect_clicked(move |_| {
@@ -32,9 +32,11 @@ fn build_ui(application: &gtk::Application) {
 }
 
 fn main() {
-    let application = gtk::Application::new("com.github.gtk-rs.examples.builder_basics",
-                                            Default::default())
-        .expect("Initialization failed...");
+    let application = gtk::Application::new(
+        Some("com.github.gtk-rs.examples.builder_basics"),
+        Default::default(),
+    )
+    .expect("Initialization failed...");
 
     application.connect_activate(|app| {
         build_ui(app);

src/bin/builder_basics.rs

@@ -0,0 +1,45 @@
+//! # Builders Sample
+//!
+//! This sample demonstrates how to create a widget using the builders.
+//! These allow to set construct-only properties and other construct
+//! properties when creating the widget.
+
+extern crate gio;
+extern crate gtk;
+
+use gio::prelude::*;
+use gtk::prelude::*;
+
+use std::env::args;
+
+fn build_ui(application: &gtk::Application) {
+    let window = gtk::ApplicationWindowBuilder::new()
+        .application(application)
+        .title("First GTK+ Program")
+        .border_width(10)
+        .window_position(gtk::WindowPosition::Center)
+        .default_width(350)
+        .default_height(70)
+        .build();
+
+    let button = gtk::LockButtonBuilder::new()
+        .text_lock("Lock")
+        .text_unlock("Unlock")
+        .build();
+
+    window.add(&button);
+
+    window.show_all();
+}
+
+fn main() {
+    let application =
+        gtk::Application::new(Some("com.github.gtk-rs.examples.basic"), Default::default())
+            .expect("Initialization failed...");
+
+    application.connect_activate(|app| {
+        build_ui(app);
+    });
+
+    application.run(&args().collect::<Vec<_>>());
+}

src/bin/builders.rs

@@ -6,8 +6,8 @@
 
 extern crate cairo;
 
-use std::fs::File;
 use cairo::{Context, Format, ImageSurface};
+use std::fs::File;
 
 fn main() {
     let surface = ImageSurface::create(Format::ARgb32, 120, 120).expect("Can't create surface");

src/bin/cairo_png.rs

@@ -1,16 +1,15 @@
 extern crate cairo;
 extern crate gio;
-extern crate gtk;
 extern crate glib;
+extern crate gtk;
 
-use std::thread;
+use std::cell::RefCell;
 use std::env::args;
-use std::sync::mpsc;
 use std::rc::Rc;
-use std::cell::RefCell;
+use std::sync::mpsc;
+use std::thread;
 use std::time::Duration;
 
-use cairo::prelude::*;
 use cairo::{Context, Format, ImageSurface};
 use gio::prelude::*;
 use gtk::prelude::*;
@@ -67,7 +66,8 @@ impl Image {
         // references the pixels anymore
         impl Drop for ImageHolder {
             fn drop(&mut self) {
-                *self.return_location.borrow_mut() = Some(self.image.take().expect("Holding no image"));
+                *self.return_location.borrow_mut() =
+                    Some(self.image.take().expect("Holding no image"));
             }
         }
 
@@ -96,14 +96,21 @@ impl Image {
             };
 
             // The surface will own the image for the scope of the block below
-            let surface = ImageSurface::create_for_data(holder, Format::Rgb24, WIDTH, HEIGHT, 4 * WIDTH).expect("Can't create surface");
+            let surface =
+                ImageSurface::create_for_data(holder, Format::Rgb24, WIDTH, HEIGHT, 4 * WIDTH)
+                    .expect("Can't create surface");
             func(&surface);
 
             // Now the surface will be destroyed and the pixels are stored in the return_location
         }
 
         // And here move the pixels back again
-        self.0 = Some(return_location.borrow_mut().take().expect("Image not returned"));
+        self.0 = Some(
+            return_location
+                .borrow_mut()
+                .take()
+                .expect("Image not returned"),
+        );
     }
 }
 
@@ -235,9 +242,11 @@ fn build_ui(application: &gtk::Application) {
 }
 
 fn main() {
-    let application = gtk::Application::new("com.github.gtk-rs.examples.cairo_threads",
-                                            Default::default())
-                                       .expect("Initialization failed...");
+    let application = gtk::Application::new(
+        Some("com.github.gtk-rs.examples.cairo_threads"),
+        Default::default(),
+    )
+    .expect("Initialization failed...");
 
     application.connect_activate(|app| {
         build_ui(app);
@@ -272,8 +281,12 @@ fn draw_slow(cr: &Context, delay: Duration, x: f64, y: f64, radius: f64) {
 }
 
 // Render the image surface into the context at the given position
-fn draw_image_if_dirty(cr: &Context, image: &ImageSurface, origin: (i32, i32),
-        dimensions: (i32, i32)) {
+fn draw_image_if_dirty(
+    cr: &Context,
+    image: &ImageSurface,
+    origin: (i32, i32),
+    dimensions: (i32, i32),
+) {
     let x = origin.0 as f64;
     let y = origin.1 as f64;
     let w = dimensions.0 as f64;
@@ -288,4 +301,3 @@ fn draw_image_if_dirty(cr: &Context, image: &ImageSurface, origin: (i32, i32),
     // Release the reference to the surface again
     cr.set_source_rgba(0.0, 0.0, 0.0, 0.0);
 }
-