From 42ddd3056c40cd38d364e0facad0582d65dc7bfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20H=C3=A4fele?= <haefele@xemio.net>
Date: Thu, 27 Oct 2016 22:43:00 +0200
Subject: [PATCH] Finish adding the Company-ID setting to the settings view

This is for issue #100.
---
 src/CTime2/App.xaml.cs                            |  2 +-
 src/CTime2/MultilingualResources/CTime2.en-US.xlf | 14 ++++++++++++++
 src/CTime2/Strings/de-DE/Resources.resw           | 10 ++++++++++
 src/CTime2/Strings/en-US/Resources.resw           | 10 ++++++++++
 src/CTime2/Views/Settings/SettingsView.xaml       | 15 +++++++++++----
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/CTime2/App.xaml.cs b/src/CTime2/App.xaml.cs
index d6e4650..7472744 100644
--- a/src/CTime2/App.xaml.cs
+++ b/src/CTime2/App.xaml.cs
@@ -181,7 +181,7 @@ private async void ConfigureVoiceCommands()
 
         private void ConfigureWindowMinSize()
         {
-            ApplicationView.GetForCurrentView().SetPreferredMinSize(new Size(360, 500));
+            ApplicationView.GetForCurrentView().SetPreferredMinSize(new Size(380, 500));
         }
         
         private async void ConfigureJumpList()
diff --git a/src/CTime2/MultilingualResources/CTime2.en-US.xlf b/src/CTime2/MultilingualResources/CTime2.en-US.xlf
index 821ac6c..388b8bd 100644
--- a/src/CTime2/MultilingualResources/CTime2.en-US.xlf
+++ b/src/CTime2/MultilingualResources/CTime2.en-US.xlf
@@ -610,6 +610,20 @@ Add the tile to your Microsoft Band 2 and use it to check-in!</target>
           <source>Teilen</source>
           <target state="translated">Share</target>
         </trans-unit>
+        <trans-unit id="TerminalSettingsGroup.Header" translate="yes" xml:space="preserve">
+          <source>Terminal</source>
+          <target state="translated">Terminal</target>
+        </trans-unit>
+        <trans-unit id="TerminalSettingsGroup.Description" translate="yes" xml:space="preserve">
+          <source>Um diese App an einem Terminal zum Stempeln mit RFID-Chips zu verwenden, musst du deine Firmen-ID von c-time hier eintragen.
+Die Firmen-ID sieht in etwa so aus: A1B2C3D4-A1B2-A1B2-A1B2-A1B2C3D4F5G6</source>
+          <target state="translated">If you want to use this app on a terminal to stamp with RFID-chips, you have to enter your c-time Company-ID here.
+Your Company-ID looks somewhat like this: A1B2C3D4-A1B2-A1B2-A1B2-A1B2C3D4F5G6</target>
+        </trans-unit>
+        <trans-unit id="CompanyIdSettingsItem.Description" translate="yes" xml:space="preserve">
+          <source>Firmen-ID</source>
+          <target state="translated">Company-ID</target>
+        </trans-unit>
       </group>
     </body>
   </file>
diff --git a/src/CTime2/Strings/de-DE/Resources.resw b/src/CTime2/Strings/de-DE/Resources.resw
index ee15e3b..c01f32b 100644
--- a/src/CTime2/Strings/de-DE/Resources.resw
+++ b/src/CTime2/Strings/de-DE/Resources.resw
@@ -568,4 +568,14 @@ Diese App wird eventuell nicht komplett funktionieren.</value>
   <data name="ShareAppBarButton.Label" xml:space="preserve">
     <value>Teilen</value>
   </data>
+  <data name="CompanyIdSettingsItem.Description" xml:space="preserve">
+    <value>Firmen-ID</value>
+  </data>
+  <data name="TerminalSettingsGroup.Description" xml:space="preserve">
+    <value>Um diese App an einem Terminal zum Stempeln mit RFID-Chips zu verwenden, musst du deine Firmen-ID von c-time hier eintragen.
+Die Firmen-ID sieht in etwa so aus: A1B2C3D4-A1B2-A1B2-A1B2-A1B2C3D4F5G6</value>
+  </data>
+  <data name="TerminalSettingsGroup.Header" xml:space="preserve">
+    <value>Terminal</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/CTime2/Strings/en-US/Resources.resw b/src/CTime2/Strings/en-US/Resources.resw
index d16f281..8de62fa 100644
--- a/src/CTime2/Strings/en-US/Resources.resw
+++ b/src/CTime2/Strings/en-US/Resources.resw
@@ -463,4 +463,14 @@ Add the tile to your Microsoft Band 2 and use it to check-in!</value>
   <data name="ShareAppBarButton.Label" xml:space="preserve">
     <value>Share</value>
   </data>
+  <data name="TerminalSettingsGroup.Header" xml:space="preserve">
+    <value>Terminal</value>
+  </data>
+  <data name="TerminalSettingsGroup.Description" xml:space="preserve">
+    <value>If you want to use this app on a terminal to stamp with RFID-chips, you have to enter your c-time Company-ID here.
+Your Company-ID looks somewhat like this: A1B2C3D4-A1B2-A1B2-A1B2-A1B2C3D4F5G6</value>
+  </data>
+  <data name="CompanyIdSettingsItem.Description" xml:space="preserve">
+    <value>Company-ID</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/CTime2/Views/Settings/SettingsView.xaml b/src/CTime2/Views/Settings/SettingsView.xaml
index b135b07..1928641 100644
--- a/src/CTime2/Views/Settings/SettingsView.xaml
+++ b/src/CTime2/Views/Settings/SettingsView.xaml
@@ -133,11 +133,18 @@
                     </StackPanel>
                 </controls:SettingsItem>
             </controls:SettingsGroup>
-            <controls:SettingsGroup Header="Terminal"
-                                    Description="Um diese App an einem Terminal zum Stempeln mit RFID-Chips zu verwenden, musst du deine Firmen-ID von c-time hier eintragen.">
-                <controls:SettingsItem Description="Firmen-ID">
+            <controls:SettingsGroup x:Uid="TerminalSettingsGroup" 
+                                    Header="~Terminal"
+                                    Description="~Um diese App an einem Terminal zum Stempeln mit RFID-Chips zu verwenden, musst du deine Firmen-ID von c-time hier eintragen.&#10;Die Firmen-ID sieht in etwa so aus: A1B2C3D4-A1B2-A1B2-A1B2-A1B2C3D4F5G6">
+                <controls:SettingsItem x:Uid="CompanyIdSettingsItem"
+                                       Description="~Firmen-ID">
+                    <!-- Through trial and error, I found that this combination of font-size padding and width looks about right. -->
                     <TextBox Text="{Binding CompanyId, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-                             Width="300" />    
+                             TextWrapping="Wrap"
+                             MaxLength="36"
+                             FontSize="14"
+                             Padding="3,3,3,5" 
+                             Width="288" />
                 </controls:SettingsItem>
             </controls:SettingsGroup>
         </StackPanel>