Skip to content

Commit 9e8ad53

Browse files
yaira2yaira2
authored
v0.7.8 (#666)
1 parent 09f5cb1 commit 9e8ad53

File tree

109 files changed

+1077
-900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1077
-900
lines changed

‎Files.Launcher/Program.cs

+5-7
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77

88
namespace ProcessLauncher
99
{
10-
class Program
10+
internal class Program
1111
{
12-
static void Main(string[] args)
12+
private static void Main(string[] args)
1313
{
1414
var localSettings = ApplicationData.Current.LocalSettings;
1515
var arguments = (string)localSettings.Values["Arguments"];
1616
if (!string.IsNullOrWhiteSpace(arguments))
1717
{
1818
if (arguments.Equals("StartupTasks"))
1919
{
20-
// Check QuickLook Availability
20+
// Check QuickLook Availability
2121
QuickLook.CheckQuickLookAvailability(localSettings);
2222
}
2323
else if (arguments.Equals("ToggleQuickLook"))
2424
{
25-
var path = (string) localSettings.Values["path"];
25+
var path = (string)localSettings.Values["path"];
2626
QuickLook.ToggleQuickLook(path);
2727
}
2828
else
@@ -64,9 +64,7 @@ static void Main(string[] args)
6464
Process.Start(executable);
6565
}
6666
}
67-
68-
6967
}
7068
}
7169
}
72-
}
70+
}

‎Files.Launcher/Properties/AssemblyInfo.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,4 @@
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
3535
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]

‎Files.Launcher/QuickLook.cs

+4-5
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
namespace ProcessLauncher
1313
{
14-
static class QuickLook
15-
{
14+
internal static class QuickLook
15+
{
1616
public static void ToggleQuickLook(string path)
1717
{
1818
string PipeName = "QuickLook.App.Pipe." + WindowsIdentity.GetCurrent().User?.Value;
@@ -50,7 +50,6 @@ static int QuickLookServerAvailable()
5050
}
5151

5252
return serverInstances;
53-
5453
}
5554
catch (TimeoutException e)
5655
{
@@ -60,6 +59,6 @@ static int QuickLookServerAvailable()
6059
}
6160

6261
localSettings.Values["quicklook_enabled"] = QuickLookServerAvailable() != 0;
63-
}
62+
}
6463
}
65-
}
64+
}

‎Files.Launcher/app.config

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

‎Files.Package/Package.appxmanifest

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5" IgnorableNamespaces="uap uap5 mp rescap desktop4 desktop">
3-
<Identity Name="49306atecsolution.FilesUWP" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.7.7.0" />
3+
<Identity Name="FilesUWPDev" Publisher="CN=53EC4384-7F5B-4CF6-8C23-513FFE9D1AB7" Version="0.7.8.0" />
44
<Properties>
5-
<DisplayName>Files UWP - Preview</DisplayName>
5+
<DisplayName>Files UWP - Dev</DisplayName>
66
<PublisherDisplayName>Yair A</PublisherDisplayName>
77
<Logo>Assets\StoreLogo.png</Logo>
88
</Properties>
@@ -15,7 +15,7 @@
1515
</Resources>
1616
<Applications>
1717
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="$targetentrypoint$" desktop4:SupportsMultipleInstances="true">
18-
<uap:VisualElements DisplayName="Files UWP - Preview" Description="Meet Files, a free and open-source File Manager for Windows 10. Created from the ground up to look and feel amazing, Files is built to replace the dated Windows File Explorer." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
18+
<uap:VisualElements DisplayName="Files UWP - Dev" Description="Meet Files, a free and open-source File Manager for Windows 10. Created from the ground up to look and feel amazing, Files is built to replace the dated Windows File Explorer." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
1919
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square71x71Logo="Assets\SmallTile.png" Square310x310Logo="Assets\LargeTile.png" ShortName="Files">
2020
<uap:ShowNameOnTiles>
2121
<uap:ShowOn Tile="square150x150Logo"/>

‎Files/App.xaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPointerOver" Color="#191919" />
6060
<SolidColorBrush x:Key="TabViewItemHeaderBackgroundPressed" Color="#191919" />
6161
<SolidColorBrush x:Key="CustomInputFieldBorderBrush" Color="#FF363636" />
62-
<!--<SolidColorBrush x:Key="TextControlBorderBrush" Color="#FF363636"/>-->
62+
<!--<SolidColorBrush x:Key="TextControlBorderBrush" Color="#FF363636" />-->
6363
<SolidColorBrush x:Key="RibbonBackgroundColor" Color="#131313" />
6464
<StaticResource x:Key="NavigationViewTopPaneBackground" ResourceKey="RibbonBackgroundColor" />
6565
</ResourceDictionary>
@@ -70,7 +70,5 @@
7070
</ResourceDictionary>
7171
</ResourceDictionary.MergedDictionaries>
7272
</ResourceDictionary>
73-
7473
</Application.Resources>
75-
7674
</Application>

‎Files/App.xaml.cs

+6-8
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ namespace Files
2828
{
2929
sealed partial class App : Application
3030
{
31-
3231
private static IShellPage currentInstance;
32+
3333
public static IShellPage CurrentInstance
3434
{
3535
get
@@ -44,6 +44,7 @@ public static IShellPage CurrentInstance
4444
}
4545
}
4646
}
47+
4748
public static Dialogs.ExceptionDialog ExceptionDialogDisplay { get; set; }
4849
public static Dialogs.ConsentDialog ConsentDialogDisplay { get; set; }
4950
public static Dialogs.PropertiesDialog PropertiesDialogDisplay { get; set; }
@@ -147,7 +148,6 @@ public static void Clipboard_ContentChanged(object sender, object e)
147148
{
148149
App.PS.IsEnabled = false;
149150
}
150-
151151
}
152152

