From 913b36ab830dc19fece710a0b1a883d1cc48f3cf Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Sat, 15 Oct 2011 15:30:32 -0500
Subject: KEYMAPPER: Added clear buttons in remap dialog

This allows clearing of the assigned key for an action.
---
 backends/keymapper/remap-dialog.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/keymapper/remap-dialog.h')

diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h
index f587ae515d..25e336c4fe 100644
--- a/backends/keymapper/remap-dialog.h
+++ b/backends/keymapper/remap-dialog.h
@@ -55,6 +55,7 @@ protected:
 	struct ActionWidgets {
 		GUI::StaticTextWidget *actionText;
 		GUI::ButtonWidget *keyButton;
+		GUI::ButtonWidget *clearButton;
 	};
 	struct ActionInfo {
 		Action *action;
@@ -64,6 +65,7 @@ protected:
 
 	void loadKeymap();
 	void refreshKeymap();
+	void clearMapping(uint i);
 	void startRemapping(uint i);
 	void stopRemapping();
 
-- 
cgit v1.2.3


From 16d529cdc335feea858fde690fc1b3eae48449a2 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 30 Dec 2011 15:28:46 -0600
Subject: KEYMAPPER: Use single column in remap dialog

This is to allow for long labels like in the eob keymap
---
 backends/keymapper/remap-dialog.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/keymapper/remap-dialog.h')

diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h
index 25e336c4fe..1cb930bd42 100644
--- a/backends/keymapper/remap-dialog.h
+++ b/backends/keymapper/remap-dialog.h
@@ -82,7 +82,7 @@ protected:
 	//GUI::ContainerWidget *_container;
 	GUI::ScrollBarWidget *_scrollBar;
 
-	uint _colCount, _rowCount;
+	uint _rowCount;
 
 	Array<ActionWidgets> _keymapWidgets;
 	Action *_activeRemapAction;
-- 
cgit v1.2.3


From 06b52994619fb9a7ef9e54e50b5cc67d07f6a0a0 Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Thu, 9 Feb 2012 02:42:53 -0600
Subject: KEYMAPPER: Fix re-selecting the top keymap

Re-selecting the top entry would always populate the actions
from the GUI keymap since it is the active keymap (the remap
dialog itself is GUI)

The top keymap was correct during RemapDialog::open() because
the gui keymap had not been pushed to the stack yet.
---
 backends/keymapper/remap-dialog.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/keymapper/remap-dialog.h')

diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h
index 1cb930bd42..143deca4cf 100644
--- a/backends/keymapper/remap-dialog.h
+++ b/backends/keymapper/remap-dialog.h
@@ -91,6 +91,8 @@ protected:
 
 	bool _changes;
 
+	bool _topKeymapIsGui;
+
 };
 
 } // End of namespace Common
-- 
cgit v1.2.3