diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-20 20:16:30 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2011-06-20 22:00:34 (GMT) |
commit | 397d11b6b95cc6fb2625dcda00ae9c62d2430e24 (patch) | |
tree | ff1a7313103486c23dbabe0c19d8057cc9be68cf /src/fluxbox.cc | |
parent | ee787d3b5a3f6257ede23405bad8eb0703f649e9 (diff) | |
download | fluxbox_pavel-397d11b6b95cc6fb2625dcda00ae9c62d2430e24.zip fluxbox_pavel-397d11b6b95cc6fb2625dcda00ae9c62d2430e24.tar.bz2 |
Convert slitlist from a separate file to a regular lua resource
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index f7eea71..15b3f0f 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -248,7 +248,6 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
248 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), | 248 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), |
249 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"), | 249 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"), |
250 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), | 250 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), |
251 | m_rc_slitlistfile(m_resourcemanager, m_RC_PATH + "/slitlist", "slitlistFile", "SlitlistFile"), | ||
252 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), | 251 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), |
253 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), | 252 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), |
254 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), | 253 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), |
@@ -1175,13 +1174,6 @@ void Fluxbox::load_rc() { | |||
1175 | 1174 | ||
1176 | FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); | 1175 | FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); |
1177 | 1176 | ||
1178 | if (!m_rc_slitlistfile->empty()) { | ||
1179 | *m_rc_slitlistfile = StringUtil::expandFilename(*m_rc_slitlistfile); | ||
1180 | } else { | ||
1181 | string filename = getDefaultDataFilename("slitlist"); | ||
1182 | m_rc_slitlistfile.setFromString(filename.c_str()); | ||
1183 | } | ||
1184 | |||
1185 | *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6); | 1177 | *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6); |
1186 | 1178 | ||
1187 | if (m_rc_stylefile->empty()) | 1179 | if (m_rc_stylefile->empty()) |