update more examples

relm-examples/examples/7gui/1_counter/Cargo.toml

@@ -5,12 +5,13 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "^0.16.0"
-gtk = "^0.16.0"
+glib = "0.18"
+gtk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
+
 [dependencies.relm]
 path = "../../../.."
 

relm-examples/examples/7gui/1_counter/src/main.rs

@@ -1,3 +1,4 @@
+use glib::Propagation;
 use gtk::prelude::*;
 use relm::Widget;
 use relm_derive::{widget, Msg};
@@ -53,7 +54,7 @@ impl Widget for Win {
                     clicked => Msg::Increment
                 }
             },
-            delete_event(_, _) => (Msg::Quit, Inhibit(false)),
+            delete_event(_, _) => (Msg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/2_temperature_converter/Cargo.toml

@@ -5,12 +5,13 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "^0.16.0"
-gtk = "^0.16.0"
+glib = "0.18"
+gtk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
+
 [dependencies.relm]
 path = "../../../.."
 

relm-examples/examples/7gui/2_temperature_converter/src/main.rs

@@ -1,3 +1,4 @@
+use glib::Propagation;
 use gtk::prelude::*;
 use relm::{Relm, Widget};
 use relm_derive::{widget, Msg};
@@ -85,7 +86,7 @@ impl Widget for Win {
                         let text = entry.text().to_string();
                         Msg::ChangedCelsius(text)
 
-                    }, Inhibit(false)),
+                    }, Propagation::Proceed),
                     text: &self.model.temp_celsius,
                 },
                 // The label only showing text.
@@ -107,15 +108,15 @@ impl Widget for Win {
                         let text = entry.text().to_string();
                         Msg::ChangedFahrenheit(text)
 
-                    }, Inhibit(false)),
+                    }, Propagation::Proceed),
                     text: &self.model.temp_fahrenheit,
                 },
                 // The label showing the text.
                 gtk::Label {
                     label: "Fahrenheit"
                 },
             },
-            delete_event(_, _) => (Msg::Quit, Inhibit(false)),
+            delete_event(_, _) => (Msg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/3_flight_booker/Cargo.toml

@@ -5,14 +5,15 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "0.16.0"
-gtk = "^0.16.0"
+glib = "0.18"
+gtk = "0.18"
 chrono = "0.4.19"
-gdk = "^0.16.0"
+gdk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
+
 [dependencies.relm]
 path = "../../../.."
 

relm-examples/examples/7gui/3_flight_booker/src/main.rs

@@ -1,6 +1,7 @@
 use std::convert::TryFrom;
 
 use chrono::NaiveDate;
+use glib::Propagation;
 use gtk::prelude::*;
 use gtk::{ButtonsType, DialogFlags, MessageDialog, MessageType};
 use relm::Widget;
@@ -234,7 +235,7 @@ impl Widget for Win {
                     clicked => Msg::Book,
                 }
             },
-            delete_event(_, _) => (Msg::Quit, Inhibit(false)),
+            delete_event(_, _) => (Msg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/4_progress_bar/Cargo.toml

@@ -5,12 +5,13 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "^0.16.0"
-gtk = "^0.16.0"
+glib = "0.18"
+gtk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
+
 [dependencies.relm]
 path = "../../../.."
 

relm-examples/examples/7gui/4_progress_bar/src/main.rs

@@ -1,3 +1,4 @@
+use glib::Propagation;
 use gtk::prelude::*;
 use gtk::Adjustment;
 use relm::{Relm, StreamHandle, Widget};
@@ -178,7 +179,7 @@ impl Widget for Win {
                     label: "Reset"
                 }
             },
-            delete_event(_, _) => (Msg::Quit, Inhibit(false)),
+            delete_event(_, _) => (Msg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/5_crud/Cargo.toml

@@ -5,12 +5,13 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "^0.16.0"
-gtk = "^0.16.0"
+glib = "0.18"
+gtk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
+
 [dependencies.relm]
 path = "../../../.."
 

relm-examples/examples/7gui/5_crud/src/gui/win.rs

@@ -1,6 +1,7 @@
 use crate::gui::person_list_box::{PersonListBox, PersonListBoxMsg};
 use crate::model::Person;
 
+use glib::Propagation;
 use gtk::prelude::*;
 use gtk::Orientation;
 use relm::{Relm, StreamHandle, Widget};
@@ -132,7 +133,7 @@ impl Widget for Win {
                     },
                 }
             },
