Merge pull request ParkitectNexus#62 from ParkitectNexus/develop

2.1.5980.38291
pollend · May 16, 2016 · 1be0b55 · 1be0b55
2 parents e3b2b41 + 7ea13ad
commit 1be0b55
Show file tree

Hide file tree

Showing 51 changed files with 386 additions and 499 deletions.
diff --git a/.gitmodules b/.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
diff --git a/AppImage/Packager.sh b/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))

diff --git a/AppImage/parkitectnexus b/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" "$@"
 
 
 
diff --git a/external/xwt b/external/xwt
diff --git a/images/.directory b/images/.directory
diff --git a/images/parkitectnexus_logo/parkitectnexus_logo.png b/images/parkitectnexus_logo/parkitectnexus_logo.png
diff --git a/src/ParkitectNexus.Client.Base/App.cs b/src/ParkitectNexus.Client.Base/App.cs
@@ -120,7 +120,7 @@ public bool Initialize(ToolkitType type)
 
             _migrator.Migrate();
             ModLoaderUtil.InstallModLoader(_parkitect, _log);
-
+            _taskManager.Add<CheckForUpdatesTask>();
             return true;
         }
 

diff --git a/src/ParkitectNexus.Client.Base/Pages/AssetsPageView.cs b/src/ParkitectNexus.Client.Base/Pages/AssetsPageView.cs
@@ -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 (

diff --git a/src/ParkitectNexus.Client.Base/Pages/BlueprintsPageView.cs b/src/ParkitectNexus.Client.Base/Pages/BlueprintsPageView.cs
@@ -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")
         {
         }
     }
-}
+}
diff --git a/src/ParkitectNexus.Client.Base/Pages/ModsPageView.cs b/src/ParkitectNexus.Client.Base/Pages/ModsPageView.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
     }
-}
+}
diff --git a/src/ParkitectNexus.Client.Base/Pages/SavegamesPageView.cs b/src/ParkitectNexus.Client.Base/Pages/SavegamesPageView.cs
@@ -15,13 +15,14 @@
 using ParkitectNexus.Data.Game;
 using ParkitectNexus.Data.Presenter;
 using ParkitectNexus.Data.Utilities;
+using ParkitectNexus.Data.Web;
 
 namespace ParkitectNexus.Client.Base.Pages
 {
     public class SavegamesPageView : AssetsPageView
     {
-        public SavegamesPageView(IParkitect parkitect, ILogger log, IPresenter parent)
-            : base(parkitect, log, AssetType.Savegame, parent, "Savegames")
+        public SavegamesPageView(IParkitect parkitect, IWebsite website, ILogger log, IPresenter parent)
+            : base(parkitect, website, log, AssetType.Savegame, parent, "Savegames")
         {
         }
     }

diff --git a/src/ParkitectNexus.Client.Base/Pages/TasksPageView.cs b/src/ParkitectNexus.Client.Base/Pages/TasksPageView.cs
@@ -15,7 +15,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using System.Runtime.InteropServices;
 using ParkitectNexus.Client.Base.Components;
 using ParkitectNexus.Client.Base.Main;
 using ParkitectNexus.Data;
@@ -31,26 +30,28 @@ namespace ParkitectNexus.Client.Base.Pages
 {
     public class TasksPageView : ScrollView, IPresenter, IPageView
     {
-        private Type[] _tasksOfInterest =
-        {
-            typeof(CompileModTask),
-            typeof(InstallAssetTask)
-        };
+        private readonly MainView _mainView;
 
         private readonly Label _nothingLabel;
         private readonly IQueueableTaskManager _taskManager;
         private readonly VBox _vBox;
         private string _displayName = "Tasks";
-        private readonly MainView _mainView;
+
+        private readonly Type[] _tasksOfInterest =
+        {
+            typeof (CompileModTask),
+            typeof (InstallAssetTask),
+            typeof (UpdateModTask),
+        };
+
         private List<TaskView> _taskViews = new List<TaskView>();
 
         public TasksPageView(IQueueableTaskManager taskManager, IPresenter parent)
         {
-
             if (!(parent is MainView))
                 throw new ArgumentException("parent must be MainView", nameof(parent));
 
-            _mainView = (MainView)parent;
+            _mainView = (MainView) parent;
 
             _taskManager = taskManager;
 

diff --git a/src/ParkitectNexus.Client.Base/Properties/AssemblyInfo.cs b/src/ParkitectNexus.Client.Base/Properties/AssemblyInfo.cs
@@ -48,4 +48,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.*")]
+[assembly: AssemblyVersion("2.1.*")]
diff --git a/src/ParkitectNexus.Client.Darwin/Main.cs b/src/ParkitectNexus.Client.Darwin/Main.cs
@@ -72,9 +72,10 @@ static void Main(string[] args)
             if(!app.Initialize(ToolkitType.Cocoa))
                 return;
 
-            TmpFixModLoaderUtil.InstallModLoader(ObjectFactory.GetInstance<IParkitect>(), ObjectFactory.GetInstance<ILogger>());
             MacEngine.App.OpenUrl += (sender, e) =>
             {
+                ObjectFactory.GetInstance<ILogger>().WriteLine($"Got url {e.Url}");
+
                 if(e.Url.StartsWith("parkitectnexus://"))
                     e.Url = e.Url;
                 else
@@ -91,6 +92,8 @@ static void Main(string[] args)
                     app.HandleUrl(url);
             };
 
+            TmpFixModLoaderUtil.InstallModLoader(ObjectFactory.GetInstance<IParkitect>(), ObjectFactory.GetInstance<ILogger>());
+
             app.Run();
         }
     }

diff --git a/src/ParkitectNexus.Client.Darwin/ParkitectNexus.Client.Darwin.csproj b/src/ParkitectNexus.Client.Darwin/ParkitectNexus.Client.Darwin.csproj
@@ -10,7 +10,7 @@
     <MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
     <AssemblyName>ParkitectNexus Client</AssemblyName>
     <SuppressXamMacMigration>True</SuppressXamMacMigration>
-    <ReleaseVersion>2.0.0</ReleaseVersion>
+    <ReleaseVersion>2.1.5980.38291</ReleaseVersion>
     <SynchReleaseVersion>false</SynchReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

diff --git a/src/ParkitectNexus.Client.Darwin/Properties/AssemblyInfo.cs b/src/ParkitectNexus.Client.Darwin/Properties/AssemblyInfo.cs
@@ -8,12 +8,12 @@
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 
-[assembly: AssemblyTitle("ParkitectNexus.Client.Base")]
+[assembly: AssemblyTitle("ParkitectNexus Client")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ParkitectNexus.Client.Base")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
+[assembly: AssemblyProduct("ParkitectNexus Client")]
+[assembly: AssemblyCopyright("Copyright © ParkitectNexus 2016")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -38,4 +38,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("2.0.5969.32190")]
+[assembly: AssemblyVersion("2.1.5980.38291")]
diff --git a/src/ParkitectNexus.Client.Linux/ParkitectNexus.Client.Linux.csproj b/src/ParkitectNexus.Client.Linux/ParkitectNexus.Client.Linux.csproj
@@ -78,9 +78,10 @@
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
-    <None Include="..\ParkitectNexus.Client.Windows\Resources\parkitectnexus_logo.png">
-      <Link>parkitectnexus_logo.png</Link>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="parkitectnexus_logo.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
 </Project>