From 5ce4f24c37f00abcb25c08109a75bb3dae7cd400 Mon Sep 17 00:00:00 2001
From: Qingping Hou <dave2008713@gmail.com>
Date: Mon, 7 Jan 2013 12:32:33 -0500
Subject: [PATCH] move CreOptions to credocument.lua

---
 frontend/document/credocument.lua | 63 ++++++++++++++++++++++++++++++-
 frontend/ui/creoptions.lua        | 62 ------------------------------
 2 files changed, 62 insertions(+), 63 deletions(-)
 delete mode 100644 frontend/ui/creoptions.lua

diff --git a/frontend/document/credocument.lua b/frontend/document/credocument.lua
index 8915a93b8..8a3f20ca4 100644
--- a/frontend/document/credocument.lua
+++ b/frontend/document/credocument.lua
@@ -1,5 +1,66 @@
 require "ui/geometry"
-require "ui/creoptions"
+
+CreOptions = {
+	prefix = 'copt',
+	default_options = {
+	},
+	{
+		icon = "resources/icons/appbar.column.two.large.png",
+		options = {
+			{
+				name = "line_spacing",
+				name_text = "Line Spacing",
+				item_text = {"decrease", "increase"},
+				args = {"decrease", "increase"},
+				default_arg = nil,
+				event = "ChangeLineSpace",
+			},
+		}
+	},
+	{
+		icon = "resources/icons/appbar.text.size.large.png",
+		options = {
+			{
+				name = "font_size",
+				item_text = {"Aa", "Aa", "Aa", "Aa", "Aa", "Aa", "Aa", "Aa"},
+				item_align_center = 1.0,
+				spacing = Screen:getWidth()*0.03,
+				item_font_size = {18, 20, 22, 24, 29, 33, 39, 44},
+				values = {18, 20, 22, 24, 29, 33, 39, 44},
+				default_value = 1,
+				event = "SetFontSize",
+			},
+		}
+	},
+	{
+		icon = "resources/icons/appbar.grade.b.large.png",
+		options = {
+			{
+				name = "font_weight",
+				name_text = "Font weight",
+				item_text = {"toggle bolder"},
+				-- args is indeed not used, we put here just to keep the
+				-- UI happy.
+				args = {1},
+				default_arg = nil,
+				event = "ToggleFontBolder",
+			}
+		}
+	},
+	{
+		icon = "resources/icons/appbar.settings.large.png",
+		options = {
+			{
+				name = "view_mode",
+				name_text = "View mode",
+				item_text = {"scroll", "page"},
+				args = {"scroll", "page"},
+				default_arg = "page",
+				event = "SetViewMode",
+			},
+		}
+	},
+}
 
 CreDocument = Document:new{
 	-- this is defined in kpvcrlib/crengine/crengine/include/lvdocview.h
diff --git a/frontend/ui/creoptions.lua b/frontend/ui/creoptions.lua
deleted file mode 100644
index 6fadedd35..000000000
--- a/frontend/ui/creoptions.lua
+++ /dev/null
@@ -1,62 +0,0 @@
-CreOptions = {
-	prefix = 'copt',
-	default_options = {
-	},
-	{
-		icon = "resources/icons/appbar.column.two.large.png",
-		options = {
-			{
-				name = "line_spacing",
-				name_text = "Line Spacing",
-				item_text = {"decrease", "increase"},
-				args = {"decrease", "increase"},
-				default_arg = nil,
-				event = "ChangeLineSpace",
-			},
-		}
-	},
-	{
-		icon = "resources/icons/appbar.text.size.large.png",
-		options = {
-			{
-				name = "font_size",
-				item_text = {"Aa", "Aa", "Aa", "Aa", "Aa", "Aa", "Aa", "Aa"},
-				item_align_center = 1.0,
-				spacing = Screen:getWidth()*0.03,
-				item_font_size = {18, 20, 22, 24, 29, 33, 39, 44},
-				values = {18, 20, 22, 24, 29, 33, 39, 44},
-				default_value = 1,
-				event = "SetFontSize",
-			},
-		}
-	},
-	{
-		icon = "resources/icons/appbar.grade.b.large.png",
-		options = {
-			{
-				name = "font_weight",
-				name_text = "Font weight",
-				item_text = {"toggle bolder"},
-				-- args is indeed not used, we put here just to keep the
-				-- UI happy.
-				args = {1},
-				default_arg = nil,
-				event = "ToggleFontBolder",
-			}
-		}
-	},
-	{
-		icon = "resources/icons/appbar.settings.large.png",
-		options = {
-			{
-				name = "view_mode",
-				name_text = "View mode",
-				item_text = {"scroll", "page"},
-				args = {"scroll", "page"},
-				default_arg = "page",
-				event = "SetViewMode",
-			},
-		}
-	},
-}
-