aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-01-12 17:59:20 (GMT)
committerfluxgen <fluxgen>2003-01-12 17:59:20 (GMT)
commit57a53674bc402a475635db1f26bc868a0952a74a (patch)
tree8371e60d60ed7796c9548a1dedd966f9f696e662 /src/Screen.hh
parentfcf431100c1729c8301aa48a884c3b0feef495cb (diff)
downloadfluxbox-57a53674bc402a475635db1f26bc868a0952a74a.zip
fluxbox-57a53674bc402a475635db1f26bc868a0952a74a.tar.bz2
changed Configmenu to FbTk Menu and fix new function setupConfigmenu and removed toolbar placement resource
Diffstat (limited to 'src/Screen.hh')
-rw-r--r--src/Screen.hh17
1 files changed, 7 insertions, 10 deletions
diff --git a/src/Screen.hh b/src/Screen.hh
index 0002e0d..418cb12 100644
--- a/src/Screen.hh
+++ b/src/Screen.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: Screen.hh,v 1.60 2003/01/10 00:34:08 fluxgen Exp $ 25// $Id: Screen.hh,v 1.61 2003/01/12 17:57:46 fluxgen Exp $
26 26
27#ifndef SCREEN_HH 27#ifndef SCREEN_HH
28#define SCREEN_HH 28#define SCREEN_HH
@@ -32,7 +32,8 @@
32#include "Workspace.hh" 32#include "Workspace.hh"
33#include "Tab.hh" 33#include "Tab.hh"
34#include "Resource.hh" 34#include "Resource.hh"
35#include "Toolbar.hh" 35#include "Subject.hh"
36#include "FbWinFrameTheme.hh"
36 37
37#include <X11/Xlib.h> 38#include <X11/Xlib.h>
38#include <X11/Xresource.h> 39#include <X11/Xresource.h>
@@ -48,11 +49,12 @@
48#include "config.h" 49#include "config.h"
49#endif // HAVE_CONFIG_H 50#endif // HAVE_CONFIG_H
50 51
51class Configmenu;
52class Workspacemenu; 52class Workspacemenu;
53class Iconmenu; 53class Iconmenu;
54class Netizen; 54class Netizen;
55class Slit; 55class Slit;
56class Toolbar;
57class FbWinFrameTheme;
56 58
57namespace FbTk { 59namespace FbTk {
58class MenuTheme; 60class MenuTheme;
@@ -168,7 +170,6 @@ public:
168 170
169 /// @return the resource value of number of workspace 171 /// @return the resource value of number of workspace
170 inline int getNumberOfWorkspaces() const { return *resource.workspaces; } 172 inline int getNumberOfWorkspaces() const { return *resource.workspaces; }
171 inline Toolbar::Placement getToolbarPlacement() const { return *resource.toolbar_placement; }
172 173
173 inline int getToolbarOnHead() { return *resource.toolbar_on_head; } 174 inline int getToolbarOnHead() { return *resource.toolbar_on_head; }
174 175
@@ -191,7 +192,6 @@ public:
191 inline void saveToolbarOnTop(bool r) { *resource.toolbar_on_top = r; } 192 inline void saveToolbarOnTop(bool r) { *resource.toolbar_on_top = r; }
192 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } 193 inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; }
193 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } 194 inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; }
194 inline void saveToolbarPlacement(Toolbar::Placement p) { *resource.toolbar_placement = p; }
195 195
196 inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; } 196 inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; }
197 197
@@ -310,6 +310,7 @@ public:
310 }; 310 };
311 311
312private: 312private:
313 void setupConfigmenu(FbTk::Menu &menu);
313 void createStyleMenu(FbTk::Menu &menu, bool newmenu, const char *label, const char *directory); 314 void createStyleMenu(FbTk::Menu &menu, bool newmenu, const char *label, const char *directory);
314 315
315 bool parseMenuFile(std::ifstream &filestream, FbTk::Menu &menu, int &row); 316 bool parseMenuFile(std::ifstream &filestream, FbTk::Menu &menu, int &row);
@@ -333,7 +334,7 @@ private:
333 Window geom_window; 334 Window geom_window;
334 335
335 FbTk::ImageControl *image_control; 336 FbTk::ImageControl *image_control;
336 Configmenu *configmenu; 337 std::auto_ptr<FbTk::Menu> m_configmenu;
337 338
338 std::auto_ptr<FbTk::Menu> m_rootmenu; 339 std::auto_ptr<FbTk::Menu> m_rootmenu;
339 340
@@ -383,10 +384,6 @@ private:
383 Resource<Tab::Alignment> tab_alignment; 384 Resource<Tab::Alignment> tab_alignment;
384 Resource<int> toolbar_on_head; 385 Resource<int> toolbar_on_head;
385 386
386
387 Resource<Toolbar::Placement> toolbar_placement;
388
389
390 bool slit_on_top, slit_auto_hide; 387 bool slit_on_top, slit_auto_hide;
391 int slit_placement, slit_direction; 388 int slit_placement, slit_direction;
392 389