arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-17 22:23:10 +03:00
Code Activity

Core/lib manager: INSTALLED label

Browse Source
This commit is contained in:
Federico Fissore
2015-03-13 15:09:20 +01:00
parent e27e2f1847
commit 0110fd8ff1
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/cc/arduino/libraries/contributions/ui/ContributedLibraryTableCell.java
View File

@ -77,8 +77,8 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
HTMLDocument html = (HTMLDocument) doc; HTMLDocument html = (HTMLDocument) doc;
StyleSheet stylesheet = html.getStyleSheet(); StyleSheet stylesheet = html.getStyleSheet();
stylesheet.addRule("body { margin: 0; padding: 0;" stylesheet.addRule("body { margin: 0; padding: 0;"
+ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;" + "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
+ "font-size: 100%;" + "font-size: 0.95em; }"); + "font-size: 100%;" + "font-size: 0.95em; }");
} }
description.setOpaque(false); description.setOpaque(false);
description.setBorder(new EmptyBorder(4, 7, 7, 7)); description.setBorder(new EmptyBorder(4, 7, 7, 7));
@ -296,14 +296,21 @@ public class ContributedLibraryTableCell extends InstallerTableCell {
// ...version. // ...version.
if (installedLib != null) { if (installedLib != null) {
String installedVer = installedLib.getVersion(); String installedVer = installedLib.getVersion();
if (installedVer == null) if (installedVer == null) {
desc += " " + _("Version unknown"); desc += " " + _("Version unknown");
else } else {
desc += " " + format(_("Version <b>{0}</b>"), installedVer); desc += " " + format(_("Version <b>{0}</b>"), installedVer);
}
} else { } else {
// not installed... // not installed...
} }
desc += "</font><br />"; desc += "</font>";
if (installedLib != null) {
desc += " <strong><font color=\"#00979D\">INSTALLED</font></strong>";
}
desc += "<br/>";
// Description // Description
if (sentence != null) { if (sentence != null) {

6
app/src/cc/arduino/packages/contributions/ui/ContributedPlatformTableCell.java
View File

@ -78,8 +78,8 @@ public class ContributedPlatformTableCell extends InstallerTableCell {
HTMLDocument html = (HTMLDocument) doc; HTMLDocument html = (HTMLDocument) doc;
StyleSheet stylesheet = html.getStyleSheet(); StyleSheet stylesheet = html.getStyleSheet();
stylesheet.addRule("body { margin: 0; padding: 0;" stylesheet.addRule("body { margin: 0; padding: 0;"
+ "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;" + "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
+ "font-size: 100%;" + "font-size: 0.95em; }"); + "font-size: 100%;" + "font-size: 0.95em; }");
} }
description.setOpaque(false); description.setOpaque(false);
description.setBorder(new EmptyBorder(4, 7, 7, 7)); description.setBorder(new EmptyBorder(4, 7, 7, 7));
@ -268,7 +268,7 @@ public class ContributedPlatformTableCell extends InstallerTableCell {
desc += " " + format("by <b>{0}</b>", author); desc += " " + format("by <b>{0}</b>", author);
} }
if (removable) { if (removable) {
desc += " " + format(_("version <b>{0}</b>"), installedPlatform.getVersion()); desc += " " + format(_("version <b>{0}</b>"), installedPlatform.getVersion()) + " <strong><font color=\"#00979D\">INSTALLED</font></strong>";
} }
desc += "<br />"; desc += "<br />";