Merge branch 'master' into ubilabs--rcapp--bug-3624

This commit is contained in:
Peter Siegmund committed 2016-05-10 14:15:03 +02:00
commit 145f44fb4f
2 files changed
+9 -14

No files matched your search

@@ -266,19 +266,14 @@ public class RegattaConfigurationDialog extends DataEntryDialog<DeviceConfigurat
gateStartClassFlagListBox.setWidth("100%");
gateStartRecallBox = setupRecallBox(originalConfiguration==null?null:originalConfiguration.gateStartConfiguration);
gateStartResultEntryBox = setupResultEntryBox(originalConfiguration==null?null:originalConfiguration.gateStartConfiguration);
gateStartPathfinderBox = new CheckBox(stringMessages.activatePathfinder());
gateStartPathfinderBox.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
@Override
public void onValueChange(ValueChangeEvent<Boolean> event) {
}
});
gateStartPathfinderBox = createCheckbox(stringMessages.activatePathfinder());
if (originalConfiguration.gateStartConfiguration != null) {
gateStartPathfinderBox.setValue(originalConfiguration.gateStartConfiguration.hasPathfinder);
}
gateStartGolfDownBox = createCheckbox(stringMessages.hasAdditionalGolfDownTime());
gateStartGolfDownBox.addValueChangeHandler(new ValueChangeHandler<Boolean>() {
@Override
public void onValueChange(ValueChangeEvent<Boolean> event) {
}
});
if (originalConfiguration.gateStartConfiguration != null) {
gateStartGolfDownBox.setValue(originalConfiguration.gateStartConfiguration.hasAdditionalGolfDownTime);
}
grid.setWidget(0, 0, new Label(stringMessages.classFlag() + ":"));
grid.setWidget(0, 1, gateStartClassFlagListBox);
grid.setWidget(0, 2, createHelpImage(stringMessages.classFlagHelpText("Gate Start")));
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
<com.sap.sailing.racecommittee.app.ui.layouts.TimePanelHeaderLayout
android:id="@+id/race_content_header"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
@@ -98,4 +98,4 @@
</RelativeLayout>
</RelativeLayout>
</RelativeLayout>
</com.sap.sailing.racecommittee.app.ui.layouts.TimePanelHeaderLayout>