Skip to content

Commit 4b849d9

Browse files
love-lingerlove-linger
committed
ux: update workspace/page switcher popup layout
Signed-off-by: leo <longshuang@msn.cn>
1 parent 6b083dc commit 4b849d9

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎src/Resources/Locales/en_US.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,8 +430,8 @@
430430
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
431431
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
432432
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
433-
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">Switch Workspace</x:String>
434-
<x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">Switch Tab</x:String>
433+
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Workspaces</x:String>
434+
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Pages</x:String>
435435
<x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
436436
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
437437
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>

‎src/Resources/Locales/ru_RU.axaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Открыть в браузере</x:String>
434434
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">ОШИБКА</x:String>
435435
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">УВЕДОМЛЕНИЕ</x:String>
436-
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">Переключить рабочее место</x:String>
436+
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Рабочие места</x:String>
437437
<x:String x:Key="Text.Merge" xml:space="preserve">Влить ветку</x:String>
438438
<x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
439439
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Опции слияния:</x:String>

‎src/Resources/Locales/zh_CN.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,8 @@
434434
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在浏览器中访问</x:String>
435435
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">出错了</x:String>
436436
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">系统提示</x:String>
437-
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">切换工作区</x:String>
438-
<x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">切换页面</x:String>
437+
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作区列表</x:String>
438+
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">页面列表</x:String>
439439
<x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
440440
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 ：</x:String>
441441
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 ：</x:String>

‎src/Resources/Locales/zh_TW.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -434,8 +434,8 @@
434434
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在瀏覽器中開啟連結</x:String>
435435
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">發生錯誤</x:String>
436436
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">系統提示</x:String>
437-
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">切換工作區</x:String>
438-
<x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">切換目前頁面</x:String>
437+
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作區列表</x:String>
438+
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">頁面列表</x:String>
439439
<x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
440440
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
441441
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>

‎src/Views/Launcher.axaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,13 +103,13 @@
103103
</ContentControl.DataTemplates>
104104
</ContentControl>
105105

106-
<!-- Workspace Switcher -->
106+
<!-- Workspace/Pages Switcher -->
107107
<Border Grid.Row="1"
108108
Background="Transparent"
109109
IsVisible="{Binding Switcher, Converter={x:Static ObjectConverters.IsNotNull}}">
110110
<Border HorizontalAlignment="Center" VerticalAlignment="Center" Effect="drop-shadow(0 0 12 #A0000000)">
111111
<Border Background="{DynamicResource Brush.Popup}" CornerRadius="8">
112-
<ContentControl Margin="16" Content="{Binding Switcher}">
112+
<ContentControl Margin="16,10,16,12" Content="{Binding Switcher}">
113113
<ContentControl.DataTemplates>
114114
<DataTemplate DataType="vm:WorkspaceSwitcher">
115115
<v:WorkspaceSwitcher/>

‎src/Views/LauncherPageSwitcher.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@
88
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
99
x:Class="SourceGit.Views.LauncherPageSwitcher"
1010
x:DataType="vm:LauncherPageSwitcher">
11-
<Grid RowDefinitions="28,Auto,Auto">
11+
<Grid RowDefinitions="Auto,Auto,Auto">
1212
<TextBlock Grid.Row="0"
13-
Text="{DynamicResource Text.Launcher.SwitchTab}"
13+
Text="{DynamicResource Text.Launcher.Pages}"
1414
FontWeight="Bold"
15-
HorizontalAlignment="Center" VerticalAlignment="Top"/>
15+
HorizontalAlignment="Center"/>
1616

1717
<TextBox Grid.Row="1"
1818
Height="24"
19-
Margin="4,0"
19+
Margin="4,8,4,0"
2020
BorderThickness="1"
2121
CornerRadius="12"
2222
Text="{Binding SearchFilter, Mode=TwoWay}"
@@ -50,7 +50,7 @@
5050
x:Name="PagesListBox"
5151
Width="300"
5252
MaxHeight="400"
53-
Margin="0,8,0,0"
53+
Margin="4,8,4,0"
5454
BorderThickness="0"
5555
SelectionMode="Single"
5656
Background="Transparent"

‎src/Views/WorkspaceSwitcher.axaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
88
x:Class="SourceGit.Views.WorkspaceSwitcher"
99
x:DataType="vm:WorkspaceSwitcher">
10-
<Grid RowDefinitions="28,Auto,Auto">
10+
<Grid RowDefinitions="Auto,Auto,Auto">
1111
<TextBlock Grid.Row="0"
12-
Text="{DynamicResource Text.Launcher.SwitchWorkspace}"
12+
Text="{DynamicResource Text.Launcher.Workspaces}"
1313
FontWeight="Bold"
14-
HorizontalAlignment="Center" VerticalAlignment="Top"/>
14+
HorizontalAlignment="Center"/>
1515

1616
<TextBox Grid.Row="1"
1717
Height="24"
18-
Margin="4,0"
18+
Margin="4,8,4,0"
1919
BorderThickness="1"
2020
CornerRadius="12"
2121
Text="{Binding SearchFilter, Mode=TwoWay}"
@@ -49,7 +49,7 @@
4949
x:Name="WorkspaceListBox"
5050
Width="300"
5151
MaxHeight="400"
52-
Margin="0,8,0,0"
52+
Margin="4,8,4,0"
5353
BorderThickness="0"
5454
SelectionMode="Single"
5555
Background="Transparent"

0 commit comments

Comments
 (0)