From 3ce665150ae80ac933f416489318f966af007d3c Mon Sep 17 00:00:00 2001 From: Colin Clark Date: Tue, 6 Aug 2019 12:28:47 +0100 Subject: [PATCH] Additional commands for multi-page files Control-Home and Control-End for first and last page of a multi-page file. --- doc/docbook/GuideMainWindowMenus.xml | 67 +++++++++++++++++- .../GuideReferenceKeyboardShortcuts.xml | 51 ++++++++++++- src/filedata.c | 17 +++++ src/filedata.h | 1 + src/icons/Makefile.am | 8 +-- src/icons/icon_next_page.png | Bin 11613 -> 0 bytes src/icons/icon_previous_page.png | Bin 18294 -> 0 bytes src/layout_util.c | 24 ++++++- src/pixbuf_util.c | 2 - src/pixbuf_util.h | 2 - src/preferences.c | 6 +- src/toolbar.c | 6 +- 12 files changed, 164 insertions(+), 20 deletions(-) delete mode 100644 src/icons/icon_next_page.png delete mode 100644 src/icons/icon_previous_page.png diff --git a/doc/docbook/GuideMainWindowMenus.xml b/doc/docbook/GuideMainWindowMenus.xml index 0c58c5c9..3f1f93b4 100644 --- a/doc/docbook/GuideMainWindowMenus.xml +++ b/doc/docbook/GuideMainWindowMenus.xml @@ -239,6 +239,7 @@
Go menu + The Page commands are for files which contain multiple images e.g. .tiff files @@ -252,7 +253,7 @@ - Goes tothe first image. + Goes to the first image. @@ -328,6 +329,70 @@ + + + + + + Ctrl + Home + + + First Page + + + + Goes to the first page. + + + + + + + + Ctrl + End + + + Last Page + + + + Goes to the last page. + + + + + + + + Ctrl + PageUp + + + Previous Page + + + + Goes to the previous page. + + + + + + + + Ctrl + PageDown + + + Next Page + + + + Goes to the next page. + +
diff --git a/doc/docbook/GuideReferenceKeyboardShortcuts.xml b/doc/docbook/GuideReferenceKeyboardShortcuts.xml index 7b5993d4..0a553784 100644 --- a/doc/docbook/GuideReferenceKeyboardShortcuts.xml +++ b/doc/docbook/GuideReferenceKeyboardShortcuts.xml @@ -328,6 +328,53 @@ + + + For files with multiple pages e.g. tiff files + + + + + + + + Ctrl + + Home + + + + Go to first page + + + + + Ctrl + + End + + + + Go to last page + + + + + Ctrl + + PageUp + + + + Go to previous page + + + + + Ctrl + + PageDown + + + + Go to next page + File Menu @@ -428,9 +475,7 @@ - - Shift + Delete - + Shift + Delete Permanently delete selected images. diff --git a/src/filedata.c b/src/filedata.c index 2a2a6454..e2580529 100644 --- a/src/filedata.c +++ b/src/filedata.c @@ -3397,6 +3397,23 @@ void marks_clear_all() g_hash_table_foreach(file_data_pool, marks_clear, NULL); } +void file_data_set_page_num(FileData *fd, gint page_num) +{ + if (fd->page_total > 1 && page_num < 0) + { + fd->page_num = fd->page_total - 1; + } + else if (fd->page_total > 1 && page_num <= fd->page_total) + { + fd->page_num = page_num - 1; + } + else + { + fd->page_num = 0; + } + file_data_send_notification(fd, NOTIFY_REREAD); +} + void file_data_inc_page_num(FileData *fd) { if (fd->page_total > 0 && fd->page_num < fd->page_total - 1) diff --git a/src/filedata.h b/src/filedata.h index 201c120b..4664ded0 100644 --- a/src/filedata.h +++ b/src/filedata.h @@ -176,5 +176,6 @@ void read_rating_data(FileData *file); void file_data_inc_page_num(FileData *fd); void file_data_dec_page_num(FileData *fd); void file_data_set_page_total(FileData *fd, gint page_total); +void file_data_set_page_num(FileData *fd, gint page_num); #endif /* vim: set shiftwidth=8 softtabstop=0 cindent cinoptions={1s: */ diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am index df90eead..2ecc437a 100644 --- a/src/icons/Makefile.am +++ b/src/icons/Makefile.am @@ -50,9 +50,7 @@ ICONS_INLINE = \ icon_trash.png \ icon_heic.png \ icon_grayscale.png \ - icon_exposure.png \ - icon_next_page.png \ - icon_previous_page.png + icon_exposure.png ICONS_INLINE_PAIRS = \ folder_closed $(srcdir)/folder_closed.png \ @@ -101,9 +99,7 @@ ICONS_INLINE_PAIRS = \ icon_trash $(srcdir)/icon_trash.png \ icon_heic $(srcdir)/icon_heic.png \ icon_grayscale $(srcdir)/icon_grayscale.png \ - icon_exposure $(srcdir)/icon_exposure.png \ - icon_next_page $(srcdir)/icon_next_page.png \ - icon_previous_page $(srcdir)/icon_previous_page.png + icon_exposure $(srcdir)/icon_exposure.png icons_inline.h: $(ICONS_INLINE) Makefile.in @sh -ec "echo '/* Auto generated file, do not edit */'; echo; \ diff --git a/src/icons/icon_next_page.png b/src/icons/icon_next_page.png deleted file mode 100644 index e3b023b7e34385e2177c1a9aacde209509606b5e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11613 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 W;8FXM1L*tFblU0$Y6U76{Qn15CE1Pu diff --git a/src/icons/icon_previous_page.png b/src/icons/icon_previous_page.png deleted file mode 100644 index f3fcdf9f484accd1faa5f28c87cf972d8b554745..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18294 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

>VAl4qMfzItaei*zOLrlPA;c zX}E4E5F{i&1z}AVR5FigVFo~0aq-vp`MWhBmB^u|b0>5WLu|gt^s4Lm3r6o)!$md= z{dy}q+l(ne8f!pS?m7vedm2XSynlKY3YL%x+gZPvo*3A2+cR_fc}Sj6N~?UH-JAZb zrl_}bnmaK+5jkmr#<4@_Sg4ES`U8u!<17NS_nkXV2G@sZkxo;$;vTXC)-q#H&1w)0 zn%k#!0+lB&uH3eUh%v+WmuPy5dIYofP|R&wPfvY91O3rQv0FTuE^B4*GF9fx^3j

