Merge pull request #231 from gtk-rs/pending

[release] merging pending into master

Author: GuillaumeGomez

.travis.yml

@@ -1,3 +1,4 @@
+dist: xenial
 language: rust
 rust:
 - nightly
@@ -7,9 +8,11 @@ addons:
   apt:
     packages:
     - libgtk-3-dev
+    - libmount-dev
 env:
-  - GTK=3.4
+  - GTK=3.14
   - GTK=3.18
   - GTK=3.22.30
+  - GTK=3.24
 script:
   - ./build_travis.sh

Cargo.toml

@@ -2,11 +2,13 @@
 name = "gtk-rs-examples"
 version = "0.0.1"
 authors = ["The Gtk-rs Project Developers"]
+autobins = false
 
 [dependencies]
 chrono = "0.4"
 url = "1.4"
 futures-preview = { version = "0.2", optional = true }
+atk = "^0"
 gobject-subclass = "^0"
 glib-sys = "^0"
 gobject-sys = "^0"
@@ -19,14 +21,15 @@ pango = "^0"
 cairo-rs = { version = "^0", features = ["png"] }
 
 [features]
-#default = ["gtk_3_22_30", "futures-stable"]
-gtk_3_10 = ["gtk/v3_10"]
-gtk_3_16 = ["gtk_3_10", "gtk/v3_16"]
-gtk_3_18 = ["gtk_3_16", "gtk/v3_18"] #for CI tools
-gtk_3_20 = ["gtk_3_18", "gtk/v3_20"] #for CI tools
-gtk_3_22 = ["gtk_3_20", "gtk/v3_22"] #for CI tools
-gtk_3_22_30 = ["gtk_3_22", "gtk/v3_22_30"] #for CI tools
+#default = ["gtk_3_22_30", "futures-stable", "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"]
+subclassing = ["glib/subclassing"]
+
+[[bin]]
+name = "accessibility"
 
 [[bin]]
 name = "basic"
@@ -49,6 +52,9 @@ name = "child-properties"
 [[bin]]
 name = "clock"
 
+[[bin]]
+name = "css"
+
 [[bin]]
 name = "drag_and_drop"
 
@@ -71,14 +77,13 @@ name = "gtktest"
 
 [[bin]]
 name = "listbox_model"
-required-features = ["gtk/v3_16", "gio/v2_44"]
+required-features = ["gtk/v3_16", "gio/v2_44", "subclassing"]
 
 [[bin]]
 name = "menu_bar"
 
 [[bin]]
 name = "menu_bar_system"
-required-features = ["gtk/v3_12"]
 
 [[bin]]
 name = "multi_windows"
@@ -89,9 +94,16 @@ name = "multithreading_context"
 [[bin]]
 name = "notebook"
 
+[[bin]]
+name = "overlay"
+
 [[bin]]
 name = "pango_attributes"
 
+[[bin]]
+name = "progress_tracker"
+path = "src/bin/progress_tracker.rs"
+
 [[bin]]
 name = "simple_treeview"
 
@@ -104,5 +116,11 @@ name = "text_viewer"
 [[bin]]
 name = "transparent_main_window"
 
+[[bin]]
+name = "tree_model_sort"
+
 [[bin]]
 name = "treeview"
+
+[[bin]]
+name = "list_store"

appveyor.yml

@@ -17,6 +17,6 @@ install:
 
 build_script:
   - cargo build
-  - cargo build --features gtk_3_20
+  - cargo build --features gtk_3_24
 
 test: false

build_travis.sh

@@ -3,19 +3,26 @@
 set -x
 set -e
 
-if [ "$GTK" = latest -o "$GTK" = "3.22.30" ]; then
+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
+	else
+		FEATURES=gtk_3_24,futures-stable,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
+		FEATURES=gtk_3_22_30,futures-stable,gio/v2_44,subclassing
 	else
-		FEATURES=gtk_3_22_30,futures-stable
+		FEATURES=gtk_3_22_30,futures-stable,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
+		FEATURES=gtk_3_18,futures-stable,gio/v2_44,subclassing
 	else
-		FEATURES=gtk_3_18,futures-stable
+		FEATURES=gtk_3_18,futures-stable,gio/v2_44,subclassing
 	fi
 fi
 
@@ -28,4 +35,4 @@ if [ -n "$BUNDLE" ]; then
 	export PKG_CONFIG_PATH="$HOME/local/lib/pkgconfig"
 fi
 
-cargo build --features "$FEATURES" --jobs 1 "$@"
+PKG_CONFIG_ALLOW_CROSS=1 cargo check $OTHER_TARGET --features "$FEATURES" --jobs 1 "$@"

resources/menu.png

