1 files changed, 82 insertions, 62 deletions
diff --git a/apps/plugins/text_viewer/tv_preferences.h b/apps/plugins/text_viewer/tv_preferences.h
index 1e5c45309a..906f5c5f16 100644
--- a/apps/plugins/text_viewer/tv_preferences.h
+++ b/apps/plugins/text_viewer/tv_preferences.h
@@ -23,88 +23,108 @@
 #ifndef PLUGIN_TEXT_VIEWER_PREFERENCES_H
 #define PLUGIN_TEXT_VIEWER_PREFERENCES_H
-enum scrollbar_mode {
+/* scrollbar_mode */
+enum {
    SB_OFF = 0,
    SB_ON,
 };
+/* word_mode */
+enum {
+    WRAP = 0,
+    CHOP,
+};
+/* line_mode */
+enum {
+    NORMAL = 0,
+    JOIN,
+    EXPAND,
+    REFLOW,
+};
+/* alignment */
+enum {
+    LEFT = 0,
+    RIGHT,
+};
+/* page_mode */
+enum {
+    NO_OVERLAP = 0,
+    OVERLAP,
+};
+/* header_mode */
+enum {
+    HD_NONE = 0,
+    HD_PATH,
+    HD_SBAR,
+    HD_BOTH,
+};
+/* footer_mode */
+enum {
+    FT_NONE = 0,
+    FT_PAGE,
+    FT_SBAR,
+    FT_BOTH,
+};
+/* horizontal_scroll_mode */
+enum {
+    SCREEN = 0,
+    COLUMN,
+};
+/* vertical_scroll_mode */
+enum {
+    PAGE = 0,
+    LINE,
+};
+/* narrow_mode */
+enum {
+    NM_PAGE = 0,
+    NM_TOP_BOTTOM,
+};
 struct tv_preferences {
-    enum {
+    unsigned word_mode;
-        WRAP = 0,
+    unsigned line_mode;
-        CHOP,
+    unsigned alignment;
-    } word_mode;
+    unsigned encoding;
-    enum {
-        NORMAL = 0,
+    unsigned horizontal_scrollbar;
-        JOIN,
+    unsigned vertical_scrollbar;
-        EXPAND,
-        REFLOW,
+    unsigned page_mode;
-    } line_mode;
+    unsigned header_mode;
+    unsigned footer_mode;
-    enum {
+    unsigned horizontal_scroll_mode;
-        LEFT = 0,
+    unsigned vertical_scroll_mode;
-        RIGHT,
-    } alignment;
-    enum codepages encoding;
-    enum scrollbar_mode horizontal_scrollbar;
-    enum scrollbar_mode vertical_scrollbar;
-    enum {
-        NO_OVERLAP = 0,
-        OVERLAP,
-    } page_mode;
-    enum {
-        HD_NONE = 0,
-        HD_PATH,
-        HD_SBAR,
-        HD_BOTH,
-    } header_mode;
-    enum {
-        FT_NONE = 0,
-        FT_PAGE,
-        FT_SBAR,
-        FT_BOTH,
-    } footer_mode;
-    enum {
-        SCREEN = 0,
-        COLUMN,
-    } horizontal_scroll_mode;
-    enum {
-        PAGE = 0,
-        LINE,
-    } vertical_scroll_mode;
    int autoscroll_speed;
    int windows;
-    enum {
+    unsigned narrow_mode;
-        NM_PAGE = 0,
-        NM_TOP_BOTTOM,
-    } narrow_mode;
-    int indent_spaces;
+    unsigned indent_spaces;
-    unsigned char font_name[MAX_PATH];
 #ifdef HAVE_LCD_BITMAP
+    unsigned char font_name[MAX_PATH];
    struct font *font;
 #endif
    unsigned char file_name[MAX_PATH];
 };
 /*
- * return the preferences
+ *     global pointer to the preferences
- *
- * return
- *     the pointer the preferences
 */
-const struct tv_preferences *tv_get_preferences(void);
+extern struct tv_preferences *preferences;
 /*
 * change the preferences

diff --git a/apps/plugins/text_viewer/tv_preferences.h b/apps/plugins/text_viewer/tv_preferences.h index 1e5c45309a..906f5c5f16 100644 --- a/apps/plugins/text_viewer/tv_preferences.h +++ b/apps/plugins/text_viewer/tv_preferences.h
@@ -23,88 +23,108 @@
23	#ifndef PLUGIN_TEXT_VIEWER_PREFERENCES_H	23	#ifndef PLUGIN_TEXT_VIEWER_PREFERENCES_H
24	#define PLUGIN_TEXT_VIEWER_PREFERENCES_H	24	#define PLUGIN_TEXT_VIEWER_PREFERENCES_H
25		25
26	enum scrollbar_mode {	26	/* scrollbar_mode */
		27	enum {
27	SB_OFF = 0,	28	SB_OFF = 0,
28	SB_ON,	29	SB_ON,
29	};	30	};
30		31
		32	/* word_mode */
		33	enum {
		34	WRAP = 0,
		35	CHOP,
		36	};
		37
		38	/* line_mode */
		39	enum {
		40	NORMAL = 0,
		41	JOIN,
		42	EXPAND,
		43	REFLOW,
		44	};
		45
		46	/* alignment */
		47	enum {
		48	LEFT = 0,
		49	RIGHT,
		50	};
		51
		52	/* page_mode */
		53	enum {
		54	NO_OVERLAP = 0,
		55	OVERLAP,
		56	};
		57
		58	/* header_mode */
		59	enum {
		60	HD_NONE = 0,
		61	HD_PATH,
		62	HD_SBAR,
		63	HD_BOTH,
		64	};
		65
		66	/* footer_mode */
		67	enum {
		68
		69	FT_NONE = 0,
		70	FT_PAGE,
		71	FT_SBAR,
		72	FT_BOTH,
		73	};
		74
		75	/* horizontal_scroll_mode */
		76	enum {
		77	SCREEN = 0,
		78	COLUMN,
		79	};
		80
		81	/* vertical_scroll_mode */
		82	enum {
		83	PAGE = 0,
		84	LINE,
		85	};
		86
		87	/* narrow_mode */
		88	enum {
		89	NM_PAGE = 0,
		90	NM_TOP_BOTTOM,
		91	};
		92
