diff options
author | fluxgen <fluxgen> | 2003-06-23 12:57:36 (GMT) |
---|---|---|
committer | fluxgen <fluxgen> | 2003-06-23 12:57:36 (GMT) |
commit | 3dadf1d7eabe33adce008cdba55576089232ff85 (patch) | |
tree | cafa910da79dfb36d43dd97ebd2f330023afb187 /src | |
parent | 12b2fafb178c7b48f1bd13cd3c2f4780daeda88d (diff) | |
download | fluxbox-3dadf1d7eabe33adce008cdba55576089232ff85.zip fluxbox-3dadf1d7eabe33adce008cdba55576089232ff85.tar.bz2 |
moved toolbar resources to Toolbar
Diffstat (limited to 'src')
-rw-r--r-- | src/Screen.hh | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index e1922eb..920347b 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.107 2003/06/20 01:28:16 fluxgen Exp $ | 25 | // $Id: Screen.hh,v 1.108 2003/06/23 12:57:36 fluxgen Exp $ |
26 | 26 | ||
27 | #ifndef SCREEN_HH | 27 | #ifndef SCREEN_HH |
28 | #define SCREEN_HH | 28 | #define SCREEN_HH |
@@ -76,8 +76,6 @@ public: | |||
76 | int scrn, int number_of_layers); | 76 | int scrn, int number_of_layers); |
77 | ~BScreen(); | 77 | ~BScreen(); |
78 | 78 | ||
79 | inline bool &doToolbarAutoHide() { return *resource.toolbar_auto_hide; } | ||
80 | inline Toolbar::Placement toolbarPlacement() const { return *resource.toolbar_placement; } | ||
81 | inline bool isSloppyFocus() const { return (*resource.focus_model == Fluxbox::SLOPPYFOCUS); } | 79 | inline bool isSloppyFocus() const { return (*resource.focus_model == Fluxbox::SLOPPYFOCUS); } |
82 | inline bool isSemiSloppyFocus() const { return (*resource.focus_model == Fluxbox::SEMISLOPPYFOCUS); } | 80 | inline bool isSemiSloppyFocus() const { return (*resource.focus_model == Fluxbox::SEMISLOPPYFOCUS); } |
83 | inline bool isRootColormapInstalled() const { return root_colormap_installed; } | 81 | inline bool isRootColormapInstalled() const { return root_colormap_installed; } |
@@ -163,31 +161,19 @@ public: | |||
163 | /// @return the resource value of number of workspace | 161 | /// @return the resource value of number of workspace |
164 | inline int getNumberOfWorkspaces() const { return *resource.workspaces; } | 162 | inline int getNumberOfWorkspaces() const { return *resource.workspaces; } |
165 | 163 | ||
166 | inline int getToolbarOnHead() { return *resource.toolbar_on_head; } | ||
167 | |||
168 | inline int getToolbarWidthPercent() const { return *resource.toolbar_width_percent; } | ||
169 | inline FbTk::Resource<int> &getToolbarWidthPercentResource() { return resource.toolbar_width_percent; } | ||
170 | inline const FbTk::Resource<int> &getToolbarWidthPercentResource() const { return resource.toolbar_width_percent; } | ||
171 | inline ToolbarHandler::ToolbarMode toolbarMode() const { return *resource.toolbar_mode; } | 164 | inline ToolbarHandler::ToolbarMode toolbarMode() const { return *resource.toolbar_mode; } |
172 | inline int getPlacementPolicy() const { return resource.placement_policy; } | 165 | inline int getPlacementPolicy() const { return resource.placement_policy; } |
173 | inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } | 166 | inline int getEdgeSnapThreshold() const { return *resource.edge_snap_threshold; } |
174 | inline int getRowPlacementDirection() const { return resource.row_direction; } | 167 | inline int getRowPlacementDirection() const { return resource.row_direction; } |
175 | inline int getColPlacementDirection() const { return resource.col_direction; } | 168 | inline int getColPlacementDirection() const { return resource.col_direction; } |
176 | 169 | ||
177 | inline int getToolbarLayerNum() const { return (*resource.toolbar_layernum).getNum(); } | ||
178 | |||
179 | |||
180 | inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; } | 170 | inline void setRootColormapInstalled(bool r) { root_colormap_installed = r; } |
181 | inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } | 171 | inline void saveRootCommand(std::string rootcmd) { *resource.rootcommand = rootcmd; } |
182 | inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; } | 172 | inline void saveFocusModel(Fluxbox::FocusModel model) { resource.focus_model = model; } |
183 | inline void saveWorkspaces(int w) { *resource.workspaces = w; } | 173 | inline void saveWorkspaces(int w) { *resource.workspaces = w; } |
184 | 174 | ||
185 | inline void saveToolbarAutoHide(bool r) { *resource.toolbar_auto_hide = r; } | 175 | |
186 | inline void saveToolbarWidthPercent(int w) { *resource.toolbar_width_percent = w; } | ||
187 | inline void saveToolbarMode(ToolbarHandler::ToolbarMode m) { *resource.toolbar_mode = m; } | 176 | inline void saveToolbarMode(ToolbarHandler::ToolbarMode m) { *resource.toolbar_mode = m; } |
188 | inline void saveToolbarPlacement(Toolbar::Placement place) { *resource.toolbar_placement = place; } | ||
189 | inline void saveToolbarOnHead(int head) { *resource.toolbar_on_head = head; } | ||
190 | inline void saveToolbarLayer(Fluxbox::Layer layer) { *resource.toolbar_layernum = layer; } | ||
191 | 177 | ||
192 | inline void savePlacementPolicy(int p) { resource.placement_policy = p; } | 178 | inline void savePlacementPolicy(int p) { resource.placement_policy = p; } |
193 | inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } | 179 | inline void saveRowPlacementDirection(int d) { resource.row_direction = d; } |
@@ -410,8 +396,7 @@ private: | |||
410 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | 396 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, |
411 | const std::string &altscrname); | 397 | const std::string &altscrname); |
412 | 398 | ||
413 | FbTk::Resource<bool> toolbar_auto_hide, | 399 | FbTk::Resource<bool> image_dither, opaque_move, full_max, |
414 | image_dither, opaque_move, full_max, | ||
415 | sloppy_window_grouping, workspace_warping, | 400 | sloppy_window_grouping, workspace_warping, |
416 | desktop_wheeling, show_window_pos, | 401 | desktop_wheeling, show_window_pos, |
417 | focus_last, focus_new, | 402 | focus_last, focus_new, |
@@ -419,14 +404,12 @@ private: | |||
419 | FbTk::Resource<std::string> rootcommand; | 404 | FbTk::Resource<std::string> rootcommand; |
420 | FbTk::Resource<Fluxbox::FocusModel> focus_model; | 405 | FbTk::Resource<Fluxbox::FocusModel> focus_model; |
421 | bool ordered_dither; | 406 | bool ordered_dither; |
422 | FbTk::Resource<int> workspaces, toolbar_width_percent, edge_snap_threshold, | 407 | FbTk::Resource<int> workspaces, edge_snap_threshold, menu_alpha; |
423 | menu_alpha; | 408 | |
424 | FbTk::Resource<Fluxbox::Layer> toolbar_layernum; | ||
425 | int placement_policy, row_direction, col_direction; | 409 | int placement_policy, row_direction, col_direction; |
426 | 410 | ||
427 | FbTk::Resource<ToolbarHandler::ToolbarMode> toolbar_mode; | 411 | FbTk::Resource<ToolbarHandler::ToolbarMode> toolbar_mode; |
428 | FbTk::Resource<int> toolbar_on_head; | 412 | |
429 | FbTk::Resource<Toolbar::Placement> toolbar_placement; | ||
430 | 413 | ||
431 | std::string strftime_format; | 414 | std::string strftime_format; |
432 | 415 | ||