gitsvn 12 anni fa
parent
commit
710f406dc4

+ 14
- 1
res/values-de/strings.xml Vedi File

@@ -75,6 +75,10 @@
<string name="caption_MainCfg_ArcerySetup_SubText">Hier klicken um eine Ausrüstung zu Editiern, zu Löschen oder Einzufügen</string>
<string name="caption_ConfirmDelete">Löschen bestätigen</string>
<string name="caption_DeleteMsg">Wollen Sie \'%s\' wirklich löschen?</string>
<string name="caption_Userguide_New">Erstellt eine neue, leere Konfiguration</string>
<string name="caption_Userguide_Save">Speichert eine neue oder geänderte Konfiguration</string>
<string name="caption_Userguide_Delete">Löscht eine Konfiguration nach Bestätigung</string>
<!-- -->
<string name="fcChart_StartAngle">Abschusswinkel:\n</string>
<string name="fcChart_MaxHeight">Max. Höhe der Flugbahn:\n</string>
@@ -111,6 +115,7 @@
<string name="ug_UserguideParams_Add2">
%1$s:\nDieser Wert bestimmt wie genau der resultierende Höhenunterschied zwischen Bogen und Ziel berechnet wird. Ein kleinerer Wert führt zu einer genaueren Flugbahn, hat aber zur Folge, dass die Berechnung länger dauert.
</string>
<!-- -->
<string name="ug_UserguideRiserParams_Add1">
Dieser Wert is negativ falls die Schraubenlöcher der Visiermontage näher an der Sehne sind als die Button-Schraubenlöcher, andernfalls positiv.
</string>
@@ -120,12 +125,20 @@
<string name="ug_UserguideRiserParams_Add3">
Schraubenlöcher Visiermontage
</string>
<!-- -->
<string name="ug_UserguideSightParams_Add1">
Dieser Wert is negativ falls die Fixierschraube näher an der Sehne ist als die Schraubenlöcher der Visiermontage, andernfalls positiv.
</string>
<string name="ug_UserguideSightParams_Add2">
Einstellbare Abstände von der Fixierschraube bis zum Pin, getrennt durch Kommas.
</string>
<!-- -->
<string name="ug_UserguideASParams_Add1">%1$s:\nWählen Sie eine Ausrüstung zum Editieren</string>
<string name="ug_UserguideASParams_Add2">%1$s:\nDie Bezeichnung der Ausrüstung. Geben Sie hier eine Bezeichnung ein wenn Sie eine neue Ausrüstung erstellen</string>
<string name="ug_UserguideASParams_Add3">%1$s:\nWählen Sie ein Griffstück aus der Liste der verfügbaren aus</string>
<string name="ug_UserguideASParams_Add4">%1$s:\nWählen Sie ein Visier aus der Liste der verfügbaren aus</string>
<string name="ug_UserguideASParams_Add5">%1$s, %2$s:\nStandardwerte für die Berechnung</string>
<string name="ug_UserguideASParams_Add6">%1$s:\nWert auf der vertikalen Skala bei welchem die Mittelachse des Visierschlittens befestigt ist (siehe auch Benutzeranleitung Visier)</string>
<string name="ug_UserguideASParams_Add7">%1$s:\nStandardwert der horizontalen Stellung des Visierschlittens</string>
</resources>

+ 13
- 1
res/values/strings.xml Vedi File

