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/ScreenPlacement.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/ScreenPlacement.cc')
-rw-r--r-- | src/ScreenPlacement.cc | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/src/ScreenPlacement.cc b/src/ScreenPlacement.cc index 0da61cd..619cca3 100644 --- a/src/ScreenPlacement.cc +++ b/src/ScreenPlacement.cc | |||
@@ -44,9 +44,9 @@ using std::cerr; | |||
44 | using std::endl; | 44 | using std::endl; |
45 | 45 | ||
46 | ScreenPlacement::ScreenPlacement(BScreen &screen): | 46 | ScreenPlacement::ScreenPlacement(BScreen &screen): |
47 | m_row_direction(screen.resourceManager(), LEFTRIGHT, | 47 | m_row_direction(screen.resourceManager(), LEFTRIGHTDIRECTION, |
48 | screen.name()+".rowPlacementDirection"), | 48 | screen.name()+".rowPlacementDirection"), |
49 | m_col_direction(screen.resourceManager(), TOPBOTTOM, | 49 | m_col_direction(screen.resourceManager(), TOPBOTTOMDIRECTION, |
50 | screen.name()+".colPlacementDirection"), | 50 | screen.name()+".colPlacementDirection"), |
51 | m_placement_policy(screen.resourceManager(), ROWMINOVERLAPPLACEMENT, | 51 | m_placement_policy(screen.resourceManager(), ROWMINOVERLAPPLACEMENT, |
52 | screen.name()+".windowPlacement"), | 52 | screen.name()+".windowPlacement"), |
@@ -174,33 +174,3 @@ void ScreenPlacement::placeAndShowMenu(FbTk::Menu& menu, int x, int y, bool resp | |||
174 | menu.show(); | 174 | menu.show(); |
175 | menu.grabInputFocus(); | 175 | menu.grabInputFocus(); |
176 | } | 176 | } |
177 | |||
178 | ////////////////////// Placement Resources | ||
179 | namespace FbTk { | ||
180 | |||
181 | template <> | ||
182 | const EnumTraits<ScreenPlacement::PlacementPolicy>::Pair EnumTraits<ScreenPlacement::PlacementPolicy>::s_map[] = { | ||
183 | { "RowSmartPlacement", ScreenPlacement::ROWSMARTPLACEMENT }, | ||
184 | { "ColSmartPlacement", ScreenPlacement::COLSMARTPLACEMENT }, | ||
185 | { "RowMinOverlapPlacement", ScreenPlacement::ROWMINOVERLAPPLACEMENT }, | ||
186 | { "ColMinOverlapPlacement", ScreenPlacement::COLMINOVERLAPPLACEMENT }, | ||
187 | { "UnderMousePlacement", ScreenPlacement::UNDERMOUSEPLACEMENT }, | ||
188 | { "CascadePlacement", ScreenPlacement::CASCADEPLACEMENT }, | ||
189 | { NULL, ScreenPlacement::CASCADEPLACEMENT } | ||
190 | }; | ||
191 | |||
192 | template <> | ||
193 | const EnumTraits<ScreenPlacement::RowDirection>::Pair EnumTraits<ScreenPlacement::RowDirection>::s_map[] = { | ||
194 | { "LeftToRight", ScreenPlacement::LEFTRIGHT }, | ||
195 | { "RightToLeft", ScreenPlacement::RIGHTLEFT }, | ||
196 | { NULL, ScreenPlacement::RIGHTLEFT }, | ||
197 | }; | ||
198 | |||
199 | template <> | ||
200 | const EnumTraits<ScreenPlacement::ColumnDirection>::Pair EnumTraits<ScreenPlacement::ColumnDirection>::s_map[] = { | ||
201 | { "TopToBottom", ScreenPlacement::TOPBOTTOM }, | ||
202 | { "BottomToTop", ScreenPlacement::BOTTOMTOP }, | ||
203 | { NULL, ScreenPlacement::BOTTOMTOP }, | ||
204 | }; | ||
205 | |||
206 | } // end namespace FbTk | ||