From c80d914e1aca24da78f2e35ff148c38d2ad032a8 Mon Sep 17 00:00:00 2001 From: David Capello Date: Tue, 21 Nov 2017 14:30:30 -0300 Subject: [PATCH] Fix toggle timeline thumbnails command (fix #1518) --- data/pref.xml | 3 -- data/strings/en.ini | 6 ++-- data/widgets/timeline_conf.xml | 10 +++---- src/app/ui/configure_timeline_popup.cpp | 25 ++++++---------- src/app/ui/configure_timeline_popup.h | 1 - src/app/ui/timeline/timeline.cpp | 38 ++++++++++++++++++------- src/app/ui/timeline/timeline.h | 7 +++-- 7 files changed, 47 insertions(+), 43 deletions(-) diff --git a/data/pref.xml b/data/pref.xml index 6270be672..9cdb42770 100644 --- a/data/pref.xml +++ b/data/pref.xml @@ -234,9 +234,6 @@
-
-
diff --git a/data/strings/en.ini b/data/strings/en.ini index 3d6620d9b..97621ce03 100644 --- a/data/strings/en.ini +++ b/data/strings/en.ini @@ -867,10 +867,8 @@ bottom = &Bottom frame_header = Frame Header: first_frame = First Frame: thumbnails = Thumbnails -force = Force -zoom = Zoom: -overlay = Overlay -size = Size: +thumbnail_size = Thumbnail Size: +overlay_size = Overlay Size: onion_skin = Onion Skin: merge_frames = Merge Frames red_blue_tint = Red/Blue Tint diff --git a/data/widgets/timeline_conf.xml b/data/widgets/timeline_conf.xml index fc09c8bb9..3b9d1e45b 100644 --- a/data/widgets/timeline_conf.xml +++ b/data/widgets/timeline_conf.xml @@ -21,16 +21,14 @@ - + - - -