rework hotkeys (2)

This commit is contained in:
Andrew Dolgov 2008-05-15 17:18:29 +01:00
parent 4298481d69
commit 94a82fecd2
3 changed files with 64 additions and 12 deletions

View File

@ -245,7 +245,7 @@ function hotkey_handler(e) {
if (keycode == 16) return; // ignore lone shift
if ((keycode == 70 || keycode == 67) && !hotkey_prefix) {
if ((keycode == 70 || keycode == 67 || keycode == 71) && !hotkey_prefix) {
hotkey_prefix = keycode;
debug("KP: PREFIX=" + keycode);
return;
@ -335,14 +335,23 @@ function hotkey_handler(e) {
return;
}
if (keycode == 84) { // t
/* FIXME: edit tags */
return notify_error("Function not implemented");
if (keycode == 84 && shift_key) { // t
var id = getActiveArticleId();
if (id) {
editArticleTags(id, getActiveFeedId(), isCdmMode());
}
}
if (keycode == 84) { // t
/* FIXME: edit tags */
return notify_error("Function not implemented");
var id = getActiveArticleId();
if (id) {
var cb = document.getElementById("RCHK-" + id);
if (cb) {
cb.checked = !cb.checked;
toggleSelectRowById(cb, "RROW-" + id);
}
}
}
if (keycode == 79) { // o
@ -411,6 +420,32 @@ function hotkey_handler(e) {
}
}
/* Prefix g */
if (hotkey_prefix == 71) { // g
hotkey_prefix = false;
if (keycode == 83) { // s
return viewfeed(-1);
}
if (keycode == 80 && shift_key) { // P
return gotoPreferences();
}
if (keycode == 80) { // p
return viewfeed(-2);
}
if (keycode == 70) { // f
return viewfeed(-3);
}
}
/*
if (keycode == 48) { // 0
return setHotkeyZone(0);

View File

@ -16,10 +16,25 @@
<tr><td class='n'>s</td><td>Toggle starred</td></tr>
<tr><td class='n'>shift-S</td><td>Toggle published</td></tr>
<tr><td class='n'>u</td><td>Toggle unread</td></tr>
<tr><td class='n'>t</td><td>Edit tags</td></tr>
<tr><td class='n'>T</td><td>Edit tags</td></tr>
<? if (get_pref($link, "COMBINED_DISPLAY_MODE")) { ?>
<tr><td class='n'>t</td><td>Select article under mouse pointer</td></tr>
<? } else { ?>
<tr><td class='n'>t</td><td class="insensitive">Select article under mouse pointer <span class="small"></span></td></tr>
<? } ?>
<!-- <tr><td class='n'>S</td><td>Edit score</td></tr> -->
</table>
<h2>Other actions</h2>
<table>
<tr><td class='n'>c f</td><td>Create filter</td></tr>
<tr><td class='n'>c s</td><td>Collapse sidebar</td></tr>
<tr><td class='n'>?</td><td>Display this help dialog</td></tr>
</table>
</td><td>
<h2>Feed actions</h2>
@ -34,14 +49,16 @@
<tr><td class='n'>f C</td><td>Mark all feeds as read</td></tr>
</table>
<h2>Other actions</h2>
<h2>Go to...</h2>
<table>
<tr><td class='n'>c f</td><td>Create filter</td></tr>
<tr><td class='n'>c s</td><td>Collapse sidebar</td></tr>
<tr><td class='n'>?</td><td>Display this help dialog</td></tr>
<tr><td class='n'>g s</td><td>Starred articles</td></tr>
<tr><td class='n'>g f</td><td>Fresh articles</td></tr>
<tr><td class='n'>g p</td><td>Published articles</td></tr>
<tr><td class='n'>g P</td><td>Preferences</td></tr>
</table>
</td></tr></table>
<p class="small">Press any key to close this window.</p>

View File

@ -674,7 +674,7 @@ span.feed_error {
color : red;
}
span.insensitive, div.insensitive, li.insensitive, label.insensitive {
span.insensitive, div.insensitive, li.insensitive, label.insensitive, td.insensitive {
color : gray;
}