diff --git a/chatclient/App.xaml b/chatclient/App.xaml index ea95f8c..76fd1be 100644 --- a/chatclient/App.xaml +++ b/chatclient/App.xaml @@ -1,9 +1,18 @@  - + + + + + + + + + diff --git a/chatclient/LoginWindow.xaml b/chatclient/LoginWindow.xaml new file mode 100644 index 0000000..0e55712 --- /dev/null +++ b/chatclient/LoginWindow.xaml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chatclient/LoginWindow.xaml.cs b/chatclient/LoginWindow.xaml.cs new file mode 100644 index 0000000..8a5f088 --- /dev/null +++ b/chatclient/LoginWindow.xaml.cs @@ -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.Shapes; + +namespace chatclient +{ + /// + /// LoginWindow.xaml 的交互逻辑 + /// + public partial class LoginWindow : Window + { + public LoginWindow() + { + InitializeComponent(); + } + + } +} diff --git a/chatclient/MainWindow.xaml b/chatclient/MainWindow.xaml index 59514ec..268d1d2 100644 --- a/chatclient/MainWindow.xaml +++ b/chatclient/MainWindow.xaml @@ -3,14 +3,38 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" xmlns:local="clr-namespace:chatclient" mc:Ignorable="d" - Title="MainWindow" Height="450" Width="800"> + Title="ChatWindow" Height="450" Width="800" + Style="{StaticResource MaterialDesignWindow}"> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/chatclient/MainWindow.xaml.cs b/chatclient/MainWindow.xaml.cs index d7290f7..b29bc62 100644 --- a/chatclient/MainWindow.xaml.cs +++ b/chatclient/MainWindow.xaml.cs @@ -20,5 +20,10 @@ namespace chatclient { InitializeComponent(); } + + private void PackIcon_DpiChanged() + { + + } } } \ No newline at end of file diff --git a/chatclient/chatclient.csproj b/chatclient/chatclient.csproj index e3e33e3..25fe900 100644 --- a/chatclient/chatclient.csproj +++ b/chatclient/chatclient.csproj @@ -8,4 +8,10 @@ true + + + + + + diff --git a/chatclient/user.png b/chatclient/user.png new file mode 100644 index 0000000..0ece63d Binary files /dev/null and b/chatclient/user.png differ