@@ -74,6 +74,9 @@
<string name="caption_MainCfg_ArcerySetup_SubText">Tab to edit, delete or insert a equipment setup</string>
<string name="caption_ConfirmDelete">Confirm Deletion</string>
<string name="caption_DeleteMsg">Are you sure you want delete \'%s\'?</string>
<string name="caption_Userguide_New">Creates a empty, new configuration</string>
<string name="caption_Userguide_Save">Saves a new or edited configuration</string>
<string name="caption_Userguide_Delete">Deletes a configuration after confirmation</string>
<!-- -->
<string name="fcChart_StartAngle">Elevation Angle:\n</string>
<string name="fcChart_MaxHeight">Max. Height of Trajectory:\n</string>
@@ -111,6 +114,7 @@
<string name="ug_UserguideParams_Add2">
%1$s:\n.This value determines the calculation precision of the difference between bow and target. A lower value will result in a more accurate ballistic trajectory but also slows down the calculation time.
</string>
<!-- -->
<string name="ug_UserguideRiserParams_Add1">
This value is negative if the sight mount screw holes are closer to the bow string than the button screw holes, otherwise positive.
</string>
@@ -120,12 +124,20 @@
<string name="ug_UserguideRiserParams_Add3">
Sight mount screw holes
</string>
<!-- -->
<string name="ug_UserguideSightParams_Add1">
This value is negative if the fixing screw is closer to the bow string than the sight mount screw holes, otherwise positive.
</string>
<string name="ug_UserguideSightParams_Add2">
Settable distances from the fixing screw to the pin, comma separated.
</string>
<!-- -->
<string name="ug_UserguideASParams_Add1">%1$s:\nChoose an equipment to edit</string>
<string name="ug_UserguideASParams_Add2">%1$s:\nThe label of the eqipment. Type a name if you are configuring a new one</string>
<string name="ug_UserguideASParams_Add3">%1$s:\nSelect a riser from the list of available risers</string>
<string name="ug_UserguideASParams_Add4">%1$s:\nSelect a sight from the list of available sights</string>
<string name="ug_UserguideASParams_Add5">%1$s, %2$s:\nDefault values for calculation</string>
<string name="ug_UserguideASParams_Add6">%1$s:\nValue of the vertical sight scale where it is fixed according to the middle axis of the horizontal sliding carriage (see also sight user guide)</string>
<string name="ug_UserguideASParams_Add7">%1$s:\nDefault value of the horizontal setting of the sight</string>
</resources>

+ 2
- 1
res/values/strings_notrans.xml Vedi File

@@ -22,5 +22,6 @@
<string name="caption_UserguideParams">1. %1$s\n2. %2$s\n3. %3$s\n4. %4$s\n5. %5$s\n6. %6$s\n7. %7$s\n\n%8$s\n\n%9$s</string>
<string name="caption_UserguideRiserParams">1. %1$s\n2. %2$s\n3. %3$s\n4. %4$s</string>
<string name="caption_UserguideSightParams">1. %1$s\n2. %2$s\n3. %3$s\n4. %4$s\n5. %5$s\n6. %6$s\n7. %7$s</string>
<string name="caption_UserguideArcherySetupParams">%1$s\n\n%2$s\n\n%3$s\n\n%4$s\n\n%5$s\n\n%6$s\n\n%7$s\n\n%8$s</string>
</resources>

+ 80
- 1
src/ch/spherIC/recurvebowsight/DialogFactory.java Vedi File

