diff --git a/RSHExporter/App.xaml.cs b/RSHExporter/App.xaml.cs index a61cf32..140f8ff 100644 --- a/RSHExporter/App.xaml.cs +++ b/RSHExporter/App.xaml.cs @@ -7,7 +7,7 @@ namespace RSHExporter; /// -/// Interaction logic for App.xaml +/// Interaction logic for App.xaml /// public partial class App : Application { diff --git a/RSHExporter/Controls/InvertedBooleanToVisibilityConverter.cs b/RSHExporter/Controls/InvertedBooleanToVisibilityConverter.cs index deb7dc5..2457a98 100644 --- a/RSHExporter/Controls/InvertedBooleanToVisibilityConverter.cs +++ b/RSHExporter/Controls/InvertedBooleanToVisibilityConverter.cs @@ -6,13 +6,13 @@ namespace RSHExporter.Controls; /// -/// Convert between boolean and visibility +/// Convert between boolean and visibility /// [Localizability(LocalizationCategory.NeverLocalize)] public sealed class InvertedBooleanToVisibilityConverter : IValueConverter { /// - /// Convert bool or Nullable<bool> to Visibility + /// Convert bool or Nullable<bool> to Visibility /// /// bool or Nullable<bool> /// Visibility @@ -21,22 +21,22 @@ public sealed class InvertedBooleanToVisibilityConverter : IValueConverter /// Visible or Collapsed public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - bool bValue = false; + var bValue = false; if (value is bool) { bValue = (bool)value; } - else if (value is Nullable) + else if (value is bool?) { - Nullable tmp = (Nullable)value; + var tmp = (bool?)value; bValue = tmp.HasValue ? tmp.Value : false; } - return (bValue) ? Visibility.Collapsed : Visibility.Visible; + return bValue ? Visibility.Collapsed : Visibility.Visible; } /// - /// Convert Visibility to boolean + /// Convert Visibility to boolean /// /// /// @@ -49,9 +49,7 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu { return (Visibility)value == Visibility.Collapsed; } - else - { - return false; - } + + return false; } } \ No newline at end of file diff --git a/RSHExporter/Resources/Localization/Resources.de.resx b/RSHExporter/Resources/Localization/Resources.de.resx index e9d827e..aca43a1 100644 --- a/RSHExporter/Resources/Localization/Resources.de.resx +++ b/RSHExporter/Resources/Localization/Resources.de.resx @@ -1,10 +1,9 @@  - + - diff --git a/RSHExporter/Resources/Localization/Resources.resx b/RSHExporter/Resources/Localization/Resources.resx index 43ba740..47a970a 100644 --- a/RSHExporter/Resources/Localization/Resources.resx +++ b/RSHExporter/Resources/Localization/Resources.resx @@ -1,10 +1,9 @@  - + - diff --git a/RSHExporter/Scrape/Scraper.cs b/RSHExporter/Scrape/Scraper.cs index c6eb03b..ab36c70 100644 --- a/RSHExporter/Scrape/Scraper.cs +++ b/RSHExporter/Scrape/Scraper.cs @@ -31,7 +31,7 @@ private static HttpClient GetOrCreateHttpClient(bool createNew = false) AllowAutoRedirect = true, UseDefaultCredentials = true, CookieContainer = cookieContainer, - UseCookies = true, + UseCookies = true }; _client = new HttpClient(clientHandler); _client.DefaultRequestHeaders.UserAgent.ParseAdd( @@ -437,7 +437,7 @@ private static async Task Login(string username, string password) { new("username", username), new("password", password), - new("use_cookie", "1"), + new("use_cookie", "1") } ); diff --git a/RSHExporter/View/FeedbackDialog.xaml.cs b/RSHExporter/View/FeedbackDialog.xaml.cs index d7954c2..60f52d4 100644 --- a/RSHExporter/View/FeedbackDialog.xaml.cs +++ b/RSHExporter/View/FeedbackDialog.xaml.cs @@ -8,7 +8,7 @@ public partial class FeedbackDialog : Window public enum FeedbackType { Default, - Error, + Error } public FeedbackDialog(FeedbackType feedbackType, string? id = null) diff --git a/RSHExporter/View/MainWindow.xaml.cs b/RSHExporter/View/MainWindow.xaml.cs index 37746cb..94b6e14 100644 --- a/RSHExporter/View/MainWindow.xaml.cs +++ b/RSHExporter/View/MainWindow.xaml.cs @@ -1,18 +1,17 @@ using System.Windows; using RSHExporter.View.Pages; -namespace RSHExporter.View +namespace RSHExporter.View; + +/// +/// Interaction logic for MainWindow.xaml +/// +public partial class MainWindow : Window { - /// - /// Interaction logic for MainWindow.xaml - /// - public partial class MainWindow : Window + public MainWindow() { - public MainWindow() - { - InitializeComponent(); + InitializeComponent(); - MainFrame.Navigate(new LicensePage()); - } + MainFrame.Navigate(new LicensePage()); } } \ No newline at end of file diff --git a/RSHExporter/View/Pages/ExportPage.xaml.cs b/RSHExporter/View/Pages/ExportPage.xaml.cs index 231442c..11444ac 100644 --- a/RSHExporter/View/Pages/ExportPage.xaml.cs +++ b/RSHExporter/View/Pages/ExportPage.xaml.cs @@ -46,7 +46,6 @@ public ExportPage(List threads) SelectableFileFormats = new ObservableCollection(); foreach (var fileFormat in Enum.GetValues()) { - // FIXME SelectableFileFormats.Add(new SelectableFileFormat(fileFormat, ExportConfiguration.FileFormats.Contains(fileFormat))); } diff --git a/RSHExporter/View/Pages/LicensePage.xaml.cs b/RSHExporter/View/Pages/LicensePage.xaml.cs index 2a2e5b1..3b001c1 100644 --- a/RSHExporter/View/Pages/LicensePage.xaml.cs +++ b/RSHExporter/View/Pages/LicensePage.xaml.cs @@ -1,4 +1,6 @@ -using System.Windows; +using System.Globalization; +using System.Threading; +using System.Windows; using System.Windows.Controls; using System.Windows.Navigation; using RSHExporter.Utils; @@ -13,7 +15,7 @@ public LicensePage() VersionTextBlock.Text = Util.GetVersion(); - var currentCulture = System.Threading.Thread.CurrentThread.CurrentUICulture.Name; + var currentCulture = Thread.CurrentThread.CurrentUICulture.Name; if (currentCulture == "de" || currentCulture.StartsWith("de-")) { ToGermanButton.IsEnabled = false; @@ -36,13 +38,13 @@ private void DeclineButton_OnClick(object sender, RoutedEventArgs e) private void ToGermanButton_OnClick(object sender, RoutedEventArgs e) { - System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("de"); + Thread.CurrentThread.CurrentUICulture = new CultureInfo("de"); NavigationService.Navigate(new LicensePage()); } private void ToEnglishButton_OnClick(object sender, RoutedEventArgs e) { - System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en"); + Thread.CurrentThread.CurrentUICulture = new CultureInfo("en"); NavigationService.Navigate(new LicensePage()); } diff --git a/RSHExporter/View/Pages/SelectPage.xaml b/RSHExporter/View/Pages/SelectPage.xaml index 6139369..c1cb810 100644 --- a/RSHExporter/View/Pages/SelectPage.xaml +++ b/RSHExporter/View/Pages/SelectPage.xaml @@ -238,7 +238,7 @@ HorizontalAlignment="Center" /> - + - + - + - + diff --git a/RSHExporter/View/Pages/WelcomePage.xaml.cs b/RSHExporter/View/Pages/WelcomePage.xaml.cs index 074be71..22c84f4 100644 --- a/RSHExporter/View/Pages/WelcomePage.xaml.cs +++ b/RSHExporter/View/Pages/WelcomePage.xaml.cs @@ -16,7 +16,7 @@ public WelcomePage() VersionTextBlock.Text = Util.GetVersion(); } - public static bool CollectDataAccepted { get; private set; } = false; + public static bool CollectDataAccepted { get; private set; } private void HelpButton_OnClick(object sender, RoutedEventArgs e) {