Skip to content

Commit a848a7e

Browse files
BlinueBlinue
committed
UI: 调整主界面UI
1 parent 51371c5 commit a848a7e

File tree

7 files changed

+45
-44
lines changed

7 files changed

+45
-44
lines changed

‎Magpie/App.xaml.cs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ private void Application_Startup(object sender, StartupEventArgs e) {
3030
// 已存在实例时广播 WM_SHOWME，唤醒该实例
3131
_ = NativeMethods.BroadcastMessage(NativeMethods.MAGPIE_WM_SHOWME);
3232
}
33-
34-
Thread.CurrentThread.CurrentUICulture = CultureInfo.GetCultureInfo("en-US");
3533
}
3634

3735
private void Application_Exit(object sender, ExitEventArgs e) {

‎Magpie/MainWindow.xaml‎

Lines changed: 36 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
mc:Ignorable="d"
1010
Title="Magpie" ResizeMode="CanMinimize" WindowStartupLocation="CenterScreen"
1111
Closing="Window_Closing" SourceInitialized="Window_SourceInitialized" StateChanged="Window_StateChanged" HorizontalAlignment="Left" VerticalAlignment="Top" SizeToContent="WidthAndHeight">
12-
<StackPanel Margin="15, 10">
12+
<StackPanel Margin="20,20">
1313
<StackPanel.Resources>
1414
<local:NotifyIconLeftClickCommand x:Key="NotifyIconLeftClickCommand" />
1515
</StackPanel.Resources>
@@ -54,13 +54,29 @@
5454
</ContextMenu>
5555
</tb:TaskbarIcon.ContextMenu>
5656
</tb:TaskbarIcon>
57+
<Grid>
58+
<Grid.ColumnDefinitions>
59+
<ColumnDefinition Width="Auto"/>
60+
<ColumnDefinition Width="1*"/>
61+
<ColumnDefinition Width="Auto"/>
62+
</Grid.ColumnDefinitions>
63+
64+
<Label Margin="0" Content="{x:Static p:Resources.Hotkey}" HorizontalAlignment="Right" VerticalAlignment="Center" Padding="0,5,5,5"/>
65+
<TextBox x:Name="txtHotkey" Grid.Column="1" Margin="10,0" VerticalAlignment="Center" Padding="1,3" TextChanged="TxtHotkey_TextChanged" >
66+
<TextBox.ContextMenu>
67+
<ContextMenu/>
68+
</TextBox.ContextMenu>
69+
</TextBox>
70+
<Button Content="{x:Static p:Resources.Scale_After_5S}" Name="btnScale" Click="BtnScale_Click" Grid.Column="2" HorizontalAlignment="Right" Margin="0" VerticalAlignment="Center" Padding="10,3"/>
5771

72+
</Grid>
5873
<Grid VerticalAlignment="Top">
5974
<Grid.Resources>
6075
<Style TargetType="ComboBox" BasedOn="{StaticResource ComboBox}">
6176
<Setter Property="Grid.Column" Value="1" />
6277
<Setter Property="Margin" Value="10,0" />
6378
<Setter Property="VerticalAlignment" Value="Center" />
79+
<Setter Property="Padding" Value="6,5,5,5" />
6480
</Style>
6581
<Style TargetType="Label" x:Key="Col0">
6682
<Setter Property="Grid.Column" Value="0" />
@@ -71,61 +87,48 @@
7187

7288
<Grid.ColumnDefinitions>
7389
<ColumnDefinition Width="Auto"/>
74-
<ColumnDefinition Width="1*" MinWidth="200"/>
90+
<ColumnDefinition Width="1*" MinWidth="220"/>
7591
<ColumnDefinition Width="Auto"/>
7692
</Grid.ColumnDefinitions>
7793
<Grid.RowDefinitions>
7894
<RowDefinition />
7995
<RowDefinition/>
8096
<RowDefinition/>
81-
<RowDefinition/>
8297
</Grid.RowDefinitions>
8398

84-
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Hotkey}" VerticalAlignment="Top" Margin="0,5,0,0" Padding="0,5,5,5"/>
85-
<TextBox x:Name="txtHotkey" Grid.Column="1" Margin="10,5,10,0" VerticalAlignment="Top" Padding="1,3" TextChanged="TxtHotkey_TextChanged" >
86-
<TextBox.ContextMenu>
87-
<ContextMenu/>
88-
</TextBox.ContextMenu>
89-
</TextBox>
90-
<Button Content="{x:Static p:Resources.Scale_After_5S}" Name="btnScale" Click="BtnScale_Click" Grid.Column="2" HorizontalAlignment="Right" Margin="0,5,0,0" VerticalAlignment="Top" Padding="10,3"/>
91-
92-
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Scaling_Mode}" Grid.Row="1" VerticalAlignment="Center" Margin="0,20,0,0" Padding="0,5,5,5" />
93-
<ComboBox Name="cbbScaleMode" Grid.Row="1" SelectionChanged="CbbScaleMode_SelectionChanged" Margin="10,20,10,0" />
99+
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Scaling_Mode}" Grid.Row="0" VerticalAlignment="Center" Margin="0,20,0,0" Padding="0,5,5,5" />
100+
<ComboBox Name="cbbScaleMode" Grid.Row="0" SelectionChanged="CbbScaleMode_SelectionChanged" Margin="5,20,0,0" />
94101

