Revision 13901
| trunk/frameworks/_fwAndami/src/com/iver/andami/Launcher.java | ||
|---|---|---|
| 2187 | 2187 |
IconThemeInfo selectedTheme = iconManager.readConfig(); |
| 2188 | 2188 |
if (selectedTheme!=null) {
|
| 2189 | 2189 |
iconManager.setDefault(selectedTheme); |
| 2190 |
logger.info("Setting the icon theme: "+selectedTheme);
|
|
| 2190 |
logger.info("Setting the icon theme: "+selectedTheme.toVerboseString());
|
|
| 2191 | 2191 |
} |
| 2192 | 2192 |
else {
|
| 2193 | 2193 |
// set the default dir and try to load the default theme |
| ... | ... | |
| 2198 | 2198 |
for (int i=0; i<list.length; i++) {
|
| 2199 | 2199 |
if (list[i].getResourceName().equals("iconThemes/icons")) {
|
| 2200 | 2200 |
iconManager.setDefault(list[i]); |
| 2201 |
logger.info("Setting the default icon theme: "+list[i]);
|
|
| 2201 |
logger.info("Setting the default icon theme: "+list[i].toVerboseString());
|
|
| 2202 | 2202 |
return; |
| 2203 | 2203 |
} |
| 2204 | 2204 |
} |
| trunk/frameworks/_fwAndami/src/com/iver/andami/PluginServices.java | ||
|---|---|---|
| 655 | 655 |
iconManager = manager; |
| 656 | 656 |
} |
| 657 | 657 |
|
| 658 |
protected static IconThemeManager getIconThemeManager() {
|
|
| 658 |
public static IconThemeManager getIconThemeManager() {
|
|
| 659 | 659 |
return iconManager; |
| 660 | 660 |
} |
| 661 | 661 |
|
| trunk/frameworks/_fwAndami/src/com/iver/andami/iconthemes/IconThemeManager.java | ||
|---|---|---|
| 83 | 83 |
private File themesDir = null; |
| 84 | 84 |
private final String themeDefinitionFile = "theme.xml"; |
| 85 | 85 |
private IconTheme defaultTheme = null; |
| 86 |
private IconThemeInfo defaultThemeForNextSession = null; |
|
| 86 | 87 |
|
| 87 | 88 |
/** |
| 88 | 89 |
* Creates a new icon theme manager. The themes dir should be set before |
| ... | ... | |
| 165 | 166 |
* @param iconThemeInfo The icon theme to set as default |
| 166 | 167 |
*/ |
| 167 | 168 |
public void setDefaultForNextSession(IconThemeInfo iconThemeInfo) {
|
| 168 |
|
|
| 169 |
defaultThemeForNextSession = iconThemeInfo; |
|
| 170 |
saveConfig(iconThemeInfo); |
|
| 169 | 171 |
} |
| 170 | 172 |
|
| 173 |
public IconThemeInfo getDefaultForNextSession() {
|
|
| 174 |
if (defaultThemeForNextSession!=null) |
|
| 175 |
return defaultThemeForNextSession; |
|
| 176 |
else |
|
| 177 |
return defaultTheme.getInfo(); |
|
| 178 |
} |
|
| 179 |
|
|
| 171 | 180 |
public void setDefault(IconTheme iconTheme) {
|
| 172 | 181 |
setDefault(iconTheme.getInfo()); |
| 173 | 182 |
} |
| trunk/frameworks/_fwAndami/src/com/iver/andami/iconthemes/IconThemeInfo.java | ||
|---|---|---|
| 152 | 152 |
} |
| 153 | 153 |
|
| 154 | 154 |
public String toString() {
|
| 155 |
return getName(); |
|
| 156 |
} |
|
| 157 |
|
|
| 158 |
public String toVerboseString() {
|
|
| 155 | 159 |
StringBuffer buffer = new StringBuffer(); |
| 156 | 160 |
buffer.append("\nName: ");
|
| 157 | 161 |
buffer.append(getName()); |
| ... | ... | |
| 163 | 167 |
buffer.append(getResourceName()); |
| 164 | 168 |
return buffer.toString(); |
| 165 | 169 |
} |
| 170 |
|
|
| 171 |
public boolean equals(IconThemeInfo themeInfo) {
|
|
| 172 |
if (!getResource().equals(themeInfo.getResource())) |
|
| 173 |
return false; |
|
| 174 |
return true; |
|
| 175 |
} |
|
| 176 |
|
|
| 177 |
public boolean equals(Object themeInfo) {
|
|
| 178 |
if (!(themeInfo instanceof IconThemeInfo)) |
|
| 179 |
return false; |
|
| 180 |
|
|
| 181 |
if (!getResource().equals(((IconThemeInfo)themeInfo).getResource())) |
|
| 182 |
return false; |
|
| 183 |
return true; |
|
| 184 |
} |
|
| 166 | 185 |
} |
Also available in: Unified diff