Skip to content

Enable connecting to Microsoft Translator from Azure China #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cdeng-81 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable connecting to Microsoft Translator from Azure China #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions TranslationAssistant.DocumentTranslationInterface/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/FirstFloor.ModernUI;component/Assets/ModernUI.xaml" />
<ResourceDictionary Source="/FirstFloor.ModernUI;component/Assets/ModernUI.Light.xaml" />
<ResourceDictionary Source="Styles.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
Expand Down
27 changes: 20 additions & 7 deletions TranslationAssistant.DocumentTranslationInterface/Content/Account.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,16 @@
xmlns:i="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
xmlns:mui="http://firstfloorsoftware.com/ModernUI"
xmlns:viewModel="clr-namespace:TranslationAssistant.DocumentTranslationInterface.ViewModel"
xmlns:core="clr-namespace:TranslationAssistant.TranslationServices.Core;assembly=Tools.TranslationAssistant.TranslationServices.Core"
xmlns:p="clr-namespace:TranslationAssistant.DocumentTranslationInterface.Properties"
mc:Ignorable="d"
d:DesignHeight="356" d:DesignWidth="475">
<UserControl.DataContext>
<viewModel:AccountViewModel/>
</UserControl.DataContext>

<UserControl.Resources>
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter"/>
</UserControl.Resources>
<Grid>
<ScrollViewer Margin="0,0,0,-32">
<StackPanel x:Name="Panel" MinWidth="200">
Expand Down Expand Up @@ -49,6 +52,7 @@
<RowDefinition />
<RowDefinition />
<RowDefinition />
<RowDefinition />
</Grid.RowDefinitions>

<TextBlock Grid.Row="1" Grid.Column="0" Text="{x:Static p:Resources.Account_key}" VerticalAlignment="Center" Margin="0,3,16,0" />
Expand All @@ -60,15 +64,24 @@
<TextBlock Grid.Row="3" Grid.Column="0" Text="{x:Static p:Resources.Account_ShowExperimental}" VerticalAlignment="Center" Margin="0,3,16,0" />
<CheckBox Grid.Row="3" Grid.Column="1" VerticalAlignment="Center" Margin ="0,3,0,0" IsChecked="{Binding ShowExperimental, UpdateSourceTrigger=PropertyChanged}" ToolTip="{x:Static p:Resources.Tooltip_ShowExperimental}" Click="CheckBox_Click" x:Name="ShowExperimental_CheckBox"/>

<TextBlock Grid.Row="4" Grid.Column="0" Text="{x:Static p:Resources.AzureGov_text}" VerticalAlignment="Center" Margin="0,3,16,0" />
<CheckBox Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Margin ="0,3,0,0" IsChecked="{Binding UseAzureGovernment, UpdateSourceTrigger=PropertyChanged}" ToolTip="{x:Static p:Resources.Tooltip_UseAzureGovernment}" />
<TextBlock Grid.Row="4" Grid.Column="0" Text="{x:Static p:Resources.Azure_LinkType}" VerticalAlignment="Center" Margin="0,3,16,0" />
<ListBox Grid.Row="4" Grid.Column="1" Style="{StaticResource RadioButtonList}" SelectedValue="{Binding LinkType}" SelectedValuePath="Tag">
<ListBoxItem Tag="{x:Static core:AzureLinkType.Global}" Content="{x:Static p:Resources.AzureGlobal_text}" />
<ListBoxItem Tag="{x:Static core:AzureLinkType.Government}" Content="{x:Static p:Resources.AzureGov_text}" />
<ListBoxItem Tag="{x:Static core:AzureLinkType.China}" Content="{x:Static p:Resources.AzureChina_text}" />
</ListBox>

<TextBlock Grid.Row="5" Grid.Column="0" Text="{x:Static p:Resources.CustomEndpoint}" VerticalAlignment="Center" Margin="0,3,16,0" />
<CheckBox Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" Margin ="0,3,0,0" IsChecked="{Binding UseCustomEndpoint, UpdateSourceTrigger=PropertyChanged}" ToolTip="{x:Static p:Resources.Tooltip_CustomUrlCheckbox}" />
<TextBox x:Name="CustomEndpointUrl" Grid.Row="5" Grid.Column="1" HorizontalAlignment="Left" Margin="30,0,0,0" TextWrapping="Wrap" Text="{Binding CustomEndpointUrl, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="270" ToolTip="{x:Static p:Resources.Tooltip_CustomUrl}"/>
<TextBlock Grid.Row="5" Grid.Column="0" Text="{x:Static p:Resources.Account_region}" VerticalAlignment="Center" Margin="0,3,16,0"
Visibility="{Binding ShowRegion, Converter={StaticResource BooleanToVisibilityConverter}}" />
<TextBox Grid.Row="5" Grid.Column="1" VerticalAlignment="Center" Margin ="0,3,0,0" Text="{Binding Region, UpdateSourceTrigger=PropertyChanged}" ToolTip="{x:Static p:Resources.Tooltip_Region}"
Visibility="{Binding ShowRegion, Converter={StaticResource BooleanToVisibilityConverter}}" />

<TextBlock Grid.Row="6" Grid.Column="0" Text="{x:Static p:Resources.CustomEndpoint}" VerticalAlignment="Center" Margin="0,3,16,0" />
<CheckBox Grid.Row="6" Grid.Column="1" VerticalAlignment="Center" Margin ="0,3,0,0" IsChecked="{Binding UseCustomEndpoint, UpdateSourceTrigger=PropertyChanged}" ToolTip="{x:Static p:Resources.Tooltip_CustomUrlCheckbox}" />
<TextBox x:Name="CustomEndpointUrl" Grid.Row="6" Grid.Column="1" HorizontalAlignment="Left" Margin="30,0,0,0" TextWrapping="Wrap" Text="{Binding CustomEndpointUrl, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Top" Width="270" ToolTip="{x:Static p:Resources.Tooltip_CustomUrl}"/>


<Button Grid.Row="7" Grid.Column="1" Content="{x:Static p:Resources.Account_save}" Width="80" HorizontalAlignment="Left" Margin="0,20,0,0">
<Button Grid.Row="8" Grid.Column="1" Content="{x:Static p:Resources.Account_save}" Width="80" HorizontalAlignment="Left" Margin="0,20,0,0">
<i:Interaction.Triggers>
<i:EventTrigger EventName="PreviewMouseUp">
<i:InvokeCommandAction
Expand Down
4 changes: 4 additions & 0 deletions TranslationAssistant.DocumentTranslationInterface/DocumentTranslator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,10 @@
<DependentUpon>Settings.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Page Include="Styles.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
Expand Down
Loading