git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/client/Maestro/Maestro.csproj b/client/Maestro/Maestro.csproj
index bc9da6ad218e1b96940fe7b97ee1387b184f4703..d0ba3701d41d8d7329e55300b5e207abe7ce0de7 100644 (file)
--- a/client/Maestro/Maestro.csproj
+++ b/client/Maestro/Maestro.csproj
@@ -307,6 +307,7 @@
     </ProjectReference>\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <None Include="Resources\installforge-installer-project.ifp" />\r
     <None Include="Resources\Pause.ico" />\r
     <None Include="Resources\Play.ico" />\r
     <None Include="Resources\Stop.ico" />\r

diff --git a/client/Maestro/Resources/AppIcon.ico b/client/Maestro/Resources/AppIcon.ico
deleted file mode 100644 (file)
index 8aa98e5..0000000
Binary files a/client/Maestro/Resources/AppIcon.ico and /dev/null differ

diff --git a/client/Maestro/Resources/configuration-ingest.json b/client/Maestro/Resources/configuration-ingest.json
index 2a2d3a317c07c279b2a3b040ce8fcb1568f16429..dd21b53e03538eb80273b8e40524b264f0322b75 100644 (file)
--- a/client/Maestro/Resources/configuration-ingest.json
+++ b/client/Maestro/Resources/configuration-ingest.json
@@ -6,7 +6,7 @@
   "player": {\r
     "enabled": true,\r
     "autoStart": false,\r
-    "segmentEditor": false\r
+    "segmentEditor": true\r
   },\r
   "source": {\r
     "$type": "UNCSource",\r

diff --git a/client/Maestro/Resources/configuration-nexio.json b/client/Maestro/Resources/configuration-nexio.json
index e6a989ec43a60fc2a167efe22b923cf067dd68f5..3154061e35706e3173e0969f2de2f8761e5d056b 100644 (file)
--- a/client/Maestro/Resources/configuration-nexio.json
+++ b/client/Maestro/Resources/configuration-nexio.json
@@ -12,7 +12,7 @@
   "source": {\r
     "$type": "NEXIOSource",\r
     "local": {\r
-      "address": "ws://10.10.1.28:8080/services/nexio"\r
+      "address": "ws://10.10.1.28/services/nexio"\r
     },\r
     "remote": {\r
       "address": "ftp://10.10.1.55:2098",\r

diff --git a/client/Maestro/Resources/installforge-installer-project.ifp b/client/Maestro/Resources/installforge-installer-project.ifp
new file mode 100644 (file)
index 0000000..a64b33d
Binary files /dev/null and b/client/Maestro/Resources/installforge-installer-project.ifp differ

diff --git a/client/Maestro/Resources/mc_logo.ico b/client/Maestro/Resources/mc_logo.ico
deleted file mode 100644 (file)
index c4c365a..0000000
Binary files a/client/Maestro/Resources/mc_logo.ico and /dev/null differ