Skip to content
This repository was archived by the owner on Jun 21, 2023. It is now read-only.

Commit 6c8abdd

Browse files
shanashana
committed
Only show basic PR creation UI
1 parent 66d97aa commit 6c8abdd

File tree

1 file changed

+106
-228
lines changed

1 file changed

+106
-228
lines changed

‎src/GitHub.VisualStudio/UI/Views/PullRequestCreationView.xaml‎

Lines changed: 106 additions & 228 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
<ResourceDictionary.MergedDictionaries>
3030
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/SharedDictionary.xaml" />
3131
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI;component/SharedDictionary.xaml" />
32+
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.UI.Reactive;component/SharedDictionary.xaml" />
3233
<helpers:SharedDictionaryManager Source="pack://application:,,,/GitHub.VisualStudio;component/Styles/GitHubActionLink.xaml" />
3334
</ResourceDictionary.MergedDictionaries>
3435

@@ -73,48 +74,20 @@
7374
</ResourceDictionary>
7475
</UserControl.Resources>
7576

76-
<Grid>
77-
<Grid.RowDefinitions>
78-
<RowDefinition Height="Auto" />
79-
<RowDefinition Height="*" />
80-
</Grid.RowDefinitions>
77+
<DockPanel>
8178

82-
<DockPanel Grid.Row="0">
79+
<DockPanel DockPanel.Dock="Top">
8380
<Grid Margin="10,-3,10,5">
8481
<Grid.ColumnDefinitions>
8582
<ColumnDefinition Width="Auto" />
8683
<ColumnDefinition Width="*" />
8784
</Grid.ColumnDefinitions>
8885

89-
<Popup x:Name="branchPopup"
90-
AllowsTransparency="True"
91-
Placement="Bottom"
92-
PlacementTarget="{Binding ElementName=branchSelection}"
93-
StaysOpen="False">
94-
<Border Style="{DynamicResource GitHubComboBoxBorder}">
95-
<DockPanel Width="100" Style="{DynamicResource GitHubComboBoxDockPanelContainer}">
96-
<ListBox x:Name="branches"
97-
DisplayMemberPath="Name"
98-
DockPanel.Dock="Top"
99-
ItemsSource="{Binding Branches}"
100-
SelectedItem="{Binding SourceBranch}"
101-
Style="{DynamicResource GitHubPopupThing}">
102-
<i:Interaction.Triggers>
103-
<i:EventTrigger EventName="SelectionChanged">
104-
<ui:ClosePopupAction TargetName="branchPopup" />
105-
</i:EventTrigger>
106-
</i:Interaction.Triggers>
107-
</ListBox>
108-
</DockPanel>
109-
</Border>
110-
</Popup>
111-
11286
<StackPanel Grid.Column="0" Orientation="Horizontal">
11387
<ui:OcticonImage Foreground="{DynamicResource GitHubVsGrayText}" Icon="git_branch" />
11488
<ui:GitHubActionLink x:Name="branchSelectionButton"
11589
Margin="5,0,0,0"
11690
VerticalAlignment="Center"
117-
Click="branchSelectionButton_Click"
11891
Content="master"
11992
HasDropDown="False" />
12093
<ui:OcticonImage Height="13"
@@ -138,215 +111,120 @@
138111
</i:EventTrigger>
139112
</i:Interaction.Triggers>
140113
</ui:GitHubActionLink>
141-
</Grid>
142114

143-
<uirx:ValidationMessage x:Name="branchValidationMessage"
144-
DockPanel.Dock="Bottom"
145-
Fill="{StaticResource GitHubWarningBrush}"
146-
Icon="alert"
147-
ValidatesControl="{Binding ElementName=sourceBranch}" />
115+
<Popup x:Name="branchPopup"
116+
AllowsTransparency="True"
117+
Placement="Bottom"
118+
PlacementTarget="{Binding ElementName=branchSelection}"
119+
StaysOpen="False">
120+
<Border Style="{DynamicResource GitHubComboBoxBorder}">
121+
<DockPanel Width="100" Style="{DynamicResource GitHubComboBoxDockPanelContainer}">
122+
<ListBox DisplayMemberPath="Name"
123+
DockPanel.Dock="Top"
124+
ItemsSource="{Binding Branches}"
125+
SelectedItem="{Binding SourceBranch}"
126+
Style="{DynamicResource GitHubPopupThing}">
127+
<i:Interaction.Triggers>
128+
<i:EventTrigger EventName="SelectionChanged">
129+
<ui:ClosePopupAction TargetName="branchPopup" />
130+
</i:EventTrigger>
131+
</i:Interaction.Triggers>
132+
</ListBox>
133+
</DockPanel>
134+
</Border>
135+
</Popup>
136+
</Grid>
148137

