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.

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

Merge Saint-Nicholas #56

Draft
wants to merge 57 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
37b5616
prj: Refactor project structure
tajbender Nov 13, 2024
0cea3b4
Refactor `ShellNamespaceService`
tajbender Nov 14, 2024
1ca5c80
Bump `AssemblyVersion` to v1.24.1113.
tajbender Nov 14, 2024
8d6804d
Update Application Icon Assets.
tajbender Nov 14, 2024
85065ee
Refactor
tajbender Nov 14, 2024
534b899
Refactor `AbstractBrowserItem`
tajbender Nov 14, 2024
cf8666e
Refactor `ShellNamespaceService`
tajbender Nov 14, 2024
5dbd5e0
Refactor
tajbender Nov 14, 2024
28a5058
gui: Add `HeaderedContentControl`
tajbender Nov 14, 2024
8245161
Move `SoftwareBitmapSource` from `BrowserItem` to `AbstractBrowserItem`
tajbender Nov 15, 2024
41108d5
gui cleanup
tajbender Nov 15, 2024
a668515
Refactor `.xaml`, esp. the SideBar
tajbender Nov 15, 2024
119f9c0
Refactor Stock Icons
tajbender Nov 15, 2024
81f620e
Add Command Resources from `Assets\Legacy Assets from Old-School elec…
tajbender Nov 15, 2024
609c0c1
Rename them
tajbender Nov 15, 2024
1cf7f3f
...add them to the AppBar
tajbender Nov 16, 2024
c8d4e45
gui: Do some Refactoring, add dummy Drives Selector Bar
tajbender Nov 16, 2024
8de65c2
Some Prototyping
tajbender Nov 16, 2024
1bbc9d0
Refactor gui: Add some Prototypes
tajbender Nov 16, 2024
a900c11
Refactor `StockIcons`
tajbender Nov 16, 2024
95ce96f
gui: Workbench
tajbender Nov 16, 2024
7ed6008
gui: Workbench
tajbender Nov 17, 2024
4ca0ca1
Remove old, obsolete Stock Icons from Source
tajbender Nov 17, 2024
02258c3
Remove `Expander` Controls
tajbender Nov 17, 2024
779b8ae
gui: Workbench
tajbender Nov 17, 2024
eaed4c0
Refactor gui, especially AppBar and artifacts
tajbender Nov 18, 2024
fe2c82a
Add StockIconImages to `ShellListView`
tajbender Nov 19, 2024
9d8f4f2
Fix Navigation via `ShellNamespaceTreeControl`
tajbender Nov 20, 2024
7cec48d
Refactor debug stuff of `NativeTreeView_SelectionChanged()`
tajbender Nov 22, 2024
720431d
Add `BrowserItemFactory`
tajbender Nov 22, 2024
527c3d7
prj: Add `.clang-format` styles
tajbender Nov 25, 2024
5508d1b
Refactor
tajbender Nov 26, 2024
ccd7b32
prj: Delete obsolete file `AbstractBrowserItem.cs`
tajbender Nov 26, 2024
c247e58
Refactoring
tajbender Nov 27, 2024
1d30d64
Refactor
tajbender Nov 29, 2024
548ec74
Add dummy Flags from original Browser
tajbender Nov 29, 2024
91eeca0
Move `CommandBar` from to `ExplorerBrowser`
tajbender Nov 30, 2024
f71d491
Re-Implement Folder Enumeration and initial Navigation
tajbender Nov 30, 2024
bd46d4a
Add Interface `IExplorerBrowser`. Move its enums there.
tajbender Nov 30, 2024
3c97587
Refactoring: Move `enum`s of Win32 ExplorerBrowser again
tajbender Nov 30, 2024
7c96600
Refactor
tajbender Nov 30, 2024
1c11971
Add `ShellNamespaceTreeRoot`.
tajbender Nov 30, 2024
0edf739
Reorganize
tajbender Dec 1, 2024
92fba25
Add Sorting to `ShellListView`
tajbender Dec 1, 2024
6dd4f35
Fix StockIcons in `ShellListView`
tajbender Dec 2, 2024
1f5faea
Remove dummy initial Navigation
tajbender Dec 2, 2024
765b6de
Add static class `StockIconFactory` for StockIcons
tajbender Dec 2, 2024
1e6669c
Add `DefaultBrowserItemComparer` to `ShellListView`
tajbender Dec 2, 2024
7e83b5a
Add Debug Assertion
tajbender Dec 2, 2024
fdffc3d
Remove oboslete Borders from `ShellListView` to enable ScrollBars
tajbender Dec 2, 2024
56a6721
Add Properties `IsSelectedTreeNode` and `HasUnrealizedChildren` to `B…
tajbender Dec 8, 2024
8ee3fa4
Refactor navigation methods and optimize selection handling
tajbender Dec 28, 2024
2f450a8
Update WinUIEx package to version 2.5.0
tajbender Dec 28, 2024
760ff9d
Update System.Text.Json to version 9.0.0
tajbender Dec 28, 2024
b96cb6b
Update CommunityToolkit.Mvvm to stable version 8.4.0
tajbender Dec 28, 2024
28eaf55
Reorder and re-add using directives across files
tajbender Dec 28, 2024
49f4a36
Update project and package versions
tajbender Dec 28, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 54 additions & 0 deletions src/electrifier 2024.clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
---
Language: Cpp
BasedOnStyle: LLVM
AccessModifierOffset: -4
AlignConsecutiveAssignments: false
AlignConsecutiveDeclarations: false
AlignOperands: false
AlignTrailingComments: false
AlwaysBreakTemplateDeclarations: Yes
BraceWrapping:
AfterCaseLabel: true
AfterClass: true
AfterControlStatement: true
AfterEnum: true
AfterFunction: true
AfterNamespace: true
AfterStruct: true
AfterUnion: true
AfterExternBlock: false
BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: true
BeforeWhile: true
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakBeforeBraces: Custom
BreakConstructorInitializers: AfterColon
BreakConstructorInitializersBeforeComma: false
ColumnLimit: 120
ConstructorInitializerAllOnOneLineOrOnePerLine: false
IncludeCategories:
- Regex: '^<.*'
Priority: 1
- Regex: '^".*'
Priority: 2
- Regex: '.*'
Priority: 3
IncludeIsMainRegex: '([-_](test|unittest))?$'
IndentCaseBlocks: true
IndentWidth: 4
InsertNewlineAtEOF: true
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
NamespaceIndentation: All
PointerAlignment: Left
SpaceInEmptyParentheses: false
SpacesInAngles: false
SpacesInConditionalStatement: false
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
TabWidth: 4
...
16 changes: 4 additions & 12 deletions src/electrifier/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using electrifier.Activation;
using System.Diagnostics;
using electrifier.Activation;
using electrifier.Contracts.Services;
using electrifier.Helpers;
using electrifier.Models;
Expand All @@ -9,18 +10,14 @@
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Microsoft.UI.Xaml;
using System.Diagnostics;
using electrifier.Controls.Vanara.Services;
using WinUIEx;
using static Microsoft.Extensions.Hosting.Host;
using UnhandledExceptionEventArgs = Microsoft.UI.Xaml.UnhandledExceptionEventArgs;

