Skip to content

Commit 83e10d0

Browse files
ferrariofilippoferrariofilippo
committed
UI Changes
1 parent 9cc8e16 commit 83e10d0

File tree

3 files changed

+73
-70
lines changed

3 files changed

+73
-70
lines changed

‎src/Files.App/Strings/en-US/Resources.resw‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4052,8 +4052,8 @@
40524052
<data name="InvalidPath" xml:space="preserve">
40534053
<value>Invalid path</value>
40544054
</data>
4055-
<data name="Test" xml:space="preserve">
4056-
<value>Test</value>
4055+
<data name="TestIntegration" xml:space="preserve">
4056+
<value>Test integration</value>
40574057
</data>
40584058
<data name="IDENotLocatedContent" xml:space="preserve">
40594059
<value>{0} could not be located. Please check your settings and try again.</value>

‎src/Files.App/Views/Settings/DevToolsPage.xaml‎

Lines changed: 70 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,51 @@
7878
<RowDefinition Height="Auto" />
7979
</Grid.RowDefinitions>
8080

81+
82+
<!-- IDE Friendly Name -->
83+
<TextBlock
84+
x:Name="IDEFriendlyName"
85+
MaxWidth="200"
86+
VerticalAlignment="Center"
87+
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
88+
LineHeight="18"
89+
Text="{helpers:ResourceString Name=FriendlyName}"
90+
TextTrimming="CharacterEllipsis" />
91+
92+
<TextBlock
93+
Grid.Column="1"
94+
VerticalAlignment="Center"
95+
FontWeight="SemiBold"
96+
Text="{x:Bind ViewModel.IDEFriendlyName, Mode=TwoWay}"
97+
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource InvertedBoolVisibilityConverter}, Mode=OneWay}" />
98+
99+
<TextBox
100+
x:Name="IDEFriendlyNameTextBox"
101+
Grid.ColumnSpan="2"
102+
Width="300"
103+
HorizontalAlignment="Left"
104+
VerticalAlignment="Center"
105+
PlaceholderText="{helpers:ResourceString Name=FriendlyName}"
106+
Text="{x:Bind ViewModel.IDEFriendlyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
107+
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
108+
<TextBox.Resources>
109+
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
110+
<TeachingTip
111+
x:Name="InvalidFriendlyNameWarning"
112+
Title="{helpers:ResourceString Name=InvalidFriendlyNameError}"
113+
IsOpen="{x:Bind ViewModel.IsFriendlyNameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
114+
PreferredPlacement="BottomRight"
115+
Target="{x:Bind IDEFriendlyNameTextBox}" />
116+
</TextBox.Resources>
117+
<TextBox.Header>
118+
<TextBlock Text="{helpers:ResourceString Name=FriendlyName}" TextTrimming="CharacterEllipsis" />
119+
</TextBox.Header>
120+
</TextBox>
121+
81122
<!-- IDE Path -->
82123
<TextBlock
83124
x:Name="IDEPath"
125+
Grid.Row="1"
84126
MaxWidth="200"
85127
VerticalAlignment="Center"
86128
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
@@ -89,6 +131,7 @@
89131
TextTrimming="CharacterEllipsis" />
90132

91133
<TextBlock
134+
Grid.Row="1"
92135
Grid.Column="1"
93136
VerticalAlignment="Center"
94137
FontWeight="SemiBold"
@@ -98,8 +141,9 @@
98141

99142
<Grid
100143
x:Name="IDEPathGrid"
144+
Grid.Row="1"
101145
Grid.ColumnSpan="3"
102-
Margin="0,0,0,8"
146+
Margin="0,8,0,0"
103147
ColumnSpacing="8"
104148
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
105149
<Grid.ColumnDefinitions>
@@ -124,30 +168,24 @@
124168
<TextBox.Resources>
125169
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
126170
</TextBox.Resources>
171+
<TextBox.Header>
172+
<TextBlock Text="{helpers:ResourceString Name=PathOrAlias}" TextTrimming="CharacterEllipsis" />
173+
</TextBox.Header>
127174
</TextBox>
128175

