aboutsummaryrefslogtreecommitdiff
path: root/src/Toolbar.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-10 13:57:07 (GMT)
committerfluxgen <fluxgen>2003-05-10 13:57:07 (GMT)
commit4a396013c67a2d5c95009b6b401266fcf4fc1566 (patch)
tree82d8308007d80c77ba327e0e1de4cf4e54eefeb9 /src/Toolbar.hh
parent94deb10b014a0f6bb27bc34a130b5c4df9ee764e (diff)
downloadfluxbox_pavel-4a396013c67a2d5c95009b6b401266fcf4fc1566.zip
fluxbox_pavel-4a396013c67a2d5c95009b6b401266fcf4fc1566.tar.bz2
minor cleaning
Diffstat (limited to 'src/Toolbar.hh')
-rw-r--r--src/Toolbar.hh25
1 files changed, 12 insertions, 13 deletions
diff --git a/src/Toolbar.hh b/src/Toolbar.hh
index 344495d..0fc7b88 100644
--- a/src/Toolbar.hh
+++ b/src/Toolbar.hh
@@ -1,5 +1,5 @@
1// Toolbar.hh for Fluxbox 1// Toolbar.hh for Fluxbox
2// Copyright (c) 2002 Henrik Kinnunen (fluxgen at users.sourceforge.net) 2// Copyright (c) 2002-2003 Henrik Kinnunen (fluxgen at users.sourceforge.net)
3// 3//
4// Toolbar.hh for Blackbox - an X11 Window manager 4// Toolbar.hh for Blackbox - an X11 Window manager
5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net) 5// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
@@ -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: Toolbar.hh,v 1.29 2003/04/25 11:39:31 fluxgen Exp $ 25// $Id: Toolbar.hh,v 1.30 2003/05/10 13:55:57 fluxgen Exp $
26 26
27#ifndef TOOLBAR_HH 27#ifndef TOOLBAR_HH
28#define TOOLBAR_HH 28#define TOOLBAR_HH
@@ -47,13 +47,11 @@ class ImageControl;
47}; 47};
48 48
49/// The toolbar. 49/// The toolbar.
50/** 50/// Handles iconbar, workspace name view and clock view
51 Handles iconbar, workspace name view and clock view
52 */
53class Toolbar : public FbTk::TimeoutHandler, public FbTk::EventHandler { 51class Toolbar : public FbTk::TimeoutHandler, public FbTk::EventHandler {
54public: 52public:
55 53
56 ///Toolbar placement on the screen 54 /// Toolbar placement on the screen
57 enum Placement{ 55 enum Placement{
58 // top and bottom placement 56 // top and bottom placement
59 TOPLEFT = 1, BOTTOMLEFT, TOPCENTER, 57 TOPLEFT = 1, BOTTOMLEFT, TOPCENTER,
@@ -63,9 +61,9 @@ public:
63 RIGHTCENTER, RIGHTBOTTOM, RIGHTTOP 61 RIGHTCENTER, RIGHTBOTTOM, RIGHTTOP
64 }; 62 };
65 63
66 /// create a toolbar on the screen with specific width 64 /// Create a toolbar on the screen with specific width
67 explicit Toolbar(BScreen &screen, FbTk::XLayer &layer, FbTk::Menu &menu, size_t width = 200); 65 Toolbar(BScreen &screen, FbTk::XLayer &layer, FbTk::Menu &menu, size_t width = 200);
68 /// destructor 66
69 virtual ~Toolbar(); 67 virtual ~Toolbar();
70 68
71 /// add icon to iconbar 69 /// add icon to iconbar
@@ -161,12 +159,13 @@ private:
161 159
162 virtual void timeout(); 160 virtual void timeout();
163 } hide_handler; 161 } hide_handler;
162
164 friend class HideHandler; 163 friend class HideHandler;
165 164
166 BScreen &m_screen; 165 BScreen &m_screen; ///< screen connection
167 FbTk::ImageControl &image_ctrl; 166
168 FbTk::Timer clock_timer; ///< timer to update clock 167 FbTk::Timer m_clock_timer; ///< timer to update clock
169 FbTk::Timer hide_timer; ///< timer to for auto hide toolbar 168 FbTk::Timer m_hide_timer; ///< timer to for auto hide toolbar
170 FbTk::Menu &m_toolbarmenu; 169 FbTk::Menu &m_toolbarmenu;
171 FbTk::Menu m_placementmenu; 170 FbTk::Menu m_placementmenu;
172 LayerMenu<Toolbar> m_layermenu; 171 LayerMenu<Toolbar> m_layermenu;