@@ -21,6 +21,8 @@ import android.app.Dialog;
import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException;
import android.text.Html;
import android.view.View;
import android.view.View.OnClickListener;
@@ -40,6 +42,8 @@ import java.util.StringTokenizer;
public final class DialogFactory {
private static Dialog userGuideAsDialog = null;
/**
* Static main method to initialize classes
*
@@ -74,6 +78,13 @@ public final class DialogFactory {
dlg = createUserguideSightDialog(parent);
break;
case RBSMainActivity.DLG_USERGUIDE_AS_CFG:
if (userGuideAsDialog == null) {
userGuideAsDialog = createUserguideArcherySetupDialog(parent);
}
dlg = userGuideAsDialog;
break;
default:
dlg = null;
break;
@@ -174,7 +185,8 @@ public final class DialogFactory {
StringTokenizer st = new StringTokenizer(parent.getResources().getString(R.string.scaVLbl), "/");
String aVStr = st.nextToken();
String aHStr = st.nextToken() + ".\n" + parent.getResources().getString(R.string.ug_UserguideSightParams_Add1);
String vHorzSettStr = parent.getResources().getString(R.string.scHeVSLbl) + ".\n" + parent.getResources().getString(R.string.ug_UserguideSightParams_Add2);
String vHorzSettStr = parent.getResources().getString(R.string.scHeVSLbl) + ".\n"
+ parent.getResources().getString(R.string.ug_UserguideSightParams_Add2);
text.setText(parent.getResources().getString(R.string.caption_UserguideSightParams, //
aVStr.trim(), aHStr.trim(), vHorzSettStr.trim(), //
@@ -194,6 +206,56 @@ public final class DialogFactory {
return dialog;
}
/**
* @param parent
*
* @return
*/
private static Dialog createUserguideArcherySetupDialog(final Activity parent) {
final Dialog dialog = new Dialog(parent);
dialog.setContentView(R.layout.rbs_userguide_dialog);
dialog.setTitle(parent.getResources().getText(R.string.menuUserGuide).toString());
// ImageView image = (ImageView) dialog.findViewById(R.id.ug_image);
// image.setImageResource(R.drawable.userguide_sight);
TextView text = (TextView) dialog.findViewById(R.id.ug_txt_HowTo);
String str1 = parent.getResources().getString(R.string.ug_UserguideASParams_Add1,
"<b>" + parent.getResources().getString(R.string.asArcherySetupLbl) + "</b>");
String str2 = parent.getResources().getString(R.string.ug_UserguideASParams_Add2,
"<b>" + parent.getResources().getString(R.string.asLabel) + "</b>");
String str3 = parent.getResources().getString(R.string.ug_UserguideASParams_Add3,
"<b>" + parent.getResources().getString(R.string.rcRiserLbl) + "</b>");
String str4 = parent.getResources().getString(R.string.ug_UserguideASParams_Add4,
"<b>" + parent.getResources().getString(R.string.scSightLbl) + "</b>");
String str5 = parent.getResources().getString(R.string.ug_UserguideASParams_Add5,
"<b>" + parent.getResources().getString(R.string.deltaTimeLbl) + "</b>",
"<b>" + parent.getResources().getString(R.string.calcPrecisionLbl) + "</b>");
String str6 = parent.getResources().getString(R.string.ug_UserguideASParams_Add6,
"<b>" + parent.getResources().getString(R.string.scVertSkalaMiddleLbl) + "</b>");
String str7 = parent.getResources().getString(R.string.ug_UserguideASParams_Add7,
"<b>" + parent.getResources().getString(R.string.scHeVSLbl) + "</b>");
String str8 = createButtonsGuideString(parent, true);
String html = parent.getResources().getString(R.string.caption_UserguideArcherySetupParams, str1, str2, str3, str4, str5, str6, str7, str8)
.replaceAll("\n", "<br>");
text.setText(Html.fromHtml(html));
((Button) dialog.findViewById(R.id.btn_ugClose)).setOnClickListener(new OnClickListener() {
@Override
public void onClick(final View v) {
dialog.dismiss();
}
});
return dialog;
}
private static Dialog createChooseArcherySetupDialog(final Activity parent) {
final ChooseArcherySetupDlg dialog = new ChooseArcherySetupDlg(parent);
@@ -240,4 +302,21 @@ public final class DialogFactory {
return dialog;
}
private static String createButtonsGuideString(final Activity parent, final boolean useForHtml) {
String nl = useForHtml ? "<br>" : "\n";
String bB = useForHtml ? "<b>" : "";
String bE = useForHtml ? "</b>" : "";
String btnStr = bB + "Button " + parent.getResources().getString(R.string.caption_New) + ":" + nl + bE
+ parent.getResources().getString(R.string.caption_Userguide_New) + nl + nl;
btnStr += bB + "Button " + parent.getResources().getString(R.string.caption_Save) + ":" + nl + bE
+ parent.getResources().getString(R.string.caption_Userguide_Save) + nl + nl;
btnStr += bB + "Button " + parent.getResources().getString(R.string.caption_Delete) + ":" + nl + bE
+ parent.getResources().getString(R.string.caption_Userguide_Delete);
return btnStr;
}
}

+ 4
- 0
src/ch/spherIC/recurvebowsight/configuration/ArcherySetupConfigurationActivity.java Vedi File

@@ -330,6 +330,10 @@ public class ArcherySetupConfigurationActivity extends Activity {
showDialog(RBSMainActivity.DLG_ABOUT);
return true;
case R.id.itemUserGuide:
showDialog(RBSMainActivity.DLG_USERGUIDE_AS_CFG);
return true;
default:
return super.onOptionsItemSelected(item);

Loading…
Annulla
Salva