Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://www.github.com/wabbajack-tools/wabbajack

Browse Source
This commit is contained in:
trawzified 2024-08-13 22:37:31 +02:00
commit a9b4b05e2d
5 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -5,6 +5,8 @@
* This issue only affected Fallout 3, Fallout NV and Skyrim LE * This issue only affected Fallout 3, Fallout NV and Skyrim LE
* Added logging to determine which downloaded files cannot be hashed * Added logging to determine which downloaded files cannot be hashed
* This could occur in the downloading phase when installing a modlist when there are broken/corrupted files in the downloads folder * This could occur in the downloading phase when installing a modlist when there are broken/corrupted files in the downloads folder
* Fixed Wabbajack crashing when double-clicking the browser window titlebar or URL
* Fixed Wabbajack always using explorer.exe instead of the default file browser
#### Version - 3.7.0.0 - 6/21/2024 #### Version - 3.7.0.0 - 6/21/2024
* Added Starfield support * Added Starfield support

16
Wabbajack.App.Wpf/Util/UIUtils.cs
View File

@ -56,7 +56,6 @@ namespace Wabbajack
} }
} }
public static void OpenWebsite(Uri url) public static void OpenWebsite(Uri url)
{ {
Process.Start(new ProcessStartInfo("cmd.exe", $"/c start {url}") Process.Start(new ProcessStartInfo("cmd.exe", $"/c start {url}")
@ -64,16 +63,23 @@ namespace Wabbajack
CreateNoWindow = true, CreateNoWindow = true,
}); });
} }
public static void OpenFolder(AbsolutePath path) public static void OpenFolder(AbsolutePath path)
{ {
Process.Start(new ProcessStartInfo(KnownFolders.Windows.Combine("explorer.exe").ToString(), path.ToString()) string folderPath = path.ToString();
if (!folderPath.EndsWith(Path.DirectorySeparatorChar.ToString()))
{ {
CreateNoWindow = true, folderPath += Path.DirectorySeparatorChar.ToString();
}
Process.Start(new ProcessStartInfo()
{
FileName = folderPath,
UseShellExecute = true,
Verb = "open"
}); });
} }
public static AbsolutePath OpenFileDialog(string filter, string initialDirectory = null) public static AbsolutePath OpenFileDialog(string filter, string initialDirectory = null)
{ {
OpenFileDialog ofd = new OpenFileDialog(); OpenFileDialog ofd = new OpenFileDialog();

2
Wabbajack.App.Wpf/View Models/Installers/MO2InstallerVM.cs
View File

@ -77,7 +77,7 @@ namespace Wabbajack
public void AfterInstallNavigation() public void AfterInstallNavigation()
{ {
Process.Start("explorer.exe", Location.TargetPath.ToString()); UIUtils.OpenFolder(Location.TargetPath);
} }
public async Task<bool> Install() public async Task<bool> Install()

6
Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs
View File

@ -25,7 +25,6 @@ public partial class BrowserWindow : MetroWindow
{ {
InitializeComponent(); InitializeComponent();
_disposable = new CompositeDisposable(); _disposable = new CompositeDisposable();
_serviceProvider = serviceProvider; _serviceProvider = serviceProvider;
Browser = _serviceProvider.GetRequiredService<WebView2>(); Browser = _serviceProvider.GetRequiredService<WebView2>();
@ -43,7 +42,10 @@ public partial class BrowserWindow : MetroWindow
private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e) private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
{ {
base.DragMove(); if (e.LeftButton == MouseButtonState.Pressed)
{
base.DragMove();
}
} }
private void BrowserWindow_OnActivated(object sender, EventArgs e) private void BrowserWindow_OnActivated(object sender, EventArgs e)

5
Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
View File

@ -144,7 +144,10 @@ namespace Wabbajack
private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e) private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
{ {
this.DragMove(); if (e.LeftButton == MouseButtonState.Pressed)
{
this.DragMove();
}
} }
} }