diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-16 19:09:37 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-11-01 09:57:19 (GMT) |
commit | e3feca08ce0f6753f7e71ccb9088cf9003d41fc2 (patch) | |
tree | abf0dafc53405d67fdf5ccc285961a37603092d3 /src/IconbarTool.cc | |
parent | 0e8a7bfb12e6d03ec288cd1fdd0a1453d5e814e1 (diff) | |
download | fluxbox_paul-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.zip fluxbox_paul-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.tar.bz2 |
Replace ResourceManager with the lua version
Loading of an init file with the new manager works ok. Saving and restarting is still not
completed.
This touches many files because i removed the alternative name of resources. Unlike Xrm, lua does
not have native support for alt names. It should be fairly easy to add them, but I think that is
unnecessary and would be confusing.
Diffstat (limited to 'src/IconbarTool.cc')
-rw-r--r-- | src/IconbarTool.cc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/IconbarTool.cc b/src/IconbarTool.cc index 1452080..ebf67fe 100644 --- a/src/IconbarTool.cc +++ b/src/IconbarTool.cc | |||
@@ -239,15 +239,13 @@ IconbarTool::IconbarTool(const FbTk::FbWindow &parent, IconbarTheme &theme, | |||
239 | m_winlist(new FocusableList(screen)), | 239 | m_winlist(new FocusableList(screen)), |
240 | m_mode("none"), | 240 | m_mode("none"), |
241 | m_rc_mode(screen.resourceManager(), "{static groups} (workspace)", | 241 | m_rc_mode(screen.resourceManager(), "{static groups} (workspace)", |
242 | screen.name() + ".iconbar.mode", screen.altName() + ".Iconbar.Mode"), | 242 | screen.name() + ".iconbar.mode"), |
243 | m_rc_alignment(screen.resourceManager(), FbTk::Container::RELATIVE, | 243 | m_rc_alignment(screen.resourceManager(), FbTk::Container::RELATIVE, |
244 | screen.name() + ".iconbar.alignment", screen.altName() + ".Iconbar.Alignment"), | 244 | screen.name() + ".iconbar.alignment"), |
245 | m_rc_client_width(screen.resourceManager(), 128, | 245 | m_rc_client_width(screen.resourceManager(), 128, screen.name() + ".iconbar.iconWidth"), |
246 | screen.name() + ".iconbar.iconWidth", screen.altName() + ".Iconbar.IconWidth"), | ||
247 | m_rc_client_padding(screen.resourceManager(), 10, | 246 | m_rc_client_padding(screen.resourceManager(), 10, |
248 | screen.name() + ".iconbar.iconTextPadding", screen.altName() + ".Iconbar.IconTextPadding"), | 247 | screen.name() + ".iconbar.iconTextPadding"), |
249 | m_rc_use_pixmap(screen.resourceManager(), true, | 248 | m_rc_use_pixmap(screen.resourceManager(), true, screen.name() + ".iconbar.usePixmap"), |
250 | screen.name() + ".iconbar.usePixmap", screen.altName() + ".Iconbar.UsePixmap"), | ||
251 | m_menu(screen.menuTheme(), screen.imageControl(), | 249 | m_menu(screen.menuTheme(), screen.imageControl(), |
252 | *screen.layerManager().getLayer(ResourceLayer::MENU)), | 250 | *screen.layerManager().getLayer(ResourceLayer::MENU)), |
253 | m_alpha(255) { | 251 | m_alpha(255) { |