Skip to content
This repository was archived by the owner on Feb 7, 2023. It is now read-only.

Commit 6c3d4b9

Browse files
ShellBrowserWeberShellBrowserWeber
committed
v1.3.0
v1.3.0
1 parent ef94177 commit 6c3d4b9

19 files changed

+293
-131
lines changed

‎ExplorerBrowser/App.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<startup>
4-
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
55
</startup>
66
</configuration>

‎ExplorerBrowser/ExplorerBrowserSample.csproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>ExplorerBrowserSample</RootNamespace>
1010
<AssemblyName>ExplorerBrowserSample</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
1515
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
16-
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
16+
<TargetFrameworkProfile>
17+
</TargetFrameworkProfile>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -24,6 +25,7 @@
2425
<DefineConstants>DEBUG;TRACE</DefineConstants>
2526
<ErrorReport>prompt</ErrorReport>
2627
<WarningLevel>4</WarningLevel>
28+
<Prefer32Bit>false</Prefer32Bit>
2729
</PropertyGroup>
2830
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2931
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -33,6 +35,7 @@
3335
<DefineConstants>TRACE</DefineConstants>
3436
<ErrorReport>prompt</ErrorReport>
3537
<WarningLevel>4</WarningLevel>
38+
<Prefer32Bit>false</Prefer32Bit>
3639
</PropertyGroup>
3740
<PropertyGroup>
3841
<ApplicationIcon>..\Common\ShellBrowserComponents-Icon.ico</ApplicationIcon>
@@ -105,6 +108,6 @@
105108
<ItemGroup>
106109
<None Include="App.config" />
107110
</ItemGroup>
108-
<Import Project="..\ProjectReferences.props" />
109-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
111+
<Import Project="..\ProjectReferences.props" />
112+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
110113
</Project>

‎ExplorerBrowser/MainWindow.xaml.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ public ObservableCollection<IJamItemIdList> ShellComboItemsSource
175175
public TestAppViewModel(Jam.Shell.WPF.Controls.ExplorerBrowser pExplorerBrowser)
176176
{
177177
m_ExplorerBrowser = pExplorerBrowser;
178-
m_ExplorerBrowser.Loaded += ExplorerBrowser_Loaded;
179178
m_ChangeViewModeCommand = new RelayCommand((clickedViewMode) =>
180179
{
181180
CheckedItem<FolderViewMode> item = clickedViewMode as CheckedItem<FolderViewMode>;
@@ -243,12 +242,6 @@ public TestAppViewModel(Jam.Shell.WPF.Controls.ExplorerBrowser pExplorerBrowser)
243242
});
244243
}
245244