-            delete_event(_, _) => (WinMsg::Quit, Inhibit(false)),
+            delete_event(_, _) => (WinMsg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/6_circle_drawer/Cargo.toml

@@ -5,14 +5,14 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "^0.16.0"
-gtk = { version = "^0.16.0", features = ["v3_24"] }
-gdk = "^0.16.0"
-cairo-rs = "^0.16.0"
+glib = "0.18"
+gtk = { version = "0.18", features = ["v3_24"] }
+gdk = "0.18"
+cairo-rs = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
 
 [dependencies.relm]
 path = "../../../.."

relm-examples/examples/7gui/6_circle_drawer/src/gui/circle_drawing.rs

@@ -4,6 +4,7 @@ use crate::gui::window_resize::{WindowResize, WindowResizeMsg};
 use crate::model::{Circle, CircleGroup};
 
 use gdk::{EventButton, EventMotion};
+use glib::Propagation;
 use gtk::prelude::*;
 use gtk::{DrawingArea, EventBox};
 use relm::{connect, init, Component, DrawHandler, Relm, StreamHandle, Update, Widget};
@@ -206,7 +207,7 @@ impl Widget for CircleDrawing {
             return (
                 // What to do when the signal occured.
                 Some(CircleDrawingMsg::UpdateDrawBuffer), // Sending a message.
-                Inhibit(false) // Do not inhibit, other widgets may also register that mouse press.
+                Propagation::Proceed // Do not inhibit, other widgets may also register that mouse press.
             )
         );
 
@@ -218,7 +219,7 @@ impl Widget for CircleDrawing {
             return (
                 // What to do when the signal occured.
                 Some(CircleDrawingMsg::Clicked(event.clone())), // Sending a message.
-                Inhibit(false) // Do not inhibit, other widgets may also register that mouse press.
+                Propagation::Proceed // Do not inhibit, other widgets may also register that mouse press.
             )
         );
 
@@ -233,7 +234,7 @@ impl Widget for CircleDrawing {
             connect_motion_notify_event(_, event),
             return (
                 Some(CircleDrawingMsg::MouseMove(event.clone())),
-                Inhibit(false)
+                Propagation::Proceed
             )
         );
 

relm-examples/examples/7gui/6_circle_drawer/src/gui/win.rs

@@ -1,6 +1,7 @@
 use crate::gui::circle_drawing::{CircleDrawing, CircleDrawingMsg};
 use crate::model::{CircleGroup, History};
 
+use glib::Propagation;
 use gtk::prelude::*;
 use gtk::Orientation;
 use relm::{Relm, Widget};
@@ -73,7 +74,7 @@ impl Widget for Win {
                     vexpand: true
                 }
             },
-            delete_event(_, _) => (WinMsg::Quit, Inhibit(false)),
+            delete_event(_, _) => (WinMsg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/6_circle_drawer/src/gui/window_resize.rs

@@ -1,5 +1,6 @@
 use crate::gui::circle_drawing::CircleDrawingMsg;
 
+use glib::Propagation;
 use gtk::prelude::*;
 use gtk::Adjustment;
 use relm::{Relm, StreamHandle, Widget};
@@ -50,7 +51,7 @@ impl Widget for WindowResize {
                     WindowResizeMsg::ValueChanged(value)
                 }
             },
-            delete_event(_, _) => (WindowResizeMsg::Quit, Inhibit(false)),
+            delete_event(_, _) => (WindowResizeMsg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/7gui/7_cells/Cargo.toml

@@ -5,13 +5,13 @@ authors = ["Julian Schmidhuber <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-glib = "^0.16.0"
-gtk = { version = "^0.16.0", features = ["v3_24"] }
-gdk = "^0.16.0"
+glib = "0.18"
+gtk = { version = "0.18", features = ["v3_24"] }
+gdk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
 
 [dependencies.relm]
 path = "../../../.."

relm-examples/examples/7gui/7_cells/src/gui/cell.rs

@@ -3,6 +3,7 @@ use crate::gui::spreadsheet::SpreadsheetMsg;
 use crate::model::CellRef;
 
 use gdk::EventButton;
+use glib::Propagation;
 use gtk::prelude::*;
 use relm::{Component, Relm, StreamHandle, Widget};
 use relm_derive::{widget, Msg};
@@ -106,7 +107,7 @@ impl Widget for Cell {
         // The event box is used to recieve click events.
         #[name="event_box"]
         gtk::EventBox {
-            button_press_event(_, event) => (CellMsg::Clicked(event.clone()), Inhibit(false)),
+            button_press_event(_, event) => (CellMsg::Clicked(event.clone()), Propagation::Proceed),
             // The border around the label
             gtk::Frame {
                 gtk::Label {

relm-examples/examples/7gui/7_cells/src/gui/win.rs

@@ -1,7 +1,7 @@
 use crate::gui::spreadsheet::Spreadsheet;
 
+use glib::Propagation;
 use gtk::prelude::*;
-use gtk::Inhibit;
 use relm::Widget;
 use relm_derive::{widget, Msg};
 
@@ -24,7 +24,7 @@ impl Widget for Win {
     view! {
         gtk::Window {
             Spreadsheet {},
-            delete_event(_, _) => (WinMsg::Quit, Inhibit(false)),
+            delete_event(_, _) => (WinMsg::Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/async/Cargo.toml

@@ -5,12 +5,12 @@ version = "0.1.0"
 edition = "2018"
 
 [dependencies]
-glib = "0.16.0"
-gtk = "^0.16.0"
+glib = "0.18"
+gtk = "0.18"
 
 [dependencies.gio]
 features = ["v2_58"]
-version = "^0.16.0"
+version = "0.18"
 
 [dependencies.relm]
 path = "../../.."

relm-examples/examples/async/src/main.rs

@@ -26,11 +26,10 @@ use gio::{
     prelude::CancellableExt,
     prelude::FileExt,
 };
-use glib::GString;
+use glib::{GString, Propagation};
 use gtk::{
     FileChooserAction,
     FileChooserDialog,
-    Inhibit,
     ResponseType,
     prelude::ButtonExt,
     prelude::DialogExt,
@@ -102,7 +101,7 @@ impl Widget for Win {
                     label: "Open application",
                 },
             },
-            delete_event(_, _) => (Quit, Inhibit(false)),
+            delete_event(_, _) => (Quit, Propagation::Proceed),
         }
     }
 }

relm-examples/examples/buttons-attribute/Cargo.toml

@@ -5,14 +5,11 @@ authors = ["Antoni Boucher <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-gtk = "^0.16.0"
-gtk-test = "^0.16.0"
+gtk = "0.18"
+gtk-test = "0.18"
 
 [dependencies.relm]
 path = "../../.."
 
 [dependencies.relm-derive]
 path = "../../../relm-derive"
-
-[dependencies.relm-test]
-path = "../../../relm-test"