From 20b54cfc2b40bb69d1d6558c7fac6cc412c98da0 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 7 Oct 2019 14:42:44 +0300 Subject: Implemented RML import/export. Fixed issue with MS in 1920x1080. Added IP Address & Up Time to PPC. Added ExternalBridge Icon IsInSession Indication. Fixed issue with ExternalBridgeService disconnection. --- .../MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml | 4 ++-- .../MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml index eecbcf8ad..a76749b05 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml @@ -15,8 +15,8 @@ - - + + diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs index d0eec65e2..915deb484 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/MainWindow.xaml.cs @@ -105,19 +105,24 @@ namespace Tango.MachineStudio.UI switch (ratio) { case 16d / 9d: - grid.Height = 1000; + grid.Height = 1145; + grid.Width = 2000; break; case 16d / 10d: grid.Height = 1145; + grid.Width = 1920; break; case 4d / 3d: grid.Height = 1280; + grid.Width = 1920; break; case 1366d / 768d: grid.Height = 1100; + grid.Width = 1920; break; default: grid.Height = 1145; + grid.Width = 1920; break; } } -- cgit v1.3.1 From 45d005de26630b6c39867ba3a03f252628f4b090 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Mon, 7 Oct 2019 15:33:06 +0300 Subject: Machine Studio v4.0.29 PPC 1.0.48 --- .../Machine Studio Installer.aip | 100 +++++++++++++++++++-- .../Properties/AssemblyInfo.cs | 2 +- 2 files changed, 94 insertions(+), 8 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip index 0ada18302..a1d7a5e2b 100644 --- a/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip +++ b/Software/Visual_Studio/Advanced Installer Projects/Machine Studio Installer.aip @@ -15,10 +15,10 @@ - + - + @@ -73,9 +73,17 @@ + + + + + + + + @@ -105,6 +113,7 @@ + @@ -119,7 +128,9 @@ + + @@ -128,6 +139,7 @@ + @@ -135,8 +147,11 @@ + + + @@ -148,13 +163,18 @@ + + + + + @@ -181,6 +201,7 @@ + @@ -197,15 +218,23 @@ + + + + + + + + @@ -213,19 +242,25 @@ + + + + + + @@ -288,12 +323,16 @@ + + + + @@ -331,14 +370,14 @@ - + - + @@ -375,9 +414,18 @@ + + + + + + + + + @@ -404,11 +452,13 @@ + + @@ -426,7 +476,9 @@ + + @@ -435,6 +487,7 @@ + @@ -443,8 +496,11 @@ + + + @@ -456,13 +512,18 @@ + + + + + @@ -490,6 +551,7 @@ + @@ -506,15 +568,23 @@ + + + + + + + + @@ -522,19 +592,25 @@ + + + + + + @@ -554,7 +630,7 @@ - + @@ -690,6 +766,8 @@ + + @@ -697,6 +775,12 @@ + + + + + + @@ -738,6 +822,9 @@ + + + @@ -756,7 +843,7 @@ - + @@ -832,7 +919,6 @@ - diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs index 1fb4da669..91792e0f3 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Properties/AssemblyInfo.cs @@ -4,5 +4,5 @@ using System.Runtime.InteropServices; [assembly: System.Windows.ThemeInfo(System.Windows.ResourceDictionaryLocation.None, System.Windows.ResourceDictionaryLocation.SourceAssembly)] [assembly: AssemblyTitle("Tango - Machine Studio")] -[assembly: AssemblyVersion("4.0.28.0")] +[assembly: AssemblyVersion("4.0.29.0")] [assembly: ComVisible(false)] \ No newline at end of file -- cgit v1.3.1