aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--util/fluxbox-update_configs.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/util/fluxbox-update_configs.cc b/util/fluxbox-update_configs.cc
index 2d53021..233bdbb 100644
--- a/util/fluxbox-update_configs.cc
+++ b/util/fluxbox-update_configs.cc
@@ -603,8 +603,7 @@ ScreenResource::ScreenResource(FbTk::ResourceManager_base &rm,
603 click_raises(rm, true, name + ".clickRaises", altname + ".ClickRaises"), 603 click_raises(rm, true, name + ".clickRaises", altname + ".ClickRaises"),
604 default_deco(rm, "NORMAL", name + ".defaultDeco", altname + ".DefaultDeco"), 604 default_deco(rm, "NORMAL", name + ".defaultDeco", altname + ".DefaultDeco"),
605 tab_placement(rm, TOPLEFT, name + ".tab.placement", altname + ".Tab.Placement"), 605 tab_placement(rm, TOPLEFT, name + ".tab.placement", altname + ".Tab.Placement"),
606 windowmenufile(rm, getenv("HOME") + string("~/.fluxbox/windowmenu"), 606 windowmenufile(rm, "~/.fluxbox/windowmenu", name + ".windowMenu", altname + ".WindowMenu"),
607 name + ".windowMenu", altname + ".WindowMenu"),
608 typing_delay(rm, 0, name + ".noFocusWhileTypingDelay", altname + ".NoFocusWhileTypingDelay"), 607 typing_delay(rm, 0, name + ".noFocusWhileTypingDelay", altname + ".NoFocusWhileTypingDelay"),
609 workspaces(rm, 4, name + ".workspaces", altname + ".Workspaces"), 608 workspaces(rm, 4, name + ".workspaces", altname + ".Workspaces"),
610 edge_snap_threshold(rm, 10, name + ".edgeSnapThreshold", altname + ".EdgeSnapThreshold"), 609 edge_snap_threshold(rm, 10, name + ".edgeSnapThreshold", altname + ".EdgeSnapThreshold"),
@@ -690,18 +689,15 @@ void update_lua_resource_manager(std::auto_ptr<FbTk::ResourceManager_base>& rm,
690 "doubleClickInterval", "DoubleClickInterval"); 689 "doubleClickInterval", "DoubleClickInterval");
691 FbTk::IntResource rc_tabs_padding(*rm, 0, "tabPadding", "TabPadding"); 690 FbTk::IntResource rc_tabs_padding(*rm, 0, "tabPadding", "TabPadding");
692 FbTk::StringResource rc_stylefile(*rm, DEFAULTSTYLE, "styleFile", "StyleFile"); 691 FbTk::StringResource rc_stylefile(*rm, DEFAULTSTYLE, "styleFile", "StyleFile");
693 FbTk::StringResource rc_styleoverlayfile(*rm, getenv("HOME") + string("/.fluxbox/overlay"), 692 FbTk::StringResource rc_styleoverlayfile(*rm, "~/.fluxbox/overlay",
694 "styleOverlay", "StyleOverlay"); 693 "styleOverlay", "StyleOverlay");
695 FbTk::StringResource rc_menufile(*rm, getenv("HOME") + string("/.fluxbox/menu"), 694 FbTk::StringResource rc_menufile(*rm, "~/.fluxbox/menu", "menuFile", "MenuFile");
696 "menuFile", "MenuFile"); 695 FbTk::StringResource rc_slitlistfile(*rm, "~/.fluxbox/slitlist",
697 FbTk::StringResource rc_slitlistfile(*rm, getenv("HOME") + string("/.fluxbox/slitlist"),
698 "slitlistFile", "SlitlistFile"); 696 "slitlistFile", "SlitlistFile");
699 697
700/* Key and apps file resources are declared in run_updates 698/* Key and apps file resources are declared in run_updates
701 FbTk::StringResource rc_keyfile(*rm, getenv("HOME") + string("/.fluxbox/keys"), 699 FbTk::StringResource rc_keyfile(*rm, "~/.fluxbox/keys", "keyFile", "KeyFile");
702 "keyFile", "KeyFile"); 700 FbTk::StringResource rc_appsfile(*rm, "~/.fluxbox/apps", "appsFile", "AppsFile");*/
703 FbTk::StringResource rc_appsfile(*rm, getenv("HOME") + string("/.fluxbox/apps"),
704 "appsFile", "AppsFile");*/
705 701
706 FbTk::Resource< 702 FbTk::Resource<
707 TabsAttachArea, FbTk::EnumTraits<TabsAttachArea> 703 TabsAttachArea, FbTk::EnumTraits<TabsAttachArea>