aboutsummaryrefslogtreecommitdiff
path: root/src/Slit.cc
diff options
context:
space:
mode:
authorPavel Labath <pavelo@centrum.sk>2011-06-16 19:09:37 (GMT)
committerPavel Labath <pavelo@centrum.sk>2011-11-01 09:57:19 (GMT)
commite3feca08ce0f6753f7e71ccb9088cf9003d41fc2 (patch)
treeabf0dafc53405d67fdf5ccc285961a37603092d3 /src/Slit.cc
parent0e8a7bfb12e6d03ec288cd1fdd0a1453d5e814e1 (diff)
downloadfluxbox_pavel-e3feca08ce0f6753f7e71ccb9088cf9003d41fc2.zip
fluxbox_pavel-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/Slit.cc')
-rw-r--r--src/Slit.cc23
1 files changed, 7 insertions, 16 deletions
diff --git a/src/Slit.cc b/src/Slit.cc
index 7224bb5..d5d2dde 100644
--- a/src/Slit.cc
+++ b/src/Slit.cc
@@ -189,21 +189,14 @@ Slit::Slit(BScreen &scr, FbTk::Layer &layer, const char *filename)
189 m_strut(0), 189 m_strut(0),
190 // resources 190 // resources
191 // lock in first resource 191 // lock in first resource
192 m_rc_kde_dockapp(scr.resourceManager(), true, 192 m_rc_kde_dockapp(scr.resourceManager(), true, scr.name() + ".slit.acceptKdeDockapps"),
193 scr.name() + ".slit.acceptKdeDockapps", scr.altName() + ".Slit.AcceptKdeDockapps"), 193 m_rc_auto_hide(scr.resourceManager(), false, scr.name() + ".slit.autoHide"),
194 m_rc_auto_hide(scr.resourceManager().lock(), false,
195 scr.name() + ".slit.autoHide", scr.altName() + ".Slit.AutoHide"),
196 // TODO: this resource name must change 194 // TODO: this resource name must change
197 m_rc_maximize_over(scr.resourceManager(), false, 195 m_rc_maximize_over(scr.resourceManager(), false, scr.name() + ".slit.maxOver"),
198 scr.name() + ".slit.maxOver", scr.altName() + ".Slit.MaxOver"), 196 m_rc_placement(scr.resourceManager(), RIGHTBOTTOM, scr.name() + ".slit.placement"),
199 m_rc_placement(scr.resourceManager(), RIGHTBOTTOM, 197 m_rc_alpha(scr.resourceManager(), 255, scr.name() + ".slit.alpha"),
200 scr.name() + ".slit.placement", scr.altName() + ".Slit.Placement"), 198 m_rc_on_head(scr.resourceManager(), 0, scr.name() + ".slit.onhead"),
201 m_rc_alpha(scr.resourceManager(), 255, 199 m_rc_layernum(scr.resourceManager(), ResourceLayer::DOCK, scr.name() + ".slit.layer") {
202 scr.name() + ".slit.alpha", scr.altName() + ".Slit.Alpha"),
203 m_rc_on_head(scr.resourceManager(), 0,
204 scr.name() + ".slit.onhead", scr.altName() + ".Slit.onHead"),
205 m_rc_layernum(scr.resourceManager(), ResourceLayer::DOCK,
206 scr.name() + ".slit.layer", scr.altName() + ".Slit.Layer") {
207 200
208 _FB_USES_NLS; 201 _FB_USES_NLS;
209 202
@@ -256,8 +249,6 @@ Slit::Slit(BScreen &scr, FbTk::Layer &layer, const char *filename)
256 loadClientList(filename); 249 loadClientList(filename);
257 250
258 setupMenu(); 251 setupMenu();
259
260 scr.resourceManager().unlock();
261} 252}
262 253
263 254