diff options
Diffstat (limited to 'src/Theme.hh')
-rw-r--r-- | src/Theme.hh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/Theme.hh b/src/Theme.hh index 2eae595..e31e5a5 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.21 2002/12/01 13:42:00 rathnor Exp $ | 25 | // $Id: Theme.hh,v 1.22 2002/12/02 20:52:50 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef THEME_HH | 27 | #ifndef THEME_HH |
28 | #define THEME_HH | 28 | #define THEME_HH |
@@ -88,19 +88,8 @@ public: | |||
88 | 88 | ||
89 | } WindowStyle; | 89 | } WindowStyle; |
90 | 90 | ||
91 | |||
92 | typedef struct ToolbarStyle { | ||
93 | ToolbarStyle():font("fixed") { } // default font 'fixed' | ||
94 | FbTk::Color l_text, w_text, c_text, b_pic; | ||
95 | FbTk::Texture toolbar, label, window, button, pressed, clock; | ||
96 | GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc; | ||
97 | FbTk::Font font; | ||
98 | DrawUtil::Font::FontJustify justify; | ||
99 | } ToolbarStyle; | ||
100 | |||
101 | inline WindowStyle &getWindowStyle() { return m_windowstyle; } | 91 | inline WindowStyle &getWindowStyle() { return m_windowstyle; } |
102 | inline MenuStyle &getMenuStyle() { return m_menustyle; } | 92 | inline MenuStyle &getMenuStyle() { return m_menustyle; } |
103 | inline ToolbarStyle &getToolbarStyle() { return m_toolbarstyle; } | ||
104 | inline const FbTk::Texture &getSlitTexture() const { return m_slit_texture; } | 93 | inline const FbTk::Texture &getSlitTexture() const { return m_slit_texture; } |
105 | inline unsigned int getBevelWidth() const { return m_bevel_width; } | 94 | inline unsigned int getBevelWidth() const { return m_bevel_width; } |
106 | inline unsigned int getBorderWidth() const { return m_border_width; } | 95 | inline unsigned int getBorderWidth() const { return m_border_width; } |
@@ -120,13 +109,12 @@ private: | |||
120 | void loadMenuStyle(); | 109 | void loadMenuStyle(); |
121 | void loadWindowStyle(); | 110 | void loadWindowStyle(); |
122 | void loadTabStyle(); | 111 | void loadTabStyle(); |
123 | void loadToolbarStyle(); | ||
124 | void loadRootCommand(); | 112 | void loadRootCommand(); |
125 | void loadMisc(); | 113 | void loadMisc(); |
126 | void freeMenuStyle(); | 114 | void freeMenuStyle(); |
127 | void freeWindowStyle(); | 115 | void freeWindowStyle(); |
128 | void freeTabStyle(); | 116 | void freeTabStyle(); |
129 | void freeToolbarStyle(); | 117 | |
130 | void loadFontFromDatabase(FbTk::Font &dest, const char *name, const char *altname); | 118 | void loadFontFromDatabase(FbTk::Font &dest, const char *name, const char *altname); |
131 | bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long); | 119 | bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long); |
132 | bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long); | 120 | bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long); |
@@ -141,7 +129,7 @@ private: | |||
141 | 129 | ||
142 | WindowStyle m_windowstyle; | 130 | WindowStyle m_windowstyle; |
143 | MenuStyle m_menustyle; | 131 | MenuStyle m_menustyle; |
144 | ToolbarStyle m_toolbarstyle; | 132 | |
145 | unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; | 133 | unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; |
146 | FbTk::Color m_border_color; | 134 | FbTk::Color m_border_color; |
147 | GC m_opgc; | 135 | GC m_opgc; |