This enables templates in auto properties, mouse configuration and the
keygrabber. It is not enabled in the menu as it is 100% valid to have
multiple entries at each level with the same name.
| src/Config.cc | |
| 1486 | @@ -1486,10 +1486,10 @@ |
| 1486 | |
| 1487 | |
| 1488 | CfgParser mouse_cfg; |
| 1489 | bool success = mouse_cfg.parse(_mouse_file, CfgParserSource::SOURCE_FILE); |
| 1490 | bool success = mouse_cfg.parse(_mouse_file, CfgParserSource::SOURCE_FILE, true); |
| 1491 | if (! success) { |
| 1492 | _mouse_file = string(SYSCONFDIR "/mouse"); |
| 1493 | success = mouse_cfg.parse(_mouse_file, CfgParserSource::SOURCE_FILE); |
| 1494 | success = mouse_cfg.parse(_mouse_file, CfgParserSource::SOURCE_FILE, true); |
| 1495 | } |
| 1496 | |
| 1497 | if (! success) { |
| ... | |
| src/KeyGrabber.cc | |
| 130 | @@ -130,7 +130,7 @@ |
| 130 | CfgParser key_cfg; |
| 131 | if (! key_cfg.parse(file, CfgParserSource::SOURCE_FILE)) { |
| 132 | _keygrabber_path = SYSCONFDIR "/keys"; |
| 133 | if (! key_cfg.parse(_keygrabber_path, CfgParserSource::SOURCE_FILE)) { |
| 134 | if (! key_cfg.parse(_keygrabber_path, CfgParserSource::SOURCE_FILE, true)) { |
| 135 | cerr << __FILE__ << "@" << __LINE__ << "Error: no keyfile at " << file |
| 136 | << " or " << _keygrabber_path << endl; |
| 137 | _keygrabber_mtime = 0; |
| ... | |
| src/AutoProperties.cc | |
| 116 | @@ -116,9 +116,9 @@ |
| 116 | unload(); |
| 117 | |
| 118 | CfgParser a_cfg; |
| 119 | if (! a_cfg.parse(cfg_file)) { |
| 120 | if (! a_cfg.parse(cfg_file, CfgParserSource::SOURCE_FILE, true)) { |
| 121 | cfg_file = SYSCONFDIR "/autoproperties"; |
| 122 | if (! a_cfg.parse (cfg_file)) { |
| 123 | if (! a_cfg.parse (cfg_file, CfgParserSource::SOURCE_FILE, true)) { |
| 124 | setDefaultTypeProperties(); |
| 125 | _autoproperties_mtime = 0; |
| 126 | return false; |
| ... | |