Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDoug Schaefer2015-09-01 01:35:05 +0000
committerGerrit Code Review @ Eclipse.org2015-09-02 02:42:36 +0000
commitd510c87df63919ff3d4e943e56f8ada5f0784aca (patch)
treeca7b2ca4513b7f861812d3805af2f308da43e770 /toolchains
parent04d9a75a5990ac01b587a18d5d718cd654b94b98 (diff)
downloadorg.eclipse.cdt-d510c87df63919ff3d4e943e56f8ada5f0784aca.tar.gz
org.eclipse.cdt-d510c87df63919ff3d4e943e56f8ada5f0784aca.tar.xz
org.eclipse.cdt-d510c87df63919ff3d4e943e56f8ada5f0784aca.zip
Add description text for board and library install pages.
Diffstat (limited to 'toolchains')
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/Messages.java2
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/messages.properties6
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/preferences/ArduinoBoardsPreferencePage.java21
-rw-r--r--toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/project/LibrariesPropertyPage.java11
4 files changed, 36 insertions, 4 deletions
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/Messages.java b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/Messages.java
index f1621d435ba..68933038836 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/Messages.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/Messages.java
@@ -26,6 +26,8 @@ public class Messages extends NLS {
public static String NewArduinoTargetWizardPage_3;
public static String NewArduinoTargetWizardPage_4;
public static String NewArduinoTargetWizardPage_5;
+ public static String ArduinoBoardsPreferencePage_desc;
+ public static String LibrariesPropertyPage_desc;
static {
// initialize resource bundle
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/messages.properties b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/messages.properties
index d9a70769606..9f0e3a2ab30 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/messages.properties
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/messages.properties
@@ -20,3 +20,9 @@ NewArduinoTargetWizardPage_2=Target name:
NewArduinoTargetWizardPage_3=
NewArduinoTargetWizardPage_4=Serial port:
NewArduinoTargetWizardPage_5=Board type:
+ArduinoBoardsPreferencePage_desc=Select a board you would like to install and click Install and then \
+OK or Apply to install the SDK and Tools for that board. By doing so you agree to the licenses of the \
+libraries and tools. For more information, see http://arduino.cc.
+LibrariesPropertyPage_desc=Select libraries to use in your project and click OK or Apply. \
+If necessary the library will be installed. By adding libraries you agree to the licenses of those \
+libraries. For more information, see http://arduino.cc
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/preferences/ArduinoBoardsPreferencePage.java b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/preferences/ArduinoBoardsPreferencePage.java
index 379ca10e9a9..1a1d4548cbd 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/preferences/ArduinoBoardsPreferencePage.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/preferences/ArduinoBoardsPreferencePage.java
@@ -20,6 +20,7 @@ import org.eclipse.cdt.arduino.core.internal.board.ArduinoPackage;
import org.eclipse.cdt.arduino.core.internal.board.ArduinoPlatform;
import org.eclipse.cdt.arduino.core.internal.board.PackageIndex;
import org.eclipse.cdt.arduino.ui.internal.Activator;
+import org.eclipse.cdt.arduino.ui.internal.Messages;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
@@ -39,6 +40,7 @@ import org.eclipse.swt.widgets.Listener;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableColumn;
import org.eclipse.swt.widgets.TableItem;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.ui.IWorkbench;
import org.eclipse.ui.IWorkbenchPreferencePage;
@@ -55,8 +57,21 @@ public class ArduinoBoardsPreferencePage extends PreferencePage implements IWork
@Override
protected Control createContents(Composite parent) {
- Composite comp = new Composite(parent, SWT.NONE);
- comp.setLayout(new GridLayout(2, false));
+ Composite control = new Composite(parent, SWT.NONE);
+ control.setLayout(new GridLayout());
+
+ Text desc = new Text(control, SWT.READ_ONLY | SWT.WRAP);
+ GridData layoutData = new GridData(SWT.FILL, SWT.FILL, true, false);
+ layoutData.widthHint = 500;
+ desc.setLayoutData(layoutData);
+ desc.setBackground(parent.getBackground());
+ desc.setText(Messages.ArduinoBoardsPreferencePage_desc);
+
+ Composite comp = new Composite(control, SWT.NONE);
+ GridLayout layout = new GridLayout(2, false);
+ layout.marginWidth = 0;
+ comp.setLayout(layout);
+ comp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
Composite tableComp = new Composite(comp, SWT.NONE);
tableComp.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
@@ -110,7 +125,7 @@ public class ArduinoBoardsPreferencePage extends PreferencePage implements IWork
updateTable();
updateButtons();
- return comp;
+ return control;
}
private void updateTable() {
diff --git a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/project/LibrariesPropertyPage.java b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/project/LibrariesPropertyPage.java
index 1537bdff7b5..2bb05d4ac11 100644
--- a/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/project/LibrariesPropertyPage.java
+++ b/toolchains/arduino/org.eclipse.cdt.arduino.ui/src/org/eclipse/cdt/arduino/ui/internal/project/LibrariesPropertyPage.java
@@ -15,6 +15,7 @@ import org.eclipse.cdt.arduino.core.internal.board.ArduinoLibrary;
import org.eclipse.cdt.arduino.core.internal.board.ArduinoManager;
import org.eclipse.cdt.arduino.core.internal.board.LibraryIndex;
import org.eclipse.cdt.arduino.ui.internal.Activator;
+import org.eclipse.cdt.arduino.ui.internal.Messages;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.BaseLabelProvider;
@@ -28,6 +29,7 @@ import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Tree;
import org.eclipse.swt.widgets.TreeColumn;
import org.eclipse.swt.widgets.TreeItem;
@@ -122,6 +124,13 @@ public class LibrariesPropertyPage extends PropertyPage {
Composite comp = new Composite(parent, SWT.NULL);
comp.setLayout(new GridLayout());
+ Text desc = new Text(comp, SWT.READ_ONLY | SWT.WRAP);
+ GridData layoutData = new GridData(SWT.LEFT, SWT.FILL, true, false);
+ layoutData.widthHint = 500;
+ desc.setLayoutData(layoutData);
+ desc.setBackground(parent.getBackground());
+ desc.setText(Messages.LibrariesPropertyPage_desc);
+
filteredTree = new FilteredTree(comp, SWT.CHECK | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL,
new PatternFilter() {
@Override
@@ -142,7 +151,7 @@ public class LibrariesPropertyPage extends PropertyPage {
return new ContainerCheckedTreeViewer(parent, style);
}
};
- filteredTree.setLayoutData(new GridData(GridData.FILL_BOTH));
+ filteredTree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
ContainerCheckedTreeViewer viewer = (ContainerCheckedTreeViewer) filteredTree.getViewer();

Back to the top