-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
17 changed files
with
394 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| <UserControl x:Class="NebulaAuth.View.Dialogs.LoginAgainOnImportDialog" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:theme="clr-namespace:NebulaAuth.Theme" | ||
| xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" | ||
| xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other" | ||
| xmlns:model="clr-namespace:NebulaAuth.Model" | ||
| xmlns:entities="clr-namespace:NebulaAuth.Model.Entities" | ||
| mc:Ignorable="d" | ||
| d:DesignHeight="250" d:DesignWidth="800" | ||
| theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True" | ||
| Foreground="WhiteSmoke" Cursor="Hand" | ||
| d:DataContext="{d:DesignInstance other:LoginAgainOnImportVM}" | ||
| Background="{DynamicResource WindowBackground}"> | ||
|
|
||
| <Grid MinHeight="100" MinWidth="300" Margin="20"> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| </Grid.RowDefinitions> | ||
| <TextBlock theme:FontScaleWindow.Scale="0.9" theme:FontScaleWindow.ResizeFont="True" Margin="10,0,0,0" HorizontalAlignment="Left"> | ||
| <Run Text="{Tr LoginAgainDialog.LoginFor, IsDynamic=False}"/> | ||
| <Run FontWeight="Bold" Text="{Binding UserName}"/> | ||
| </TextBlock> | ||
| <TextBox Text="{Binding Password}" Margin="10,10,10,0" Grid.Row="1" Style="{StaticResource MaterialDesignFloatingHintTextBox}" materialDesign:HintAssist.Hint="{Tr LoginAgainDialog.PasswordBox}"></TextBox> | ||
| <ComboBox Grid.Row="2" Margin="10,10,10,0" materialDesign:HintAssist.Hint="{Tr Common.Proxy}" ItemsSource="{Binding Proxies}" SelectedItem="{Binding SelectedProxy}" > | ||
| <ItemsControl.ItemTemplate> | ||
| <DataTemplate DataType="{x:Type entities:MaProxy}"> | ||
| <TextBlock Text="{Binding Converter={StaticResource ProxyTextConverter}, Mode=OneWay}" /> | ||
| </DataTemplate> | ||
| </ItemsControl.ItemTemplate> | ||
| </ComboBox> | ||
| <CheckBox Grid.Row="3" Margin="10,10,10,0" IsEnabled="{Binding Source={x:Static model:PHandler.IsPasswordSet}}" IsChecked="{Binding SavePassword}" Content="{Tr LoginAgainDialog.SaveEncryptedPassword}"/> | ||
| <CheckBox Grid.Row="4" Margin="10,10,10,0" IsEnabled="{Binding MafileHasProxy}" Content="{Tr LoginAgainDialog.UseMafileProxy}" IsChecked="{Binding UseMafileProxy}"/> | ||
| <Grid Grid.Row="5" Margin="10,0,10,0"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition/> | ||
| <ColumnDefinition/> | ||
| </Grid.ColumnDefinitions> | ||
| <Button IsDefault="True" Margin="0,5,5,5" Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource True}" Content="{Tr LoginAgainDialog.LoginButton}"/> | ||
| <Button IsCancel="True" Grid.Column="1" Margin="5,5,0,5" Style="{StaticResource MaterialDesignOutlinedButton}" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" CommandParameter="{StaticResource False}" Content="{Tr LoginAgainDialog.CancelButton}"/> | ||
| </Grid> | ||
| </Grid> | ||
| </UserControl> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| using System.Windows.Controls; | ||
|
|
||
| namespace NebulaAuth.View.Dialogs | ||
| { | ||
| /// <summary> | ||
| /// Логика взаимодействия для LoginAgainDialog.xaml | ||
| /// </summary> | ||
| public partial class LoginAgainOnImportDialog | ||
| { | ||
| public LoginAgainOnImportDialog() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <UserControl x:Class="NebulaAuth.View.UpdaterView" | ||
| xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
| xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
| xmlns:local="clr-namespace:NebulaAuth.View" | ||
| xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" | ||
| xmlns:other="clr-namespace:NebulaAuth.ViewModel.Other" | ||
| xmlns:wpf="clr-namespace:Microsoft.Web.WebView2.Wpf;assembly=Microsoft.Web.WebView2.Wpf" | ||
| mc:Ignorable="d" | ||
| d:DesignHeight="700" | ||
| d:DesignWidth="500" | ||
| Foreground="WhiteSmoke" | ||
| FontFamily="{materialDesign:MaterialDesignFont}" | ||
| d:DataContext="{d:DesignInstance other:UpdaterVM}" | ||
| Background="{DynamicResource WindowBackground}" | ||
| Padding="10" | ||
| MaxWidth="500"> | ||
| <d:DesignerProperties.DesignStyle> | ||
| <Style TargetType="UserControl"> | ||
| <Setter Property="Background" Value="{DynamicResource WindowBackground}" /> | ||
| </Style> | ||
| </d:DesignerProperties.DesignStyle> | ||
| <Grid> | ||
| <Grid.RowDefinitions> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| <RowDefinition Height="Auto"/> | ||
| </Grid.RowDefinitions> | ||
|
|
||
| <TextBlock FontSize="24" Text="Обновления"/> | ||
| <Separator Grid.Row="1"></Separator> | ||
|
|
||
| <TextBlock FontSize="16" Margin="5,10,0,10" TextWrapping="WrapWithOverflow" Grid.Row="2" > | ||
| <Run Text="Доступна новая версия:"/> | ||
| <Run FontWeight="Bold" Text="{Binding UpdateInfoEventArgs.CurrentVersion}"/> | ||
| <Run Text="
Вы используете версию"/> | ||
| <Run FontWeight="Bold" Text="{Binding UpdateInfoEventArgs.InstalledVersion}"/> | ||
| <Run Text="Хотите обновить программу?"/> | ||
| </TextBlock> | ||
| <Expander Header="Что изменилось?" Grid.Row="3"> | ||
| <!--<wpf:WebView2 HorizontalAlignment="Stretch" Height="300" | ||
| Source="{Binding UpdateInfoEventArgs.ChangelogURL}" | ||
| />--> | ||
| </Expander> | ||
| <Grid Grid.Row="4"> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition/> | ||
| <ColumnDefinition/> | ||
| </Grid.ColumnDefinitions> | ||
| <Button Content="OK" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" /> | ||
| <Button IsCancel="True" Grid.Column="1" Content="Cancel" Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}" /> | ||
| </Grid> | ||
|
|
||
| </Grid> | ||
| </UserControl> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.Linq; | ||
| using System.Text; | ||
| using System.Threading.Tasks; | ||
| using System.Windows; | ||
| using System.Windows.Controls; | ||
| using System.Windows.Data; | ||
| using System.Windows.Documents; | ||
| using System.Windows.Input; | ||
| using System.Windows.Media; | ||
| using System.Windows.Media.Imaging; | ||
| using System.Windows.Navigation; | ||
| using System.Windows.Shapes; | ||
|
|
||
| namespace NebulaAuth.View | ||
| { | ||
| /// <summary> | ||
| /// Логика взаимодействия для UpdaterView.xaml | ||
| /// </summary> | ||
| public partial class UpdaterView : UserControl | ||
| { | ||
| public UpdaterView() | ||
| { | ||
| InitializeComponent(); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.