diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-11 11:00:45 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-06-15 23:12:25 (GMT) |
commit | cd9df3b8144c4c41f7b57f0075fbb98ef7561296 (patch) | |
tree | 10ffc1692e4afbcb2c74b9db8c8a44b434ef62ca /src/Screen.hh | |
parent | 787c7a994d4328a9c90a037dd464f8007351b0c0 (diff) | |
download | fluxbox_pavel-cd9df3b8144c4c41f7b57f0075fbb98ef7561296.zip fluxbox_pavel-cd9df3b8144c4c41f7b57f0075fbb98ef7561296.tar.bz2 |
Simplify FbTk::Resource template class
by outsourcing the conversion from string/lua to the specific type (and back) to a separate
class. This change touches a lot of files because the interface of FbTk::Resource changed
slightly. However, the changes are minor.
Diffstat (limited to 'src/Screen.hh')
-rw-r--r-- | src/Screen.hh | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/Screen.hh b/src/Screen.hh index de3a5a1..9d436a9 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -513,21 +513,21 @@ private: | |||
513 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | 513 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, |
514 | const std::string &altscrname); | 514 | const std::string &altscrname); |
515 | 515 | ||
516 | FbTk::Resource<bool> opaque_move, full_max, | 516 | FbTk::BoolResource opaque_move, full_max, |
517 | max_ignore_inc, max_disable_move, max_disable_resize, | 517 | max_ignore_inc, max_disable_move, max_disable_resize, |
518 | workspace_warping, show_window_pos, auto_raise, click_raises; | 518 | workspace_warping, show_window_pos, auto_raise, click_raises; |
519 | FbTk::Resource<std::string> default_deco; | 519 | FbTk::StringResource default_deco; |
520 | FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; | 520 | FbTk::Resource<FbWinFrame::TabPlacement, FbTk::EnumTraits<FbWinFrame::TabPlacement> > tab_placement; |
521 | FbTk::Resource<std::string> windowmenufile; | 521 | FbTk::StringResource windowmenufile; |
522 | FbTk::Resource<unsigned int> typing_delay; | 522 | FbTk::UIntResource typing_delay; |
523 | FbTk::Resource<int> workspaces, edge_snap_threshold, focused_alpha, | 523 | FbTk::IntResource workspaces, edge_snap_threshold, focused_alpha, |
524 | unfocused_alpha, menu_alpha, menu_delay, | 524 | unfocused_alpha, menu_alpha, menu_delay, |
525 | tab_width, tooltip_delay; | 525 | tab_width, tooltip_delay; |
526 | FbTk::Resource<bool> allow_remote_actions; | 526 | FbTk::BoolResource allow_remote_actions; |
527 | FbTk::Resource<bool> clientmenu_use_pixmap; | 527 | FbTk::BoolResource clientmenu_use_pixmap; |
528 | FbTk::Resource<bool> tabs_use_pixmap; | 528 | FbTk::BoolResource tabs_use_pixmap; |
529 | FbTk::Resource<bool> max_over_tabs; | 529 | FbTk::BoolResource max_over_tabs; |
530 | FbTk::Resource<bool> default_internal_tabs; | 530 | FbTk::BoolResource default_internal_tabs; |
531 | 531 | ||
532 | 532 | ||
533 | } resource; | 533 | } resource; |