From dd7251e66d7c7d3862f617785fb85a45bbdd678f Mon Sep 17 00:00:00 2001
From: Frans de Jonge <fransdejonge@gmail.com>
Date: Thu, 6 Apr 2017 14:56:40 +0200
Subject: [PATCH] Menu order and separators

* Add separators to navigation menu
* Move speed reading to "typeset" (reading experience) menu
* Move Goodreads over to search

See https://github.com/koreader/koreader/issues/2562#issuecomment-290379241
---
 frontend/ui/elements/filemanager_menu_order.lua |  2 +-
 frontend/ui/elements/reader_menu_order.lua      | 13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/frontend/ui/elements/filemanager_menu_order.lua b/frontend/ui/elements/filemanager_menu_order.lua
index 3cf0c52a1..07657c66b 100644
--- a/frontend/ui/elements/filemanager_menu_order.lua
+++ b/frontend/ui/elements/filemanager_menu_order.lua
@@ -29,7 +29,6 @@ local order = {
     tools = {
         "calibre_wireless_connection",
         "evernote",
-        "goodreads",
         "keep_alive",
         "frontlight_gesture_controller",
         "statistics",
@@ -48,6 +47,7 @@ local order = {
         "find_book_in_calibre_catalog",
         "find_file",
         "----------------------------",
+        "goodreads",
         "opds_catalog",
     },
     main = {
diff --git a/frontend/ui/elements/reader_menu_order.lua b/frontend/ui/elements/reader_menu_order.lua
index 7183bade6..e280361aa 100644
--- a/frontend/ui/elements/reader_menu_order.lua
+++ b/frontend/ui/elements/reader_menu_order.lua
@@ -11,18 +11,24 @@ local order = {
     navi = {
         "table_of_contents",
         "bookmarks",
+        "----------------------------",
         "go_to",
         "skim_to",
+        "----------------------------",
         "follow_links",
     },
     typeset = {
         "page_overlap",
         "switch_zoom_mode",
         "set_render_style",
-        "floating_punctuation",
+        "----------------------------",
         "highlight_options",
+        "----------------------------",
+        "floating_punctuation",
         "change_font",
         "hyphenation",
+        "----------------------------",
+        "speed_reading_module_perception_expander",
     },
     setting = {
         "read_from_right_to_left",
@@ -45,13 +51,11 @@ local order = {
         "read_timer",
         "calibre_wireless_connection",
         "evernote",
-        "goodreads",
         "keep_alive",
         "frontlight_gesture_controller",
         "statistics",
         "battery_statistics",
         "storage_stat",
-        "speed_reading_module_perception_expander",
         "synchronize_time",
         "progress_sync",
         "zsync",
@@ -60,6 +64,9 @@ local order = {
     search = {
         "dictionary_lookup",
         "wikipedia_lookup",
+        "----------------------------",
+        "goodreads",
+        "----------------------------",
         "fulltext_search",
     },
     filemanager = {},