From e84e5b1d9f520a76fe6e8c7fcbfce1871b0cae2b Mon Sep 17 00:00:00 2001 From: Jeremy Date: Tue, 7 Dec 2021 20:44:19 +1100 Subject: [PATCH] remove obsolete new tab/window methods --- .../Views/SettingsControl.xaml.cs | 23 +---------- .../SettingsControl.xaml.cs | 41 ------------------- .../SettingsControl.xaml.cs | 26 ------------ 3 files changed, 2 insertions(+), 88 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs index 56fa58acf..5f5d3246c 100644 --- a/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.BrowserBookmark/Views/SettingsControl.xaml.cs @@ -1,19 +1,16 @@ -using Microsoft.Win32; using System.Windows; -using System.Windows.Controls; using Flow.Launcher.Plugin.BrowserBookmark.Models; using System.Windows.Input; using System.ComponentModel; namespace Flow.Launcher.Plugin.BrowserBookmark.Views { - /// - /// Interaction logic for BrowserBookmark.xaml - /// public partial class SettingsControl : INotifyPropertyChanged { public Settings Settings { get; } + public CustomBrowser SelectedCustomBrowser { get; set; } + public bool OpenInNewBrowserWindow { get => Settings.OpenInNewBrowserWindow; @@ -23,10 +20,6 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(OpenInNewBrowserWindow))); } } - public bool OpenInNewTab - { - get => !OpenInNewBrowserWindow; - } public SettingsControl(Settings settings) { @@ -36,18 +29,6 @@ namespace Flow.Launcher.Plugin.BrowserBookmark.Views public event PropertyChangedEventHandler PropertyChanged; - private void OnChooseClick(object sender, RoutedEventArgs e) - { - var fileBrowserDialog = new OpenFileDialog(); - fileBrowserDialog.Filter = "Application(*.exe)|*.exe|All files|*.*"; - fileBrowserDialog.CheckFileExists = true; - fileBrowserDialog.CheckPathExists = true; - if (fileBrowserDialog.ShowDialog() == true) - { - Settings.BrowserPath = fileBrowserDialog.FileName; - } - } - private void NewCustomBrowser(object sender, RoutedEventArgs e) { var newBrowser = new CustomBrowser(); diff --git a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs index 9457659db..dce13c522 100644 --- a/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Url/SettingsControl.xaml.cs @@ -1,25 +1,10 @@ using System; using System.Collections.Generic; using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows; using System.Windows.Controls; -using System.Windows.Data; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; -using System.Windows.Navigation; -using System.Windows.Shapes; -using Microsoft.Win32; - namespace Flow.Launcher.Plugin.Url { - /// - /// SettingsControl.xaml 的交互逻辑 - /// public partial class SettingsControl : UserControl { private Settings _settings; @@ -32,31 +17,5 @@ namespace Flow.Launcher.Plugin.Url _flowlauncherAPI = flowlauncherAPI; } - - private void OnChooseClick(object sender, RoutedEventArgs e) - { - var fileBrowserDialog = new OpenFileDialog(); - fileBrowserDialog.Filter = _flowlauncherAPI.GetTranslation("flowlauncher_plugin_url_plugin_filter"); ; - fileBrowserDialog.CheckFileExists = true; - fileBrowserDialog.CheckPathExists = true; - if (fileBrowserDialog.ShowDialog() == true) - { - _settings.BrowserPath = fileBrowserDialog.FileName; - } - } - - private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e) - { - _settings.OpenInNewBrowserWindow = true; - } - - private void OnNewTabClick(object sender, RoutedEventArgs e) - { - _settings.OpenInNewBrowserWindow = false; - } - - private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e) - { - } } } diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs index 02f8f3afa..d2af6eb6d 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml.cs @@ -61,32 +61,6 @@ namespace Flow.Launcher.Plugin.WebSearch } } - private void OnNewBrowserWindowClick(object sender, RoutedEventArgs e) - { - _settings.OpenInNewBrowser = true; - } - - private void OnNewTabClick(object sender, RoutedEventArgs e) - { - _settings.OpenInNewBrowser = false; - } - - private void OnChooseClick(object sender, RoutedEventArgs e) - { - var fileBrowserDialog = new OpenFileDialog(); - fileBrowserDialog.Filter = "Application(*.exe)|*.exe|All files|*.*"; - fileBrowserDialog.CheckFileExists = true; - fileBrowserDialog.CheckPathExists = true; - if (fileBrowserDialog.ShowDialog() == true) - { - _settings.BrowserPath = fileBrowserDialog.FileName; - } - } - - private void OnBrowserPathTextChanged(object sender, TextChangedEventArgs e) - { - } - GridViewColumnHeader _lastHeaderClicked = null; ListSortDirection _lastDirection = ListSortDirection.Ascending;