Skip to content

Commit

Permalink
Finish adding the Company-ID setting to the settings view
Browse files Browse the repository at this point in the history
This is for issue #100.
  • Loading branch information
haefele committed Nov 16, 2016
1 parent d5639d8 commit 42ddd30
Show file tree
Hide file tree
Showing 5 changed files with 46 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/CTime2/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
14 changes: 14 additions & 0 deletions src/CTime2/MultilingualResources/CTime2.en-US.xlf
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
10 changes: 10 additions & 0 deletions src/CTime2/Strings/de-DE/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -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>
10 changes: 10 additions & 0 deletions src/CTime2/Strings/en-US/Resources.resw
Original file line number Diff line number Diff line change
Expand Up @@ -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>
15 changes: 11 additions & 4 deletions src/CTime2/Views/Settings/SettingsView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 42ddd30

Please sign in to comment.