dearwolf/sourcegit
1
0
Fork 0
mirror of https://github.com/sourcegit-scm/sourcegit synced 2025-05-19 19:34:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ux: update workspace/page switcher popup layout

Browse source 
Signed-off-by: leo <longshuang@msn.cn>
This commit is contained in:
leo 2025-05-18 20:33:55 +08:00
parent 6b083dcd3e
commit 4b849d9d5c
No known key found for this signature in database
7 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Resources/Locales/en_US.axaml
View file

@ -430,8 +430,8 @@
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">ERROR</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">NOTICE</x:String>
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">Switch Workspace</x:String>
<x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">Switch Tab</x:String>
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Workspaces</x:String>
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">Pages</x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">Merge Branch</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">Into:</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Merge Option:</x:String>

2
src/Resources/Locales/ru_RU.axaml
View file

@ -433,7 +433,7 @@
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Открыть в браузере</x:String>
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">ОШИБКА</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">УВЕДОМЛЕНИЕ</x:String>
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">Переключить рабочее место</x:String>
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">Рабочие места</x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">Влить ветку</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">В:</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">Опции слияния:</x:String>

4
src/Resources/Locales/zh_CN.axaml
View file

@ -434,8 +434,8 @@
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在浏览器中访问</x:String>
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">出错了</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">系统提示</x:String>
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">切换工作区</x:String>
<x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">切换页面</x:String>
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作区列表</x:String>
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">页面列表</x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">合并分支</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目标分支 ：</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合并方式 ：</x:String>

4
src/Resources/Locales/zh_TW.axaml
View file

@ -434,8 +434,8 @@
<x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在瀏覽器中開啟連結</x:String>
<x:String x:Key="Text.Launcher.Error" xml:space="preserve">發生錯誤</x:String>
<x:String x:Key="Text.Launcher.Info" xml:space="preserve">系統提示</x:String>
<x:String x:Key="Text.Launcher.SwitchWorkspace" xml:space="preserve">切換工作區</x:String>
<x:String x:Key="Text.Launcher.SwitchTab" xml:space="preserve">切換目前頁面</x:String>
<x:String x:Key="Text.Launcher.Workspaces" xml:space="preserve">工作區列表</x:String>
<x:String x:Key="Text.Launcher.Pages" xml:space="preserve">頁面列表</x:String>
<x:String x:Key="Text.Merge" xml:space="preserve">合併分支</x:String>
<x:String x:Key="Text.Merge.Into" xml:space="preserve">目標分支:</x:String>
<x:String x:Key="Text.Merge.Mode" xml:space="preserve">合併方式:</x:String>

4
src/Views/Launcher.axaml
View file

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

10
src/Views/LauncherPageSwitcher.axaml
View file

@ -8,15 +8,15 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.LauncherPageSwitcher"
x:DataType="vm:LauncherPageSwitcher">
<Grid RowDefinitions="28,Auto,Auto">
<Grid RowDefinitions="Auto,Auto,Auto">
<TextBlock Grid.Row="0"
Text="{DynamicResource Text.Launcher.SwitchTab}"
Text="{DynamicResource Text.Launcher.Pages}"
FontWeight="Bold"
HorizontalAlignment="Center" VerticalAlignment="Top"/>
HorizontalAlignment="Center"/>
<TextBox Grid.Row="1"
Height="24"
Margin="4,0"
Margin="4,8,4,0"
BorderThickness="1"
CornerRadius="12"
Text="{Binding SearchFilter, Mode=TwoWay}"
@ -50,7 +50,7 @@
x:Name="PagesListBox"
Width="300"
MaxHeight="400"
Margin="0,8,0,0"
Margin="4,8,4,0"
BorderThickness="0"
SelectionMode="Single"
Background="Transparent"

10
src/Views/WorkspaceSwitcher.axaml
View file

@ -7,15 +7,15 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.WorkspaceSwitcher"
x:DataType="vm:WorkspaceSwitcher">
<Grid RowDefinitions="28,Auto,Auto">
<Grid RowDefinitions="Auto,Auto,Auto">
<TextBlock Grid.Row="0"
Text="{DynamicResource Text.Launcher.SwitchWorkspace}"
Text="{DynamicResource Text.Launcher.Workspaces}"
FontWeight="Bold"
HorizontalAlignment="Center" VerticalAlignment="Top"/>
HorizontalAlignment="Center"/>
<TextBox Grid.Row="1"
Height="24"
Margin="4,0"
Margin="4,8,4,0"
BorderThickness="1"
CornerRadius="12"
Text="{Binding SearchFilter, Mode=TwoWay}"
@ -49,7 +49,7 @@
x:Name="WorkspaceListBox"
Width="300"
MaxHeight="400"
Margin="0,8,0,0"
Margin="4,8,4,0"
BorderThickness="0"
SelectionMode="Single"
Background="Transparent"