diff options
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r-- | src/Toolbar.hh | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh index b0aeb60..4453af2 100644 --- a/src/Toolbar.hh +++ b/src/Toolbar.hh | |||
@@ -27,6 +27,7 @@ | |||
27 | 27 | ||
28 | #include "ToolbarTheme.hh" | 28 | #include "ToolbarTheme.hh" |
29 | #include "LayerMenu.hh" | 29 | #include "LayerMenu.hh" |
30 | #include "Resources.hh" | ||
30 | #include "ToolFactory.hh" | 31 | #include "ToolFactory.hh" |
31 | #include "ToolTheme.hh" | 32 | #include "ToolTheme.hh" |
32 | #include "Layer.hh" | 33 | #include "Layer.hh" |
@@ -60,19 +61,6 @@ class Shape; | |||
60 | class Toolbar: public FbTk::EventHandler, | 61 | class Toolbar: public FbTk::EventHandler, |
61 | public LayerObject { | 62 | public LayerObject { |
62 | public: | 63 | public: |
63 | |||
64 | /// Toolbar placement on the screen | ||
65 | enum Placement { | ||
66 | // top and bottom placement | ||
67 | TOPLEFT = 1, TOPCENTER, TOPRIGHT, | ||
68 | BOTTOMLEFT, BOTTOMCENTER, BOTTOMRIGHT, | ||
69 | // left and right placement | ||
70 | LEFTBOTTOM, LEFTCENTER, LEFTTOP, | ||
71 | RIGHTBOTTOM, RIGHTCENTER, RIGHTTOP, | ||
72 | |||
73 | DEFAULT = BOTTOMRIGHT | ||
74 | }; | ||
75 | |||
76 | /// Create a toolbar on the screen with specific width | 64 | /// Create a toolbar on the screen with specific width |
77 | Toolbar(BScreen &screen, FbTk::Layer &layer, size_t width = 200); | 65 | Toolbar(BScreen &screen, FbTk::Layer &layer, size_t width = 200); |
78 | 66 | ||
@@ -187,9 +175,9 @@ private: | |||
187 | FbTk::BoolResource m_rc_auto_hide, m_rc_maximize_over, m_rc_visible; | 175 | FbTk::BoolResource m_rc_auto_hide, m_rc_maximize_over, m_rc_visible; |
188 | FbTk::IntResource m_rc_width_percent; | 176 | FbTk::IntResource m_rc_width_percent; |
189 | FbTk::IntResource m_rc_alpha; | 177 | FbTk::IntResource m_rc_alpha; |
190 | FbTk::Resource<ResourceLayer::Type, FbTk::EnumTraits<ResourceLayer::Type> > m_rc_layernum; | 178 | FbTk::Resource<LayerType, FbTk::EnumTraits<LayerType> > m_rc_layernum; |
191 | FbTk::IntResource m_rc_on_head; | 179 | FbTk::IntResource m_rc_on_head; |
192 | FbTk::Resource<Placement, FbTk::EnumTraits<Placement> > m_rc_placement; | 180 | PlacementResource m_rc_placement; |
193 | FbTk::IntResource m_rc_height; | 181 | FbTk::IntResource m_rc_height; |
194 | FbTk::StringResource m_rc_tools; | 182 | FbTk::StringResource m_rc_tools; |
195 | std::auto_ptr<FbTk::Shape> m_shape; | 183 | std::auto_ptr<FbTk::Shape> m_shape; |