diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-08-15 21:03:57 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 10:04:02 (GMT) |
commit | 698a4af938737295494dade50950d1aeebc8b55d (patch) | |
tree | 075017c3a59ac2575f708d223cf2391e82b9eb69 /src/IconbarTool.cc | |
parent | 678a98de943963e993827540496741ae814af8bd (diff) | |
download | fluxbox_paul-698a4af938737295494dade50950d1aeebc8b55d.zip fluxbox_paul-698a4af938737295494dade50950d1aeebc8b55d.tar.bz2 |
Move declarations of Resource enums to a separate file
The reason for this is that I need to access those enums from fluxbox-update_configs and I don't
want to #include and link everything in src.
I also merged Slit::Placement, Toolbar::Placement and FbWinFrame::TabPlacement into one enum.
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r-- | src/IconbarTool.cc | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index 621a8a1..64378e4 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -65,18 +65,6 @@ using std::string; | |||
65 | using std::list; | 65 | using std::list; |
66 | using std::endl; | 66 | using std::endl; |
67 | 67 | ||
68 | namespace FbTk { | ||
69 | |||
70 | template<> | ||
71 | const EnumTraits<Container::Alignment>::Pair EnumTraits<Container::Alignment>::s_map[] = { | ||
72 | { "Left", Container::LEFT }, | ||
73 | { "Right", Container::RIGHT }, | ||
74 | { "Relative", Container::RELATIVE }, | ||
75 | { NULL, Container::RELATIVE } | ||
76 | }; | ||
77 | |||
78 | } // end namespace FbTk | ||
79 | |||
80 | class IconbarTool::ToolbarModeMenuItem : public FbTk::RadioMenuItem { | 68 | class IconbarTool::ToolbarModeMenuItem : public FbTk::RadioMenuItem { |
81 | public: | 69 | public: |
82 | ToolbarModeMenuItem(const FbTk::FbString &label, IconbarTool &handler, | 70 | ToolbarModeMenuItem(const FbTk::FbString &label, IconbarTool &handler, |
@@ -231,7 +219,7 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, | |||
231 | screen.name() + ".iconbar.iconTextPadding"), | 219 | screen.name() + ".iconbar.iconTextPadding"), |
232 | m_rc_use_pixmap(screen.resourceManager(), true, screen.name() + ".iconbar.usePixmap"), | 220 | m_rc_use_pixmap(screen.resourceManager(), true, screen.name() + ".iconbar.usePixmap"), |
233 | m_menu(new FbMenu(screen.menuTheme(), screen.imageControl(), | 221 | m_menu(new FbMenu(screen.menuTheme(), screen.imageControl(), |
234 | *screen.layerManager().getLayer(ResourceLayer::MENU)) ), | 222 | *screen.layerManager().getLayer(LAYERMENU)) ), |
235 | m_alpha(255) { | 223 | m_alpha(255) { |
236 | 224 | ||
237 | // setup mode menu | 225 | // setup mode menu |