Skip to content

Commit d4a3479

Browse files
committed
ux: only show REMOTE badge in branch tooltip if it is a remote branch
Signed-off-by: leo <[email protected]>
1 parent 9734026 commit d4a3479

File tree

7 files changed

+1
-10
lines changed

7 files changed

+1
-10
lines changed

src/Resources/Locales/de_DE.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">Setze ${0}$ zurück auf ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Setze verfolgten Branch...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">Branch Vergleich</x:String>
77-
<x:String x:Key="Text.BranchTree.Local" xml:space="preserve">LOKAL</x:String>
7877
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">REMOTE</x:String>
7978
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">VERFOLGT</x:String>
8079
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">URL</x:String>

src/Resources/Locales/en_US.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">Reset ${0}$ to ${1}$...</x:String>
7171
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Set Tracking Branch...</x:String>
7272
<x:String x:Key="Text.BranchCompare" xml:space="preserve">Branch Compare</x:String>
73-
<x:String x:Key="Text.BranchTree.Local" xml:space="preserve">LOCAL</x:String>
7473
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">REMOTE</x:String>
7574
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">TRACKING</x:String>
7675
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">URL</x:String>

src/Resources/Locales/es_ES.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">Resetear ${0}$ a ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Establecer Rama de Seguimiento...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">Comparar Ramas</x:String>
77-
<x:String x:Key="Text.BranchTree.Local" xml:space="preserve">LOCAL</x:String>
7877
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">REMOTO</x:String>
7978
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">SEGUIMIENTO</x:String>
8079
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">URL</x:String>

src/Resources/Locales/ru_RU.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">Сбросить ${0}$ к ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">Отслеживать ветку...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">Сравнение веток</x:String>
77-
<x:String x:Key="Text.BranchTree.Local" xml:space="preserve">ЛОКАЛЬНЫЙ</x:String>
7877
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">УДАЛЁННЫЙ</x:String>
7978
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">ОТСЛЕЖИВАНИЕ</x:String>
8079
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">URL-АДРЕС</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">重置 ${0}$ 到 ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切换上游分支 ...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比较</x:String>
77-
<x:String x:Key="Text.BranchTree.Local" xml:space="preserve">本地</x:String>
7877
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">远程</x:String>
7978
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">上游分支</x:String>
8079
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">远程地址</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<x:String x:Key="Text.BranchCM.ResetToSelectedCommit" xml:space="preserve">重設 ${0}$ 至 ${1}$...</x:String>
7575
<x:String x:Key="Text.BranchCM.Tracking" xml:space="preserve">切換上游分支...</x:String>
7676
<x:String x:Key="Text.BranchCompare" xml:space="preserve">分支比較</x:String>
77-
<x:String x:Key="Text.BranchTree.Local" xml:space="preserve">本機</x:String>
7877
<x:String x:Key="Text.BranchTree.Remote" xml:space="preserve">遠端</x:String>
7978
<x:String x:Key="Text.BranchTree.Tracking" xml:space="preserve">上游分支</x:String>
8079
<x:String x:Key="Text.BranchTree.URL" xml:space="preserve">遠端網址</x:String>

src/Views/BranchTree.axaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@
4444
<StackPanel Orientation="Horizontal">
4545
<Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
4646
<TextBlock FontWeight="Bold" VerticalAlignment="Center" Margin="8,0,0,0" Text="{Binding FriendlyName}"/>
47-
<Border Background="Green" Margin="4,0,0,0" CornerRadius="4" VerticalAlignment="Center" IsVisible="{Binding IsLocal}">
48-
<TextBlock Text="{DynamicResource Text.BranchTree.Local}" FontSize="12" Classes="primary" Margin="4,1" Foreground="White" VerticalAlignment="Center"/>
49-
</Border>
50-
<Border Background="Gray" Margin="4,0,0,0" CornerRadius="4" VerticalAlignment="Center" IsVisible="{Binding !IsLocal}">
47+
<Border Background="Green" Margin="4,0,0,0" CornerRadius="4" VerticalAlignment="Center" IsVisible="{Binding !IsLocal}">
5148
<TextBlock Text="{DynamicResource Text.BranchTree.Remote}" FontSize="12" Classes="primary" Margin="4,1" Foreground="White" VerticalAlignment="Center"/>
5249
</Border>
5350
</StackPanel>

0 commit comments

Comments
 (0)