eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-09 13:50:57 +00:00
Code Activity

Merge branch 'bug3556' of ssh://localhost:12347/home/trac/git into bug3556

Browse Source
This commit is contained in:
Axel Uhl committed 2016-04-06 23:33:52 +02:00
2 parents a6979dc343 3f07074e54
commit 26ff2a5343
2 files changed
+6 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+2 -2
View File
@@ -199,6 +199,8 @@
<string name="preference_racing_procedure_classflag_header">Klassenflagge</string>
<string name="preference_racing_procedure_hasxray_header">Einzelrückruf</string>
<string name="preference_racing_procedure_hasxray_description">Diese Option aktiviert den Einzelrückruf</string>
<string name="preference_racing_procedure_resultentryenabled_header">Rennliste</string>
<string name="preference_racing_procedure_resultentryenabled_description">Aktiviere diese Option, um die Rennliste während und nach der Zieleinfahrt bearbeiten zu können</string>
<string name="preference_racing_procedure_gatestart_haspathfinder_description">Diese Option aktiviert den Pathfinder</string>
<string name="preference_racing_procedure_gatestart_haspathfinder_header">Pathfinder</string>
<string name="preference_racing_procedure_gatestart_hasadditionalgolfdowntime_description">Diese Option aktiviert das Wählen der zusätzlichen Golfflaggenzeit.</string>
@@ -497,8 +499,6 @@
<string name="preference_non_public_events_header">Zeige nicht öffentliche Events</string>
<string name="preference_non_public_events_summary">Lade alle Events, auch die nicht öffentlichen.</string>
<string name="preference_race_results_header">Erlaube Rennlistenbearbeitung</string>
<string name="preference_race_results_summary">Erlaube Race-Manager die Zieleinlaufliste in der Finishing-Phase zu bearbeiten</string>
<string name="abort_title">Rennen abbrechen</string>
<string name="abort_hint">Welche laufenden Rennen möchten Sie abbrechen?</string>
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/FinishedButtonFragment.java
+4 -3
View File
@@ -78,9 +78,6 @@ public class FinishedButtonFragment extends BasePanelFragment {
mList = ViewHelper.get(layout, R.id.list_button);
if (mList != null) {
mList.setOnClickListener(new ListClick());
if (!preferences.getRacingProcedureIsResultEntryEnabled(getRaceState().getRacingProcedure().getType())) {
mList.setVisibility(View.GONE);
}
}
mListLock = ViewHelper.get(layout, R.id.list_lock);
@@ -97,6 +94,10 @@ public class FinishedButtonFragment extends BasePanelFragment {
LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mReceiver, filter);
sendIntent(AppConstants.INTENT_ACTION_CLEAR_TOGGLE);
if (!preferences.getRacingProcedureIsResultEntryEnabled(getRaceState().getRacingProcedure().getType())) {
mList.setVisibility(View.GONE);
}
}
@Override