updated for new toolbar

1 files changed, 13 insertions, 7 deletions

diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh
index eaa7811..d356ead 100644
--- a/src/ToolbarTheme.hh
+++ b/src/ToolbarTheme.hh
@@ -19,7 +19,7 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarTheme.hh,v 1.5 2003/07/10 13:48:35 fluxgen Exp $
+// $Id: ToolbarTheme.hh,v 1.6 2003/08/11 16:54:46 fluxgen Exp $
 
 #ifndef TOOLBARTHEME_HH
 #define TOOLBARTHEME_HH
@@ -54,6 +54,8 @@ public:
     */
     ///@{
     const FbTk::Texture &toolbar() const { return *m_toolbar; }
+    const FbTk::Texture &iconbarFocused() const { return *m_iconbar_focused; }
+    const FbTk::Texture &iconbarUnfocused() const { return *m_iconbar_unfocused; }
     const FbTk::Texture &label() const { return *m_label; }
     const FbTk::Texture &window() const { return *m_window; }
     const FbTk::Texture &button() const { return *m_button; }
@@ -62,6 +64,8 @@ public:
     ///@}
     const FbTk::Font &font() const { return *m_font; }
     FbTk::Font &font() { return *m_font; }
+    const FbTk::Font &iconFont() const { return *m_icon_font; }
+    FbTk::Font &iconFont() { return *m_icon_font; }
     /**
        @name graphic context
      */
@@ -70,6 +74,8 @@ public:
     GC windowTextGC() const { return m_window_text_gc; }
     GC clockTextGC() const { return m_clock_text_gc; }
     GC buttonPicGC() const { return m_button_pic_gc; }
+    GC iconTextFocusedGC() const { return m_icon_text_focused_gc; }
+    GC iconTextUnfocusedGC() const { return m_icon_text_unfocused_gc; }
     ///@}
     FbTk::Justify justify() const { return *m_justify; }
 
@@ -77,27 +83,27 @@ public:
     inline int bevelWidth() const { return *m_bevel_width; }    
     inline int buttonBorderWidth() const { return *m_button_border_width; }
     inline bool shape() const { return *m_shape; }
-
-    void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); }
-    void removeListener(FbTk::Observer &obs) { m_theme_change_sig.detach(&obs); }
+    inline unsigned char alpha() const { return *m_alpha; }
 
 private:
     // text colors
     FbTk::ThemeItem<FbTk::Color> m_label_textcolor, m_window_textcolor, m_clock_textcolor;
     FbTk::ThemeItem<FbTk::Color> m_button_color, m_border_color;
     // textures
-    FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_label, m_window, m_button, m_pressed_button, m_clock;
-    FbTk::ThemeItem<FbTk::Font> m_font;
+    FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_iconbar_focused, m_iconbar_unfocused, 
+        m_label, m_window, m_button, m_pressed_button, m_clock;
+    FbTk::ThemeItem<FbTk::Font> m_font, m_icon_font;
     FbTk::ThemeItem<FbTk::Justify> m_justify;
 
     FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width;
     FbTk::ThemeItem<bool> m_shape;
+    FbTk::ThemeItem<int> m_alpha;
 
     // graphic context
     GC m_label_text_gc, m_window_text_gc, m_clock_text_gc, m_button_pic_gc;
+    GC m_icon_text_unfocused_gc, m_icon_text_focused_gc;
     Display *m_display;
 
-    FbTk::Subject m_theme_change_sig;
 };
 
 #endif // TOOLBARTHEME_HH