updated on Thu Jan 26 16:09:46 UTC 2012
[aur-mirror.git] / rtorrent-extended / kb_vi_tjwoosta.patch
blob89fb705997d33fe7c1a18238c1e3fe1bb4cf84cc
1 diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc
2 index e72bff6..30b5987 100644
3 --- a/src/ui/download_list.cc
4 +++ b/src/ui/download_list.cc
5 @@ -350,9 +350,16 @@ DownloadList::setup_keys() {
6 m_uiArray[DISPLAY_LOG]->bindings()['B' - '@'] =
7 m_uiArray[DISPLAY_LOG]->bindings()[' '] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST);
9 + m_uiArray[DISPLAY_LOG]->bindings()['h'] =
10 + m_uiArray[DISPLAY_LOG]->bindings()['B' - '@'] =
11 + m_uiArray[DISPLAY_LOG]->bindings()[' '] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST);
13 m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()[KEY_RIGHT] =
14 m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['F' - '@'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD);
15 - m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['l'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_LOG);
17 + m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['l'] =
18 + m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['F' - '@'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD);
19 + m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['L'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_LOG);
23 diff --git a/src/ui/element_chunks_seen.cc b/src/ui/element_chunks_seen.cc
24 index 8ee1dd9..5336b05 100644
25 --- a/src/ui/element_chunks_seen.cc
26 +++ b/src/ui/element_chunks_seen.cc
27 @@ -54,8 +54,12 @@ ElementChunksSeen::ElementChunksSeen(core::Download* d) :
29 m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
31 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
33 m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next);
34 + m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next);
35 m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev);
36 + m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev);
37 m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementChunksSeen::receive_pagenext);
38 m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementChunksSeen::receive_pageprev);
40 diff --git a/src/ui/element_download_list.cc b/src/ui/element_download_list.cc
41 index 1dc9ece..f2763ca 100644
42 --- a/src/ui/element_download_list.cc
43 +++ b/src/ui/element_download_list.cc
44 @@ -96,7 +96,9 @@ ElementDownloadList::ElementDownloadList() :
45 m_bindings['9'] = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "active");
47 m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev);
48 + m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev);
49 m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next);
50 + m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next);
53 void
54 diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc
55 index 75ecec0..a24f429 100644
56 --- a/src/ui/element_file_list.cc
57 +++ b/src/ui/element_file_list.cc
58 @@ -65,7 +65,9 @@ ElementFileList::ElementFileList(core::Download* d) :
59 m_collapsed(false) {
61 m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
62 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
63 m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select);
64 + m_bindings['l'] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select);
66 m_bindings[' '] = sigc::mem_fun(*this, &ElementFileList::receive_priority);
67 m_bindings['*'] = sigc::mem_fun(*this, &ElementFileList::receive_change_all);
68 @@ -74,7 +76,9 @@ ElementFileList::ElementFileList(core::Download* d) :
69 m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementFileList::receive_pageprev);
71 m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_next);
72 + m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_next);
73 m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_prev);
74 + m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_prev);
77 inline ElementText*
78 diff --git a/src/ui/element_menu.cc b/src/ui/element_menu.cc
79 index 04130f3..b6b3ee9 100644
80 --- a/src/ui/element_menu.cc
81 +++ b/src/ui/element_menu.cc
82 @@ -72,11 +72,15 @@ ElementMenu::ElementMenu() :
83 m_entry(entry_invalid) {
85 // Move bindings into a function that defines default bindings.
86 - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
87 + m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
88 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
89 m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_select);
90 + m_bindings['l'] = m_bindings['F' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_select);
92 m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_prev);
93 + m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_prev);
94 m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_next);
95 + m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_next);
98 ElementMenu::~ElementMenu() {
99 diff --git a/src/ui/element_peer_list.cc b/src/ui/element_peer_list.cc
100 index da08e15..b521aa3 100644
101 --- a/src/ui/element_peer_list.cc
102 +++ b/src/ui/element_peer_list.cc
103 @@ -73,14 +73,18 @@ ElementPeerList::ElementPeerList(core::Download* d) :
105 m_elementInfo->slot_exit(sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_LIST));
107 - m_bindings['k'] = sigc::mem_fun(this, &ElementPeerList::receive_disconnect_peer);
108 + m_bindings['K'] = sigc::mem_fun(this, &ElementPeerList::receive_disconnect_peer);
109 m_bindings['*'] = sigc::mem_fun(this, &ElementPeerList::receive_snub_peer);
110 m_bindings['B'] = sigc::mem_fun(this, &ElementPeerList::receive_ban_peer);
111 - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
112 + m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
113 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
114 m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_INFO);
115 + m_bindings['l'] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_INFO);
117 m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_prev);
118 + m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_prev);
119 m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_next);
120 + m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_next);
123 ElementPeerList::~ElementPeerList() {
124 diff --git a/src/ui/element_text.cc b/src/ui/element_text.cc
125 index a7496f2..4c2e171 100644
126 --- a/src/ui/element_text.cc
127 +++ b/src/ui/element_text.cc
128 @@ -54,7 +54,9 @@ ElementText::ElementText(rpc::target_type target) :
129 m_columnWidth(0) {
131 // Move bindings into a function that defines default bindings.
132 - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
133 + m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
135 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
137 // m_bindings[KEY_UP] = sigc::mem_fun(this, &ElementText::entry_prev);
138 // m_bindings[KEY_DOWN] = sigc::mem_fun(this, &ElementText::entry_next);
139 diff --git a/src/ui/element_tracker_list.cc b/src/ui/element_tracker_list.cc
140 index 7d81b89..5584653 100644
141 --- a/src/ui/element_tracker_list.cc
142 +++ b/src/ui/element_tracker_list.cc
143 @@ -55,12 +55,15 @@ ElementTrackerList::ElementTrackerList(core::Download* d) :
144 m_focus(0) {
146 m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
147 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
149 m_bindings[' '] = sigc::mem_fun(*this, &ElementTrackerList::receive_cycle_group);
150 m_bindings['*'] = sigc::mem_fun(*this, &ElementTrackerList::receive_disable);
152 m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next);
153 + m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next);
154 m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_prev);
155 + m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_prev);
158 void
159 diff --git a/src/ui/element_transfer_list.cc b/src/ui/element_transfer_list.cc
160 index 50eaec6..f14a2d2 100644
161 --- a/src/ui/element_transfer_list.cc
162 +++ b/src/ui/element_transfer_list.cc
163 @@ -54,8 +54,12 @@ ElementTransferList::ElementTransferList(core::Download* d) :
165 m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
167 + m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator());
169 m_bindings[KEY_DOWN] = sigc::mem_fun(*this, &ElementTransferList::receive_next);
170 + m_bindings['j'] = sigc::mem_fun(*this, &ElementTransferList::receive_next);
171 m_bindings[KEY_UP] = sigc::mem_fun(*this, &ElementTransferList::receive_prev);
172 + m_bindings['k'] = sigc::mem_fun(*this, &ElementTransferList::receive_prev);
173 m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementTransferList::receive_pagenext);
174 m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementTransferList::receive_pageprev);