[gnome-games/wip/abhinavsingh/gamepad-reassign: 20/24] ui: Add GamepadConfigurer
- From: Abhinav Singh <abhinavsingh src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/abhinavsingh/gamepad-reassign: 20/24] ui: Add GamepadConfigurer
- Date: Sat, 22 Jul 2017 20:34:31 +0000 (UTC)
commit c0a17c573b3e6732782fea3ce8d4eaab2e879d5a
Author: theawless <theawless gmail com>
Date: Fri Jul 21 12:34:02 2017 +0530
ui: Add GamepadConfigurer
Allows the user to create, save, and reset gamepad mappings.
data/Makefile.am | 2 +
data/org.gnome.Games.gresource.xml | 2 +
data/ui/gamepad-configurer.ui | 106 +++++++++++++++
data/ui/reset-gamepad-mapping-dialog.ui | 32 +++++
src/Makefile.am | 2 +
src/ui/gamepad-configurer.vala | 217 ++++++++++++++++++++++++++++++
src/ui/reset-gamepad-mapping-dialog.vala | 5 +
7 files changed, 366 insertions(+), 0 deletions(-)
---
diff --git a/data/Makefile.am b/data/Makefile.am
index 0b9e21f..947b80e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -37,6 +37,7 @@ EXTRA_DIST = \
ui/empty-collection.ui \
ui/error-display.ui \
ui/error-info-bar.ui \
+ ui/gamepad-configurer.ui \
ui/gamepad-mapper.ui \
ui/gamepad-tester.ui \
ui/game-icon-view.ui \
@@ -48,6 +49,7 @@ EXTRA_DIST = \
ui/preferences-window.ui \
ui/quit-dialog.ui \
ui/remote-display.ui \
+ ui/reset-gamepad-mapping-dialog.ui \
ui/resume-dialog.ui \
ui/resume-failed-dialog.ui \
ui/search-bar.ui \
diff --git a/data/org.gnome.Games.gresource.xml b/data/org.gnome.Games.gresource.xml
index 61d23af..a9e846d 100644
--- a/data/org.gnome.Games.gresource.xml
+++ b/data/org.gnome.Games.gresource.xml
@@ -16,6 +16,7 @@
<file preprocess="xml-stripblanks">ui/empty-collection.ui</file>
<file preprocess="xml-stripblanks">ui/error-display.ui</file>
<file preprocess="xml-stripblanks">ui/error-info-bar.ui</file>
+ <file preprocess="xml-stripblanks">ui/gamepad-configurer.ui</file>
<file preprocess="xml-stripblanks">ui/gamepad-mapper.ui</file>
<file preprocess="xml-stripblanks">ui/gamepad-tester.ui</file>
<file preprocess="xml-stripblanks">ui/game-icon-view.ui</file>
@@ -27,6 +28,7 @@
<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-gamepad-mapping-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>
diff --git a/data/ui/gamepad-configurer.ui b/data/ui/gamepad-configurer.ui
new file mode 100644
index 0000000..e0767da
--- /dev/null
+++ b/data/ui/gamepad-configurer.ui
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <template class="GamesGamepadConfigurer" parent="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkStack" id="stack">
+ <property name="visible">True</property>
+ <property name="halign">fill</property>
+ <property name="valign">fill</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child>
+ <object class="GtkBox" id="gamepad_mapper_holder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="name">gamepad_mapper</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="gamepad_tester_holder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="name">gamepad_tester</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkActionBar" id="action_bar">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="reset_button">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Reset</property>
+ <signal name="clicked" handler="on_reset_clicked"/>
+ <style>
+ <class name="destructive-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="configure_button">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Configure</property>
+ <signal name="clicked" handler="on_configure_clicked"/>
+ <style>
+ <class name="suggested-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </template>
+ <object class="GtkHeaderBar" id="header_bar">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="back_button">
+ <property name="visible">True</property>
+ <signal name="clicked" handler="on_back_clicked"/>
+ <style>
+ <class name="image-button"/>
+ </style>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="a11y-back">
+ <property name="accessible-name" translatable="yes">Back</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkImage" id="back_image">
+ <property name="visible">True</property>
+ <property name="icon-name">go-previous-symbolic</property>
+ <property name="icon-size">1</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="pack-type">start</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="cancel_button">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Cancel</property>
+ <signal name="clicked" handler="on_cancel_clicked"/>
+ <style>
+ <class name="destructive-action"/>
+ </style>
+ </object>
+ <packing>
+ <property name="pack-type">end</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/data/ui/reset-gamepad-mapping-dialog.ui b/data/ui/reset-gamepad-mapping-dialog.ui
new file mode 100644
index 0000000..146c0b4
--- /dev/null
+++ b/data/ui/reset-gamepad-mapping-dialog.ui
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <requires lib="gtk+" version="3.16"/>
+ <template class="GamesResetGamepadMappingDialog" parent="GtkMessageDialog">
+ <property name="modal">True</property>
+ <property name="destroy-with-parent">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="message_type">question</property>
+ <property name="text" translatable="yes">Factory reset mapping for this gamepad?</property>
+ <property name="secondary_text" translatable="yes">Your mapping will be lost.</property>
+ <child type="action">
+ <object class="GtkButton" id="button_cancel">
+ <property name="visible">True</property>
+ <property name="can-default">True</property>
+ <property name="label" translatable="yes">Cancel</property>
+ </object>
+ </child>
+ <child type="action">
+ <object class="GtkButton" id="button_reset">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Reset</property>
+ <style>
+ <class name="destructive-action"/>
+ </style>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="accept">button_reset</action-widget>
+ <action-widget response="cancel" default="true">button_cancel</action-widget>
+ </action-widgets>
+ </template>
+</interface>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2632f73..0bfd623 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -146,6 +146,7 @@ gnome_games_SOURCES = \
ui/empty-collection.vala \
ui/error-display.vala \
ui/error-info-bar.vala \
+ ui/gamepad-configurer.vala \
ui/gamepad-mapper.vala \
ui/gamepad-tester.vala \
ui/gamepad-view.vala \
@@ -161,6 +162,7 @@ gnome_games_SOURCES = \
ui/preferences-window.vala \
ui/quit-dialog.vala \
ui/remote-display.vala \
+ ui/reset-gamepad-mapping-dialog.vala \
ui/resume-dialog.vala \
ui/resume-failed-dialog.vala \
ui/search-bar.vala \
diff --git a/src/ui/gamepad-configurer.vala b/src/ui/gamepad-configurer.vala
new file mode 100644
index 0000000..e720e87
--- /dev/null
+++ b/src/ui/gamepad-configurer.vala
@@ -0,0 +1,217 @@
+// This file is part of GNOME Games. License: GPL-3.0+.
+
+[GtkTemplate (ui = "/org/gnome/Games/ui/gamepad-configurer.ui")]
+private class Games.GamepadConfigurer : Gtk.Box {
+
+ private const GamepadInput[] STANDARD_GAMEPAD_INPUTS = {
+ { EventCode.EV_KEY, EventCode.BTN_A },
+ { EventCode.EV_KEY, EventCode.BTN_B },
+ { EventCode.EV_KEY, EventCode.BTN_X },
+ { EventCode.EV_KEY, EventCode.BTN_Y },
+ { EventCode.EV_KEY, EventCode.BTN_THUMBL },
+ { EventCode.EV_KEY, EventCode.BTN_THUMBR },
+ { EventCode.EV_KEY, EventCode.BTN_TL },
+ { EventCode.EV_KEY, EventCode.BTN_TR },
+ { EventCode.EV_KEY, EventCode.BTN_TL2 },
+ { EventCode.EV_KEY, EventCode.BTN_TR2 },
+ { EventCode.EV_KEY, EventCode.BTN_DPAD_UP },
+ { EventCode.EV_KEY, EventCode.BTN_DPAD_LEFT },
+ { EventCode.EV_KEY, EventCode.BTN_DPAD_DOWN },
+ { EventCode.EV_KEY, EventCode.BTN_DPAD_RIGHT },
+ { EventCode.EV_KEY, EventCode.BTN_SELECT },
+ { EventCode.EV_KEY, EventCode.BTN_MODE },
+ { EventCode.EV_KEY, EventCode.BTN_START },
+ { EventCode.EV_ABS, EventCode.ABS_X },
+ { EventCode.EV_ABS, EventCode.ABS_RX },
+ { EventCode.EV_ABS, EventCode.ABS_Y },
+ { EventCode.EV_ABS, EventCode.ABS_RY },
+ };
+
+ private const GamepadInputPath[] STANDARD_GAMEPAD_INPUT_PATHS = {
+ { { EventCode.EV_ABS, EventCode.ABS_X }, "leftx" },
+ { { EventCode.EV_ABS, EventCode.ABS_Y }, "lefty" },
+ { { EventCode.EV_ABS, EventCode.ABS_RX }, "rightx" },
+ { { EventCode.EV_ABS, EventCode.ABS_RY }, "righty" },
+ { { EventCode.EV_KEY, EventCode.BTN_A }, "a" },
+ { { EventCode.EV_KEY, EventCode.BTN_B }, "b" },
+ { { EventCode.EV_KEY, EventCode.BTN_DPAD_DOWN }, "dpdown" },
+ { { EventCode.EV_KEY, EventCode.BTN_DPAD_LEFT }, "dpleft" },
+ { { EventCode.EV_KEY, EventCode.BTN_DPAD_RIGHT }, "dpright" },
+ { { EventCode.EV_KEY, EventCode.BTN_DPAD_UP }, "dpup" },
+ { { EventCode.EV_KEY, EventCode.BTN_MODE }, "guide" },
+ { { EventCode.EV_KEY, EventCode.BTN_SELECT }, "back" },
+ { { EventCode.EV_KEY, EventCode.BTN_TL }, "leftshoulder" },
+ { { EventCode.EV_KEY, EventCode.BTN_TR }, "rightshoulder" },
+ { { EventCode.EV_KEY, EventCode.BTN_START }, "start" },
+ { { EventCode.EV_KEY, EventCode.BTN_THUMBL }, "leftstick" },
+ { { EventCode.EV_KEY, EventCode.BTN_THUMBR }, "rightstick" },
+ { { EventCode.EV_KEY, EventCode.BTN_TL2 }, "lefttrigger" },
+ { { EventCode.EV_KEY, EventCode.BTN_TR2 }, "righttrigger" },
+ { { EventCode.EV_KEY, EventCode.BTN_Y }, "x" },
+ { { EventCode.EV_KEY, EventCode.BTN_X }, "y" },
+ };
+
+ private const GamepadViewConfiguration STANDARD_GAMEPAD_VIEW_CONFIGURATION = {
+ "resource:///org/gnome/Games/gamepads/standard-gamepad.svg", STANDARD_GAMEPAD_INPUT_PATHS
+ };
+
+ private enum State {
+ TEST,
+ CONFIGURE,
+ }
+
+ public signal void back ();
+
+ private State? _state;
+ private State? state {
+ set {
+ _state = value;
+ immersive_mode = (state == State.CONFIGURE);
+
+ switch (value) {
+ case State.TEST:
+ var user_mapping = mappings_manager.get_user_mapping (gamepad.guid);
+ reset_button.set_sensitive (user_mapping != null);
+
+ back_button.show ();
+ cancel_button.hide ();
+ action_bar.show ();
+ header_bar.title = _("Testing ") + gamepad.name;
+ header_bar.get_style_context ().remove_class ("selection-mode");
+ stack.set_visible_child_name ("gamepad_tester");
+
+ tester.start ();
+ mapper.stop ();
+ mapper.finished.disconnect (on_mapper_finished);
+
+ break;
+ case State.CONFIGURE:
+ back_button.hide ();
+ cancel_button.show ();
+ action_bar.hide ();
+ header_bar.title = _("Configuring ") + gamepad.name;
+ header_bar.get_style_context ().add_class ("selection-mode");
+ stack.set_visible_child_name ("gamepad_mapper");
+
+ tester.stop ();
+ mapper.start ();
+ mapper.finished.connect (on_mapper_finished);
+
+ break;
+ }
+ }
+ get { return _state; }
+ }
+
+ [GtkChild (name = "header_bar")]
+ private Gtk.HeaderBar _header_bar;
+ public Gtk.HeaderBar header_bar {
+ private set { _header_bar = value; }
+ get { return _header_bar; }
+ }
+
+ private bool _immersive_mode;
+ public bool immersive_mode {
+ private set { _immersive_mode = value; }
+ get { return _immersive_mode; }
+ }
+
+ [GtkChild]
+ private Gtk.Stack stack;
+ [GtkChild]
+ private Gtk.Box gamepad_mapper_holder;
+ [GtkChild]
+ private Gtk.Box gamepad_tester_holder;
+ [GtkChild]
+ private Gtk.ActionBar action_bar;
+ [GtkChild]
+ private Gtk.Button reset_button;
+ [GtkChild]
+ private Gtk.Button configure_button;
+ [GtkChild]
+ private Gtk.Button back_button;
+ [GtkChild]
+ private Gtk.Button cancel_button;
+
+ private Gamepad gamepad;
+ private GamepadMapper mapper;
+ private GamepadTester tester;
+ private GamepadMappingsManager mappings_manager;
+
+ construct {
+ mappings_manager = GamepadMappingsManager.get_instance ();
+ }
+
+ public GamepadConfigurer (Gamepad gamepad) {
+ this.gamepad = gamepad;
+ mapper = new GamepadMapper (gamepad, STANDARD_GAMEPAD_VIEW_CONFIGURATION,
STANDARD_GAMEPAD_INPUTS);
+ gamepad_mapper_holder.pack_start (mapper);
+ tester = new GamepadTester (gamepad, STANDARD_GAMEPAD_VIEW_CONFIGURATION);
+ gamepad_tester_holder.pack_start (tester);
+
+ state = State.TEST;
+ }
+
+ [GtkCallback]
+ private void on_reset_clicked () {
+ reset_mapping ();
+ }
+
+ [GtkCallback]
+ private void on_configure_clicked () {
+ state = State.CONFIGURE;
+ }
+
+ [GtkCallback]
+ private void on_back_clicked () {
+ back ();
+ }
+
+ [GtkCallback]
+ private void on_cancel_clicked () {
+ state = State.TEST;
+ }
+
+ private void reset_mapping () {
+ var message_dialog = new ResetGamepadMappingDialog ();
+ message_dialog.set_transient_for ((Gtk.Window) get_toplevel ());
+ message_dialog.response.connect ((response) => {
+ switch (response) {
+ case Gtk.ResponseType.ACCEPT:
+ mappings_manager.delete_mapping (gamepad.guid);
+ var sdl_string = mappings_manager.get_default_mapping (gamepad.guid);
+ set_gamepad_mapping (sdl_string);
+ reset_button.set_sensitive (false);
+
+ break;
+ default:
+ break;
+ }
+
+ message_dialog.destroy();
+ });
+ message_dialog.show ();
+ }
+
+ private void on_mapper_finished (string sdl_string) {
+ mappings_manager.save_mapping (gamepad.guid, gamepad.name, sdl_string);
+ set_gamepad_mapping (sdl_string);
+
+ state = State.TEST;
+ }
+
+ private void set_gamepad_mapping (string? sdl_string) {
+ if (sdl_string == null) {
+ gamepad.set_mapping (null);
+
+ return;
+ }
+ try {
+ var mapping = new GamepadMapping.from_sdl_string (sdl_string);
+ gamepad.set_mapping (mapping);
+ }
+ catch (Error e) {
+ warning (e.message);
+ }
+ }
+}
diff --git a/src/ui/reset-gamepad-mapping-dialog.vala b/src/ui/reset-gamepad-mapping-dialog.vala
new file mode 100644
index 0000000..adff3e0
--- /dev/null
+++ b/src/ui/reset-gamepad-mapping-dialog.vala
@@ -0,0 +1,5 @@
+// This file is part of GNOME Games. License: GPL-3.0+.
+
+[GtkTemplate (ui = "/org/gnome/Games/ui/reset-gamepad-mapping-dialog.ui")]
+public class Games.ResetGamepadMappingDialog : Gtk.MessageDialog {
+}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
