Skip to content

Commit 8c68f48

Browse files
author
jantje
committed
#585 adding the gui part
Italian translation is still needed
1 parent 1026418 commit 8c68f48

File tree

7 files changed

+29
-25
lines changed

7 files changed

+29
-25
lines changed

io.sloeber.ui.nl1/OSGI-INF/l10n/bundle_nl.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@ wizard.folder.import.name= Importeer een map met source code in je gekozen sketc
9393
wizard.libraries.import.description = Gebruik een wizard om arduino libraries toe te voegen aan je sketch.
9494
wizard.libraries.import.name = Importeer Arduino libraries in de huidige sketch.
9595
wizard.new.sketch.description = Maak een nieuwe Arduino sketch.
96-
wizard.new.sketch.name = Nieuwe Arduino Sketch
96+
wizard.new.sketch.name = Nieuwe Arduino Sketch
97+
page.preferences.targets.name = Bouw doelen

io.sloeber.ui/OSGI-INF/l10n/bundle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ launch.arduino.label = Arduino Launch
7878
page.preferences.libraries.name = Library Manager
7979
page.preferences.platform..name = Platforms and Boards
8080
page.preferences.third.party.name = Third party index url's
81+
page.preferences.targets.name = Build targets
8182
plotter.view.name = Plotter
8283
serial.monitor.view.name = Serial monitor view
8384
tab.board.selection.name = Arduino board selection

io.sloeber.ui/plugin.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,12 @@
321321
id="io.sloeber.eclipse.libraries"
322322
name="%page.preferences.libraries.name">
323323
</page>
324+
<page
325+
category="io.sloeber.eclipse.ArduinoPreferencePage"
326+
class="io.sloeber.ui.preferences.TargetSerialDisconnectPage"
327+
id="io.sloeber.eclipse.tagets"
328+
name="%page.preferences.targets.name">
329+
</page>
324330
</extension>
325331
<extension
326332
point="org.eclipse.ui.commands">

io.sloeber.ui/src/io/sloeber/ui/Messages.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,11 @@ public class Messages extends NLS {
160160
public static String ui_workspace_settings;
161161
public static String ui_enable_bonjour;
162162
public static String ui_put_in_version_control;
163+
public static String target_maintain;
164+
public static String Add_Targets_To_force_serial_disconnect_when_run;
163165

164166
public static String yes;
167+
165168
static {
166169
// initialize resource bundle
167170
NLS.initializeMessages(BUNDLE_NAME, Messages.class);

io.sloeber.ui/src/io/sloeber/ui/messages.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,3 +132,5 @@ yes=Yes
132132
Invalid_Private_Hardware_folder=You can not add [sloeber]/arduinoPlugin to the private Hardware folders.
133133
Invalid_Private_Library_folder=You can not add [sloeber]/arduinoPlugin to the private Libraries folders.
134134
ui_put_in_version_control=Share in version control?
135+
target_maintain=Targets
136+
Add_Targets_To_force_serial_disconnect_when_run=Add targets that require the serial connection to be closed when build.

io.sloeber.ui/src/io/sloeber/ui/preferences/TargetSerialDisconnectPage.java

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,28 @@
11

22
package io.sloeber.ui.preferences;
33

4-
import org.eclipse.core.runtime.preferences.ConfigurationScope;
5-
import org.eclipse.jface.preference.FieldEditorPreferencePage;
6-
import org.eclipse.jface.preference.IPreferenceStore;
4+
import org.eclipse.jface.preference.PreferencePage;
75
import org.eclipse.swt.SWT;
86
import org.eclipse.swt.layout.GridData;
7+
import org.eclipse.swt.layout.GridLayout;
98
import org.eclipse.swt.widgets.Composite;
9+
import org.eclipse.swt.widgets.Control;
1010
import org.eclipse.swt.widgets.Label;
1111
import org.eclipse.swt.widgets.Text;
1212
import org.eclipse.ui.IWorkbench;
1313
import org.eclipse.ui.IWorkbenchPreferencePage;
14-
import org.eclipse.ui.preferences.ScopedPreferenceStore;
1514

1615
import io.sloeber.core.api.Preferences;
1716
import io.sloeber.ui.Messages;
18-
import io.sloeber.ui.helpers.MyPreferences;
1917

20-
public class TargetSerialDisconnectPage extends FieldEditorPreferencePage implements IWorkbenchPreferencePage {
21-
private static final String KEY_SERIAL_DISCONNECT_TARGETS = "Targets to disconnect Serial when build"; //$NON-NLS-1$
18+
public class TargetSerialDisconnectPage extends PreferencePage implements IWorkbenchPreferencePage {
2219
private Text targetsText;
2320

24-
public TargetSerialDisconnectPage() {
25-
super(org.eclipse.jface.preference.FieldEditorPreferencePage.GRID);
26-
setDescription(Messages.json_maintain);
27-
setPreferenceStore(new ScopedPreferenceStore(ConfigurationScope.INSTANCE, MyPreferences.NODE_ARDUINO));
28-
}
2921

3022
@Override
3123
public boolean performOk() {
3224
Preferences.setDisconnectSerialTargets(targetsText.getText());
33-
return super.performOk();
25+
return true;
3426
}
3527

3628
@Override
@@ -40,25 +32,24 @@ protected void performDefaults() {
4032
}
4133

4234
@Override
43-
protected void createFieldEditors() {
35+
protected Control createContents(Composite parent) {
36+
Composite control = new Composite(parent, SWT.NONE);
37+
control.setLayout(new GridLayout());
4438
String selectedTargets = Preferences.getDisconnectSerialTargets();
45-
final Composite parent = getFieldEditorParent();
39+
4640
// Composite control = new Composite(parent, SWT.NONE);
47-
Label title = new Label(parent, SWT.UP);
48-
title.setFont(parent.getFont());
41+
Label title = new Label(control, SWT.UP);
42+
title.setFont(control.getFont());
4943

50-
title.setText(Messages.ui_url_for_index_file);
44+
title.setText(Messages.Add_Targets_To_force_serial_disconnect_when_run);
5145
title.setLayoutData(new GridData(GridData.VERTICAL_ALIGN_BEGINNING));
5246

53-
this.targetsText = new Text(parent, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER | SWT.WRAP);
47+
this.targetsText = new Text(control, SWT.MULTI | SWT.V_SCROLL | SWT.BORDER | SWT.WRAP);
5448
GridData gd = new GridData(GridData.FILL_BOTH);
5549
this.targetsText.setLayoutData(gd);
5650
this.targetsText.setText(selectedTargets);
5751

58-
IPreferenceStore prefstore=getPreferenceStore();
59-
prefstore.setValue(KEY_SERIAL_DISCONNECT_TARGETS, selectedTargets);
60-
// prefstore.setDefault(KEY_SERIAL_DISCONNECT_TARGETS, true);
61-
52+
return control;
6253
}
6354

6455
@Override

io.sloeber.ui/src/io/sloeber/ui/preferences/ThirdPartyHardwareSelectionPage.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public boolean performOk() {
4747
@Override
4848
protected void performDefaults() {
4949
super.performDefaults();
50-
this.urlsText.setText(PackageManager.getDefaultURLs());
50+
this.urlsText.setText(PackageManager.getDefaultJsonURLs());
5151
}
5252

5353
@Override

0 commit comments

Comments
 (0)