Merge remote-tracking branch 'origin/bug2114' into bug2201

This commit is contained in:
Simon Pamies committed 2014-08-16 16:44:44 +02:00
commit 4c97fedba9
5 files changed
+13 -5

No files matched your search

@@ -1079,4 +1079,6 @@ public interface StringMessages extends Messages {
String windChart();
String showVideoPopup();
String hideVideoPopup();
String manageMedia();
String manageMediaTooltip();
}
@@ -1062,4 +1062,6 @@ raceIsInLiveTimePanelMode=Race is Live
backToLiveTimePanelMode=Back to Live
windChart=Wind Chart
showVideoPopup=Show Video
hideVideoPopup=Hide Video
hideVideoPopup=Hide Video
manageMedia=Manage Media
manageMediaTooltip=Configure audio and video clips, synchronize times
@@ -1057,4 +1057,6 @@ raceIsInLiveTimePanelMode=Rennen ist live
backToLiveTimePanelMode=Zurück zu live
windChart=Wind Chart
showVideoPopup=Video zeigen
hideVideoPopup=Video verstecken
hideVideoPopup=Video verstecken
manageMedia=Audio/Video verwalten
manageMediaTooltip=Audio- und Video-Clips verwalten, Zeiten synchronisieren
@@ -1012,4 +1012,6 @@ raceIsInLiveTimePanelMode=Race is Live
backToLiveTimePanelMode=Back to Live
windChart=Wind Chart
showVideoPopup=Show Video
hideVideoPopup=Hide Video
hideVideoPopup=Hide Video
manageMedia=Manage Media
manageMediaTooltip=Configure audio and video clips, synchronize times
@@ -93,7 +93,7 @@ public class MediaSelector implements PlayStateListener, TimeListener, MediaSele
mediaSelectionDialog = new MediaSelectionDialog(this);
manageMediaButton = new Button("Manage Media");
manageMediaButton = new Button(stringMessages.manageMedia());
manageMediaButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@@ -106,7 +106,7 @@ public class MediaSelector implements PlayStateListener, TimeListener, MediaSele
});
manageMediaButton.addStyleName("raceBoardNavigation-settingsButton");
manageMediaButton.getElement().getStyle().setFloat(Style.Float.LEFT);
manageMediaButton.setTitle("Configure Media");
manageMediaButton.setTitle(stringMessages.manageMediaTooltip());
toggleMediaButton = new CheckBox("Audio & Video");
toggleMediaButton.addStyleName("raceBoardNavigation-innerElement");