129-
<StackPanel
130-
x:Name="IDEPathButtons"
176+
<Button
177+
x:Name="PickIDEExe"
131178
Grid.Column="1"
132179
VerticalAlignment="Bottom"
133-
Orientation="Horizontal"
134-
Spacing="16">
135-
<Button
136-
x:Name="PickIDEExe"
137-
Command="{x:Bind ViewModel.OpenFilePickerForIDECommand, Mode=OneWay}"
138-
Content="{helpers:ResourceString Name=Browse}" />
139-
140-
<Button
141-
x:Name="TestIDE"
142-
Command="{x:Bind ViewModel.TestIDECommand, Mode=OneWay}"
143-
Content="{helpers:ResourceString Name=Test}" />
144-
</StackPanel>
180+
Command="{x:Bind ViewModel.OpenFilePickerForIDECommand, Mode=OneWay}"
181+
Content="{helpers:ResourceString Name=Browse}" />
145182

146183
<Grid
147184
x:Name="InvalidPathWarning"
185+
Grid.Row="1"
148186
Grid.Column="2"
149-
Padding="12,4"
150-
VerticalAlignment="Stretch"
187+
Padding="12,6"
188+
VerticalAlignment="Bottom"
151189
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Mode=OneWay}"
152190
Background="{ThemeResource SystemFillColorCriticalBackgroundBrush}"
153191
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
@@ -183,46 +221,6 @@
183221
</Grid>
184222
</Grid>
185223

186-
<!-- IDE Friendly Name -->
187-
<TextBlock
188-
x:Name="IDEFriendlyName"
189-
Grid.Row="1"
190-
MaxWidth="200"
191-
VerticalAlignment="Center"
192-
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
193-
LineHeight="18"
194-
Text="{helpers:ResourceString Name=FriendlyName}"
195-
TextTrimming="CharacterEllipsis" />
196-
197-
<TextBlock
198-
Grid.Row="1"
199-
Grid.Column="1"
200-
VerticalAlignment="Center"
201-
FontWeight="SemiBold"
202-
Text="{x:Bind ViewModel.IDEFriendlyName, Mode=TwoWay}"
203-
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource InvertedBoolVisibilityConverter}, Mode=OneWay}" />
204-
205-
<TextBox
206-
x:Name="IDEFriendlyNameTextBox"
207-
Grid.Row="1"
208-
Grid.ColumnSpan="2"
209-
Width="300"
210-
HorizontalAlignment="Left"
211-
VerticalAlignment="Center"
212-
PlaceholderText="{helpers:ResourceString Name=FriendlyName}"
213-
Text="{x:Bind ViewModel.IDEFriendlyName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
214-
Visibility="{x:Bind ViewModel.IsEditingIDEConfig, Converter={StaticResource BoolVisibilityConverter}, Mode=OneWay}">
215-
<TextBox.Resources>
216-
<SolidColorBrush x:Key="TextControlBackgroundFocused" Color="{ThemeResource SolidBackgroundFillColorSecondary}" />
217-
<TeachingTip
218-
x:Name="InvalidFriendlyNameWarning"
219-
Title="{helpers:ResourceString Name=InvalidFriendlyNameError}"
220-
IsOpen="{x:Bind ViewModel.IsFriendlyNameValid, Converter={StaticResource BoolNegationConverter}, Mode=OneWay}"
221-
PreferredPlacement="Bottom"
222-
Target="{x:Bind IDEFriendlyNameTextBox}" />
223-
</TextBox.Resources>
224-
</TextBox>
225-
226224
<!-- Edit -->
227225
<Button
228226
x:Name="EditIDEConfigButton"
@@ -242,10 +240,16 @@
242240
HorizontalAlignment="Right"
243241
x:Load="{x:Bind ViewModel.IsEditingIDEConfig, Mode=OneWay}"
244242
Orientation="Horizontal"
245-
Spacing="12">
243+
Spacing="8">
246244
<!-- Cancel -->
247245
<Button Command="{x:Bind ViewModel.CancelIDEChangesCommand, Mode=OneWay}" Content="{helpers:ResourceString Name=Cancel}" />
248246