31	struct tv_preferences {	93	struct tv_preferences {
32	enum {	94	unsigned word_mode;
33	WRAP = 0,	95	unsigned line_mode;
34	CHOP,	96	unsigned alignment;
35	} word_mode;	97
36		98	unsigned encoding;
37	enum {	99
38	NORMAL = 0,	100	unsigned horizontal_scrollbar;
39	JOIN,	101	unsigned vertical_scrollbar;
40	EXPAND,	102
41	REFLOW,	103	unsigned page_mode;
42	} line_mode;	104	unsigned header_mode;
43		105	unsigned footer_mode;
44	enum {	106	unsigned horizontal_scroll_mode;
45	LEFT = 0,	107	unsigned vertical_scroll_mode;
46	RIGHT,
47	} alignment;
48
49	enum codepages encoding;
50
51	enum scrollbar_mode horizontal_scrollbar;
52	enum scrollbar_mode vertical_scrollbar;
53
54	enum {
55	NO_OVERLAP = 0,
56	OVERLAP,
57	} page_mode;
58
59	enum {
60	HD_NONE = 0,
61	HD_PATH,
62	HD_SBAR,
63	HD_BOTH,
64	} header_mode;
65
66	enum {
67	FT_NONE = 0,
68	FT_PAGE,
69	FT_SBAR,
70	FT_BOTH,
71	} footer_mode;
72
73	enum {
74	SCREEN = 0,
75	COLUMN,
76	} horizontal_scroll_mode;
77
78	enum {
79	PAGE = 0,
80	LINE,
81	} vertical_scroll_mode;
82		108
83	int autoscroll_speed;	109	int autoscroll_speed;
84		110
85	int windows;	111	int windows;
86		112
87	enum {	113	unsigned narrow_mode;
88	NM_PAGE = 0,
89	NM_TOP_BOTTOM,
90	} narrow_mode;
91		114
92	int indent_spaces;	115	unsigned indent_spaces;
93		116
94	unsigned char font_name[MAX_PATH];
95	#ifdef HAVE_LCD_BITMAP	117	#ifdef HAVE_LCD_BITMAP
		118	unsigned char font_name[MAX_PATH];
96	struct font *font;	119	struct font *font;
97	#endif	120	#endif
98	unsigned char file_name[MAX_PATH];	121	unsigned char file_name[MAX_PATH];
99	};	122	};
100		123
101	/*	124	/*
102	* return the preferences	125	* global pointer to the preferences
103	*
104	* return
105	* the pointer the preferences
106	*/	126	*/
107	const struct tv_preferences *tv_get_preferences(void);	127	extern struct tv_preferences *preferences;
108		128
109	/*	129	/*
110	* change the preferences	130	* change the preferences