namespace electrifier;

/// <summary>
/// App
///
/// The .NET Generic Host provides dependency injection, configuration, logging, and other services:
/// The .NET <seealso cref="IHost">Generic Host</seealso> provides dependency injection, configuration, logging, and other services:
/// <a href="https://docs.microsoft.com/dotnet/core/extensions/generic-host"/>,
/// <a href="https://docs.microsoft.com/dotnet/core/extensions/dependency-injection"/>,
/// <a href="https://docs.microsoft.com/dotnet/core/extensions/configuration"/>,
Expand All @@ -38,12 +35,7 @@ public IHost Host
get;
}
public static WindowEx MainWindow { get; } = new MainWindow();

public static ShellNamespaceService NamespaceService
{
get;
} = new() { };


public App()
{
InitializeComponent();
Expand Down
Binary file added src/electrifier/Assets/BadgeLogo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/electrifier/Assets/BadgeLogo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/electrifier/Assets/BadgeLogo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/electrifier/Assets/BadgeLogo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/electrifier/Assets/BadgeLogo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.scale-100.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.scale-125.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.scale-150.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.scale-200.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.scale-400.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.targetsize-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.targetsize-24.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.targetsize-256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/electrifier/Assets/Square44x44Logo.targetsize-32.png
Binary file modified src/electrifier/Assets/Square44x44Logo.targetsize-48.png
Binary file modified src/electrifier/Assets/StoreLogo.scale-100.png
Binary file modified src/electrifier/Assets/StoreLogo.scale-125.png
Binary file modified src/electrifier/Assets/StoreLogo.scale-150.png
Binary file modified src/electrifier/Assets/StoreLogo.scale-200.png
Binary file modified src/electrifier/Assets/StoreLogo.scale-400.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
46 changes: 0 additions & 46 deletions src/electrifier/Controls/Vanara/Contracts/AbstractBrowserItem.cs

This file was deleted.

Loading