Skip to content

Commit 1e5bc69

Browse files
Refactor: Move About and Trimmer tabs to SettingsPage
Co-authored-by: toniolo.luca <toniolo.luca@outlook.com>
1 parent 37e4a35 commit 1e5bc69

4 files changed

Lines changed: 6 additions & 36 deletions

File tree

src/Captura/Pages/AboutPage.xaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -118,26 +118,6 @@
118118
</DockPanel>
119119
</Button>
120120

121-
<Label Margin="0,15,0,5">
122-
<TextBlock Text="{Binding Tools, Source={StaticResource Loc}, Mode=OneWay}"/>
123-
</Label>
124-
125-
<WrapPanel Margin="3">
126-
<!-- Image Editor button removed - internal editor was removed, external editor is available via toggle in main UI -->
127-
<!-- Crop and Imgur upload buttons removed - features no longer working/supported -->
128-
129-
<Button ToolTip="{Binding Trim, Source={StaticResource Loc}, Mode=OneWay}"
130-
Padding="5"
131-
Margin="0,0,10,10"
132-
Click="OpenAudioVideoTrimmer">
133-
<Path Data="{Binding Icons.Trim, Source={StaticResource ServiceLocator}}"
134-
Width="15"
135-
Height="15"
136-
Stretch="Uniform"
137-
HorizontalAlignment="Center"
138-
VerticalAlignment="Center"/>
139-
</Button>
140-
</WrapPanel>
141121
</StackPanel>
142122
</ScrollViewer>
143123
</Grid>

src/Captura/Pages/AboutPage.xaml.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,5 @@ void ViewCrashLogs(object Sender, RoutedEventArgs E)
1414
{
1515
NavigationService?.Navigate(new CrashLogsPage());
1616
}
17-
18-
// OpenImageEditor, OpenImageCropper, and UploadToImgur methods removed - features no longer supported
19-
20-
void OpenAudioVideoTrimmer(object Sender, RoutedEventArgs E)
21-
{
22-
new TrimmerWindow().ShowAndFocus();
23-
}
2417
}
2518
}

src/Captura/Pages/MainPage.xaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,15 +109,6 @@
109109

110110
<Frame Source="RecentPage.xaml"/>
111111
</TabItem>
112-
<TabItem>
113-
<TabItem.Header>
114-
<Path Data="{Binding Icons.Help, Source={StaticResource ServiceLocator}}"
115-
Style="{StaticResource TabIcon}"
116-
ToolTip="{Binding About, Source={StaticResource Loc}, Mode=OneWay}"/>
117-
</TabItem.Header>
118-
119-
<Frame Source="AboutPage.xaml"/>
120-
</TabItem>
121112
</TabControl>
122113
</DockPanel>
123114
</Page>

src/Captura/Pages/SettingsPage.xaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<TabItem Header="FFmpeg">
5454
<Frame Source="FFmpegPage.xaml"/>
5555
</TabItem>
56+
<TabItem Header="{Binding Trim, Source={StaticResource Loc}, Mode=OneWay}">
57+
<Frame Source="TrimmerPage.xaml"/>
58+
</TabItem>
59+
<TabItem Header="{Binding About, Source={StaticResource Loc}, Mode=OneWay}">
60+
<Frame Source="AboutPage.xaml"/>
61+
</TabItem>
5662
</TabControl>
5763
</Grid>
5864
</Page>

0 commit comments

Comments
 (0)