149138
</DockPanel>
150139

151-
<TabControl Grid.Row="1"
140+
<!-- TabControl
152141
BorderThickness="0,1,0,0"
153142
Style="{DynamicResource GitHubPRDetailsTabControl}">
154143
<TabItem Header="Details" Style="{DynamicResource GitHubPRDetailsTabItem}">
155-
<ScrollViewer VerticalScrollBarVisibility="Auto">
156-
<StackPanel Orientation="Vertical">
157-
<ui:PromptTextBox x:Name="title" Margin="10,5"
158-
PromptText="Title"
159-
Style="{DynamicResource GitHubVsPromptTextBox}" />
160-
161-
<uirx:ValidationMessage x:Name="titleValidationMessage"
144+
<ScrollViewer VerticalScrollBarVisibility="Auto"-->
145+
<StackPanel Orientation="Vertical">
146+
<ui:PromptTextBox x:Name="titleText"
147+
Margin="10,5"
148+
Text="{Binding PRTitle}"
149+
PromptText="Title (required)"
150+
Style="{DynamicResource GitHubVsPromptTextBox}" />
151+
152+
<uirx:ValidationMessage x:Name="titleValidationMessage"
162153
DockPanel.Dock="Bottom"
163154
Fill="{StaticResource GitHubWarningBrush}"
164155
Icon="alert"
165-
ValidatesControl="{Binding ElementName=title}" />
166-
167-
<ui:PromptTextBox Height="100"
168-
Margin="10,5"
169-
AcceptsReturn="True"
170-
PromptText="Description"
171-
Style="{DynamicResource GitHubVsPromptTextBox}"
172-
TextWrapping="Wrap" />
173-
<Grid Margin="10,3">
174-
<Grid.ColumnDefinitions>
175-
<ColumnDefinition Width="Auto" />
176-
<ColumnDefinition Width="*" />
177-
</Grid.ColumnDefinitions>
156+
ValidatesControl="{Binding ElementName=titleText}" />
178157