@@ -0,0 +1,64 @@
+//! # Accessibility example
+//!
+//! This sample demonstrates how to make an application more accessible.
+
+extern crate atk;
+extern crate gdk;
+extern crate gio;
+extern crate glib;
+extern crate gtk;
+
+use atk::prelude::*;
+use gio::prelude::*;
+use gtk::prelude::*;
+
+use std::env::args;
+
+fn build_ui(application: &gtk::Application) {
+    let window = gtk::ApplicationWindow::new(application);
+
+    window.set_title("Accessibility");
+    window.set_position(gtk::WindowPosition::Center);
+
+    let button = gtk::Button::new_with_label("Click me!");
+    let label = gtk::Label::new("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 = atk::Relation::new(&[button_obj], atk::RelationType::LabelFor);
+
+        relation_set.add(&relation);
+    }
+
+    vbox.add(&button);
+    vbox.add(&label);
+
+    window.add(&vbox);
+
+    button.connect_clicked(move |_| {
+        let value = label.get_text()
+            .and_then(|s| u32::from_str_radix(&s, 10).ok())
+            .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...");
+
+    application.connect_activate(|app| {
+        // We build the application UI.
+        build_ui(app);
+    });
+
+    application.run(&args().collect::<Vec<_>>());
+}

src/bin/accessibility.rs

@@ -20,11 +20,6 @@ fn build_ui(application: &gtk::Application) {
     window.set_position(gtk::WindowPosition::Center);
     window.set_default_size(350, 70);
 
-    window.connect_delete_event(move |win, _| {
-        win.destroy();
-        Inhibit(false)
-    });
-
     let button = gtk::Button::new_with_label("Click me!");
 
     window.add(&button);
@@ -33,14 +28,13 @@ fn build_ui(application: &gtk::Application) {
 }
 
 fn main() {
-    let application = gtk::Application::new("com.github.basic",
-                                            gio::ApplicationFlags::empty())
+    let application = gtk::Application::new("com.github.gtk-rs.examples.basic",
+                                            Default::default())
                                        .expect("Initialization failed...");
 
-    application.connect_startup(|app| {
+    application.connect_activate(|app| {
         build_ui(app);
     });
-    application.connect_activate(|_| {});
 
     application.run(&args().collect::<Vec<_>>());
 }

src/bin/basic.rs

@@ -5,63 +5,40 @@
 extern crate gio;
 extern crate gtk;
 
-#[cfg(feature = "gtk_3_10")]
-mod example {
-    use gio;
-    use gtk;
+use gio::prelude::*;
+use gtk::prelude::*;
 
-    use gio::prelude::*;
-    use gtk::prelude::*;
+use gtk::{ApplicationWindow, Builder, Button, MessageDialog};
 
-    use gtk::{ApplicationWindow, Builder, Button, MessageDialog};
+use std::env::args;
 
-    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);
 
-    pub 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);
+    let bigbutton: Button = builder.get_object("button1").expect("Couldn't get button1");
+    let dialog: MessageDialog = builder.get_object("messagedialog1")
+        .expect("Couldn't get messagedialog1");
 
-        let window: ApplicationWindow = builder.get_object("window1").expect("Couldn't get window1");
-        let bigbutton: Button = builder.get_object("button1").expect("Couldn't get button1");
-        let dialog: MessageDialog = builder.get_object("messagedialog1")
-                                           .expect("Couldn't get messagedialog1");
+    bigbutton.connect_clicked(move |_| {
+        dialog.run();
+        dialog.hide();
+    });
 
-        window.set_application(application);
-        window.connect_delete_event(move |win, _| {
-            win.destroy();
-            Inhibit(false)
-        });
-
-        bigbutton.connect_clicked(move |_| {
-            dialog.run();
-            dialog.hide();
-        });
-
-        window.show_all();
-    }
-
-    pub fn main() {
-        let application = gtk::Application::new("com.github.builder_basics",
-                                                gio::ApplicationFlags::empty())
-                                           .expect("Initialization failed...");
-
-        application.connect_startup(move |app| {
-            build_ui(app);
-        });
-        application.connect_activate(|_| {});
-
-        application.run(&args().collect::<Vec<_>>());
-    }
+    window.show_all();
 }
 
-#[cfg(feature = "gtk_3_10")]
 fn main() {
-    example::main()
-}
+    let application = gtk::Application::new("com.github.gtk-rs.examples.builder_basics",
+                                            Default::default())
+        .expect("Initialization failed...");
 
-#[cfg(not(feature = "gtk_3_10"))]
-fn main() {
-    println!("This example requires GTK 3.10 or later");
-    println!("Did you forget to build with `--features gtk_3_10`?");
+    application.connect_activate(|app| {
+        build_ui(app);
+    });
+
+    application.run(&args().collect::<Vec<_>>());
 }