Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Feature: Redid set as background flyout #9775

Merged
merged 10 commits into from Aug 22, 2022
Merged

Feature: Redid set as background flyout #9775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec1b9b8
Feature: Tweaked colors on toolbar buttons
yaira2 Aug 18, 2022
6500eb9
Added chevron to toolbar buttons with flyouts
yaira2 Aug 19, 2022
386dd53
Removed x86 build from pipeline (#9764)
yaira2 Aug 19, 2022
800b204
Flyout for set as background
puppetsw Aug 20, 2022
8bc050d
Revert "Removed x86 build from pipeline (#9764)"
puppetsw Aug 21, 2022
9296e1b
Update src/Files.Uwp/Strings/en-US/Resources.resw
puppetsw Aug 21, 2022
8440eb6
Update src/Files.Uwp/Strings/en-US/Resources.resw
puppetsw Aug 21, 2022
93a29c7
Merge branch 'main' into setas_flyout
puppetsw Aug 21, 2022
50f3183
Reverted some changes to strings. Added new strings. New button for s…
puppetsw Aug 22, 2022
1e1d992
Fixed issue with rotation buttons not showing on multiple images.
puppetsw Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 15 additions & 17 deletions src/Files.Uwp/Interacts/BaseLayoutCommandImplementationModel.cs
View file
Open in desktop
Expand Up @@ -112,25 +112,23 @@ public virtual void SetAsLockscreenBackgroundItem(RoutedEventArgs e)

public virtual async void SetAsDesktopBackgroundItem(RoutedEventArgs e)
{
if (SlimContentPage.SelectedItems.Count > 1)
{
var images = (from o in SlimContentPage.SelectedItems select o.ItemPath).ToArray();
WallpaperHelpers.SetAsBackground(WallpaperType.Desktop, SlimContentPage.SelectedItem.ItemPath);
}

var connection = await AppServiceConnectionHelper.Instance;
if (connection != null)
{
var value = new ValueSet
{
{ "Arguments", "WallpaperOperation" },
{ "wallpaperop", "SetSlideshow" },
{ "filepaths", images }
};
await connection.SendMessageAsync(value);
}
}
else
public virtual async void SetAsSlideshowItem(RoutedEventArgs e)
{
var images = (from o in SlimContentPage.SelectedItems select o.ItemPath).ToArray();

var connection = await AppServiceConnectionHelper.Instance;
if (connection != null)
{
WallpaperHelpers.SetAsBackground(WallpaperType.Desktop, SlimContentPage.SelectedItem.ItemPath);
var value = new ValueSet
{
{ "Arguments", "WallpaperOperation" },
{ "wallpaperop", "SetSlideshow" },
{ "filepaths", images }
};
await connection.SendMessageAsync(value);
}
}

Expand Down
3 changes: 3 additions & 0 deletions src/Files.Uwp/Interacts/BaseLayoutCommandsViewModel.cs
View file
Open in desktop
Expand Up @@ -31,6 +31,7 @@ private void InitializeCommands()
CreateShortcutCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.CreateShortcut);
SetAsLockscreenBackgroundItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.SetAsLockscreenBackgroundItem);
SetAsDesktopBackgroundItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.SetAsDesktopBackgroundItem);
SetAsSlideshowItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.SetAsSlideshowItem);
RunAsAdminCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.RunAsAdmin);
RunAsAnotherUserCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.RunAsAnotherUser);
SidebarPinItemCommand = new RelayCommand<RoutedEventArgs>(CommandsModel.SidebarPinItem);
Expand Down Expand Up @@ -90,6 +91,8 @@ private void InitializeCommands()

public ICommand SetAsDesktopBackgroundItemCommand { get; private set; }

public ICommand SetAsSlideshowItemCommand { get; private set; }

public ICommand RunAsAdminCommand { get; private set; }

public ICommand RunAsAnotherUserCommand { get; private set; }
Expand Down
2 changes: 2 additions & 0 deletions src/Files.Uwp/Interacts/IBaseLayoutCommandImplementationModel.cs
View file
Open in desktop
Expand Up @@ -16,6 +16,8 @@ public interface IBaseLayoutCommandImplementationModel : IDisposable

void SetAsDesktopBackgroundItem(RoutedEventArgs e);

void SetAsSlideshowItem(RoutedEventArgs e);

void RunAsAdmin(RoutedEventArgs e);

void RunAsAnotherUser(RoutedEventArgs e);
Expand Down
637 changes: 435 additions & 202 deletions src/Files.Uwp/ResourceDictionaries/ToolbarButtonStyle.xaml
View file
Open in desktop

Large diffs are not rendered by default.

15 changes: 12 additions & 3 deletions src/Files.Uwp/Strings/en-US/Resources.resw
View file
Open in desktop
Expand Up @@ -2672,9 +2672,6 @@ We use App Center to track which settings are being used, find bugs, and fix cra
<data name="RunWithPowerShell" xml:space="preserve">
<value>Run with PowerShell</value>
</data>
<data name="SetAsBackground" xml:space="preserve">
<value>Set as desktop background</value>
</data>
<data name="ShowFolderSizesWarning" xml:space="preserve">
<value>Calculating folder sizes is resource intensive and may cause your CPU usage to increase.</value>
</data>
Expand Down Expand Up @@ -2786,6 +2783,15 @@ We use App Center to track which settings are being used, find bugs, and fix cra
<data name="ReviewFilesContent" xml:space="preserve">
<value>Would you like to review Files?</value>
</data>
<data name="SetAsBackgroundFlyout" xml:space="preserve">
<value>Set as background</value>
</data>
<data name="SetAsLockscreen" xml:space="preserve">
<value>Set as lockscreen</value>
</data>
<data name="SetAsBackground" xml:space="preserve">
<value>Set as desktop background</value>
puppetsw marked this conversation as resolved.
Show resolved Hide resolved
yaira2 marked this conversation as resolved.
Show resolved Hide resolved
</data>
<data name="SetAsDefault" xml:space="preserve">
<value>Set as default</value>
</data>
Expand All @@ -2807,4 +2813,7 @@ We use App Center to track which settings are being used, find bugs, and fix cra
<data name="DisplayTypeColumn" xml:space="preserve">
<value>Display Type column</value>
</data>
<data name="Lockscreen" xml:space="preserve">
<value>Lockscreen</value>
</data>
</root>