179-
<Popup x:Name="assigneePopup"
180-
AllowsTransparency="True"
181-
Placement="Bottom"
182-
PlacementTarget="{Binding ElementName=assigneePopupButton}"
183-
StaysOpen="False">
184-
<Border Style="{DynamicResource GitHubComboBoxBorder}">
185-
<Grid MinWidth="150"
186-
MaxWidth="300"
187-
Style="{DynamicResource GitHubComboBoxGridContainer}">
188-
189-
<Grid.RowDefinitions>
190-
<RowDefinition Height="*" />
191-
<RowDefinition Height="*" />
192-
<RowDefinition Height="Auto" />
193-
</Grid.RowDefinitions>
194-
195-
<ui:FilterTextBox x:Name="filterAssignee"
196-
Grid.Row="0"
197-
Foreground="{DynamicResource GitHubVsWindowText}"
198-
PromptText="Filter people" />
199-
<Separator Grid.Row="1" />
200-
201-
<ListBox Grid.Row="2">
202-
<ListBoxItem>
203-
<Grid>
204-
<Grid.ColumnDefinitions>
205-
<ColumnDefinition Width="16" />
206-
<ColumnDefinition Width="Auto" />
207-
<ColumnDefinition Width="Auto" />
208-
<ColumnDefinition Width="*" />
209-
</Grid.ColumnDefinitions>
210-
211-
<Image Grid.Column="0"
212-
VerticalAlignment="Top"
213-
Source="/GitHub.VisualStudio;component/Resources/default_user_avatar.png" />
214-
<TextBlock Grid.Column="1" Margin="5,0,0,0">Haacked</TextBlock>
215-
<TextBlock Grid.Column="2"
216-
Margin="5,0,0,0"
217-
Opacity="0.6">
218-
Phil Haack
219-
</TextBlock>
220-
<ui:OcticonImage Grid.Column="3"
221-
HorizontalAlignment="Right"
222-
Foreground="{DynamicResource GitHubVsToolWindowText}"
223-
Icon="check"
224-
Opacity="0.6" />
225-
</Grid>
226-
</ListBoxItem>
227-
228-
<ListBoxItem>
229-
<Grid>
230-
<Grid.ColumnDefinitions>
231-
<ColumnDefinition Width="16" />
232-
<ColumnDefinition Width="Auto" />
233-
<ColumnDefinition Width="Auto" />
234-
<ColumnDefinition Width="*" />
235-
</Grid.ColumnDefinitions>
236-
237-
<Image Grid.Column="0"
238-
VerticalAlignment="Top"
239-
Source="/GitHub.VisualStudio;component/Resources/default_user_avatar.png" />
240-
<TextBlock Grid.Column="1" Margin="5,0,0,0">shana</TextBlock>
241-
<TextBlock Grid.Column="2"
242-
Margin="5,0,0,0"
243-
Opacity="0.6">
244-
Andreia Gaita
245-
</TextBlock>
246-
</Grid>
247-
</ListBoxItem>
248-
249-
<ListBoxItem>
250-
<Grid>
251-
<Grid.ColumnDefinitions>
252-
<ColumnDefinition Width="16" />
253-
<ColumnDefinition Width="Auto" />
254-
<ColumnDefinition Width="Auto" />
255-
<ColumnDefinition Width="*" />
256-
</Grid.ColumnDefinitions>
257-
258-
<Image Grid.Column="0"
259-
VerticalAlignment="Top"
260-
Source="/GitHub.VisualStudio;component/Resources/default_user_avatar.png" />
261-
<TextBlock Grid.Column="1" Margin="5,0,0,0">shiftkey</TextBlock>
262-
<TextBlock Grid.Column="2"
263-
Margin="5,0,0,0"
264-
Opacity="0.6">
265-
Brendan Forster
266-
</TextBlock>
267-
</Grid>
268-
</ListBoxItem>
269-
270-
<ListBoxItem>
271-
<Grid>
272-
<Grid.ColumnDefinitions>
273-
<ColumnDefinition Width="16" />
274-
<ColumnDefinition Width="Auto" />
275-
<ColumnDefinition Width="Auto" />
276-
<ColumnDefinition Width="*" />
277-
</Grid.ColumnDefinitions>
278-
279-
<Image Grid.Column="0"
280-
VerticalAlignment="Top"
281-
Source="/GitHub.VisualStudio;component/Resources/default_user_avatar.png" />
282-
<TextBlock Grid.Column="1" Margin="5,0,0,0">paladique</TextBlock>
283-
<TextBlock Grid.Column="2"
284-
Margin="5,0,0,0"
285-
Opacity="0.6">
286-
Jasmine Greenaway
287-
</TextBlock>
288-
</Grid>
289-
</ListBoxItem>
290-
291-
<ListBoxItem HorizontalContentAlignment="Stretch" Padding="3">
292-
<Grid>
293-
<Grid.ColumnDefinitions>
294-
<ColumnDefinition Width="16" />
295-
<ColumnDefinition Width="Auto" />
296-
<ColumnDefinition Width="Auto" />
297-
</Grid.ColumnDefinitions>
298-
299-
<Image Grid.Column="0"
300-
VerticalAlignment="Top"
301-
Source="/GitHub.VisualStudio;component/Resources/default_user_avatar.png" />
302-
<TextBlock Grid.Column="1" Margin="5,0,0,0">shana</TextBlock>
303-
<TextBlock Grid.Column="2"
304-
Margin="5,0,0,0"
305-
Opacity="0.6">
306-
Andreia Gaita
307-
</TextBlock>
308-
</Grid>
309-
</ListBoxItem>
310-
</ListBox>
311-
</Grid>
312-
</Border>
313-
</Popup>
314-
315-
<Label Grid.Column="0"
316-
VerticalAlignment="Center"
317-
Content="Assignee"
318-
Foreground="{DynamicResource GitHubVsWindowText}"
319-
Padding="0" />
320-
<ui:GitHubActionLink x:Name="assigneePopupButton"
321-
Grid.Column="1"
322-
HorizontalAlignment="Right"
323-
VerticalAlignment="Center"
324-
Click="assigneePopupButton_Click"
325-
Content="Haacked (Phil Haack)"
326-
HasDropDown="True" />
327-
</Grid>
158+
<ui:PromptTextBox Height="100"
159+
Margin="10,5"
160+
AcceptsReturn="True"
161+
PromptText="Description"
162+
Style="{DynamicResource GitHubVsPromptTextBox}"
163+
TextWrapping="Wrap" />
164+
<!-- DockPanel Margin="10,3">
328165
329-
<Grid Margin="10,10,10,20" HorizontalAlignment="Stretch">
330-
<Grid.ColumnDefinitions>
331-
<ColumnDefinition Width="*" />
332-
<ColumnDefinition Width="Auto" />
333-
</Grid.ColumnDefinitions>
166+
<Label VerticalAlignment="Center"
167+
Content="Assignee"
168+
Foreground="{DynamicResource GitHubVsWindowText}"
169+
Padding="0" />
334170
335-
<Button Grid.Column="0"
336-
HorizontalAlignment="Right"
337-
Command="{Binding Cancel}"
338-
Content="Cancel"
339-
Style="{StaticResource GitHubVsButton}" />
340-
<Button Grid.Column="1"
341-
Margin="6,0,0,0"
342-
HorizontalAlignment="Right"
343-
Command="{Binding CreatePullRequest}"
344-
Content="Create pull request"
345-
Style="{StaticResource GitHubVsPrimaryActionButton}" />
346-
</Grid>
347-
</StackPanel>
348-
</ScrollViewer>
349-
</TabItem>
171+
172+
<ui:GitHubActionLink x:Name="assigneeSelection"
173+
Grid.Column="1"
174+
Margin="5,0"
175+
VerticalAlignment="Center"
176+
Content="{Binding SelectedAssignee}"
177+
HasDropDown="True"
178+
ToolTip="Select an assignee">
179+
<i:Interaction.Triggers>
180+
<i:EventTrigger EventName="Click">
181+
<ui:OpenPopupAction TargetName="assigneePopup" />
182+
</i:EventTrigger>
183+
</i:Interaction.Triggers>
184+
</ui:GitHubActionLink>
185+
186+
<Popup x:Name="assigneePopup"
187+
AllowsTransparency="True"
188+
Placement="Bottom"
189+
PlacementTarget="{Binding ElementName=assigneeSelection}"
190+
StaysOpen="False">
191+
<Border Style="{DynamicResource GitHubComboBoxBorder}">
192+
<DockPanel Width="100" Style="{DynamicResource GitHubComboBoxDockPanelContainer}">
193+
<ListBox x:Name="branches"
194+
DisplayMemberPath="Name"
195+
DockPanel.Dock="Top"
196+
ItemsSource="{Binding Assignees}"
197+
SelectedItem="{Binding SelectedAssignee}"
198+
Style="{DynamicResource GitHubPopupThing}">
199+
<i:Interaction.Triggers>
200+
<i:EventTrigger EventName="SelectionChanged">
201+
<ui:ClosePopupAction TargetName="assigneePopup" />
202+
</i:EventTrigger>
203+
</i:Interaction.Triggers>
204+
</ListBox>
205+
</DockPanel>
206+
</Border>
207+
</Popup>
208+
209+
</ -->
210+
211+
<DockPanel Margin="10,10,10,20" HorizontalAlignment="Stretch">
212+
<Button DockPanel.Dock="Right"
213+
Margin="6,0,0,0"
214+
HorizontalAlignment="Right"
215+
Command="{Binding CreatePullRequest}"
216+
Content="Create pull request"
217+
Style="{StaticResource GitHubVsPrimaryActionButton}" />
218+
<Button DockPanel.Dock="Right"
219+
HorizontalAlignment="Right"
220+
Command="{Binding Cancel}"
221+
Content="Cancel"
222+
Style="{StaticResource GitHubVsButton}" />
223+
</DockPanel>
224+
</StackPanel>
225+
226+
<!-- /ScrollViewer>
227+
</>
350228
351229
<TabItem Header="Commits" Style="{DynamicResource GitHubPRDetailsTabItem}">
352230
<ListView Background="Transparent"
@@ -528,6 +406,6 @@
528406
</ListViewItem>
529407
</ListView>
530408
</TabItem>
531-
</TabControl>
532-
</Grid>
409+
</-->
410+
</DockPanel>
533411
</local:GenericPullRequestCreationView>

0 commit comments

Comments
 (0)