247+
<!-- Test Integration -->
248+
<Button
249+
x:Name="TestIDE"
250+
Command="{x:Bind ViewModel.TestIDECommand, Mode=OneWay}"
251+
Content="{helpers:ResourceString Name=TestIntegration}" />
252+
249253
<!-- Save Changes -->
250254
<Button
251255
Command="{x:Bind ViewModel.SaveIDEChangesCommand, Mode=OneWay}"
@@ -293,14 +297,14 @@
293297
<Setter Target="IDEFriendlyNameTextBox.Width" Value="300" />
294298
<Setter Target="IDEFriendlyNameTextBox.HorizontalAlignment" Value="Left" />
295299
<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="2" />
296-
<Setter Target="IDEPathButtons.(Grid.Column)" Value="1" />
297-
<Setter Target="IDEPathButtons.(Grid.Row)" Value="0" />
298-
<Setter Target="IDEPathButtons.Orientation" Value="Horizontal" />
299-
<Setter Target="IDEPathButtons.Spacing" Value="16" />
300+
<Setter Target="PickIDEExe.(Grid.Column)" Value="1" />
301+
<Setter Target="PickIDEExe.(Grid.Row)" Value="0" />
300302
<Setter Target="InvalidPathWarning.(Grid.Column)" Value="2" />
301303
<Setter Target="InvalidPathWarning.(Grid.Row)" Value="0" />
304+
<Setter Target="InvalidPathWarning.VerticalAlignment" Value="Bottom" />
302305
<Setter Target="IDEPathGrid.RowSpacing" Value="0" />
303306
<Setter Target="IDEPathGrid.ColumnSpacing" Value="8" />
307+
<Setter Target="InvalidFriendlyNameWarning.PreferredPlacement" Value="BottomRight" />
304308
</VisualState.Setters>
305309
</VisualState>
306310
<VisualState x:Name="CompactState">
@@ -311,14 +315,14 @@
311315
<Setter Target="IDEFriendlyNameTextBox.Width" Value="Auto" />
312316
<Setter Target="IDEFriendlyNameTextBox.HorizontalAlignment" Value="Stretch" />
313317
<Setter Target="IDEFriendlyNameTextBox.(Grid.ColumnSpan)" Value="3" />
314-
<Setter Target="IDEPathButtons.(Grid.Column)" Value="3" />
315-
<Setter Target="IDEPathButtons.(Grid.Row)" Value="1" />
316-
<Setter Target="IDEPathButtons.Orientation" Value="Vertical" />
317-
<Setter Target="IDEPathButtons.Spacing" Value="8" />
318+
<Setter Target="PickIDEExe.(Grid.Column)" Value="3" />
319+
<Setter Target="PickIDEExe.(Grid.Row)" Value="1" />
318320
<Setter Target="InvalidPathWarning.(Grid.Column)" Value="3" />
319321
<Setter Target="InvalidPathWarning.(Grid.Row)" Value="2" />
322+
<Setter Target="InvalidPathWarning.VerticalAlignment" Value="Stretch" />
320323
<Setter Target="IDEPathGrid.RowSpacing" Value="12" />
321324
<Setter Target="IDEPathGrid.ColumnSpacing" Value="0" />
325+
<Setter Target="InvalidFriendlyNameWarning.PreferredPlacement" Value="Bottom" />
322326
</VisualState.Setters>
323327
</VisualState>
324328
</VisualStateGroup>

‎src/Files.App/Views/Settings/DevToolsPage.xaml.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ private void Page_SizeChanged(object sender, SizeChangedEventArgs e)
1919
return;
2020

2121
var defaultPathWidth = 300;
22-
var testIDEWidth = TestIDE.ActualWidth == 0 ? 64 : TestIDE.ActualWidth;
2322
var pickIDEWidth = PickIDEExe.ActualWidth == 0 ? 64 : PickIDEExe.ActualWidth;
2423

25-
var minWidth = defaultPathWidth + testIDEWidth + pickIDEWidth;
24+
var minWidth = defaultPathWidth + pickIDEWidth;
2625
var state = minWidth > e.NewSize.Width / 1.6 ? "CompactState" : "DefaultState";
2726
VisualStateManager.GoToState(this, state, false);
2827
}

0 commit comments

Comments
 (0)