diff options
Diffstat (limited to 'rtorrent-extended/vi_kb_tjwoosta.patch')
| -rw-r--r-- | rtorrent-extended/vi_kb_tjwoosta.patch | 175 |
1 files changed, 0 insertions, 175 deletions
diff --git a/rtorrent-extended/vi_kb_tjwoosta.patch b/rtorrent-extended/vi_kb_tjwoosta.patch deleted file mode 100644 index b7ea5ac..0000000 --- a/rtorrent-extended/vi_kb_tjwoosta.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff --git a/src/ui/download_list.cc b/src/ui/download_list.cc -index e72bff6..30b5987 100644 ---- a/src/ui/download_list.cc -+++ b/src/ui/download_list.cc -@@ -350,9 +350,16 @@ DownloadList::setup_keys() { - m_uiArray[DISPLAY_LOG]->bindings()['B' - '@'] = - m_uiArray[DISPLAY_LOG]->bindings()[' '] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST); - -+ m_uiArray[DISPLAY_LOG]->bindings()['h'] = -+ m_uiArray[DISPLAY_LOG]->bindings()['B' - '@'] = -+ m_uiArray[DISPLAY_LOG]->bindings()[' '] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD_LIST); -+ - m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()[KEY_RIGHT] = - m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['F' - '@'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD); -- m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['l'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_LOG); -+ -+ m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['l'] = -+ m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['F' - '@'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_DOWNLOAD); -+ m_uiArray[DISPLAY_DOWNLOAD_LIST]->bindings()['L'] = sigc::bind(sigc::mem_fun(*this, &DownloadList::activate_display), DISPLAY_LOG); - } - - } -diff --git a/src/ui/element_chunks_seen.cc b/src/ui/element_chunks_seen.cc -index 8ee1dd9..5336b05 100644 ---- a/src/ui/element_chunks_seen.cc -+++ b/src/ui/element_chunks_seen.cc -@@ -54,8 +54,12 @@ ElementChunksSeen::ElementChunksSeen(core::Download* d) : - - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ - m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next); -+ m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_next); - m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev); -+ m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementChunksSeen::receive_prev); - m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementChunksSeen::receive_pagenext); - m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementChunksSeen::receive_pageprev); - } -diff --git a/src/ui/element_download_list.cc b/src/ui/element_download_list.cc -index 1dc9ece..f2763ca 100644 ---- a/src/ui/element_download_list.cc -+++ b/src/ui/element_download_list.cc -@@ -96,7 +96,9 @@ ElementDownloadList::ElementDownloadList() : - m_bindings['9'] = sigc::bind(sigc::mem_fun(*this, &ElementDownloadList::receive_change_view), "active"); - - m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev); -+ m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_prev); - m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next); -+ m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementDownloadList::receive_next); - } - - void -diff --git a/src/ui/element_file_list.cc b/src/ui/element_file_list.cc -index 75ecec0..a24f429 100644 ---- a/src/ui/element_file_list.cc -+++ b/src/ui/element_file_list.cc -@@ -65,7 +65,9 @@ ElementFileList::ElementFileList(core::Download* d) : - m_collapsed(false) { - - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select); -+ m_bindings['l'] = m_bindings['F' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_select); - - m_bindings[' '] = sigc::mem_fun(*this, &ElementFileList::receive_priority); - m_bindings['*'] = sigc::mem_fun(*this, &ElementFileList::receive_change_all); -@@ -74,7 +76,9 @@ ElementFileList::ElementFileList(core::Download* d) : - m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementFileList::receive_pageprev); - - m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_next); -+ m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_next); - m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_prev); -+ m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementFileList::receive_prev); - } - - inline ElementText* -diff --git a/src/ui/element_menu.cc b/src/ui/element_menu.cc -index 04130f3..b6b3ee9 100644 ---- a/src/ui/element_menu.cc -+++ b/src/ui/element_menu.cc -@@ -72,11 +72,15 @@ ElementMenu::ElementMenu() : - m_entry(entry_invalid) { - - // Move bindings into a function that defines default bindings. -- m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_select); -+ m_bindings['l'] = m_bindings['F' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_select); - - m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_prev); -+ m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_prev); - m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_next); -+ m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementMenu::entry_next); - } - - ElementMenu::~ElementMenu() { -diff --git a/src/ui/element_peer_list.cc b/src/ui/element_peer_list.cc -index be0e0b4..8b7303e 100644 ---- a/src/ui/element_peer_list.cc -+++ b/src/ui/element_peer_list.cc -@@ -73,14 +73,18 @@ ElementPeerList::ElementPeerList(core::Download* d) : - - m_elementInfo->slot_exit(sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_LIST)); - -- m_bindings['k'] = sigc::mem_fun(this, &ElementPeerList::receive_disconnect_peer); -+ m_bindings['K'] = sigc::mem_fun(this, &ElementPeerList::receive_disconnect_peer); - m_bindings['*'] = sigc::mem_fun(this, &ElementPeerList::receive_snub_peer); - m_bindings['B'] = sigc::mem_fun(this, &ElementPeerList::receive_ban_peer); -- m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - m_bindings[KEY_RIGHT] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_INFO); -+ m_bindings['l'] = m_bindings['F' - '@'] = sigc::bind(sigc::mem_fun(this, &ElementPeerList::activate_display), DISPLAY_INFO); - - m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_prev); -+ m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_prev); - m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_next); -+ m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(this, &ElementPeerList::receive_next); - } - - ElementPeerList::~ElementPeerList() { -diff --git a/src/ui/element_text.cc b/src/ui/element_text.cc -index a7496f2..4c2e171 100644 ---- a/src/ui/element_text.cc -+++ b/src/ui/element_text.cc -@@ -54,7 +54,9 @@ ElementText::ElementText(rpc::target_type target) : - m_columnWidth(0) { - - // Move bindings into a function that defines default bindings. -- m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - - // m_bindings[KEY_UP] = sigc::mem_fun(this, &ElementText::entry_prev); - // m_bindings[KEY_DOWN] = sigc::mem_fun(this, &ElementText::entry_next); -diff --git a/src/ui/element_tracker_list.cc b/src/ui/element_tracker_list.cc -index 7d81b89..5584653 100644 ---- a/src/ui/element_tracker_list.cc -+++ b/src/ui/element_tracker_list.cc -@@ -55,12 +55,15 @@ ElementTrackerList::ElementTrackerList(core::Download* d) : - m_focus(0) { - - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - - m_bindings[' '] = sigc::mem_fun(*this, &ElementTrackerList::receive_cycle_group); - m_bindings['*'] = sigc::mem_fun(*this, &ElementTrackerList::receive_disable); - - m_bindings[KEY_DOWN] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next); -+ m_bindings['j'] = m_bindings['N' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_next); - m_bindings[KEY_UP] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_prev); -+ m_bindings['k'] = m_bindings['P' - '@'] = sigc::mem_fun(*this, &ElementTrackerList::receive_prev); - } - - void -diff --git a/src/ui/element_transfer_list.cc b/src/ui/element_transfer_list.cc -index 50eaec6..f14a2d2 100644 ---- a/src/ui/element_transfer_list.cc -+++ b/src/ui/element_transfer_list.cc -@@ -54,8 +54,12 @@ ElementTransferList::ElementTransferList(core::Download* d) : - - m_bindings[KEY_LEFT] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); - -+ m_bindings['h'] = m_bindings['B' - '@'] = sigc::mem_fun(&m_slotExit, &slot_type::operator()); -+ - m_bindings[KEY_DOWN] = sigc::mem_fun(*this, &ElementTransferList::receive_next); -+ m_bindings['j'] = sigc::mem_fun(*this, &ElementTransferList::receive_next); - m_bindings[KEY_UP] = sigc::mem_fun(*this, &ElementTransferList::receive_prev); -+ m_bindings['k'] = sigc::mem_fun(*this, &ElementTransferList::receive_prev); - m_bindings[KEY_NPAGE] = sigc::mem_fun(*this, &ElementTransferList::receive_pagenext); - m_bindings[KEY_PPAGE] = sigc::mem_fun(*this, &ElementTransferList::receive_pageprev); - } |