Some little UI and label text adjustments

2026-09-24 14:38:45 +00:00 · 2016-09-09 17:04:56 +02:00
parent ebe0319d12
commit be1f5f7fff
11 changed files with 40 additions and 21 deletions
@@ -8,6 +8,8 @@ import java.util.Set;
 import com.google.gwt.cell.client.AbstractCell;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.Style.FontWeight;
+import com.google.gwt.dom.client.Style.Unit;
 import com.google.gwt.event.dom.client.ChangeEvent;
 import com.google.gwt.event.dom.client.ChangeHandler;
 import com.google.gwt.event.dom.client.ClickEvent;
@@ -23,6 +25,7 @@ import com.google.gwt.user.cellview.client.ColumnSortEvent.ListHandler;
 import com.google.gwt.user.cellview.client.TextColumn;
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.HasVerticalAlignment;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.ListBox;
@@ -134,6 +137,13 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl
        raceTable = new FlushableCellTable<RaceDTO>(/* pageSize */10000, tableRes);
        raceTable.ensureDebugId("TrackedRacesCellTable");
        
+        Label lblFilterRaces = new Label(stringMessages.filterRaces()+":");
+        lblFilterRaces.setWordWrap(false);
+        lblFilterRaces.getElement().getStyle().setFontWeight(FontWeight.BOLD);
+        lblFilterRaces.getElement().getStyle().setMarginRight(10, Unit.PX);
+        filterPanel.add(lblFilterRaces);
+        filterPanel.setCellVerticalAlignment(lblFilterRaces, HasVerticalAlignment.ALIGN_MIDDLE);
+
        filterablePanelRaces = new CustomizableFilterablePanel<RaceDTO>(allRaces, raceTable,
                raceList) {
            @Override
@@ -145,8 +155,8 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl
                return strings;
            }
        };
-        Label lblFilterRacesByRegatta = new Label(stringMessages.filterRacesByRegatta() + ":");
-        lblFilterRacesByRegatta.setWordWrap(false);
+        Label lblFilterByRegatta = new Label(stringMessages.filterByRegatta());
+        lblFilterByRegatta.setWordWrap(false);
        listBoxRegattas = new ListBox();
        listBoxRegattas.addChangeHandler(new ChangeHandler() {
            @Override
@@ -155,9 +165,9 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl
                filterablePanelRaces.filter();
            }
        });
-        filterablePanelRaces.add(lblFilterRacesByRegatta, listBoxRegattas);
+        filterablePanelRaces.add(lblFilterByRegatta, listBoxRegattas);
        
