aboutsummaryrefslogtreecommitdiff
path: root/src/Screen.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-11 11:00:45 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:52:46 (GMT)
commit8c208459910f1dddcfdeb00567b990eebfc218b8 (patch)
tree47c442f906124306a52e13641d28fc6cd1ac513e /src/Screen.hh
parent60cd98604ae0ee62d64e3bc852898f69dae221d4 (diff)
downloadfluxbox_pavel-8c208459910f1dddcfdeb00567b990eebfc218b8.zip
fluxbox_pavel-8c208459910f1dddcfdeb00567b990eebfc218b8.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.hh22
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;