153153
public static Windows.UI.Xaml.UnhandledExceptionEventArgs ExceptionInfo { get; set; }
@@ -169,7 +169,6 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
169169

170170
bool canEnablePrelaunch = Windows.Foundation.Metadata.ApiInformation.IsMethodPresent("Windows.ApplicationModel.Core.CoreApplication", "EnablePrelaunch");
171171

172-
173172
// Do not repeat app initialization when the Window already has content,
174173
// just ensure that the window is active
175174
if (!(Window.Current.Content is Frame rootFrame))
@@ -197,13 +196,10 @@ protected override void OnLaunched(LaunchActivatedEventArgs e)
197196

198197
if (rootFrame.Content == null)
199198
{
200-
201199
// When the navigation stack isn't restored navigate to the first page,
202200
// configuring the new page by passing required information as a navigation
203201
// parameter
204202
rootFrame.Navigate(typeof(InstanceTabsView), e.Arguments, new SuppressNavigationTransitionInfo());
205-
206-
207203
}
208204

209205
// Ensure the current window is active
@@ -265,6 +261,7 @@ protected override void OnActivated(IActivatedEventArgs args)
265261
Window.Current.Activate();
266262
Window.Current.CoreWindow.PointerPressed += CoreWindow_PointerPressed;
267263
return;
264+
268265
case ParsedCommandType.Unkwon:
269266
rootFrame.Navigate(typeof(InstanceTabsView), null, new SuppressNavigationTransitionInfo());
270267
// Ensure the current window is active.
@@ -288,12 +285,13 @@ private void TryEnablePrelaunch()
288285
{
289286
Windows.ApplicationModel.Core.CoreApplication.EnablePrelaunch(true);
290287
}
288+
291289
/// <summary>
292290
/// Invoked when Navigation to a certain page fails
293291
/// </summary>
294292
/// <param name="sender">The Frame which failed navigation</param>
295293
/// <param name="e">Details about the navigation failure</param>
296-
void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
294+
private void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
297295
{
298296
throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
299297
}
@@ -328,4 +326,4 @@ public class WSLDistroItem : INavigationControlItem
328326

329327
NavigationControlItemType INavigationControlItem.ItemType => NavigationControlItemType.LinuxDistro;
330328
}
331-
}
329+
}

‎Files/BaseLayout.cs

+9-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
using Windows.UI.Xaml.Input;
1717
using Windows.UI.Xaml.Navigation;
1818

19-
2019
namespace Files
2120
{
2221
/// <summary>
@@ -31,6 +30,7 @@ public abstract class BaseLayout : Page, INotifyPropertyChanged
3130
public bool isRenamingItem = false;
3231

3332
private bool isItemSelected = false;
33+
3434
public bool IsItemSelected
3535
{
3636
get
@@ -48,11 +48,12 @@ internal set
4848
}
4949

5050
private List<ListedItem> _SelectedItems;
51+
5152
public List<ListedItem> SelectedItems
5253
{
5354
get
5455
{
55-
if(_SelectedItems == null)
56+
if (_SelectedItems == null)
5657
{
5758
return new List<ListedItem>();
5859
}
@@ -81,6 +82,7 @@ internal set
8182
}
8283

8384
private ListedItem _SelectedItem;
85+
8486
public ListedItem SelectedItem
8587
{
8688
get
@@ -106,7 +108,6 @@ internal set
106108
}
107109
}
108110

109-
110111
public BaseLayout()
111112
{
112113
this.Loaded += Page_Loaded;
@@ -127,7 +128,7 @@ public BaseLayout()
127128
protected abstract void SetSelectedItemsOnUi(List<ListedItem> selectedItems);
128129

129130
public abstract void FocusSelectedItems();
130-
131+
131132
protected abstract ListedItem GetItemFromElement(object element);
132133

133134
private void AppSettings_LayoutModeChangeRequested(object sender, EventArgs e)
@@ -146,10 +147,10 @@ private void AppSettings_LayoutModeChangeRequested(object sender, EventArgs e)
146147
App.CurrentInstance.ContentFrame.Navigate(typeof(PhotoAlbum), App.CurrentInstance.ViewModel.WorkingDirectory, null);
147148
}
148149
}
149-
150150
}
151151

152152
public event PropertyChangedEventHandler PropertyChanged;
153+
153154
private void NotifyPropertyChanged([CallerMemberName] string propertyName = "")
154155
{
155156
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
@@ -254,14 +255,12 @@ public void RightClickContextMenu_Opening(object sender, object e)
254255
UnloadMenuFlyoutItemByName("OpenInNewWindowItem");
255256
UnloadMenuFlyoutItemByName("UnzipItem");
256257
}
257-
258258
}
259259

260260
//check if the selected file is an image
261261
App.InteractionViewModel.CheckForImage();
262262
}
263263

264-
265264
private void Page_Loaded(object sender, RoutedEventArgs e)
266265
{
267266
if (AssociatedViewModel == null && AssociatedInteractions == null)
@@ -319,7 +318,8 @@ protected async void Item_DragStarting(object sender, DragStartingEventArgs e)
319318
selectedStorageItems.Add(await StorageFolder.GetFolderFromPathAsync(item.ItemPath));
320319
}
321320

322-
if (selectedStorageItems.Count == 0) {
321+
if (selectedStorageItems.Count == 0)
322+
{
323323
e.Cancel = true;
324324
return;
325325
}
@@ -372,6 +372,5 @@ protected void InitializeDrag(UIElement element)
372372
}
373373
}
374374
}
375-
376375
}
377-
}
376+
}

0 commit comments

Comments
 (0)