eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:processing/processing

Browse Source
This commit is contained in:
Ben Fry
2016-10-29 09:53:45 -04:00
parent 394413e147 63066ebb73
commit 463221674a
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/processing/app/contrib/DetailPanel.java
+1 -1
View File
@@ -461,7 +461,7 @@ class DetailPanel extends JPanel {
desc.append("</font> ");
String version = contrib.getPrettyVersion();
if (version != null) {
if (version != null && !version.equals("null")) {
desc.append(version);
}
desc.append(" <br/>");
app/src/processing/app/contrib/StatusPanel.java
+15 -3
View File
@@ -259,12 +259,24 @@ class StatusPanel extends JPanel {
if (panel.getContrib().isCompatible(Base.getRevision())) {
if (installButton.isEnabled()) {
updateLabel.setText(latestVersion + " available");
if (latestVersion != null) {
updateLabel.setText(latestVersion + " available");
} else {
updateLabel.setText("Available");
}
} else {
updateLabel.setText(currentVersion + " installed");
if (currentVersion != null && !currentVersion.equals("null")) {
updateLabel.setText(currentVersion + " installed");
} else {
updateLabel.setText("Installed");
}
}
} else {
updateLabel.setText(currentVersion + " not compatible");
if (currentVersion != null && !currentVersion.equals("null")) {
updateLabel.setText(currentVersion + " not compatible");
} else {
updateLabel.setText("Not compatible");
}
}
if (latestVersion != null) {
build/shared/lib/languages/PDE_es.properties
+1 -1
View File
@@ -60,7 +60,7 @@ menu.library.contributed = Contribuidas
menu.library.no_core_libraries = el modo no tiene bibliotecas incluidas
# ---
menu.sketch = Sketch
menu.sketch.show_sketch_folder = Mostrar carpeta de sketches
menu.sketch.show_sketch_folder = Mostrar carpeta del sketch
menu.sketch.add_file = Añadir archivo
# | File | Edit | Sketch | Debug | Tools | Help |