examples: update for 4.10 deprecations

jf2048 · bilelmoussaoui · commit 82e14841ae54 · 2023-04-28T20:04:05.000+02:00
diff --git a/examples/Cargo.toml b/examples/Cargo.toml
@@ -18,7 +18,7 @@ im-rc = { version = "15", optional = true }
 [dependencies.gtk]
 path = "../gtk4"
 package = "gtk4"
-features = ["v4_8"]
+features = ["v4_10"]
 
 # used by gif-paintable example
 [dependencies.image]
diff --git a/examples/basics/main.rs b/examples/basics/main.rs
@@ -18,5 +18,5 @@ fn build_ui(application: &gtk::Application) {
 
     window.set_child(Some(&button));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/builder_pattern/main.rs b/examples/builder_pattern/main.rs
@@ -30,5 +30,5 @@ fn build_ui(application: &Application) {
 
     window.set_child(Some(&button));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/clipboard/main.rs b/examples/clipboard/main.rs
@@ -125,5 +125,5 @@ fn build_ui(application: &gtk::Application) {
     container.append(&texture_container);
 
     window.set_child(Some(&container));
-    window.show();
+    window.present();
 }
diff --git a/examples/clock/main.rs b/examples/clock/main.rs
@@ -22,7 +22,7 @@ fn build_ui(application: &Application) {
 
     window.set_child(Some(&label));
 
-    window.show();
+    window.present();
 
     // we are using a closure to capture the label (else we could also use a normal function)
     let tick = move || {
diff --git a/examples/column_view_datagrid/main.rs b/examples/column_view_datagrid/main.rs
@@ -87,5 +87,5 @@ fn build_ui(application: &gtk::Application) {
     scrolled_window.set_child(Some(&columnview));
 
     window.set_child(Some(&scrolled_window));
-    window.show();
+    window.present();
 }
diff --git a/examples/composite_template/main.rs b/examples/composite_template/main.rs
@@ -13,7 +13,7 @@ fn main() -> glib::ExitCode {
 
     application.connect_activate(|app| {
         let win = ExApplicationWindow::new(app);
-        win.show();
+        win.present();
     });
     application.run()
 }
diff --git a/examples/confetti_snapshot_animation/main.rs b/examples/confetti_snapshot_animation/main.rs
@@ -47,5 +47,5 @@ fn build_ui(application: &gtk::Application) {
         confetti.explode(params, duration);
     });
     confetti.add_controller(ev_ctrl);
-    window.show();
+    window.present();
 }
diff --git a/examples/css/main.rs b/examples/css/main.rs
@@ -3,8 +3,8 @@ use gtk::prelude::*;
 
 use gtk::gdk::Display;
 use gtk::{
-    Application, ApplicationWindow, Box as Box_, Button, ComboBoxText, CssProvider, Entry,
-    Orientation, STYLE_PROVIDER_PRIORITY_APPLICATION,
+    Application, ApplicationWindow, Box as Box_, Button, CssProvider, DropDown, Entry, Orientation,
+    STYLE_PROVIDER_PRIORITY_APPLICATION,
 };
 
 fn main() -> glib::ExitCode {
@@ -42,19 +42,16 @@ fn build_ui(application: &Application) {
     entry.add_css_class("entry1");
     entry.set_text("Some text");
 
-    let combo = ComboBoxText::new();
-    combo.append_text("option 1");
-    combo.append_text("option 2");
-    combo.append_text("option 3");
-    combo.set_active(Some(0));
+    let model = gtk::StringList::new(&["option 1", "option 2", "option 3"]);
+    let drop_down = DropDown::new(Some(model), gtk::Expression::NONE);
 
     vbox.append(&button);
     vbox.append(&entry);
-    vbox.append(&combo);
+    vbox.append(&drop_down);
     // Then we add the container inside our window.
     window.set_child(Some(&vbox));
 
     application.connect_activate(move |_| {
-        window.show();
+        window.present();
     });
 }
diff --git a/examples/custom_application/ex_application/imp.rs b/examples/custom_application/ex_application/imp.rs
@@ -25,7 +25,7 @@ impl ApplicationImpl for ExApplication {
         let label = gtk::Label::new(Some("Hello"));
         label.add_css_class("title-2");
         window.set_child(Some(&label));
-        window.show();
+        window.present();
     }
 }
 impl GtkApplicationImpl for ExApplication {}
diff --git a/examples/custom_buildable/custom_buildable/mod.rs b/examples/custom_buildable/custom_buildable/mod.rs
@@ -12,12 +12,12 @@ impl CustomBuildable {
     pub fn add_suffix<T: glib::IsA<gtk::Widget>>(&self, widget: &T) {
         let imp = self.imp();
         imp.suffixes.append(widget);
-        imp.suffixes.show();
+        imp.suffixes.set_visible(true);
     }
 
     pub fn add_prefix<T: glib::IsA<gtk::Widget>>(&self, widget: &T) {
         let imp = self.imp();
         imp.prefixes.append(widget);
-        imp.prefixes.show();
+        imp.prefixes.set_visible(true);
     }
 }
diff --git a/examples/custom_buildable/main.rs b/examples/custom_buildable/main.rs
@@ -22,5 +22,5 @@ fn build_ui(application: &gtk::Application) {
 
     let window: gtk::ApplicationWindow = builder.object("window").expect("Couldn't get window");
     application.add_window(&window);
-    window.show();
+    window.present();
 }
diff --git a/examples/custom_editable/main.rs b/examples/custom_editable/main.rs
@@ -72,5 +72,5 @@ fn build_ui(application: &gtk::Application) {
 
     container.append(&horizontal_container);
     window.set_child(Some(&container));
-    window.show();
+    window.present();
 }
diff --git a/examples/custom_layout_manager/main.rs b/examples/custom_layout_manager/main.rs
@@ -48,7 +48,7 @@ fn main() -> glib::ExitCode {
         }
 
         window.set_child(Some(&widget));
-        window.show();
+        window.present();
     });
 
     application.run()
