-
-
Notifications
You must be signed in to change notification settings - Fork 448
Prefer https over http setting for url #4037
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
1a373e1
prefer https over http setting
AWAS666 ae3559c
fix: explicit scheme
AWAS666 a412c79
Fix format
Jack251970 001dad9
revert manual translation
AWAS666 b8acead
Merge branch 'dev' into httpspref
Jack251970 6f17aa2
Resolve conflicts
Jack251970 1e3306e
Remove unused file
Jack251970 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
|
||
Jack251970 marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
namespace Flow.Launcher.Plugin.Url; | ||
|
||
public class SettingsViewModel(Settings settings) : BaseModel | ||
{ | ||
public Settings Settings { get; } = settings; | ||
} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
<UserControl | ||
x:Class="Flow.Launcher.Plugin.Url.URLSettings" | ||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
xmlns:url="clr-namespace:Flow.Launcher.Plugin.Url" | ||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" | ||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" | ||
xmlns:viewModels="clr-namespace:Flow.Launcher.Plugin.Url" | ||
d:DataContext="{d:DesignInstance Type=viewModels:SettingsViewModel}" | ||
d:DesignHeight="450" | ||
d:DesignWidth="800" | ||
mc:Ignorable="d"> | ||
|
||
<Grid Margin="{StaticResource SettingPanelMargin}"> | ||
<Grid.RowDefinitions> | ||
<RowDefinition Height="auto" /> | ||
</Grid.RowDefinitions> | ||
<Grid.ColumnDefinitions> | ||
<ColumnDefinition Width="Auto" /> | ||
</Grid.ColumnDefinitions> | ||
|
||
<CheckBox | ||
Grid.Row="0" | ||
Grid.Column="0" | ||
Margin="{StaticResource SettingPanelItemTopBottomMargin}" | ||
HorizontalAlignment="Left" | ||
VerticalAlignment="Center" | ||
Content="{DynamicResource flowlauncher_plugin_url_usehttps}" | ||
IsChecked="{Binding Settings.AlwaysOpenWithHttps, Mode=TwoWay}" /> | ||
</Grid> | ||
</UserControl> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
using System.Windows.Controls; | ||
|
||
namespace Flow.Launcher.Plugin.Url; | ||
|
||
public partial class URLSettings : UserControl | ||
{ | ||
private readonly SettingsViewModel _viewModel; | ||
|
||
public URLSettings(Settings settings) | ||
{ | ||
_viewModel = new SettingsViewModel(settings); | ||
DataContext = _viewModel; | ||
InitializeComponent(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.