diff --git a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs
index 91409d6..b27a23d 100644
--- a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs
+++ b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.Designer.cs
@@ -11,32 +11,46 @@ namespace ModpackUpdater.Apps.Manager.LangRes {
using System;
- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
- [System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
public class GeneralLangRes {
- private static System.Resources.ResourceManager resourceMan;
+ private static global::System.Resources.ResourceManager resourceMan;
- private static System.Globalization.CultureInfo resourceCulture;
+ private static global::System.Globalization.CultureInfo resourceCulture;
- [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
internal GeneralLangRes() {
}
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public static System.Resources.ResourceManager ResourceManager {
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
get {
- if (object.Equals(null, resourceMan)) {
- System.Resources.ResourceManager temp = new System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.GeneralLangRes", typeof(GeneralLangRes).Assembly);
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ModpackUpdater.Apps.Manager.LangRes.GeneralLangRes", typeof(GeneralLangRes).Assembly);
resourceMan = temp;
}
return resourceMan;
}
}
- [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)]
- public static System.Globalization.CultureInfo Culture {
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
get {
return resourceCulture;
}
@@ -45,274 +59,418 @@ namespace ModpackUpdater.Apps.Manager.LangRes {
}
}
- public static string ModlistForVersionX {
- get {
- return ResourceManager.GetString("ModlistForVersionX", resourceCulture);
- }
- }
-
- public static string GitLabInstanceUrl {
- get {
- return ResourceManager.GetString("GitLabInstanceUrl", resourceCulture);
- }
- }
-
- public static string GitLabApiToken {
- get {
- return ResourceManager.GetString("GitLabApiToken", resourceCulture);
- }
- }
-
- public static string RepositoryId {
- get {
- return ResourceManager.GetString("RepositoryId", resourceCulture);
- }
- }
-
- public static string RootFolderPath {
- get {
- return ResourceManager.GetString("RootFolderPath", resourceCulture);
- }
- }
-
- public static string FileLocationOfInstallJson {
- get {
- return ResourceManager.GetString("FileLocationOfInstallJson", resourceCulture);
- }
- }
-
- public static string FileLocationOfUpdateJson {
- get {
- return ResourceManager.GetString("FileLocationOfUpdateJson", resourceCulture);
- }
- }
-
- public static string ModpackConfigUrl {
- get {
- return ResourceManager.GetString("ModpackConfigUrl", resourceCulture);
- }
- }
-
- public static string Remove {
- get {
- return ResourceManager.GetString("Remove", resourceCulture);
- }
- }
-
- public static string WorkspacePreferences {
- get {
- return ResourceManager.GetString("WorkspacePreferences", resourceCulture);
- }
- }
-
- public static string SaveWorkspace {
- get {
- return ResourceManager.GetString("SaveWorkspace", resourceCulture);
- }
- }
-
- public static string NewWorkspace {
- get {
- return ResourceManager.GetString("NewWorkspace", resourceCulture);
- }
- }
-
- public static string RecentWorkspaces {
- get {
- return ResourceManager.GetString("RecentWorkspaces", resourceCulture);
- }
- }
-
- public static string Workspace {
- get {
- return ResourceManager.GetString("Workspace", resourceCulture);
- }
- }
-
- public static string CreateUpdate {
- get {
- return ResourceManager.GetString("CreateUpdate", resourceCulture);
- }
- }
-
- public static string RemoveUpdate {
- get {
- return ResourceManager.GetString("RemoveUpdate", resourceCulture);
- }
- }
-
- public static string Update {
- get {
- return ResourceManager.GetString("Update", resourceCulture);
- }
- }
-
- public static string Tools {
- get {
- return ResourceManager.GetString("Tools", resourceCulture);
- }
- }
-
- public static string Updates {
- get {
- return ResourceManager.GetString("Updates", resourceCulture);
- }
- }
-
+ ///
+ /// Looks up a localized string similar to Add.
+ ///
public static string Add {
get {
return ResourceManager.GetString("Add", resourceCulture);
}
}
- public static string Public {
+ ///
+ /// Looks up a localized string similar to Create update.
+ ///
+ public static string CreateUpdate {
get {
- return ResourceManager.GetString("Public", resourceCulture);
- }
- }
-
- public static string Id {
- get {
- return ResourceManager.GetString("Id", resourceCulture);
- }
- }
-
- public static string Side {
- get {
- return ResourceManager.GetString("Side", resourceCulture);
- }
- }
-
- public static string UpdateType {
- get {
- return ResourceManager.GetString("UpdateType", resourceCulture);
- }
- }
-
- public static string SourceType {
- get {
- return ResourceManager.GetString("SourceType", resourceCulture);
- }
- }
-
- public static string DestinationPath {
- get {
- return ResourceManager.GetString("DestinationPath", resourceCulture);
- }
- }
-
- public static string State {
- get {
- return ResourceManager.GetString("State", resourceCulture);
- }
- }
-
- public static string InheritFrom {
- get {
- return ResourceManager.GetString("InheritFrom", resourceCulture);
- }
- }
-
- public static string SourcePath {
- get {
- return ResourceManager.GetString("SourcePath", resourceCulture);
- }
- }
-
- public static string IsDirectory {
- get {
- return ResourceManager.GetString("IsDirectory", resourceCulture);
- }
- }
-
- public static string General {
- get {
- return ResourceManager.GetString("General", resourceCulture);
- }
- }
-
- public static string Name {
- get {
- return ResourceManager.GetString("Name", resourceCulture);
- }
- }
-
- public static string IsExtra {
- get {
- return ResourceManager.GetString("IsExtra", resourceCulture);
+ return ResourceManager.GetString("CreateUpdate", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Destination.
+ ///
public static string Destination {
get {
return ResourceManager.GetString("Destination", resourceCulture);
}
}
- public static string Source {
+ ///
+ /// Looks up a localized string similar to Destination path.
+ ///
+ public static string DestinationPath {
get {
- return ResourceManager.GetString("Source", resourceCulture);
+ return ResourceManager.GetString("DestinationPath", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to File location of "install.json".
+ ///
+ public static string FileLocationOfInstallJson {
+ get {
+ return ResourceManager.GetString("FileLocationOfInstallJson", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to File location of "update.json".
+ ///
+ public static string FileLocationOfUpdateJson {
+ get {
+ return ResourceManager.GetString("FileLocationOfUpdateJson", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to General.
+ ///
+ public static string General {
+ get {
+ return ResourceManager.GetString("General", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to GitLab Api token.
+ ///
+ public static string GitLabApiToken {
+ get {
+ return ResourceManager.GetString("GitLabApiToken", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to GitLab instance url.
+ ///
+ public static string GitLabInstanceUrl {
+ get {
+ return ResourceManager.GetString("GitLabInstanceUrl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Id.
+ ///
+ public static string Id {
+ get {
+ return ResourceManager.GetString("Id", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Inherit from.
+ ///
+ public static string InheritFrom {
+ get {
+ return ResourceManager.GetString("InheritFrom", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Is directory.
+ ///
+ public static string IsDirectory {
+ get {
+ return ResourceManager.GetString("IsDirectory", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Is extra.
+ ///
+ public static string IsExtra {
+ get {
+ return ResourceManager.GetString("IsExtra", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Is Zip archive.
+ ///
public static string IsZipArchive {
get {
return ResourceManager.GetString("IsZipArchive", resourceCulture);
}
}
- public static string SourceOwner {
- get {
- return ResourceManager.GetString("SourceOwner", resourceCulture);
- }
- }
-
- public static string SourceName {
- get {
- return ResourceManager.GetString("SourceName", resourceCulture);
- }
- }
-
- public static string SourceRegex {
- get {
- return ResourceManager.GetString("SourceRegex", resourceCulture);
- }
- }
-
- public static string SourceUrl {
- get {
- return ResourceManager.GetString("SourceUrl", resourceCulture);
- }
- }
-
- public static string ZipArchivePath {
- get {
- return ResourceManager.GetString("ZipArchivePath", resourceCulture);
- }
- }
-
+ ///
+ /// Looks up a localized string similar to Metadata.
+ ///
public static string Metadata {
get {
return ResourceManager.GetString("Metadata", resourceCulture);
}
}
- public static string Website {
+ ///
+ /// Looks up a localized string similar to Modlist for v{0}.
+ ///
+ public static string ModlistForVersionX {
get {
- return ResourceManager.GetString("Website", resourceCulture);
+ return ResourceManager.GetString("ModlistForVersionX", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Modpack config url.
+ ///
+ public static string ModpackConfigUrl {
+ get {
+ return ResourceManager.GetString("ModpackConfigUrl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Name.
+ ///
+ public static string Name {
+ get {
+ return ResourceManager.GetString("Name", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to New workspace.
+ ///
+ public static string NewWorkspace {
+ get {
+ return ResourceManager.GetString("NewWorkspace", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Public.
+ ///
+ public static string Public {
+ get {
+ return ResourceManager.GetString("Public", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Recent workspace.
+ ///
+ public static string RecentWorkspaces {
+ get {
+ return ResourceManager.GetString("RecentWorkspaces", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Remove.
+ ///
+ public static string Remove {
+ get {
+ return ResourceManager.GetString("Remove", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Remove update.
+ ///
+ public static string RemoveUpdate {
+ get {
+ return ResourceManager.GetString("RemoveUpdate", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Repository Id.
+ ///
+ public static string RepositoryId {
+ get {
+ return ResourceManager.GetString("RepositoryId", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Root folder path.
+ ///
+ public static string RootFolderPath {
+ get {
+ return ResourceManager.GetString("RootFolderPath", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Save workspace.
+ ///
+ public static string SaveWorkspace {
+ get {
+ return ResourceManager.GetString("SaveWorkspace", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Search.
+ ///
+ public static string Search {
+ get {
+ return ResourceManager.GetString("Search", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Select.
+ ///
public static string Select {
get {
return ResourceManager.GetString("Select", resourceCulture);
}
}
+ ///
+ /// Looks up a localized string similar to Select root folder.
+ ///
public static string SelectRootFolder {
get {
return ResourceManager.GetString("SelectRootFolder", resourceCulture);
}
}
+
+ ///
+ /// Looks up a localized string similar to Side.
+ ///
+ public static string Side {
+ get {
+ return ResourceManager.GetString("Side", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source.
+ ///
+ public static string Source {
+ get {
+ return ResourceManager.GetString("Source", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source name.
+ ///
+ public static string SourceName {
+ get {
+ return ResourceManager.GetString("SourceName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source owner.
+ ///
+ public static string SourceOwner {
+ get {
+ return ResourceManager.GetString("SourceOwner", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source path.
+ ///
+ public static string SourcePath {
+ get {
+ return ResourceManager.GetString("SourcePath", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source RegEx.
+ ///
+ public static string SourceRegex {
+ get {
+ return ResourceManager.GetString("SourceRegex", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source type.
+ ///
+ public static string SourceType {
+ get {
+ return ResourceManager.GetString("SourceType", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Source URL.
+ ///
+ public static string SourceUrl {
+ get {
+ return ResourceManager.GetString("SourceUrl", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to State.
+ ///
+ public static string State {
+ get {
+ return ResourceManager.GetString("State", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Tools.
+ ///
+ public static string Tools {
+ get {
+ return ResourceManager.GetString("Tools", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Update.
+ ///
+ public static string Update {
+ get {
+ return ResourceManager.GetString("Update", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Updates.
+ ///
+ public static string Updates {
+ get {
+ return ResourceManager.GetString("Updates", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Update type.
+ ///
+ public static string UpdateType {
+ get {
+ return ResourceManager.GetString("UpdateType", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Website.
+ ///
+ public static string Website {
+ get {
+ return ResourceManager.GetString("Website", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Workspace.
+ ///
+ public static string Workspace {
+ get {
+ return ResourceManager.GetString("Workspace", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Workspace preferences.
+ ///
+ public static string WorkspacePreferences {
+ get {
+ return ResourceManager.GetString("WorkspacePreferences", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to ZIP archive path.
+ ///
+ public static string ZipArchivePath {
+ get {
+ return ResourceManager.GetString("ZipArchivePath", resourceCulture);
+ }
+ }
}
}
diff --git a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx
index bad5c43..4e6e1aa 100644
--- a/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx
+++ b/ModpackUpdater.Apps.Manager/LangRes/GeneralLangRes.resx
@@ -252,4 +252,7 @@
Select root folder
+
+ Search
+
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
index 0f98d33..74ea242 100644
--- a/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/MainWindow.axaml
@@ -8,7 +8,7 @@
xmlns:symbols="clr-namespace:Pilz.UI.Symbols;assembly=Pilz.UI"
xmlns:mainWindow="clr-namespace:ModpackUpdater.Apps.Manager.Ui.Models.MainWindow"
xmlns:langRes="clr-namespace:ModpackUpdater.Apps.Manager.LangRes"
- mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+ mc:Ignorable="d" d:DesignWidth="1000" d:DesignHeight="450"
x:Class="ModpackUpdater.Apps.Manager.Ui.MainWindow"
Title="Minecraft Modpack Manager"
WindowState="Maximized"
@@ -109,44 +109,55 @@
Orientation="Horizontal"
VerticalAlignment="Center">
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Content="{Binding SelectedTreeNode}"
+ >
+ Orientation="Horizontal"
+ Spacing="6">
-
-
-
-
-
-
diff --git a/ModpackUpdater.Apps.Manager/Ui/Models/DynamicDataView.cs b/ModpackUpdater.Apps.Manager/Ui/Models/DynamicDataView.cs
index a61d16b..22feb6f 100644
--- a/ModpackUpdater.Apps.Manager/Ui/Models/DynamicDataView.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/Models/DynamicDataView.cs
@@ -29,10 +29,6 @@ public class DynamicDataView : INotifyPropertyChanged where T : notnull
public string? SearchText
{
get => searchText;
- set
- {
- searchText = value;
- searchTextSubject.OnNext(value);
- }
+ set => searchTextSubject.OnNext(searchText = value);
}
}
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/Ui/Models/MainWindow/MainWindowViewModel.cs b/ModpackUpdater.Apps.Manager/Ui/Models/MainWindow/MainWindowViewModel.cs
index bae0f33..bd12b9d 100644
--- a/ModpackUpdater.Apps.Manager/Ui/Models/MainWindow/MainWindowViewModel.cs
+++ b/ModpackUpdater.Apps.Manager/Ui/Models/MainWindow/MainWindowViewModel.cs
@@ -65,6 +65,21 @@ public class MainWindowViewModel : INotifyPropertyChanged
private static Func FilterGridRows(string? searchText)
{
- return n => string.IsNullOrWhiteSpace(searchText) || true;
+ return n => string.IsNullOrWhiteSpace(searchText)
+ || (!string.IsNullOrWhiteSpace(n.Name) && n.Name.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.InheritFrom) && n.InheritFrom.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.InheritedDestPath) && n.InheritedDestPath.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.InheritedId) && n.InheritedId.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.InheritedSide) && n.InheritedSide.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.InheritedSourceType) && n.InheritedSourceType.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.InheritedUpdateType) && n.InheritedUpdateType.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.SourceName) && n.SourceName.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.SourceOwner) && n.SourceOwner.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.SourceRegex) && n.SourceRegex.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.SourceTag) && n.SourceTag.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.SourceUrl) && n.SourceUrl.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.SrcPath) && n.SrcPath.Contains(searchText))
+ || (!string.IsNullOrWhiteSpace(n.Website) && n.Website.Contains(searchText))
+ ;
}
}
\ No newline at end of file
diff --git a/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorView.axaml b/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorView.axaml
index 830369a..06d9c5d 100644
--- a/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorView.axaml
+++ b/ModpackUpdater.Apps.Manager/Ui/UpdatesCollectorView.axaml
@@ -25,7 +25,7 @@