diff --git a/examples/custom_orientable/main.rs b/examples/custom_orientable/main.rs
@@ -32,7 +32,7 @@ fn main() -> glib::ExitCode {
         bx.set_margin_end(18);
 
         window.set_child(Some(&bx));
-        window.show();
+        window.present();
     });
 
     application.run()
diff --git a/examples/custom_paintable/main.rs b/examples/custom_paintable/main.rs
@@ -26,5 +26,5 @@ fn build_ui(application: &gtk::Application) {
     picture.set_paintable(Some(&paintable));
 
     window.set_child(Some(&picture));
-    window.show();
+    window.present();
 }
diff --git a/examples/custom_widget/main.rs b/examples/custom_widget/main.rs
@@ -17,7 +17,7 @@ fn main() -> glib::ExitCode {
         button.set_margin_start(18);
         button.set_margin_end(18);
         window.set_child(Some(&button));
-        window.show();
+        window.present();
     });
 
     application.run()
diff --git a/examples/dialog/main.rs b/examples/dialog/main.rs
@@ -46,24 +46,19 @@ fn build_ui(application: &gtk::Application) {
 }
 
 async fn dialog<W: IsA<gtk::Window>>(window: Rc<W>) {
-    let question_dialog = gtk::MessageDialog::builder()
-        .transient_for(&*window)
+    let question_dialog = gtk::AlertDialog::builder()
         .modal(true)
-        .buttons(gtk::ButtonsType::OkCancel)
-        .text("What is your answer?")
+        .buttons(["Cancel", "Ok"])
+        .message("What is your answer?")
         .build();
 
-    let answer = question_dialog.run_future().await;
-    question_dialog.close();
+    let answer = question_dialog.choose_future(Some(&*window)).await;
 
-    let info_dialog = gtk::MessageDialog::builder()
-        .transient_for(&*window)
+    let info_dialog = gtk::AlertDialog::builder()
         .modal(true)
-        .buttons(gtk::ButtonsType::Close)
-        .text("You answered")
-        .secondary_text(format!("Your answer: {answer:?}"))
+        .message("You answered")
+        .detail(format!("Your answer: {answer:?}"))
         .build();
 
-    info_dialog.run_future().await;
-    info_dialog.close();
+    info_dialog.show(Some(&*window));
 }
diff --git a/examples/entry_completion/main.rs b/examples/entry_completion/main.rs
@@ -1,3 +1,8 @@
+// TODO - EntryCompletion is deprecated without replacement in GTK 4.10. This example should be
+// updated to remove the deprecated code when a replacement lands.
+// See: https://gitlab.gnome.org/GNOME/gtk/-/issues/5689
+#![allow(deprecated)]
+
 use gtk::glib;
 use gtk::prelude::*;
 