-        Label lblFilterRacesByName = new Label(stringMessages.filterRacesByName() + ":");
+        Label lblFilterRacesByName = new Label(stringMessages.filterByNameOrBoatClass());
        lblFilterRacesByName.setWordWrap(false);
        final TextBox textBoxFilter = new TextBox();
        textBoxFilter.addKeyUpHandler(new KeyUpHandler() {
@@ -171,6 +181,8 @@ public abstract class AbstractTrackedRacesListComposite extends SimplePanel impl
        filterablePanelRaces.add(lblFilterRacesByName, textBoxFilter);

        filterPanel.add(filterablePanelRaces);
+        filterPanel.setCellVerticalAlignment(filterablePanelRaces, HasVerticalAlignment.ALIGN_MIDDLE);
+
        final EntityIdentityComparator<RaceDTO> entityIdentityComparator = new EntityIdentityComparator<RaceDTO>() {
            @Override
            public boolean representSameEntity(RaceDTO dto1, RaceDTO dto2) {
@@ -241,7 +241,7 @@ public class SwissTimingEventManagementPanel extends AbstractEventManagementPane
        filterPanel.setSpacing(5);
        trackableRacesPanel.add(filterPanel);

-        Label lblFilterEvents = new Label(stringConstants.filterRacesByName() + ":");
+        Label lblFilterEvents = new Label(stringConstants.filterRaces() + ":");
        filterPanel.add(lblFilterEvents);
        filterPanel.setCellVerticalAlignment(lblFilterEvents, HasVerticalAlignment.ALIGN_MIDDLE);
        
@@ -172,7 +172,7 @@ public class SwissTimingReplayConnectorPanel extends AbstractEventManagementPane
        filterPanel.setSpacing(5);
        racesPanel.add(filterPanel);
        
-        Label lblFilterEvents = new Label(stringMessages.filterRacesByName()+ ":");
+        Label lblFilterEvents = new Label(stringMessages.filterRaces()+ ":");
        filterPanel.add(lblFilterEvents);
        filterPanel.setCellVerticalAlignment(lblFilterEvents, HasVerticalAlignment.ALIGN_MIDDLE);
        
@@ -313,7 +313,7 @@ public class TracTracEventManagementPanel extends AbstractEventManagementPanel {
        layoutTable.setWidget(++row, 1, ignoreTracTracMarkPassingsCheckbox);
        
        // Filter
-        Label racesFilterLabel = new Label(stringMessages.filterRacesByName() + ":");
+        Label racesFilterLabel = new Label(stringMessages.filterRaces() + ":");
        AdminConsoleTableResources tableResources = GWT.create(AdminConsoleTableResources.class);
        racesTable = new FlushableCellTable<TracTracRaceRecordDTO>(10000, tableResources);
        racesTable.ensureDebugId("TrackableRacesCellTable");
@@ -205,8 +205,9 @@ public interface StringMessages extends com.sap.sse.gwt.client.StringMessages,
    String mark();
    String otherManeuver();
    String douglasPeuckerPoints();
-    String filterRacesByName();
-    String filterRacesByRegatta();
+    String filterRaces();
+    String filterByNameOrBoatClass();
+    String filterByRegatta();
    String filterMediaByName();
    String actionEdit();
    String actionEditScores();
@@ -206,8 +206,9 @@ markPassing=Mark passing
 mark=Mark
 otherManeuver=Unknown maneuver
 douglasPeuckerPoints=Douglas peucker points
-filterRacesByName=Filter races
-filterRacesByRegatta=Filter races by regatta
+filterRaces=Filter races
+filterByNameOrBoatClass=by name or boat class
+filterByRegatta=by regatta
 filterMediaByName=Filter media by name
 trackSettings=Track settings
 actionEdit=Edit
@@ -209,8 +209,9 @@ markPassing=Tonnenpassierung
 mark=Tonne
 otherManeuver=Manövertyp unbekannt
 douglasPeuckerPoints=Douglas-Peucker-Punkte
-filterRacesByName=Rennen filtern
-filterRacesByRegatta=Rennen nach Regatta filtern
+filterRaces=Rennen filtern
+filterByNameOrBoatClass=nach Name oder Bootsklasse
+filterByRegatta=nach Regatta
 filterMediaByName=Medien nach Name filtern
 actionEdit=Ändern
 actionEditCompetitors=Teilnehmer ändern
@@ -206,8 +206,9 @@ markPassing=マーク通過
 mark=マーク
 otherManeuver=不明のマニューバー
 douglasPeuckerPoints=Douglas peucker ポイント
-filterRacesByName=レースをフィルタリングする名称
-filterRacesByRegatta=レガッタでフィルタレース
+filterRaces=Filter races
+filterByNameOrBoatClass=by name or boat class
+filterByRegatta=by regatta
 filterMediaByName=メディアをフィルタリングする名称
 trackSettings=設定追跡
 actionEdit=編集
@@ -206,8 +206,9 @@ markPassing=Прохождение отметки
 mark=Отметка
 otherManeuver=Неизвестный маневр
 douglasPeuckerPoints=Точки Дугласа – Пекера
-filterRacesByName=Фильтровать гонки
-filterRacesByRegatta=Фильтровать гонки по регате
+filterRaces=Filter races
+filterByNameOrBoatClass=by name or boat class
+filterByRegatta=by regatta
 filterMediaByName=Фильтровать по названию
 trackSettings=Параметры отслеживания
 actionEdit=Изменить
@@ -206,8 +206,9 @@ markPassing=绕标
 mark=标志
 otherManeuver=未知操作
 douglasPeuckerPoints=道格拉斯-普克得分
-filterRacesByName=按名称筛选比赛轮次
-filterRacesByRegatta=过滤器通过比赛帆船赛
+filterRaces=Filter races
+filterByNameOrBoatClass=by name or boat class
+filterByRegatta=by regatta
 filterMediaByName=按名称筛选媒体
 trackSettings=跟踪设置
 actionEdit=编辑
@@ -206,8 +206,9 @@ markPassing=绕标
 mark=标志
 otherManeuver=未知操作
 douglasPeuckerPoints=道格拉斯-普克得分
-filterRacesByName=按名称筛选比赛轮次
-filterRacesByRegatta=过滤器通过比赛帆船赛
+filterRaces=Filter races
+filterByNameOrBoatClass=by name or boat class
+filterByRegatta=by regatta
 filterMediaByName=按名称筛选媒体
 trackSettings=跟踪设置
 actionEdit=编辑