Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Changed DynamicResources to StaticResources.

  • Loading branch information...
commit 60068e6cc47ffa3cacb9e1232a666a701087b967 1 parent 2342a2a
@kaisellgren authored
View
3  Converters/StatusToColorConverter.cs
@@ -24,6 +24,9 @@ class StatusToColorConverter : IValueConverter
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
+ if (value == null)
+ return COLOR_RED;
+
LibGit2Sharp.FileStatus status = (LibGit2Sharp.FileStatus) value;
// Whether to use darker colors (for text).
View
9 Git-GUI.csproj
@@ -51,6 +51,7 @@
<Prefer32Bit>false</Prefer32Bit>
<RunCodeAnalysis>false</RunCodeAnalysis>
<GenerateSerializationAssemblies>On</GenerateSerializationAssemblies>
+ <UseVSHostingProcess>true</UseVSHostingProcess>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
@@ -233,6 +234,10 @@
</Compile>
<Compile Include="ViewModels\MainWindowViewModel.cs" />
<DesignData Include="DesignData\SampleApplication.xaml" />
+ <Page Include="Styles\ChangesetHistoryDataGrid.xaml">
+ <Generator>MSBuild:Compile</Generator>
+ <SubType>Designer</SubType>
+ </Page>
<Page Include="Views\About.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
@@ -270,10 +275,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Styles\ChangesetHistoryDataGrid.xaml">
- <SubType>Designer</SubType>
- <Generator>MSBuild:Compile</Generator>
- </Page>
<Page Include="Styles\Colors.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
View
5 Git-GUI.sln
@@ -1,6 +1,6 @@

Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 11
+# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Git-GUI", "Git-GUI.csproj", "{3E181F9A-55E5-4769-BB53-AE95AC319AAF}"
EndProject
Global
@@ -23,4 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
+ GlobalSection(Performance) = preSolution
+ HasPerformanceSessions = true
+ EndGlobalSection
EndGlobal
View
2  Styles/Scrollbar.xaml
@@ -38,7 +38,7 @@
<Border Grid.Row="0" x:Name="OuterBorder" BorderThickness="1">
<Track x:Name="PART_Track" IsDirectionReversed="true" Focusable="false">
<Track.Thumb>
- <Thumb x:Name="Thumb" Background="{TemplateBinding Foreground}" BorderBrush="#b6b6b6" Style="{DynamicResource ScrollThumbs}" />
+ <Thumb x:Name="Thumb" Background="{TemplateBinding Foreground}" BorderBrush="#b6b6b6" Style="{StaticResource ScrollThumbs}" />
</Track.Thumb>
<Track.IncreaseRepeatButton>
<RepeatButton x:Name="PageUp" Command="ScrollBar.PageDownCommand" Opacity="0" Focusable="false" />
View
4 Templates/RepoTabContentTemplate.xaml
@@ -18,7 +18,7 @@
<controls:ChangesetHistory Grid.Row="0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
- <GridSplitter Grid.Row="1" Style="{DynamicResource GridSplitterVerticalStyle}" />
+ <GridSplitter Grid.Row="1" Style="{StaticResource GridSplitterVerticalStyle}" />
<Grid Grid.Row="2">
<Grid.ColumnDefinitions>
@@ -28,7 +28,7 @@
</Grid.ColumnDefinitions>
<controls:StatusGrid Grid.Column="0" HorizontalAlignment="Stretch" />
- <GridSplitter Grid.Column="1" Style="{DynamicResource GridSplitterHorizontalStyle}" />
+ <GridSplitter Grid.Column="1" Style="{StaticResource GridSplitterHorizontalStyle}" />
<controls:CommitPanel Grid.Column="2" HorizontalAlignment="Stretch" />
</Grid>
</Grid>
View
11 UserControls/ChangesetHistory.xaml
@@ -28,7 +28,6 @@
VirtualizingPanel.VirtualizationMode="Recycling"
ItemsSource="{Binding Commits}"
AutoGenerateColumns="False"
- Grid.Row="0"
Loaded="OnDataContextChanged"
x:Name="ChangesetHistoryGrid"
Tag="{Binding}"
@@ -54,8 +53,8 @@
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<WrapPanel>
- <ListBox ItemsSource="{Binding DisplayTags}" Style="{DynamicResource DisplayTagsBlueStyle}" IsHitTestVisible="False" />
- <ListBox ItemsSource="{Binding Tags}" Style="{DynamicResource DisplayTagsOrangeStyle}" IsHitTestVisible="False" />
+ <ListBox ItemsSource="{Binding DisplayTags}" Style="{StaticResource DisplayTagsBlueStyle}" IsHitTestVisible="False" />
+ <ListBox ItemsSource="{Binding Tags}" Style="{StaticResource DisplayTagsOrangeStyle}" IsHitTestVisible="False" />
<TextBlock Text="{Binding Path=ShortDescription}"
VerticalAlignment="Center"
FontWeight="{Binding IsHead, Converter={StaticResource isHeadToFontWeightConverter}}"
@@ -65,7 +64,7 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTemplateColumn Header="Date">
+ <DataGridTemplateColumn Header="Date" Width="128">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=FormattedDate}"
@@ -75,7 +74,7 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTemplateColumn Header="Author">
+ <DataGridTemplateColumn Header="Author" Width="224">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=Author}"
@@ -85,7 +84,7 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
- <DataGridTemplateColumn Header="Hash">
+ <DataGridTemplateColumn Header="Hash" Width="64">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Path=HashShort}"
View
24 UserControls/LeftToolbar.xaml
@@ -9,7 +9,7 @@
<Border BorderBrush="#bbb" BorderThickness="1,1,1,0">
<Grid>
- <Grid VerticalAlignment="Stretch" Style="{DynamicResource LeftToolbarStyle}" HorizontalAlignment="Left" Width="160">
+ <Grid VerticalAlignment="Stretch" Style="{StaticResource LeftToolbarStyle}" HorizontalAlignment="Left" Width="160">
<Grid Margin="8" d:DataContext="{d:DesignData Source=../DesignData/Branches.xaml}">
<TreeView Background="{x:Null}" BorderThickness="0" Padding="0">
<TreeView.InputBindings>
@@ -19,14 +19,14 @@
<TreeViewItem ItemsSource="{Binding Branches}" PreviewMouseRightButtonDown="OnPreviewMouseRightButtonDown">
<TreeViewItem.Header>
<WrapPanel>
- <Image Source="../Resources/Icons/Branch.png" Stretch="None" Style="{DynamicResource LeftToolbarTitleImageStyle}" />
- <TextBlock Style="{DynamicResource LeftToolbarTitleStyle}">BRANCHES</TextBlock>
+ <Image Source="../Resources/Icons/Branch.png" Stretch="None" Style="{StaticResource LeftToolbarTitleImageStyle}" />
+ <TextBlock Style="{StaticResource LeftToolbarTitleStyle}">BRANCHES</TextBlock>
</WrapPanel>
</TreeViewItem.Header>
<TreeViewItem.ItemTemplate>
<DataTemplate>
- <TextBlock Text="{Binding Name}" Style="{DynamicResource LeftToolbarTitleStyle}" Tag="{Binding ElementName=LeftToolbarUserControl}">
+ <TextBlock Text="{Binding Name}" Style="{StaticResource LeftToolbarTitleStyle}" Tag="{Binding ElementName=LeftToolbarUserControl}">
<TextBlock.ContextMenu>
<ContextMenu>
<MenuItem Header="Checkout">
@@ -54,8 +54,8 @@
<TreeViewItem ItemsSource="{Binding Tags}">
<TreeViewItem.Header>
<WrapPanel>
- <Image Source="../Resources/Icons/Tag.png" Stretch="None" Style="{DynamicResource LeftToolbarTitleImageStyle}" />
- <TextBlock Style="{DynamicResource LeftToolbarTitleStyle}">TAGS</TextBlock>
+ <Image Source="../Resources/Icons/Tag.png" Stretch="None" Style="{StaticResource LeftToolbarTitleImageStyle}" />
+ <TextBlock Style="{StaticResource LeftToolbarTitleStyle}">TAGS</TextBlock>
</WrapPanel>
</TreeViewItem.Header>
</TreeViewItem>
@@ -63,8 +63,8 @@
<TreeViewItem ItemsSource="{Binding Remotes}">
<TreeViewItem.Header>
<WrapPanel>
- <Image Source="../Resources/Icons/Remote.png" Stretch="None" Style="{DynamicResource LeftToolbarTitleImageStyle}" />
- <TextBlock Style="{DynamicResource LeftToolbarTitleStyle}">REMOTES</TextBlock>
+ <Image Source="../Resources/Icons/Remote.png" Stretch="None" Style="{StaticResource LeftToolbarTitleImageStyle}" />
+ <TextBlock Style="{StaticResource LeftToolbarTitleStyle}">REMOTES</TextBlock>
</WrapPanel>
</TreeViewItem.Header>
</TreeViewItem>
@@ -72,8 +72,8 @@
<TreeViewItem ItemsSource="{Binding Stashes}">
<TreeViewItem.Header>
<WrapPanel>
- <Image Source="../Resources/Icons/Stash.png" Stretch="None" Style="{DynamicResource LeftToolbarTitleImageStyle}" />
- <TextBlock Style="{DynamicResource LeftToolbarTitleStyle}">STASHES</TextBlock>
+ <Image Source="../Resources/Icons/Stash.png" Stretch="None" Style="{StaticResource LeftToolbarTitleImageStyle}" />
+ <TextBlock Style="{StaticResource LeftToolbarTitleStyle}">STASHES</TextBlock>
</WrapPanel>
</TreeViewItem.Header>
</TreeViewItem>
@@ -81,8 +81,8 @@
<TreeViewItem ItemsSource="{Binding Submodules}">
<TreeViewItem.Header>
<WrapPanel>
- <Image Source="../Resources/Icons/Submodule.png" Stretch="None" Style="{DynamicResource LeftToolbarTitleImageStyle}" />
- <TextBlock Style="{DynamicResource LeftToolbarTitleStyle}">SUBMODULES</TextBlock>
+ <Image Source="../Resources/Icons/Submodule.png" Stretch="None" Style="{StaticResource LeftToolbarTitleImageStyle}" />
+ <TextBlock Style="{StaticResource LeftToolbarTitleStyle}">SUBMODULES</TextBlock>
</WrapPanel>
</TreeViewItem.Header>
</TreeViewItem>
View
2  UserControls/NewTabPage.xaml
@@ -18,7 +18,7 @@
d:DataContext="{d:DesignData Source=../DesignData/RecentRepositories.xaml}"
DataContext="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=DataContext}"
ItemsSource="{Binding RecentRepositories}"
- Style="{DynamicResource NewTabListViewStyle}"
+ Style="{StaticResource NewTabListViewStyle}"
x:Name="RecentRepositoriesList"
MouseDoubleClick="OnMouseDoubleClick">
<ListView.Resources>
View
4 UserControls/Panel.xaml
@@ -18,8 +18,8 @@
<DockPanel>
<StackPanel DockPanel.Dock="Top">
<Border BorderBrush="#7ea3be" BorderThickness="1">
- <DockPanel Style="{DynamicResource PanelHeaderStyle}">
- <ContentPresenter DockPanel.Dock="Left" Style="{DynamicResource PanelHeaderTitleStyle}" Content="{TemplateBinding userControls:Panel.Header}" />
+ <DockPanel Style="{StaticResource PanelHeaderStyle}">
+ <ContentPresenter DockPanel.Dock="Left" Style="{StaticResource PanelHeaderTitleStyle}" Content="{TemplateBinding userControls:Panel.Header}" />
<WrapPanel DockPanel.Dock="Right" HorizontalAlignment="Right">
<Grid>
<ComboBox ToolTip="Copy a previous commit message. The entire message will be copied."
View
2  UserControls/StatusGrid.xaml
@@ -98,7 +98,7 @@
<ControlTemplate TargetType="{x:Type GroupItem}">
<StackPanel>
<Border BorderBrush="#aaa" BorderThickness="0,1,0,1">
- <Grid Style="{DynamicResource DataGridGroupItemStyle}">
+ <Grid Style="{StaticResource DataGridGroupItemStyle}">
<StackPanel Orientation="Horizontal" Margin="4,3,0,3">
<TextBlock Text="{Binding Name}" Foreground="{Binding Path=Name, Converter={StaticResource statusGridGroupToColorConverter}}" />
<TextBlock xml:space="preserve" Foreground="{Binding Path=Name, Converter={StaticResource statusGridGroupToColorConverter}}">: </TextBlock>
View
2  UserControls/TopToolbar.xaml
@@ -7,7 +7,7 @@
d:DesignHeight="80" d:DesignWidth="605">
<StackPanel>
- <WrapPanel Style="{DynamicResource TopToolbarStyle}">
+ <WrapPanel Style="{StaticResource TopToolbarStyle}">
<WrapPanel Margin="4,0,0,0">
<Button IsEnabled="False">
<StackPanel>
Please sign in to comment.
Something went wrong with that request. Please try again.