246-
private void ExplorerBrowser_Loaded(object sender, RoutedEventArgs e)
247-
{
248-
// Columns need to be loaded delayed as the IShellView must be ready
249-
RaisePropertyChanged("Columns");
250-
}
251-
252245
public IEnumerable<ExplorerPane> AllPanes
253246
{
254247
get
@@ -365,7 +358,7 @@ public IEnumerable<CheckedItem<ShellViewColumn>> Columns
365358
if (m_Columns == null)
366359
{
367360

368-
if (m_ExplorerBrowser.IsLoaded)
361+
if (m_ExplorerBrowser.IsAvailable)
369362
{
370363
m_Columns = m_ExplorerBrowser.AllColumns.Select((column, index) => new CheckedItem<ShellViewColumn>(column, m_ChangeColumnsCommand, (m_ExplorerBrowser.Columns.Contains(column))));
371364
RaisePropertyChanged("Columns");

‎ExplorerBrowser/Properties/Resources.Designer.cs‎

Lines changed: 18 additions & 26 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ExplorerBrowser/Properties/Settings.Designer.cs‎

Lines changed: 9 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎ExplorerBrowser/app.manifest‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
3-
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
4-
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5-
<security>
6-
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7-
<!-- UAC Manifest Options
3+
<assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
4+
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
5+
<security>
6+
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
7+
<!-- UAC Manifest Options
88
If you want to change the Windows User Account Control level replace the
99
requestedExecutionLevel node with one of the following.
1010
@@ -16,61 +16,60 @@
1616
Remove this element if your application requires this virtualization for backwards
1717
compatibility.
1818
-->
19-
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20-
</requestedPrivileges>
21-
</security>
22-
</trustInfo>
19+
<requestedExecutionLevel level="asInvoker" uiAccess="false" />
20+
</requestedPrivileges>
21+
</security>
22+
</trustInfo>
2323

24-
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
25-
<application>
26-
<!-- A list of the Windows versions that this application has been tested on
24+
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
25+
<application>
26+
<!-- A list of the Windows versions that this application has been tested on
2727
and is designed to work with. Uncomment the appropriate elements
2828
and Windows will automatically select the most compatible environment. -->
2929

30-
<!-- Windows Vista -->
31-
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
30+
<!-- Windows Vista -->
31+
<!--<supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />-->
3232

33-
<!-- Windows 7 -->
34-
<!--<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />-->
33+
<!-- Windows 7 -->
34+
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
3535

36-
<!-- Windows 8 -->
37-
<!--<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />-->
36+
<!-- Windows 8 -->
37+
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
3838

39-
<!-- Windows 8.1 -->
40-
<!--<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />-->
39+
<!-- Windows 8.1 -->
40+
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
4141

42-
<!-- Windows 10 -->
43-
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
42+
<!-- Windows 10 -->
43+
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
4444

45-
</application>
46-
</compatibility>
45+
</application>
46+
</compatibility>
4747

48-
<!-- Indicates that the application is DPI-aware and will not be automatically scaled by Windows at higher
49-
DPIs. Windows Presentation Foundation (WPF) applications are automatically DPI-aware and do not need
50-
to opt in. Windows Forms applications targeting .NET Framework 4.6 that opt into this setting, should
51-
also set the 'EnableWindowsFormsHighDpiAutoResizing' setting to 'true' in their app.config. -->
52-
<!--
53-
<application xmlns="urn:schemas-microsoft-com:asm.v3">
54-
<windowsSettings>
55-
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
56-
</windowsSettings>
57-
</application>
58-
-->
48+
<asmv3:application xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" >
49+
<asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">
50+
<!-- False Sets the Application to not DPI-aware
51+
True Sets the application to system DPI-aware
52+
Per-monitor On Windows 8.1, sets the application to per monitor-DPI aware. On Windows Vista through Windows 8, sets the application to not DPI–aware.
53+
True/PM On Windows 8.1, sets the application to per monitor-DPI aware. On Windows Vista through Windows 8, sets the application to system-DPI aware. -->
54+
<dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, System</dpiAwareness>
55+
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">True/PM</dpiAware>
56+
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
57+
</asmv3:windowsSettings>
58+
</asmv3:application>
5959

60-
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
61-
<!--
62-
<dependency>
63-
<dependentAssembly>
64-
<assemblyIdentity
65-
type="win32"
66-
name="Microsoft.Windows.Common-Controls"
67-
version="6.0.0.0"
68-
processorArchitecture="*"
69-
publicKeyToken="6595b64144ccf1df"
70-
language="*"
60+
<!-- Enable themes for Windows common controls and dialogs (Windows XP and later) -->
61+
<dependency>
62+
<dependentAssembly>
63+
<assemblyIdentity
64+
type="win32"
65+
name="Microsoft.Windows.Common-Controls"
66+
version="6.0.0.0"
67+
processorArchitecture="*"
68+
publicKeyToken="6595b64144ccf1df"
69+
language="*"
7170
/>
72-
</dependentAssembly>
73-
</dependency>
74-
-->
71+
</dependentAssembly>
72+
</dependency>
73+
7574

7675
</assembly>

‎JamExplorer/JamExplorer.csproj‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
<OutputType>WinExe</OutputType>
99
<RootNamespace>JamExplorer</RootNamespace>
1010
<AssemblyName>JamExplorer</AssemblyName>
11-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
11+
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
1212
<FileAlignment>512</FileAlignment>
1313
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
1414
<WarningLevel>4</WarningLevel>
15+
<TargetFrameworkProfile />
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -22,6 +23,7 @@
2223
<DefineConstants>DEBUG;TRACE</DefineConstants>
2324
<ErrorReport>prompt</ErrorReport>
2425
<WarningLevel>4</WarningLevel>
26+
<Prefer32Bit>false</Prefer32Bit>
2527
</PropertyGroup>
2628
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
2729
<PlatformTarget>AnyCPU</PlatformTarget>
@@ -31,10 +33,14 @@
3133
<DefineConstants>TRACE</DefineConstants>
3234
<ErrorReport>prompt</ErrorReport>
3335
<WarningLevel>4</WarningLevel>
36+
<Prefer32Bit>false</Prefer32Bit>
3437
</PropertyGroup>
3538
<PropertyGroup>
3639
<ApplicationIcon>..\Common\ShellBrowserComponents-Icon.ico</ApplicationIcon>
3740
</PropertyGroup>
41+
<PropertyGroup>
42+
<ApplicationManifest>app.manifest</ApplicationManifest>
43+
</PropertyGroup>
3844
<ItemGroup>
3945
<Reference Include="System" />
4046
<Reference Include="System.Data" />
@@ -90,11 +96,13 @@
9096
<Generator>ResXFileCodeGenerator</Generator>
9197
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
9298
</EmbeddedResource>
99+
<None Include="app.config" />
100+
<None Include="app.manifest" />
93101
<None Include="Properties\Settings.settings">
94102
<Generator>SettingsSingleFileGenerator</Generator>
95103
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
96104
</None>
97105
</ItemGroup>
98-
<Import Project="..\ProjectReferences.props" />
99-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
106+
<Import Project="..\ProjectReferences.props" />
107+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
100108
</Project>

‎JamExplorer/Properties/Resources.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JamExplorer/Properties/Settings.Designer.cs‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎JamExplorer/app.config‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup></configuration>

0 commit comments

Comments
 (0)