Skip to content

Commit 576ef9c

Browse files
zezba9000zezba9000
committed
Added missing libs from installer for image API update.
Added quick repo refresh button
1 parent e117ae4 commit 576ef9c

File tree

4 files changed

+150
-133
lines changed

4 files changed

+150
-133
lines changed

‎GitCommander/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
public static class VersionInfo
3939
{
40-
public const string version = "1.0.6";
40+
public const string version = "1.0.7";
4141

4242
#if DEBUG
4343
public const string versionType = version + "d";

‎GitItGUI.UI/Screens/RepoTabs/ChangesTab.xaml

+132-129
Original file line numberDiff line numberDiff line change
@@ -6,147 +6,150 @@
66
xmlns:local="clr-namespace:GitItGUI.UI.Screens.RepoTabs"
77
mc:Ignorable="d"
88
d:DesignHeight="600" d:DesignWidth="1000">
9-
<Grid>
10-
<Grid.ColumnDefinitions>
11-
<ColumnDefinition Width="*" Name="columDefHL" />
12-
<ColumnDefinition Width="5" />
13-
<ColumnDefinition Width="*" Name="columDefHR" />
14-
</Grid.ColumnDefinitions>
9+
<Grid>
10+
<Grid.ColumnDefinitions>
11+
<ColumnDefinition Width="*" Name="columDefHL" />
12+
<ColumnDefinition Width="5" />
13+
<ColumnDefinition Width="*" Name="columDefHR" />
14+
</Grid.ColumnDefinitions>
1515

16-
<Grid Grid.Column="0">
17-
<Grid.RowDefinitions>
18-
<RowDefinition Height="*" Name="rowStagingDefVU" />
19-
<RowDefinition Height="5" />
20-
<RowDefinition Height="*" Name="rowStagingDefVD" />
21-
</Grid.RowDefinitions>
16+
<Grid Grid.Column="0">
17+
<Grid.RowDefinitions>
18+
<RowDefinition Height="*" Name="rowStagingDefVU" />
19+
<RowDefinition Height="5" />
20+
<RowDefinition Height="*" Name="rowStagingDefVD" />
21+
</Grid.RowDefinitions>
2222

23-
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="2" Margin="10,10,5,5">
24-
<Grid Background="#FFDDDD">
25-
<Label Content="Un-Staged Changes" FontWeight="Bold" Margin="10,10,10,0" VerticalAlignment="Top"/>
26-
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
27-
<TextBlock Text="▼" Margin="0,-2,0,0"/>
28-
<Button.ContextMenu>
29-
<ContextMenu>
30-
<MenuItem Name="stageAllMenuItem" Header="Stage All" Click="stageAllMenuItem_Click"/>
31-
<MenuItem Name="stageSelectedMenuItem" Header="Stage Selected" Click="stageSelectedMenuItem_Click"/>
32-
<MenuItem Name="resolveAllMenuItem" Header="Resolve All" Click="resolveAllMenuItem_Click" IsEnabled="False"/>
33-
<Separator/>
34-
<MenuItem Name="revertAllMenuItem" Header="Revert All" Click="revertAllMenuItem_Click"/>
35-
<MenuItem Name="revertSelectedMenuItem" Header="Revert Selected" Click="revertSelectedMenuItem_Click"/>
36-
<Separator/>
37-
<MenuItem Name="cleanupAllMenuItem" Header="Remove all untracked files" Click="cleanupAllMenuItem_Click"/>
38-
<MenuItem Name="cleanupSelectedMenuItem" Header="Remove selected untracked files" Click="cleanupSelectedMenuItem_Click"/>
39-
</ContextMenu>
40-
</Button.ContextMenu>
41-
</Button>
42-
<ListBox Name="unstagedChangesListBox" Margin="10,41,10,10" SelectionMode="Extended" SelectionChanged="unstagedChangesListBox_SelectionChanged"/>
43-
</Grid>
44-
</Border>
23+
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="2" Margin="10,10,5,5">
24+
<Grid Background="#FFDDDD">
25+
<Label Content="Un-Staged Changes" FontWeight="Bold" Margin="10,10,0,0" VerticalAlignment="Top" HorizontalAlignment="Left" Width="134"/>
26+
<Button Name="quickRefreshButton" ToolTip="Quick refresh changes" Width="24" Height="24" Margin="0,12,31,0" HorizontalAlignment="Right" VerticalAlignment="Top" Click="quickRefreshButton_Click">
27+
<TextBlock Text="↻" FontWeight="Bold" FontSize="16" Margin="0,-2,0,0"/>
28+
</Button>
29+
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
30+
<TextBlock Text="▼" Margin="0,-2,0,0"/>
31+
<Button.ContextMenu>
32+
<ContextMenu>
33+
<MenuItem Name="stageAllMenuItem" Header="Stage All" Click="stageAllMenuItem_Click"/>
34+
<MenuItem Name="stageSelectedMenuItem" Header="Stage Selected" Click="stageSelectedMenuItem_Click"/>
35+
<MenuItem Name="resolveAllMenuItem" Header="Resolve All" Click="resolveAllMenuItem_Click" IsEnabled="False"/>
36+
<Separator/>
37+
<MenuItem Name="revertAllMenuItem" Header="Revert All" Click="revertAllMenuItem_Click"/>
38+
<MenuItem Name="revertSelectedMenuItem" Header="Revert Selected" Click="revertSelectedMenuItem_Click"/>
39+
<Separator/>
40+
<MenuItem Name="cleanupAllMenuItem" Header="Remove all untracked files" Click="cleanupAllMenuItem_Click"/>
41+
<MenuItem Name="cleanupSelectedMenuItem" Header="Remove selected untracked files" Click="cleanupSelectedMenuItem_Click"/>
42+
</ContextMenu>
43+
</Button.ContextMenu>
44+
</Button>
45+
<ListBox Name="unstagedChangesListBox" Margin="10,41,10,10" SelectionMode="Extended" SelectionChanged="unstagedChangesListBox_SelectionChanged"/>
46+
</Grid>
47+
</Border>
4548

46-
<GridSplitter Grid.Row="1" Width="60" Height="5" Background="Gray" HorizontalAlignment="Stretch" />
49+
<GridSplitter Grid.Row="1" Width="60" Height="5" Background="Gray" HorizontalAlignment="Stretch" />
4750

48-
<Border Grid.Row="2" BorderBrush="Gray" BorderThickness="2" Margin="10,5,5,10">
49-
<Grid Background="#DDFFDD">
50-
<Label Content="Staged Changes" Margin="10,10,10,0" FontWeight="Bold" VerticalAlignment="Top"/>
51-
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
52-
<TextBlock Text="▼" Margin="0,-2,0,0"/>
53-
<Button.ContextMenu>
54-
<ContextMenu>
55-
<MenuItem Name="unstageAllMenuItem" Header="Un-Stage All" Click="unstageAllMenuItem_Click"/>
56-
<MenuItem Name="unstageSelectedMenuItem" Header="Un-Stage Selected" Click="unstageSelectedMenuItem_Click"/>
57-
</ContextMenu>
58-
</Button.ContextMenu>
59-
</Button>
60-
<ListBox Name="stagedChangesListBox" Margin="10,41,10,10" SelectionMode="Extended" SelectionChanged="stagedChangesListBox_SelectionChanged"/>
61-
</Grid>
62-
</Border>
63-
</Grid>
51+
<Border Grid.Row="2" BorderBrush="Gray" BorderThickness="2" Margin="10,5,5,10">
52+
<Grid Background="#DDFFDD">
53+
<Label Content="Staged Changes" Margin="10,10,0,0" FontWeight="Bold" VerticalAlignment="Top" HorizontalAlignment="Left" Width="113"/>
54+
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
55+
<TextBlock Text="▼" Margin="0,-2,0,0"/>
56+
<Button.ContextMenu>
57+
<ContextMenu>
58+
<MenuItem Name="unstageAllMenuItem" Header="Un-Stage All" Click="unstageAllMenuItem_Click"/>
59+
<MenuItem Name="unstageSelectedMenuItem" Header="Un-Stage Selected" Click="unstageSelectedMenuItem_Click"/>
60+
</ContextMenu>
61+
</Button.ContextMenu>
62+
</Button>
63+
<ListBox Name="stagedChangesListBox" Margin="10,41,10,10" SelectionMode="Extended" SelectionChanged="stagedChangesListBox_SelectionChanged"/>
64+
</Grid>
65+
</Border>
66+
</Grid>
6467

65-
<GridSplitter Grid.Column="1" Width="5" Height="60" Background="Gray" HorizontalAlignment="Stretch" />
68+
<GridSplitter Grid.Column="1" Width="5" Height="60" Background="Gray" HorizontalAlignment="Stretch" />
6669

67-
<Grid Grid.Column="2">
68-
<Grid.RowDefinitions>
69-
<RowDefinition Height="*" Name="rowCommitDiffDefVU" />
70-
<RowDefinition Height="5" />
71-
<RowDefinition Height="150" Name="rowCommitDiffDefVD" />
72-
</Grid.RowDefinitions>
70+
<Grid Grid.Column="2">
71+
<Grid.RowDefinitions>
72+
<RowDefinition Height="*" Name="rowCommitDiffDefVU" />
73+
<RowDefinition Height="5" />
74+
<RowDefinition Height="150" Name="rowCommitDiffDefVD" />
75+
</Grid.RowDefinitions>
7376

74-
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="2" Margin="5,10,10,5">
75-
<Grid Background="#EEEEEE">
76-
<Label Content="Changes preview" FontWeight="Bold" Margin="10,10,10,0" VerticalAlignment="Top"/>
77-
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
78-
<TextBlock Text="▼" Margin="0,-2,0,0"/>
79-
<Button.ContextMenu>
80-
<ContextMenu>
81-
<MenuItem Name="preivewDiffMenuItem" Header="Preview in diff tool" Click="preivewDiffMenuItem_Click"/>
82-
</ContextMenu>
83-
</Button.ContextMenu>
84-
</Button>
77+
<Border Grid.Row="0" BorderBrush="Gray" BorderThickness="2" Margin="5,10,10,5">
78+
<Grid Background="#EEEEEE">
79+
<Label Content="Changes preview" FontWeight="Bold" Margin="10,10,10,0" VerticalAlignment="Top"/>
80+
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
81+
<TextBlock Text="▼" Margin="0,-2,0,0"/>
82+
<Button.ContextMenu>
83+
<ContextMenu>
84+
<MenuItem Name="preivewDiffMenuItem" Header="Preview in diff tool" Click="preivewDiffMenuItem_Click"/>
85+
</ContextMenu>
86+
</Button.ContextMenu>
87+
</Button>
8588

86-
<RichTextBox Name="previewTextBox" Margin="10,41,10,10" IsReadOnly="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
89+
<RichTextBox Name="previewTextBox" Margin="10,41,10,10" IsReadOnly="True" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/>
8790

88-
<Grid Name="previewGrid" Margin="10,41,10,10" Visibility="Visible" Background="White">
89-
<Grid.RowDefinitions>
90-
<RowDefinition Height="50*"/>
91-
<RowDefinition Height="50*"/>
92-
</Grid.RowDefinitions>
91+
<Grid Name="previewGrid" Margin="10,41,10,10" Visibility="Visible" Background="White">
92+
<Grid.RowDefinitions>
93+
<RowDefinition Height="50*"/>
94+
<RowDefinition Height="50*"/>
95+
</Grid.RowDefinitions>
9396

94-
<Border Grid.Row="0" Margin="10,10,10,5" BorderThickness="1" BorderBrush="Gray" SnapsToDevicePixels="True">
95-
<Grid>
96-
<Grid.Background>
97-
<ImageBrush ImageSource="../../Images/CheckPattern.png" TileMode="FlipXY" Stretch="Uniform" AlignmentY="Top" Viewport="0,0,24,24" ViewportUnits="Absolute" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
98-
</Grid.Background>
99-
<Image Name="oldImage" Source="../../Images/AppIcon.png"/>
100-
<Label Name="oldImageLabel" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="44" Height="24" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0" FontWeight="Bold" Foreground="Red">Old</Label>
101-
</Grid>
102-
</Border>
97+
<Border Grid.Row="0" Margin="10,10,10,5" BorderThickness="1" BorderBrush="Gray" SnapsToDevicePixels="True">
98+
<Grid>
99+
<Grid.Background>
100+
<ImageBrush ImageSource="../../Images/CheckPattern.png" TileMode="FlipXY" Stretch="Uniform" AlignmentY="Top" Viewport="0,0,24,24" ViewportUnits="Absolute" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
101+
</Grid.Background>
102+
<Image Name="oldImage" Source="../../Images/AppIcon.png"/>
103+
<Label Name="oldImageLabel" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="44" Height="24" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0" FontWeight="Bold" Foreground="Red">Old</Label>
104+
</Grid>
105+
</Border>
103106

104-
<Border Grid.Row="2" Margin="10,5,10,10" BorderThickness="1" BorderBrush="Gray" SnapsToDevicePixels="True">
105-
<Grid>
106-
<Grid.Background>
107-
<ImageBrush ImageSource="../../Images/CheckPattern.png" TileMode="FlipXY" Stretch="Uniform" AlignmentY="Top" Viewport="0,0,24,24" ViewportUnits="Absolute" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
108-
</Grid.Background>
109-
<Image Name="newImage" Source="../../Images/AppIcon.png"/>
110-
<Label Name="newImageLabel" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="44" Height="24" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0" FontWeight="Bold" Foreground="Green">New</Label>
111-
</Grid>
112-
</Border>
113-
</Grid>
107+
<Border Grid.Row="2" Margin="10,5,10,10" BorderThickness="1" BorderBrush="Gray" SnapsToDevicePixels="True">
108+
<Grid>
109+
<Grid.Background>
110+
<ImageBrush ImageSource="../../Images/CheckPattern.png" TileMode="FlipXY" Stretch="Uniform" AlignmentY="Top" Viewport="0,0,24,24" ViewportUnits="Absolute" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
111+
</Grid.Background>
112+
<Image Name="newImage" Source="../../Images/AppIcon.png"/>
113+
<Label Name="newImageLabel" Background="White" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Width="44" Height="24" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="0" FontWeight="Bold" Foreground="Green">New</Label>
114+
</Grid>
115+
</Border>
116+
</Grid>
114117

115-
<Grid Name="previewSingleGrid" Margin="10,41,10,10" Visibility="Hidden" Background="White">
116-
<Border Margin="10,5,10,10" BorderThickness="1" BorderBrush="Gray" SnapsToDevicePixels="True">
117-
<Grid>
118-
<Grid.Background>
119-
<ImageBrush ImageSource="../../Images/CheckPattern.png" TileMode="FlipXY" Stretch="Uniform" AlignmentY="Top" Viewport="0,0,24,24" ViewportUnits="Absolute" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
120-
</Grid.Background>
121-
<Image Name="previewImage" Source="../../Images/AppIcon.png"/>
122-
</Grid>
123-
</Border>
124-
</Grid>
125-
</Grid>
126-
</Border>
118+
<Grid Name="previewSingleGrid" Margin="10,41,10,10" Visibility="Hidden" Background="White">
119+
<Border Margin="10,5,10,10" BorderThickness="1" BorderBrush="Gray" SnapsToDevicePixels="True">
120+
<Grid>
121+
<Grid.Background>
122+
<ImageBrush ImageSource="../../Images/CheckPattern.png" TileMode="FlipXY" Stretch="Uniform" AlignmentY="Top" Viewport="0,0,24,24" ViewportUnits="Absolute" RenderOptions.BitmapScalingMode="NearestNeighbor"/>
123+
</Grid.Background>
124+
<Image Name="previewImage" Source="../../Images/AppIcon.png"/>
125+
</Grid>
126+
</Border>
127+
</Grid>
128+
</Grid>
129+
</Border>
127130

128-
<GridSplitter Grid.Row="1" Width="60" Height="5" Background="Gray" HorizontalAlignment="Stretch" />
131+
<GridSplitter Grid.Row="1" Width="60" Height="5" Background="Gray" HorizontalAlignment="Stretch" />
129132

130-
<Border Grid.Row="2" BorderBrush="Gray" BorderThickness="2" Margin="5,5,10,10">
131-
<Grid Background="#DDDDFF">
132-
<Label Content="Commit Message..." Margin="10,10,10,0" FontWeight="Bold" VerticalAlignment="Top"/>
133-
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
134-
<TextBlock Text="▼" Margin="0,-2,0,0"/>
135-
<Button.ContextMenu>
136-
<ContextMenu>
137-
<MenuItem Name="simpleModeMenuItem" Header="Enable Simple Mode" Click="simpleModeMenuItem_Click"/>
138-
<MenuItem Name="advancedModeMenuItem" Header="Enable Advanced Mode" Click="advancedModeMenuItem_Click"/>
139-
</ContextMenu>
140-
</Button.ContextMenu>
141-
</Button>
142-
<TextBox Name="commitMessageTextBox" Margin="10,41,10,35" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
143-
<Button Name="syncButton" Content="Sync" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="75" ToolTip="Sync changes with server" Click="syncButton_Click"/>
144-
<Button Name="commitAndPushButton" Content="Commit &amp; Push" HorizontalAlignment="Left" Margin="90,0,0,10" VerticalAlignment="Bottom" Width="100" ToolTip="Commit/Push changes to server" Click="commitAndPushButton_Click"/>
145-
<Button Name="commitButton" Content="Commit" HorizontalAlignment="Right" Margin="0,0,170,10" VerticalAlignment="Bottom" Width="75" ToolTip="Commit changes to local repo database" Click="commitButton_Click"/>
146-
<Button Name="pullButton" Content="Pull" HorizontalAlignment="Right" Margin="0,0,90,10" VerticalAlignment="Bottom" Width="75" ToolTip="Pull changes from remote server" Click="pullButton_Click"/>
147-
<Button Name="pushButton" Content="Push" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" ToolTip="Push changes to remote server" Click="pushButton_Click"/>
148-
</Grid>
149-
</Border>
150-
</Grid>
151-
</Grid>
133+
<Border Grid.Row="2" BorderBrush="Gray" BorderThickness="2" Margin="5,5,10,10">
134+
<Grid Background="#DDDDFF">
135+
<Label Content="Commit Message..." Margin="10,10,10,0" FontWeight="Bold" VerticalAlignment="Top"/>
136+
<Button Width="16" Height="16" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0,20,10,0" Click="ToolButton_Click">
137+
<TextBlock Text="▼" Margin="0,-2,0,0"/>
138+
<Button.ContextMenu>
139+
<ContextMenu>
140+
<MenuItem Name="simpleModeMenuItem" Header="Enable Simple Mode" Click="simpleModeMenuItem_Click"/>
141+
<MenuItem Name="advancedModeMenuItem" Header="Enable Advanced Mode" Click="advancedModeMenuItem_Click"/>
142+
</ContextMenu>
143+
</Button.ContextMenu>
144+
</Button>
145+
<TextBox Name="commitMessageTextBox" Margin="10,41,10,35" AcceptsReturn="True" VerticalScrollBarVisibility="Auto"/>
146+
<Button Name="syncButton" Content="Sync" HorizontalAlignment="Left" Margin="10,0,0,10" VerticalAlignment="Bottom" Width="75" ToolTip="Sync changes with server" Click="syncButton_Click"/>
147+
<Button Name="commitAndPushButton" Content="Commit &amp; Push" HorizontalAlignment="Left" Margin="90,0,0,10" VerticalAlignment="Bottom" Width="100" ToolTip="Commit/Push changes to server" Click="commitAndPushButton_Click"/>
148+
<Button Name="commitButton" Content="Commit" HorizontalAlignment="Right" Margin="0,0,170,10" VerticalAlignment="Bottom" Width="75" ToolTip="Commit changes to local repo database" Click="commitButton_Click"/>
149+
<Button Name="pullButton" Content="Pull" HorizontalAlignment="Right" Margin="0,0,90,10" VerticalAlignment="Bottom" Width="75" ToolTip="Pull changes from remote server" Click="pullButton_Click"/>
150+
<Button Name="pushButton" Content="Push" HorizontalAlignment="Right" Margin="0,0,10,10" VerticalAlignment="Bottom" Width="75" ToolTip="Push changes to remote server" Click="pushButton_Click"/>
151+
</Grid>
152+
</Border>
153+
</Grid>
154+
</Grid>
152155
</UserControl>

‎GitItGUI.UI/Screens/RepoTabs/ChangesTab.xaml.cs

+5
Original file line numberDiff line numberDiff line change
@@ -1130,5 +1130,10 @@ private void preivewDiffMenuItem_Click(object sender, RoutedEventArgs e)
11301130
MainWindow.singleton.HideWaitingOverlay();
11311131
});
11321132
}
1133+
1134+
private void quickRefreshButton_Click(object sender, RoutedEventArgs e)
1135+
{
1136+
RepoScreen.singleton.QuickRefresh();
1137+
}
11331138
}
11341139
}

0 commit comments

Comments
 (0)