95-
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Capture_Mode}" Grid.Row="2" VerticalAlignment="Top" Margin="0,9.667,0.333,0" Padding="0,5,5,5"/>
96-
<ComboBox Name="cbbCaptureMode" Grid.Row="2" SelectionChanged="CbbCaptureMode_SelectionChanged" Margin="10,10,10,0">
102+
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Capture_Mode}" Grid.Row="1" VerticalAlignment="Top" Margin="0,15,0,0" Padding="0,5,5,5"/>
103+
<ComboBox Name="cbbCaptureMode" Grid.Row="1" SelectionChanged="CbbCaptureMode_SelectionChanged" Margin="5,15,0,0">
97104
<ComboBoxItem Content="WinRT Capture" />
98105
<ComboBoxItem Content="GDI" />
99106
</ComboBox>
100107

101-
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Injection_Mode}" Grid.Row="3" VerticalAlignment="Center" Margin="0,10,0,0" Padding="0,5,5,5"/>
102-
<ComboBox Name="cbbInjectMode" Grid.Row="3" SelectionChanged="CbbInjectMode_SelectionChanged" Margin="10,10,10,0">
108+
<Label Style="{StaticResource Col0}" Content="{x:Static p:Resources.Injection_Mode}" Grid.Row="2" VerticalAlignment="Center" Margin="0,15,0,0" Padding="0,5,5,5"/>
109+
<ComboBox Name="cbbInjectMode" Grid.Row="2" SelectionChanged="CbbInjectMode_SelectionChanged" Margin="5,15,0,0">
103110
<ComboBoxItem Content="{x:Static p:Resources.No_Injection}" />
104111
<ComboBoxItem Content="{x:Static p:Resources.Runtime_Injection}" />
105112
<ComboBoxItem Content="{x:Static p:Resources.Injection_At_Startup}" />
106113
</ComboBox>
107114
</Grid>
108115

