[gnome-games] reset-controller-mapping-dialog: Drop and create manually
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games] reset-controller-mapping-dialog: Drop and create manually
- Date: Thu, 15 Oct 2020 23:40:23 +0000 (UTC)
commit 5ce74921486db83f703718fea8e990c68b273abe
Author: Alexander Mikhaylenko <alexm gnome org>
Date: Fri Oct 16 03:03:32 2020 +0500
reset-controller-mapping-dialog: Drop and create manually
Remove the template, GtkMessageDialog is not derivable in GTK4.
data/org.gnome.Games.gresource.xml | 1 -
data/ui/reset-controller-mapping-dialog.ui | 32 -----------------------------
src/meson.build | 1 -
src/ui/preferences-subpage-gamepad.vala | 23 ++++++++++++++++-----
src/ui/preferences-subpage-keyboard.vala | 23 ++++++++++++++++-----
src/ui/reset-controller-mapping-dialog.vala | 5 -----
6 files changed, 36 insertions(+), 49 deletions(-)
---
diff --git a/data/org.gnome.Games.gresource.xml b/data/org.gnome.Games.gresource.xml
index e0b86211..469cb5f7 100644
--- a/data/org.gnome.Games.gresource.xml
+++ b/data/org.gnome.Games.gresource.xml
@@ -46,7 +46,6 @@
<file preprocess="xml-stripblanks">ui/preferences-window.ui</file>
<file preprocess="xml-stripblanks">ui/quit-dialog.ui</file>
<file preprocess="xml-stripblanks">ui/remote-display.ui</file>
- <file preprocess="xml-stripblanks">ui/reset-controller-mapping-dialog.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>
diff --git a/src/meson.build b/src/meson.build
index ca368448..762d68ba 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -158,7 +158,6 @@ vala_sources = [
'ui/preferences-window.vala',
'ui/quit-dialog.vala',
'ui/remote-display.vala',
- 'ui/reset-controller-mapping-dialog.vala',
'ui/restart-dialog.vala',
'ui/resume-dialog.vala',
'ui/resume-failed-dialog.vala',
diff --git a/src/ui/preferences-subpage-gamepad.vala b/src/ui/preferences-subpage-gamepad.vala
index ecfe5bf8..24c5d1ca 100644
--- a/src/ui/preferences-subpage-gamepad.vala
+++ b/src/ui/preferences-subpage-gamepad.vala
@@ -136,9 +136,21 @@ private class Games.PreferencesSubpageGamepad : Gtk.Bin, PreferencesSubpage {
}
private void reset_mapping () {
- var message_dialog = new ResetControllerMappingDialog ();
- message_dialog.transient_for = get_toplevel () as Gtk.Window;
- message_dialog.response.connect ((response) => {
+ var dialog = new Gtk.MessageDialog (
+ get_toplevel () as Gtk.Window,
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+ Gtk.MessageType.QUESTION,
+ Gtk.ButtonsType.CANCEL,
+ "%s",
+ _("Factory reset mapping for this controller?")
+ );
+
+ dialog.format_secondary_text ("%s", _("Your mapping will be lost"));
+
+ var button = dialog.add_button (C_("Confirm controller configuration factory reset",
"_Reset"), Gtk.ResponseType.ACCEPT);
+ button.get_style_context ().add_class ("destructive-action");
+
+ dialog.response.connect ((response) => {
switch (response) {
case Gtk.ResponseType.ACCEPT:
device.remove_user_mapping ();
@@ -149,9 +161,10 @@ private class Games.PreferencesSubpageGamepad : Gtk.Bin, PreferencesSubpage {
break;
}
- message_dialog.destroy ();
+ dialog.destroy ();
});
- message_dialog.show ();
+
+ dialog.present ();
}
private void on_mapper_finished (string sdl_string) {
diff --git a/src/ui/preferences-subpage-keyboard.vala b/src/ui/preferences-subpage-keyboard.vala
index e0857fd7..d3831fb5 100644
--- a/src/ui/preferences-subpage-keyboard.vala
+++ b/src/ui/preferences-subpage-keyboard.vala
@@ -118,9 +118,21 @@ private class Games.PreferencesSubpageKeyboard : Gtk.Bin, PreferencesSubpage {
}
private void reset_mapping () {
- var message_dialog = new ResetControllerMappingDialog ();
- message_dialog.transient_for = get_toplevel () as Gtk.Window;
- message_dialog.response.connect ((response) => {
+ var dialog = new Gtk.MessageDialog (
+ get_toplevel () as Gtk.Window,
+ Gtk.DialogFlags.MODAL | Gtk.DialogFlags.DESTROY_WITH_PARENT,
+ Gtk.MessageType.QUESTION,
+ Gtk.ButtonsType.CANCEL,
+ "%s",
+ _("Factory reset mapping for this controller?")
+ );
+
+ dialog.format_secondary_text ("%s", _("Your mapping will be lost"));
+
+ var button = dialog.add_button (C_("Confirm controller configuration factory reset",
"_Reset"), Gtk.ResponseType.ACCEPT);
+ button.get_style_context ().add_class ("destructive-action");
+
+ dialog.response.connect ((response) => {
switch (response) {
case Gtk.ResponseType.ACCEPT:
mapping_manager.delete_mapping ();
@@ -131,9 +143,10 @@ private class Games.PreferencesSubpageKeyboard : Gtk.Bin, PreferencesSubpage {
break;
}
- message_dialog.destroy ();
+ dialog.destroy ();
});
- message_dialog.show ();
+
+ dialog.present ();
}
private void on_mapper_finished (Retro.KeyJoypadMapping mapping) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]