merge of '01c1a5c0e70a460534e66dd487aa8676d666168d'

and '441b352d1cef1c64ee96f55692be67cfc4b4abf1'
This commit is contained in:
zzz
2012-08-09 15:03:01 +00:00
13 changed files with 1846 additions and 1315 deletions

View File

@ -86,7 +86,7 @@ public class SnarkManager implements Snark.CompleteListener {
public static final String PROP_STARTUP_DELAY = "i2psnark.startupDelay";
public static final String PROP_REFRESH_DELAY = "i2psnark.refreshSeconds";
public static final String RC_PROP_THEME = "routerconsole.theme";
public static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.theme.universal";
public static final String RC_PROP_UNIVERSAL_THEMING = "routerconsole.universal.theme";
public static final String PROP_THEME = "i2psnark.theme";
public static final String DEFAULT_THEME = "ubergine";
private static final String PROP_USE_OPENTRACKERS = "i2psnark.useOpentrackers";
@ -310,7 +310,11 @@ public class SnarkManager implements Snark.CompleteListener {
themeExists = true;
}
if (!themeExists) {
theme = DEFAULT_THEME;
// Since the default is not "light", explicitly check if universal theme is "classic"
if (theme.equals("classic"))
theme = "light";
else
theme = DEFAULT_THEME;
_config.setProperty(PROP_THEME, DEFAULT_THEME);
}
}