aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarHandler.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-06-24 16:27:18 (GMT)
committerfluxgen <fluxgen>2003-06-24 16:27:18 (GMT)
commit44fbcc447e957d63696e9e2654d9c52803474ebf (patch)
treef68476b388595fdb5b62b98be538e8972a723b4c /src/ToolbarHandler.hh
parent11a0b784b3c3143675ba6b666c57682f4f688e15 (diff)
downloadfluxbox_pavel-44fbcc447e957d63696e9e2654d9c52803474ebf.zip
fluxbox_pavel-44fbcc447e957d63696e9e2654d9c52803474ebf.tar.bz2
cleaning, moved toolbar mode resource here
Diffstat (limited to 'src/ToolbarHandler.hh')
-rw-r--r--src/ToolbarHandler.hh13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/ToolbarHandler.hh b/src/ToolbarHandler.hh
index 4017e53..3986cc0 100644
--- a/src/ToolbarHandler.hh
+++ b/src/ToolbarHandler.hh
@@ -20,7 +20,7 @@
20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 20// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
21// DEALINGS IN THE SOFTWARE. 21// DEALINGS IN THE SOFTWARE.
22 22
23// $Id: ToolbarHandler.hh,v 1.3 2003/06/18 13:35:36 fluxgen Exp $ 23// $Id: ToolbarHandler.hh,v 1.4 2003/06/24 16:27:18 fluxgen Exp $
24 24
25#ifndef TOOLBARHANDLER_HH 25#ifndef TOOLBARHANDLER_HH
26#define TOOLBARHANDLER_HH 26#define TOOLBARHANDLER_HH
@@ -28,6 +28,7 @@
28#include "AtomHandler.hh" 28#include "AtomHandler.hh"
29#include "Menu.hh" 29#include "Menu.hh"
30#include "Toolbar.hh" 30#include "Toolbar.hh"
31#include "Resource.hh"
31 32
32class BScreen; 33class BScreen;
33class FluxboxWindow; 34class FluxboxWindow;
@@ -44,14 +45,14 @@ public:
44 LASTMODE 45 LASTMODE
45 }; 46 };
46 47
47 ToolbarHandler(BScreen &screen, ToolbarMode mode); 48 explicit ToolbarHandler(BScreen &screen);
48 ~ToolbarHandler() { } 49 ~ToolbarHandler() { }
49 50
50 void setMode(ToolbarMode mode, bool initialise = true); 51 void setMode(ToolbarMode mode, bool initialise = true);
51 ToolbarMode getMode() { return m_mode; }; 52 ToolbarMode mode() const { return *m_rc_mode; };
52 53
53 inline const Toolbar *getToolbar() const { return m_toolbar.get(); } 54 inline const Toolbar *toolbar() const { return m_toolbar.get(); }
54 inline Toolbar *getToolbar() { return m_toolbar.get(); } 55 inline Toolbar *toolbar() { return m_toolbar.get(); }
55 56
56 57
57 void initForScreen(BScreen &screen); 58 void initForScreen(BScreen &screen);
@@ -84,7 +85,7 @@ public:
84 85
85private: 86private:
86 BScreen &m_screen; 87 BScreen &m_screen;
87 ToolbarMode m_mode; 88 FbTk::Resource<ToolbarMode> m_rc_mode;
88 std::auto_ptr<Toolbar> m_toolbar; 89 std::auto_ptr<Toolbar> m_toolbar;
89 unsigned int m_current_workspace; 90 unsigned int m_current_workspace;
90 91