Merge pull request ParkitectNexus#62 from ParkitectNexus/develop

2.1.5980.38291

Author: ikkentim

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "external/xwt"]
 	path = external/xwt
-	url = https://github.com/mono/xwt.git
+	url = https://github.com/ikkentim/xwt.git

AppImage/Packager.sh

@@ -15,8 +15,8 @@ mkdir -p ./$APP/$APP.AppDir/usr/bin
 mkdir -p ./$APP/$APP.AppDir/usr/opt
 
 #build Nexus Client and copy release into bin
-xbuild /p:Configuration=Release ./../src/ParkitectNexus.Client.Linux.Xwt/ParkitectNexus.Client.Linux.Xwt.csproj
-cp -R ./../src/ParkitectNexus.Client.Linux.Xwt/bin/Release/* ./$APP/$APP.AppDir/usr/bin
+xbuild /p:Configuration=Release ./../src/ParkitectNexus.Client.Linux/ParkitectNexus.Client.Linux.csproj
+cp -R ./../bin/Release/* ./$APP/$APP.AppDir/usr/bin
 
 # Figure out $VERSION
 VERSION=$(git describe origin/master  --tags $(git rev-list --tags --max-count=0))

AppImage/parkitectnexus

@@ -6,7 +6,7 @@ export MONO_CONFIG=././etc/mono/config
 export MONO_CFG_DIR=././etc
 
 ././bin/mozroots --import --sync
-././bin/mono  "././bin/ParkitectNexus.Client.Linux.Xwt.exe" "$@"
+././bin/mono  "././bin/ParkitectNexus.Client.Linux.exe" "$@"
 
 
 

external/xwt

@@ -120,7 +120,7 @@ public bool Initialize(ToolkitType type)
 
             _migrator.Migrate();
             ModLoaderUtil.InstallModLoader(_parkitect, _log);
-
+            _taskManager.Add<CheckForUpdatesTask>();
             return true;
         }
 

images/.directory

@@ -23,31 +23,43 @@
 using ParkitectNexus.Data.Game;
 using ParkitectNexus.Data.Presenter;
 using ParkitectNexus.Data.Utilities;
+using ParkitectNexus.Data.Web;
 using Xwt;
 using Xwt.Drawing;
 using Image = System.Drawing.Image;
+using System.Linq;
 
 namespace ParkitectNexus.Client.Base.Pages
 {
     public class AssetsPageView : LoadableDataTileView
     {
+        private string[] _requiredAssets;
         private readonly IParkitect _parkitect;
+        private readonly IWebsite _website;
         private readonly ILogger _log;
         private readonly AssetType _type;
 
-        public AssetsPageView(IParkitect parkitect, ILogger log, AssetType type, IPresenter parent, string displayName)
+        public AssetsPageView(IParkitect parkitect, IWebsite website, ILogger log, AssetType type, IPresenter parent, string displayName)
             : base(log, displayName)
         {
             if (!(parent is MainView))
                 throw new ArgumentException("parent must be MainView", nameof(parent));
 
             _parkitect = parkitect;
+            _website = website;
             _log = log;
             _type = type;
             MainView = (MainView) parent;
 
             parkitect.Assets.AssetAdded += Assets_AssetAdded;
             parkitect.Assets.AssetRemoved += Assets_AssetRemoved;
+
+            GetRequiredMods();
+        }
+
+        private async void GetRequiredMods()
+        {
+            _requiredAssets = await _website.API.GetRequiredModIdentifiers();
         }
 
         public MainView MainView { get; }
@@ -92,7 +104,10 @@ protected virtual void PopulateViewBoxWithImage(VBox vBox, IAsset asset)
 
         protected virtual void PopulateViewBoxWithButtons(VBox vBox, IAsset asset)
         {
-            var deleteButton = new Button("Delete");
+            var canDelete = _requiredAssets == null || !_requiredAssets.Contains(asset.Id);
+
+            var deleteButton = new Button("Delete") { Sensitive = canDelete };
+
             deleteButton.Clicked += (sender, args) =>
             {
                 if (

images/parkitectnexus_logo/parkitectnexus_logo.png

@@ -15,14 +15,15 @@
 using ParkitectNexus.Data.Game;
 using ParkitectNexus.Data.Presenter;
 using ParkitectNexus.Data.Utilities;
+using ParkitectNexus.Data.Web;
 
 namespace ParkitectNexus.Client.Base.Pages
 {
     public class BlueprintsPageView : AssetsPageView
     {
-        public BlueprintsPageView(IParkitect parkitect, ILogger log, IPresenter parent)
-            : base(parkitect, log, AssetType.Blueprint, parent, "Blueprints")
+        public BlueprintsPageView(IParkitect parkitect, IWebsite website, ILogger log, IPresenter parent)
+            : base(parkitect, website, log, AssetType.Blueprint, parent, "Blueprints")
         {
         }
     }
-}
+}

src/ParkitectNexus.Client.Base/App.cs

@@ -12,6 +12,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System.Diagnostics;
+using System.Linq;
 using ParkitectNexus.Data.Assets;
 using ParkitectNexus.Data.Assets.Modding;
 using ParkitectNexus.Data.Game;
@@ -26,12 +27,14 @@ namespace ParkitectNexus.Client.Base.Pages
 {
     public class ModsPageView : AssetsPageView
     {
+        private readonly IParkitect _parkitect;
         private readonly IQueueableTaskManager _queueableTaskManager;
         private readonly IWebsite _website;
 
         public ModsPageView(IParkitect parkitect, ILogger log, IPresenter parent, IQueueableTaskManager queueableTaskManager,
-            IWebsite website) : base(parkitect, log, AssetType.Mod, parent, "Mods")
+            IWebsite website) : base(parkitect, website, log, AssetType.Mod, parent, "Mods")
         {
+            _parkitect = parkitect;
             _queueableTaskManager = queueableTaskManager;
             _website = website;
         }
@@ -114,4 +117,4 @@ protected override void PopulateViewBoxWithButtons(VBox vBox, IAsset asset)
 
         #endregion
     }
-}
+}