@@ -73,7 +78,7 @@ fn build_ui(application: &Application) {
     window.set_child(Some(&row));
 
     // show everything
-    window.show();
+    window.present();
 }
 
 struct Data {
diff --git a/examples/entry_undo/main.rs b/examples/entry_undo/main.rs
@@ -31,5 +31,5 @@ fn build_ui(application: &gtk::Application) {
 
     window.set_child(Some(&vbox));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/expressions/main.rs b/examples/expressions/main.rs
@@ -79,7 +79,7 @@ fn build_ui(app: &gtk::Application) {
         .child(&scrolled_window)
         .build();
 
-    window.show();
+    window.present();
 }
 
 fn data() -> gio::ListStore {
diff --git a/examples/femtovg_area/main.rs b/examples/femtovg_area/main.rs
@@ -40,5 +40,5 @@ fn build_ui(application: &gtk::Application) {
     let widget = FemtoVGArea::default();
     window.set_child(Some(&widget));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/flow_box/main.rs b/examples/flow_box/main.rs
@@ -41,7 +41,7 @@ fn build_ui(app: &gtk::Application) {
         .build();
 
     window.set_child(Some(&scrolled_window));
-    window.show();
+    window.present();
 }
 
 fn create_color_button(color: &'static str) -> gtk::Button {
diff --git a/examples/gif_paintable/main.rs b/examples/gif_paintable/main.rs
@@ -18,7 +18,7 @@ fn main() -> glib::ExitCode {
 
     application.connect_activate(|app| {
         let win = GifPaintableWindow::new(app);
-        win.show();
+        win.present();
     });
 
     application.run()
diff --git a/examples/glium_gl_area/main.rs b/examples/glium_gl_area/main.rs
@@ -40,5 +40,5 @@ fn build_ui(application: &gtk::Application) {
     let widget = GliumGLArea::new();
     window.set_child(Some(&widget));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/grid_packing/main.rs b/examples/grid_packing/main.rs
@@ -51,5 +51,5 @@ fn build_ui(application: &gtk::Application) {
 
     grid.attach(&quit_button, 0, 1, 2, 1);
 
-    window.show();
+    window.present();
 }
diff --git a/examples/gtk_builder/gtk_builder.ui b/examples/gtk_builder/gtk_builder.ui
@@ -10,12 +10,4 @@
       </object>
     </child>
   </object>
-  <object class="GtkMessageDialog" id="messagedialog">
-    <property name="transient-for">window</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="buttons">ok</property>
-    <property name="text" translatable="yes">Thank you for trying this example</property>
-    <property name="secondary-text" translatable="yes">You have pressed the button</property>
-  </object>
 </interface>
diff --git a/examples/gtk_builder/main.rs b/examples/gtk_builder/main.rs
@@ -1,5 +1,5 @@
 use gtk::prelude::*;
-use gtk::{glib, Application, ApplicationWindow, Builder, Button, MessageDialog, ResponseType};
+use gtk::{glib, Application, ApplicationWindow, Builder, Button};
 
 fn main() -> glib::ExitCode {
     let application = gtk::Application::new(
@@ -17,17 +17,16 @@ fn build_ui(application: &Application) {
     let window: ApplicationWindow = builder.object("window").expect("Couldn't get window");
     window.set_application(Some(application));
     let bigbutton: Button = builder.object("button").expect("Couldn't get button");
-    let dialog: MessageDialog = builder
-        .object("messagedialog")
-        .expect("Couldn't get messagedialog");
 
-    dialog.connect_response(move |d: &MessageDialog, _: ResponseType| {
-        d.hide();
-    });
+    bigbutton.connect_clicked(glib::clone!(@weak window => move |_| {
+        gtk::AlertDialog::builder()
+            .modal(true)
+            .message("Thank you for trying this example")
+            .detail("You have pressed the button")
+            .buttons(["Ok"])
+            .build()
+            .show(Some(&window));
+    }));
 
-    bigbutton.connect_clicked(move |_| {
-        dialog.show();
-    });
-
-    window.show();
+    window.present();
 }
diff --git a/examples/list_box_model/main.rs b/examples/list_box_model/main.rs
@@ -123,5 +123,5 @@ fn build_ui(application: &gtk::Application) {
         model.append(&RowData::new(&format!("Name {i}"), i * 10));
     }
 
-    window.show();
+    window.present();
 }
diff --git a/examples/list_view_apps_launcher/main.rs b/examples/list_view_apps_launcher/main.rs
@@ -73,14 +73,12 @@ fn build_ui(app: &gtk::Application) {
         if let Err(err) = app_info.launch(&[], Some(&context)) {
             let parent_window = list_view.root().and_downcast::<gtk::Window>().unwrap();
 
-            gtk::MessageDialog::builder()
-                .text(format!("Failed to start {}", app_info.name()))
-                .secondary_text(err.to_string())
-                .message_type(gtk::MessageType::Error)
+            gtk::AlertDialog::builder()
+                .message(format!("Failed to start {}", app_info.name()))
+                .detail(err.to_string())
                 .modal(true)
-                .transient_for(&parent_window)
                 .build()
-                .show();
+                .show(Some(&parent_window));
         }
     });
 
@@ -91,5 +89,5 @@ fn build_ui(app: &gtk::Application) {
         .build();
 
     window.set_child(Some(&scrolled_window));
-    window.show();
+    window.present();
 }
diff --git a/examples/rotation_bin/main.rs b/examples/rotation_bin/main.rs
@@ -102,5 +102,5 @@ fn build_ui(application: &gtk::Application) {
 
     window.set_child(Some(&vbox));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/scale_bin/main.rs b/examples/scale_bin/main.rs
@@ -13,7 +13,7 @@ fn main() -> glib::ExitCode {
         let window = gtk::ApplicationWindow::new(app);
         let scale_bin = ScaleBin::new();
         window.set_child(Some(&scale_bin));
-        window.show();
+        window.present();
     });
 
     application.run()
diff --git a/examples/search_bar/main.rs b/examples/search_bar/main.rs
@@ -69,5 +69,5 @@ fn build_ui(application: &gtk::Application) {
         }
     }));
 
-    window.show();
+    window.present();
 }
diff --git a/examples/squeezer_bin/main.rs b/examples/squeezer_bin/main.rs
@@ -26,7 +26,7 @@ fn main() -> glib::ExitCode {
 
         window.set_titlebar(Some(&headerbar));
         window.set_child(Some(&squeezer));
-        window.show();
+        window.present();
     });
 
     application.run()
diff --git a/examples/text_viewer/main.rs b/examples/text_viewer/main.rs
diff --git a/examples/video_player/main.rs b/examples/video_player/main.rs
diff --git a/examples/video_player/video_player_window/imp.rs b/examples/video_player/video_player_window/imp.rs
diff --git a/examples/virtual_methods/main.rs b/examples/virtual_methods/main.rs

Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ fn build_ui(application: &gtk::Application) {`
`18`	`18`
`19`	`19`	`window.set_child(Some(&button));`
`20`	`20`
`21`		`- window.show();`
	`21`	`+ window.present();`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ fn build_ui(application: &Application) {`
`30`	`30`
`31`	`31`	`window.set_child(Some(&button));`
`32`	`32`
`33`		`- window.show();`
	`33`	`+ window.present();`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,5 +125,5 @@ fn build_ui(application: &gtk::Application) {`
`125`	`125`	`container.append(&texture_container);`
`126`	`126`
`127`	`127`	`window.set_child(Some(&container));`
`128`		`- window.show();`
	`128`	`+ window.present();`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -87,5 +87,5 @@ fn build_ui(application: &gtk::Application) {`
`87`	`87`	`scrolled_window.set_child(Some(&columnview));`
`88`	`88`
`89`	`89`	`window.set_child(Some(&scrolled_window));`
`90`		`- window.show();`
	`90`	`+ window.present();`
`91`	`91`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ fn main() -> glib::ExitCode {`
`13`	`13`
`14`	`14`	`application.connect_activate(\|app\| {`
`15`	`15`	`let win = ExApplicationWindow::new(app);`
`16`		`- win.show();`
	`16`	`+ win.present();`
`17`	`17`	`});`
`18`	`18`	`application.run()`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -47,5 +47,5 @@ fn build_ui(application: &gtk::Application) {`
`47`	`47`	`confetti.explode(params, duration);`
`48`	`48`	`});`
`49`	`49`	`confetti.add_controller(ev_ctrl);`
`50`		`- window.show();`
	`50`	`+ window.present();`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ impl ApplicationImpl for ExApplication {`
`25`	`25`	`let label = gtk::Label::new(Some("Hello"));`
`26`	`26`	`label.add_css_class("title-2");`
`27`	`27`	`window.set_child(Some(&label));`
`28`		`- window.show();`
	`28`	`+ window.present();`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`	`impl GtkApplicationImpl for ExApplication {}`