[gnome-games/wip/aplazas/libmanette: 11/15] configurer
- From: Adrien Plazas <aplazas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/aplazas/libmanette: 11/15] configurer
- Date: Wed, 8 Nov 2017 20:26:00 +0000 (UTC)
commit fd2b6fa72b41ed02adb3f14c971eb921ca30faea
Author: Adrien Plazas <kekun plazas laposte net>
Date: Wed Nov 8 19:13:43 2017 +0100
configurer
src/ui/gamepad-configurer.vala | 34 +++-------------------------------
1 files changed, 3 insertions(+), 31 deletions(-)
---
diff --git a/src/ui/gamepad-configurer.vala b/src/ui/gamepad-configurer.vala
index 7ecee36..377c464 100644
--- a/src/ui/gamepad-configurer.vala
+++ b/src/ui/gamepad-configurer.vala
@@ -69,9 +69,7 @@ private class Games.GamepadConfigurer : Gtk.Box {
switch (value) {
case State.TEST:
- var user_mapping = mappings_manager.get_user_mapping (device.get_guid ());
- reset_button.set_sensitive (user_mapping != null);
- reset_button.set_sensitive (true);
+ reset_button.set_sensitive (device.has_user_mapping ());
back_button.show ();
cancel_button.hide ();
@@ -132,11 +130,6 @@ private class Games.GamepadConfigurer : Gtk.Box {
private Manette.Device device;
private GamepadMapper mapper;
private GamepadTester tester;
- private GamepadMappingsManager mappings_manager;
-
- construct {
- mappings_manager = GamepadMappingsManager.get_instance ();
- }
public GamepadConfigurer (Manette.Device device) {
this.device = device;
@@ -174,9 +167,7 @@ private class Games.GamepadConfigurer : Gtk.Box {
message_dialog.response.connect ((response) => {
switch (response) {
case Gtk.ResponseType.ACCEPT:
- mappings_manager.delete_mapping (device.get_guid ());
- var sdl_string = mappings_manager.get_default_mapping
(device.get_guid ());
- set_gamepad_mapping (sdl_string);
+ device.remove_user_mapping ();
reset_button.set_sensitive (false);
break;
@@ -190,26 +181,7 @@ private class Games.GamepadConfigurer : Gtk.Box {
}
private void on_mapper_finished (string sdl_string) {
- mappings_manager.save_mapping (device.get_guid (), device.get_name (), sdl_string);
- set_gamepad_mapping (sdl_string);
-
+ device.save_user_mapping (sdl_string);
state = State.TEST;
}
-
- private void set_gamepad_mapping (string? sdl_string) {
- if (sdl_string == null) {
- // FIXME
- // device.set_mapping (null);
-
- return;
- }
- try {
- // FIXME
- // var mapping = new GamepadMapping.from_sdl_string (sdl_string);
- // device.set_mapping (mapping);
- }
- catch (Error e) {
- critical (e.message);
- }
- }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]