Merge remote-tracking branch 'baskerville/master'

pull/12/head
Bert Münnich 13 years ago
commit 4057453d6d

@ -93,6 +93,7 @@ The following general key commands are available:
A Toggle visibility of alpha-channel, i.e. transparency A Toggle visibility of alpha-channel, i.e. transparency
r Reload image r Reload image
R Refresh thumbnails
D Remove image from file list and go to next image D Remove image from file list and go to next image

@ -94,6 +94,24 @@ bool it_toggle_bar(arg_t a) {
return true; return true;
} }
bool it_refresh_thumbs(arg_t a) {
int i = 0;
if (mode == MODE_THUMB) {
win_set_cursor(&win, CURSOR_WATCH);
while (i < filecnt) {
if (!tns_load(&tns, i, &files[i], true, false)) {
remove_file(i, false);
tns.dirty = true;
if (tns.sel >= tns.cnt)
tns.sel = tns.cnt - 1;
} else {
i++;
}
}
}
return true;
}
bool it_reload_image(arg_t a) { bool it_reload_image(arg_t a) {
if (mode == MODE_IMAGE) { if (mode == MODE_IMAGE) {
load_image(fileidx); load_image(fileidx);

@ -45,6 +45,7 @@ bool it_quit(arg_t);
bool it_switch_mode(arg_t); bool it_switch_mode(arg_t);
bool it_toggle_fullscreen(arg_t); bool it_toggle_fullscreen(arg_t);
bool it_toggle_bar(arg_t); bool it_toggle_bar(arg_t);
bool it_refresh_thumbs(arg_t);
bool it_reload_image(arg_t); bool it_reload_image(arg_t);
bool it_remove_image(arg_t); bool it_remove_image(arg_t);
bool i_navigate(arg_t); bool i_navigate(arg_t);

@ -64,6 +64,7 @@ static const keymap_t keys[] = {
{ false, XK_b, it_toggle_bar, (arg_t) None }, { false, XK_b, it_toggle_bar, (arg_t) None },
{ false, XK_r, it_reload_image, (arg_t) None }, { false, XK_r, it_reload_image, (arg_t) None },
{ false, XK_R, it_refresh_thumbs, (arg_t) None },
{ false, XK_D, it_remove_image, (arg_t) None }, { false, XK_D, it_remove_image, (arg_t) None },
{ false, XK_n, i_navigate, (arg_t) +1 }, { false, XK_n, i_navigate, (arg_t) +1 },

@ -117,6 +117,9 @@ Toggle visibility of alpha-channel, i.e. image transparency.
.B r .B r
Reload image. Reload image.
.TP .TP
.B R
Refresh thumbnails.
.TP
.B D .B D
Remove current image from file list and go to next image. Remove current image from file list and go to next image.
.SH THUMBNAIL KEYBOARD COMMANDS .SH THUMBNAIL KEYBOARD COMMANDS

Loading…
Cancel
Save