diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-07-24 14:14:01 (GMT) |
---|---|---|
committer | Pavel Labath <pavelo@centrum.sk> | 2013-02-18 21:04:24 (GMT) |
commit | 8e408fb12177586d09bc42536bbf54db54fa605d (patch) | |
tree | 3ab92eafddc427e142b61b38b1106f70cc293e66 | |
parent | 5a96ffd04b2eb10d32bf83f98e0437b3d12f9cc5 (diff) | |
download | fluxbox_pavel-8e408fb12177586d09bc42536bbf54db54fa605d.zip fluxbox_pavel-8e408fb12177586d09bc42536bbf54db54fa605d.tar.bz2 |
Rename new config files to <foo>.lua
-rw-r--r-- | src/Screen.cc | 2 | ||||
-rw-r--r-- | src/fluxbox.cc | 4 | ||||
-rw-r--r-- | src/main.cc | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 1970ad0..44f0eba 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -270,7 +270,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm, | |||
270 | click_raises(rm, true, scrname+".clickRaises"), | 270 | click_raises(rm, true, scrname+".clickRaises"), |
271 | default_deco(rm, "NORMAL", scrname+".defaultDeco"), | 271 | default_deco(rm, "NORMAL", scrname+".defaultDeco"), |
272 | tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement"), | 272 | tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement"), |
273 | windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu2"), scrname+".windowMenu"), | 273 | windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu.lua"), scrname+".windowMenu"), |
274 | typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay"), | 274 | typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay"), |
275 | workspaces(rm, 4, scrname+".workspaces"), | 275 | workspaces(rm, 4, scrname+".workspaces"), |
276 | edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold"), | 276 | edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold"), |
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index ec22eae..e293606 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -249,8 +249,8 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
249 | m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"), | 249 | m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"), |
250 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"), | 250 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"), |
251 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"), | 251 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"), |
252 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile"), | 252 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu.lua", "menuFile"), |
253 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile"), | 253 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys.lua", "keyFile"), |
254 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"), | 254 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"), |
255 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"), | 255 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"), |
256 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife"), | 256 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife"), |
diff --git a/src/main.cc b/src/main.cc index cfc702c..2d1a2f3 100644 --- a/src/main.cc +++ b/src/main.cc | |||
@@ -246,7 +246,7 @@ struct Options { | |||
246 | #endif | 246 | #endif |
247 | if (env && strlen(env) > 0) { | 247 | if (env && strlen(env) > 0) { |
248 | rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); | 248 | rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); |
249 | rc_file = rc_path + "/init2"; | 249 | rc_file = rc_path + "/init.lua"; |
250 | } | 250 | } |
251 | } | 251 | } |
252 | 252 | ||