zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverted routerconsole to storing theme itself, also store universal theming boolean

Browse Source
This commit is contained in:
str4d
2012-08-01 01:50:59 +00:00
parent 3d69d2bf63
commit a623d924fa
3 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
apps/routerconsole/java/src/net/i2p/router/web/ConfigUIHandler.java
View File

@@ -1,8 +1,5 @@
package net.i2p.router.web;
import java.util.Iterator;
import java.util.Properties;
/** set the theme */
public class ConfigUIHandler extends FormHandler {
private boolean _shouldSave;
@@ -27,21 +24,18 @@ public class ConfigUIHandler extends FormHandler {
private void saveChanges() {
if (_config == null)
return;
Properties props = _context.readConfigFile(CSSHelper.THEME_CONFIG_FILE);
String oldTheme = props.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
// Save routerconsole theme first to ensure it is in config file
String oldTheme = _context.getProperty(CSSHelper.PROP_THEME_NAME, CSSHelper.DEFAULT_THEME);
boolean ok;
if (_config.equals("default")) // obsolete
props.put(CSSHelper.PROP_THEME_NAME, null);
ok = _context.router().saveConfig(CSSHelper.PROP_THEME_NAME, null);
else
props.put(CSSHelper.PROP_THEME_NAME, _config);
if (_universalTheming) {
// The routerconsole theme gets set again, but oh well
for (Iterator it = props.keySet().iterator(); it.hasNext();) {
String key = (String) it.next();
props.put(key, _config);
}
ok = _context.router().saveConfig(CSSHelper.PROP_THEME_NAME, _config);
if (ok) {
if (_universalTheming)
ok = _context.router().saveConfig(CSSHelper.PROP_UNIVERSAL_THEMING, "true");
else
ok = _context.router().saveConfig(CSSHelper.PROP_UNIVERSAL_THEMING, null);
}
boolean ok = _context.writeConfigFile(CSSHelper.THEME_CONFIG_FILE, props);
if (ok) {
if (!oldTheme.equals(_config))
addFormNotice(_("Theme change saved.") +