[gnome-games] resume-dialog: Drop and construct manually



commit 714cee7183b77dd03b2c594012f931769effefdf
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Fri Oct 16 04:15:47 2020 +0500

    resume-dialog: Drop and construct manually

 data/org.gnome.Games.gresource.xml |  1 -
 data/ui/resume-dialog.ui           | 28 ----------------------------
 src/meson.build                    |  1 -
 src/ui/display-view.vala           | 16 +++++++++++++---
 src/ui/resume-dialog.vala          |  5 -----
 5 files changed, 13 insertions(+), 38 deletions(-)
---
diff --git a/data/org.gnome.Games.gresource.xml b/data/org.gnome.Games.gresource.xml
index 469cb5f7..13949855 100644
--- a/data/org.gnome.Games.gresource.xml
+++ b/data/org.gnome.Games.gresource.xml
@@ -47,7 +47,6 @@
     <file preprocess="xml-stripblanks">ui/quit-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/remote-display.ui</file>
     <file preprocess="xml-stripblanks">ui/restart-dialog.ui</file>
-    <file preprocess="xml-stripblanks">ui/resume-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/resume-failed-dialog.ui</file>
     <file preprocess="xml-stripblanks">ui/search-bar.ui</file>
     <file preprocess="xml-stripblanks">ui/selection-action-bar.ui</file>
diff --git a/src/meson.build b/src/meson.build
index c4ee634c..b8aec809 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -158,7 +158,6 @@ vala_sources = [
   'ui/quit-dialog.vala',
   'ui/remote-display.vala',
   'ui/restart-dialog.vala',
-  'ui/resume-dialog.vala',
   'ui/resume-failed-dialog.vala',
   'ui/search-bar.vala',
   'ui/selection-action-bar.vala',
diff --git a/src/ui/display-view.vala b/src/ui/display-view.vala
index 1f369eb5..bcd248c6 100644
--- a/src/ui/display-view.vala
+++ b/src/ui/display-view.vala
@@ -126,7 +126,7 @@ private class Games.DisplayView : Gtk.Box, UiView {
        private Cancellable run_game_cancellable;
        private Cancellable quit_game_cancellable;
 
-       private ResumeDialog resume_dialog;
+       private Gtk.MessageDialog resume_dialog;
        private ResumeFailedDialog resume_failed_dialog;
        private QuitDialog quit_dialog;
        private RestartDialog restart_dialog;
@@ -430,8 +430,18 @@ private class Games.DisplayView : Gtk.Box, UiView {
                if (resume_dialog != null)
                        return Gtk.ResponseType.NONE;
 
-               resume_dialog = new ResumeDialog ();
-               resume_dialog.transient_for = window;
+               resume_dialog = new Gtk.MessageDialog (
+                       window,
+                       Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+                       Gtk.MessageType.QUESTION,
+                       Gtk.ButtonsType.NONE,
+                       "%s",
+                       _("Resume last game?")
+               );
+
+               resume_dialog.add_button (_("Restart"), Gtk.ResponseType.CANCEL);
+               resume_dialog.add_button (_("Resume"), Gtk.ResponseType.ACCEPT);
+               resume_dialog.set_default_response (Gtk.ResponseType.ACCEPT);
 
                cancellable.cancelled.connect (() => {
                        resume_dialog.destroy ();


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]