From be1ff378a5915c1eab1271ccab83106b344c8f49 Mon Sep 17 00:00:00 2001 From: Pavel Labath Date: Sun, 24 Jul 2011 16:14:01 +0200 Subject: Rename new config files to .lua --- src/Screen.cc | 2 +- src/fluxbox.cc | 4 ++-- src/main.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Screen.cc b/src/Screen.cc index 63143ec..1e3d1c4 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -252,7 +252,7 @@ BScreen::ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm, click_raises(rm, true, scrname+".clickRaises"), default_deco(rm, "NORMAL", scrname+".defaultDeco"), tab_placement(rm, FbWinFrame::TOPLEFT, scrname+".tab.placement"), - windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu2"), scrname+".windowMenu"), + windowmenufile(rm, Fluxbox::instance()->getDefaultDataFilename("windowmenu.lua"), scrname+".windowMenu"), typing_delay(rm, 0, scrname+".noFocusWhileTypingDelay"), workspaces(rm, 4, scrname+".workspaces"), edge_snap_threshold(rm, 10, scrname+".edgeSnapThreshold"), diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 9e5159a..8b5d11f 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc @@ -241,8 +241,8 @@ Fluxbox::Fluxbox(int argc, char **argv, m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"), m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"), m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"), - m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile"), - m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile"), + m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu.lua", "menuFile"), + m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys.lua", "keyFile"), m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"), m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"), m_rc_cache_life(m_resourcemanager, 5, "cacheLife"), diff --git a/src/main.cc b/src/main.cc index befe1ba..c49487f 100644 --- a/src/main.cc +++ b/src/main.cc @@ -231,7 +231,7 @@ struct Options { #endif if (env && strlen(env) > 0) { rc_path.assign(std::string(env) + "/." + realProgramName("fluxbox")); - rc_file = rc_path + "/init2"; + rc_file = rc_path + "/init.lua"; } } -- cgit v0.11.2