diff options
Diffstat (limited to 'src/Theme.hh')
-rw-r--r-- | src/Theme.hh | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/src/Theme.hh b/src/Theme.hh index e31e5a5..810365b 100644 --- a/src/Theme.hh +++ b/src/Theme.hh | |||
@@ -22,7 +22,7 @@ | |||
22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | 22 | // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER |
23 | // DEALINGS IN THE SOFTWARE. | 23 | // DEALINGS IN THE SOFTWARE. |
24 | 24 | ||
25 | // $Id: Theme.hh,v 1.22 2002/12/02 20:52:50 fluxgen Exp $ | 25 | // $Id: Theme.hh,v 1.23 2003/01/12 18:47:56 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef THEME_HH | 27 | #ifndef THEME_HH |
28 | #define THEME_HH | 28 | #define THEME_HH |
@@ -37,9 +37,10 @@ | |||
37 | 37 | ||
38 | #include <string> | 38 | #include <string> |
39 | 39 | ||
40 | /// OBSOLETE | ||
40 | /** | 41 | /** |
41 | Main theme class, holds themes for | 42 | Main theme class, holds themes for |
42 | Window, toolbar, slit, menu and the rootCommand, for a specific screen. | 43 | Window, slit, and the rootCommand, for a specific screen. |
43 | */ | 44 | */ |
44 | class Theme { | 45 | class Theme { |
45 | public: | 46 | public: |
@@ -48,19 +49,6 @@ public: | |||
48 | int screennum, const char *filename, const char *rootcommand); | 49 | int screennum, const char *filename, const char *rootcommand); |
49 | ~Theme(); | 50 | ~Theme(); |
50 | 51 | ||
51 | |||
52 | typedef struct MenuStyle { | ||
53 | MenuStyle():titlefont("fixed"), | ||
54 | framefont("fixed") { } | ||
55 | FbTk::Color t_text, f_text, h_text, d_text; | ||
56 | FbTk::Texture title, frame, hilite; | ||
57 | GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; | ||
58 | FbTk::Font titlefont, framefont; | ||
59 | DrawUtil::Font::FontJustify framefont_justify; | ||
60 | DrawUtil::Font::FontJustify titlefont_justify; | ||
61 | int bullet, bullet_pos; | ||
62 | } MenuStyle; | ||
63 | |||
64 | typedef struct LabelStyle { | 52 | typedef struct LabelStyle { |
65 | LabelStyle(const char *fontname="fixed"):font(fontname) { } | 53 | LabelStyle(const char *fontname="fixed"):font(fontname) { } |
66 | 54 | ||
@@ -89,7 +77,6 @@ public: | |||
89 | } WindowStyle; | 77 | } WindowStyle; |
90 | 78 | ||
91 | inline WindowStyle &getWindowStyle() { return m_windowstyle; } | 79 | inline WindowStyle &getWindowStyle() { return m_windowstyle; } |
92 | inline MenuStyle &getMenuStyle() { return m_menustyle; } | ||
93 | inline const FbTk::Texture &getSlitTexture() const { return m_slit_texture; } | 80 | inline const FbTk::Texture &getSlitTexture() const { return m_slit_texture; } |
94 | inline unsigned int getBevelWidth() const { return m_bevel_width; } | 81 | inline unsigned int getBevelWidth() const { return m_bevel_width; } |
95 | inline unsigned int getBorderWidth() const { return m_border_width; } | 82 | inline unsigned int getBorderWidth() const { return m_border_width; } |
@@ -106,12 +93,10 @@ public: | |||
106 | 93 | ||
107 | private: | 94 | private: |
108 | 95 | ||
109 | void loadMenuStyle(); | ||
110 | void loadWindowStyle(); | 96 | void loadWindowStyle(); |
111 | void loadTabStyle(); | 97 | void loadTabStyle(); |
112 | void loadRootCommand(); | 98 | void loadRootCommand(); |
113 | void loadMisc(); | 99 | void loadMisc(); |
114 | void freeMenuStyle(); | ||
115 | void freeWindowStyle(); | 100 | void freeWindowStyle(); |
116 | void freeTabStyle(); | 101 | void freeTabStyle(); |
117 | 102 | ||
@@ -128,7 +113,6 @@ private: | |||
128 | 113 | ||
129 | 114 | ||
130 | WindowStyle m_windowstyle; | 115 | WindowStyle m_windowstyle; |
131 | MenuStyle m_menustyle; | ||
132 | 116 | ||
133 | unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; | 117 | unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; |
134 | FbTk::Color m_border_color; | 118 | FbTk::Color m_border_color; |