kg!$>Xi^cCaU!n8 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", N_("Next Page"), CB(layout_menu_page_next_cb) }, - { "PrevPage", PIXBUF_INLINE_ICON_PREVIOUS_PAGE, N_("_Previous Page"), "Page_Up", N_("Previous Page"), CB(layout_menu_page_previous_cb) }, + { "FirstPage", GTK_STOCK_MEDIA_PREVIOUS, N_("_First Page"), "Home", N_( "First Page"), CB(layout_menu_page_first_cb) }, + { "LastPage", GTK_STOCK_MEDIA_NEXT, N_("_Last Page"), "End", N_("Last Page"), CB(layout_menu_page_last_cb) }, + { "NextPage", GTK_STOCK_MEDIA_FORWARD, N_("_Next Page"), "Page_Down", N_("Next Page"), CB(layout_menu_page_next_cb) }, + { "PrevPage", GTK_STOCK_MEDIA_REWIND, N_("_Previous Page"), "Page_Up", N_("Previous Page"), CB(layout_menu_page_previous_cb) }, { "NextImageAlt2", GTK_STOCK_GO_DOWN, N_("_Next Image"), "KP_Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) }, @@ -2142,6 +2160,8 @@ static const gchar *menu_ui_description = " " " " " " +" " +" " " " " " " " diff --git a/src/pixbuf_util.c b/src/pixbuf_util.c index 42435372..2a6f79da 100644 --- a/src/pixbuf_util.c +++ b/src/pixbuf_util.c @@ -149,8 +149,6 @@ static PixbufInline inline_pixbuf_data[] = { { PIXBUF_INLINE_ICON_HEIF, icon_heic }, { PIXBUF_INLINE_ICON_GRAYSCALE, icon_grayscale }, { PIXBUF_INLINE_ICON_EXPOSURE, icon_exposure }, - { PIXBUF_INLINE_ICON_NEXT_PAGE, icon_next_page }, - { PIXBUF_INLINE_ICON_PREVIOUS_PAGE, icon_previous_page }, { NULL, NULL } }; diff --git a/src/pixbuf_util.h b/src/pixbuf_util.h index 5bd748ef..bcec3aec 100644 --- a/src/pixbuf_util.h +++ b/src/pixbuf_util.h @@ -77,8 +77,6 @@ gboolean pixbuf_scale_aspect(gint req_w, gint req_h, gint old_w, gint old_h, gin #define PIXBUF_INLINE_ICON_HEIF "icon_heic" #define PIXBUF_INLINE_ICON_GRAYSCALE "icon_grayscale" #define PIXBUF_INLINE_ICON_EXPOSURE "icon_exposure" -#define PIXBUF_INLINE_ICON_NEXT_PAGE "icon_next_page" -#define PIXBUF_INLINE_ICON_PREVIOUS_PAGE "icon_previous_page" #define PIXBUF_INLINE_ICON_CW "icon_rotate_clockwise" #define PIXBUF_INLINE_ICON_CCW "icon_rotate_counter_clockwise" diff --git a/src/preferences.c b/src/preferences.c index 70a612dc..41304baa 100644 --- a/src/preferences.c +++ b/src/preferences.c @@ -654,8 +654,10 @@ static const UseableMouseItems useable_mouse_items[] = { {"Forward", N_("Forward"), GTK_STOCK_GO_FORWARD}, {"Home", N_("Home"), GTK_STOCK_HOME}, {"Up", N_("Up"), GTK_STOCK_GO_UP}, - {"NextPage", N_("Next Page"), PIXBUF_INLINE_ICON_NEXT_PAGE}, - {"PrevPage", N_("Previous Page"), PIXBUF_INLINE_ICON_PREVIOUS_PAGE}, + {"FirstPage", N_("First page"), GTK_STOCK_MEDIA_PREVIOUS}, + {"LastPage", N_("Last Page"), GTK_STOCK_MEDIA_NEXT}, + {"NextPage", N_("Next page"), GTK_STOCK_MEDIA_FORWARD}, + {"PrevPage", N_("Previous Page"), GTK_STOCK_MEDIA_REWIND}, {"NewWindow", N_("New _window"), GTK_STOCK_NEW}, {"NewCollection", N_("New collection"), GTK_STOCK_INDEX}, {"OpenCollection", N_("Open collection"), GTK_STOCK_OPEN}, diff --git a/src/toolbar.c b/src/toolbar.c index f4bc1151..4a484a96 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -79,8 +79,10 @@ static const UseableToolbarItems useable_toolbar_items[] = { {"Forward", N_("Forward"), GTK_STOCK_GO_FORWARD}, {"Home", N_("Home"), GTK_STOCK_HOME}, {"Up", N_("Up"), GTK_STOCK_GO_UP}, - {"NextPage", N_("Next page"), PIXBUF_INLINE_ICON_NEXT_PAGE}, - {"PrevPage", N_("Previous Page"), PIXBUF_INLINE_ICON_PREVIOUS_PAGE}, + {"FirstPage", N_("First page"), GTK_STOCK_MEDIA_PREVIOUS}, + {"LastPage", N_("Last Page"), GTK_STOCK_MEDIA_NEXT}, + {"NextPage", N_("Next page"), GTK_STOCK_MEDIA_FORWARD}, + {"PrevPage", N_("Previous Page"), GTK_STOCK_MEDIA_REWIND}, {"NewWindow", N_("New _window"), GTK_STOCK_NEW}, {"NewCollection", N_("New collection"), GTK_STOCK_INDEX}, {"OpenCollection", N_("Open collection"), GTK_STOCK_OPEN}, -- 2.20.1