From 8728c74aacc59ab4a54180dd99d2b7f7d2386d91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Cort=C3=A9z?= <manuel@manuelcortez.net>
Date: Fri, 26 Jun 2015 11:00:02 -0500
Subject: [PATCH] Modified keymaps are saved at exit

---
 src/controller/mainController.py       |   2 +
 src/keymaps/default.keymap             | 105 ++++++++++++-------------
 src/keystrokeEditor/keystrokeEditor.py |   2 -
 3 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/src/controller/mainController.py b/src/controller/mainController.py
index 5b6c6fb4..41848807 100644
--- a/src/controller/mainController.py
+++ b/src/controller/mainController.py
@@ -445,6 +445,7 @@ class Controller(object):
     return output.speak(page.get_message(), True)
   output.speak(_(u"{0} not found.").format(string,), True)
   page.buffer.list.select_item(start)
+
  def edit_keystrokes(self, *args, **kwargs):
   editor = keystrokeEditor.KeystrokeEditor()
   if editor.changed == True:
@@ -553,6 +554,7 @@ class Controller(object):
   log.debug("Exiting...")
   log.debug("Saving global configuration...")
   config.app.write()
+  config.keymap.write()
   for item in session_.sessions:
    if session_.sessions[item].logged == False: continue
    log.debug("Saving config for %s session" % (session_.sessions[item].session_id,))
diff --git a/src/keymaps/default.keymap b/src/keymaps/default.keymap
index 20c6f6f8..8f0b6fc5 100644
--- a/src/keymaps/default.keymap
+++ b/src/keymaps/default.keymap
@@ -1,53 +1,52 @@
-[info]
-name = Default
-desc = TWBlue's default keymap.
-author = Bill Dengler <codeofdusk@gmail.com>
-
-[keymap]
-up = control+win+up
-down = control+win+down
-left = control+win+left
-right = control+win+right
-next_account = control+win+shift+right
-previous_account = control+win+shift+left
-open_conversation = control+win+c
-show_hide = control+win+m
-post_tweet = control+win+n
-post_reply = control+win+r
-post_retweet = control+win+shift+r
-send_dm = control+win+d
-add_to_favourites = alt+win+f
-remove_from_favourites = alt+shift+win+f
-follow = control+win+s
-user_details = control+win+alt+n
-view_item = control+win+v
-exit = control+win+f4
-open_timeline = control+win+i
-remove_buffer = control+win+shift+i
-interact = control+alt+win+return
-url = control+win+return
-volume_up = control+win+alt+up
-volume_down = control+win+alt+down
-go_home = control+win+home
-go_end = control+win+end
-go_page_up = control+win+pageup
-go_page_down = control+win+pagedown
-update_profile = alt+win+p
-delete = control+win+delete
-clear_buffer = control+win+shift+delete
-repeat_item = control+win+space
-copy_to_clipboard = control+win+c
-add_to_list = control+win+a
-remove_from_list = control+win+shift+a
-toggle_buffer_mute = control+win+shift+m
-toggle_session_mute = alt+win+m
-toggle_autoread = control+win+e
-search = control+win+-
-edit_keystrokes = control+win+k
-view_user_lists = control+win+l
-get_more_items = alt+win+pageup
-reverse_geocode = control+win+g
-view_reverse_geocode = control+win+shift+g
-get_trending_topics = control+win+t
-find = control+win+/
-secondary_interact = control+win+alt+return
+[info]
+name = Default
+desc = TWBlue's default keymap.
+author = Bill Dengler <codeofdusk@gmail.com>
+
+[keymap]
+up = control+win+up
+down = control+win+down
+left = control+win+left
+right = control+win+right
+next_account = control+win+shift+right
+previous_account = control+win+shift+left
+open_conversation = control+win+c
+show_hide = control+win+m
+post_tweet = control+win+n
+post_reply = control+win+r
+post_retweet = control+win+shift+r
+send_dm = control+win+d
+add_to_favourites = alt+win+f
+remove_from_favourites = alt+shift+win+f
+follow = control+win+s
+user_details = control+win+alt+n
+view_item = control+win+v
+exit = control+win+f4
+open_timeline = control+win+i
+remove_buffer = control+win+shift+i
+interact = control+alt+win+return
+url = control+win+return
+volume_up = control+win+alt+up
+volume_down = control+win+alt+down
+go_home = control+win+home
+go_end = control+win+end
+go_page_up = control+win+pageup
+go_page_down = control+win+pagedown
+update_profile = alt+win+p
+delete = control+win+delete
+clear_buffer = control+win+shift+delete
+repeat_item = control+win+space
+copy_to_clipboard = control+win+c
+add_to_list = control+win+a
+remove_from_list = control+win+shift+a
+toggle_buffer_mute = control+win+shift+m
+toggle_session_mute = alt+win+m
+toggle_autoread = control+win+e
+search = control+win+-
+edit_keystrokes = control+win+k
+view_user_lists = control+win+l
+get_more_items = alt+win+pageup
+reverse_geocode = control+win+g
+view_reverse_geocode = control+win+shift+g
+get_trending_topics = control+win+t
+find = control+win+/
diff --git a/src/keystrokeEditor/keystrokeEditor.py b/src/keystrokeEditor/keystrokeEditor.py
index 12307716..90c033b9 100644
--- a/src/keystrokeEditor/keystrokeEditor.py
+++ b/src/keystrokeEditor/keystrokeEditor.py
@@ -23,10 +23,8 @@ class KeystrokeEditor(object):
   answer = edit_dialog.get_response()
   if answer == widgetUtils.OK:
    new_keystroke = self.get_edited_keystroke(edit_dialog)
-   print new_keystroke
    if new_keystroke != self.map[action]:
     self.changed = True
-    print "changed"
     self.map[action] = new_keystroke
 
  def set_keystroke(self, keystroke, dialog):