aboutsummaryrefslogtreecommitdiff
path: root/src/IconbarTool.hh
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-11 11:00:45 (GMT)
committerPaul Tagliamonte <paultag@fluxbox.org>2012-04-07 02:10:40 (GMT)
commitcc0f1196a5632cd7de035e51d4f5204591f1359d (patch)
treeedaf534c913f1427f59e6a09ceb5387e30bbba16 /src/IconbarTool.hh
parent5f91d3183a1407222bb6929de0eb2bdc314a0bad (diff)
downloadfluxbox_paul-cc0f1196a5632cd7de035e51d4f5204591f1359d.zip
fluxbox_paul-cc0f1196a5632cd7de035e51d4f5204591f1359d.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/IconbarTool.hh')
-rw-r--r--src/IconbarTool.hh11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/IconbarTool.hh b/src/IconbarTool.hh
index 118eacf..90df5cf 100644
--- a/src/IconbarTool.hh
+++ b/src/IconbarTool.hh
@@ -110,11 +110,12 @@ private:
110 std::auto_ptr<FocusableList> m_winlist; 110 std::auto_ptr<FocusableList> m_winlist;
111 IconMap m_icons; 111 IconMap m_icons;
112 std::string m_mode; 112 std::string m_mode;
113 FbTk::Resource<std::string> m_rc_mode; 113 FbTk::StringResource m_rc_mode;
114 FbTk::Resource<FbTk::Container::Alignment> m_rc_alignment; ///< alignment of buttons 114 /// alignment of buttons
115 FbTk::Resource<int> m_rc_client_width; ///< size of client button in LEFT/RIGHT mode 115 FbTk::Resource<FbTk::Container::Alignment, FbTk::EnumTraits<FbTk::Container::Alignment> > m_rc_alignment;
116 FbTk::Resource<unsigned int> m_rc_client_padding; ///< padding of the text 116 FbTk::IntResource m_rc_client_width; ///< size of client button in LEFT/RIGHT mode
117 FbTk::Resource<bool> m_rc_use_pixmap; ///< if iconbar should use win pixmap or not 117 FbTk::UIntResource m_rc_client_padding; ///< padding of the text
118 FbTk::BoolResource m_rc_use_pixmap; ///< if iconbar should use win pixmap or not
118 FbMenu m_menu; 119 FbMenu m_menu;
119 int m_alpha; 120 int m_alpha;
120}; 121};