109-
<Grid Margin="0,20,0,0">
116+
<Grid x:Name="gridAutoRestore" Margin="0,20,0,0" Visibility="Collapsed">
110117
<Grid.ColumnDefinitions>
111-
<ColumnDefinition />
118+
<ColumnDefinition Width="1*" />
112119
<ColumnDefinition Width="Auto" />
113120
</Grid.ColumnDefinitions>
114-
<Grid x:Name="gridAutoRestore" Visibility="Hidden">
115-
<Grid.ColumnDefinitions>
116-
<ColumnDefinition />
117-
<ColumnDefinition Width="Auto" />
118-
</Grid.ColumnDefinitions>
119-
<TextBlock x:Name="tbCurWndTitle" Margin="0" Text="Current_Window：" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="250"/>
120-
<Button Content="取消" Margin="5,0,0,0" VerticalAlignment="Center" Padding="5,2" Click="BtnCancelRestore_Click" Grid.Column="1"/>
121+
<Grid x:Name="gridCurrentWnd">
122+
<TextBlock x:Name="tbCurWndTitle" Margin="0" Text="Current_Window: " VerticalAlignment="Center" TextTrimming="CharacterEllipsis" MaxWidth="{Binding ElementName=gridCurrentWnd, Path=ActualWidth}" />
121123
</Grid>
122-
123-
<Button Click="BtnOptions_Click" Margin="10,0,0,0" VerticalAlignment="Center" Padding="10,5" Grid.Column="1" HorizontalAlignment="Right">
124-
<StackPanel Orientation="Horizontal">
125-
<Label FontFamily="Segoe MDL2 Assets" Content="&#xE713;" Padding="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="0" />
126-
<Label Content="{x:Static p:Resources.Options}" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Padding="0" Margin="5,0,0,0" />
127-
</StackPanel>
128-
</Button>
124+
<Button Content="取消" Margin="5,0,0,0" VerticalAlignment="Center" Padding="5,2" Click="BtnCancelRestore_Click" Grid.Column="1"/>
129125
</Grid>
126+
127+
<Button Click="BtnOptions_Click" Margin="0,20,0,0" VerticalAlignment="Center" Padding="10,5" Grid.Column="1" HorizontalAlignment="Right">
128+
<StackPanel Orientation="Horizontal">
129+
<Label FontFamily="Segoe MDL2 Assets" Content="&#xE713;" Padding="0" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="0" />
130+
<Label Content="{x:Static p:Resources.Options}" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Padding="0" Margin="5,0,0,0" />
131+
</StackPanel>
132+
</Button>
130133
</StackPanel>
131134
</Window>

‎Magpie/MainWindow.xaml.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ private void TimerRestore_Tick(object sender, EventArgs e) {
100100
return;
101101
}
102102

103-
tbCurWndTitle.Text = $"{Properties.Resources.Current_Window}：{NativeMethods.GetWindowTitle(prevSrcWindow)}";
103+
tbCurWndTitle.Text = $"{Properties.Resources.Current_Window}{NativeMethods.GetWindowTitle(prevSrcWindow)}";
104104
gridAutoRestore.Visibility = Visibility.Visible;
105105
}
106106

@@ -276,7 +276,7 @@ private void Window_SourceInitialized(object sender, EventArgs e) {
276276
private void StopWaitingForRestore() {
277277
Logger.Info("停止监视源窗口是否为前台窗口");
278278

279-
gridAutoRestore.Visibility = Visibility.Hidden;
279+
gridAutoRestore.Visibility = Visibility.Collapsed;
280280
tbCurWndTitle.Text = "";
281281
prevSrcWindow = IntPtr.Zero;
282282
timerRestore.Stop();

‎Magpie/Options/OptionsWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<Setter Property="FontFamily" Value="Segoe MDL2 Assets" />
2222
</Style>
2323
<Style TargetType="Label" x:Key="Name">
24-
<Setter Property="Width" Value="80" />
24+
<Setter Property="Width" Value="90" />
2525
</Style>
2626
</ListBox.Resources>
2727

‎Magpie/Properties/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Magpie/Properties/Resources.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@
146146
<value>Close</value>
147147
</data>
148148
<data name="Cpp_WinRT" xml:space="preserve">
149-
<value>C++ / WinRT</value>
149+
<value>C++/WinRT</value>
150150
</data>
151151
<data name="Current_Window" xml:space="preserve">
152-
<value>Current Window</value>
152+
<value>Current Window: </value>
153153
</data>
154154
<data name="EasyHook" xml:space="preserve">
155155
<value>EasyHook</value>

‎Magpie/Properties/Resources.zh-CN.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,10 @@
146146
<value>确定</value>
147147
</data>
148148
<data name="Cpp_WinRT" xml:space="preserve">
149-
<value>C++ / WinRT</value>
149+
<value>C++/WinRT</value>
150150
</data>
151151
<data name="Current_Window" xml:space="preserve">
152-
<value>当前窗口</value>
152+
<value>当前窗口：</value>
153153
</data>
154154
<data name="EasyHook" xml:space="preserve">
155155
<value>EasyHook</value>

0 commit comments

Comments
 (0)