diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-11 11:00:45 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2013-02-16 23:49:23 (GMT) |
commit | eb0eef14134ee667c60f75f53de4e24950f3c117 (patch) | |
tree | 58b35842e1f84666373478bca3386be037a7a019 /src/Screen.hh | |
parent | 3b7c1a3c220b7ccec0dee7804d36dabfe81449c4 (diff) | |
download | fluxbox_pavel-eb0eef14134ee667c60f75f53de4e24950f3c117.zip fluxbox_pavel-eb0eef14134ee667c60f75f53de4e24950f3c117.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 fe8d127..44f91d0 100644 --- a/src/Screen.hh +++ b/src/Screen.hh | |||
@@ -530,21 +530,21 @@ private: | |||
530 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, | 530 | ScreenResource(FbTk::ResourceManager &rm, const std::string &scrname, |
531 | const std::string &altscrname); | 531 | const std::string &altscrname); |
532 | 532 | ||
533 | FbTk::Resource<bool> opaque_move, full_max, | 533 | FbTk::BoolResource opaque_move, full_max, |
534 | max_ignore_inc, max_disable_move, max_disable_resize, | 534 | max_ignore_inc, max_disable_move, max_disable_resize, |
535 | workspace_warping, show_window_pos, auto_raise, click_raises; | 535 | workspace_warping, show_window_pos, auto_raise, click_raises; |
536 | FbTk::Resource<std::string> default_deco; | 536 | FbTk::StringResource default_deco; |
537 | FbTk::Resource<FbWinFrame::TabPlacement> tab_placement; | 537 | FbTk::Resource<FbWinFrame::TabPlacement, FbTk::EnumTraits<FbWinFrame::TabPlacement> > tab_placement; |
538 | FbTk::Resource<std::string> windowmenufile; | 538 | FbTk::StringResource windowmenufile; |
539 | FbTk::Resource<unsigned int> typing_delay; | 539 | FbTk::UIntResource typing_delay; |
540 | FbTk::Resource<int> workspaces, edge_snap_threshold, focused_alpha, | 540 | FbTk::IntResource workspaces, edge_snap_threshold, focused_alpha, |
541 | unfocused_alpha, menu_alpha, menu_delay, | 541 | unfocused_alpha, menu_alpha, menu_delay, |
542 | tab_width, tooltip_delay; | 542 | tab_width, tooltip_delay; |
543 | FbTk::Resource<bool> allow_remote_actions; | 543 | FbTk::BoolResource allow_remote_actions; |
544 | FbTk::Resource<bool> clientmenu_use_pixmap; | 544 | FbTk::BoolResource clientmenu_use_pixmap; |
545 | FbTk::Resource<bool> tabs_use_pixmap; | 545 | FbTk::BoolResource tabs_use_pixmap; |
546 | FbTk::Resource<bool> max_over_tabs; | 546 | FbTk::BoolResource max_over_tabs; |
547 | FbTk::Resource<bool> default_internal_tabs; | 547 | FbTk::BoolResource default_internal_tabs; |
548 | 548 | ||
549 | 549 | ||
550 | } resource; | 550 | } resource; |