aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Modules
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-08-15 11:23:13 +0300
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-08-15 11:23:13 +0300
commitbd012a8edd576026f8277ab0b462197482df9285 (patch)
tree56e99cdbbf1eb86e37fcaee0484946f81c239b0e /Software/Visual_Studio/PPC/Modules
parent527b28b9484b499d1150f1dbd8d92b058246dc52 (diff)
downloadTango-bd012a8edd576026f8277ab0b462197482df9285.tar.gz
Tango-bd012a8edd576026f8277ab0b462197482df9285.zip
Modified PPC side menu design..
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules')
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/jobs-module.pngbin1626 -> 1664 bytes
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/ppc-module.pngbin1748 -> 0 bytes
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/settings-module.pngbin0 -> 2377 bytes
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs2
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj2
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Images/ppc-module.pngbin1748 -> 1232 bytes
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/MyModule.cs2
-rw-r--r--Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Views/MainView.xaml2
8 files changed, 4 insertions, 4 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/jobs-module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/jobs-module.png
index 15f9c73bb..85e82c491 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/jobs-module.png
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Jobs/Images/jobs-module.png
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/ppc-module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/ppc-module.png
deleted file mode 100644
index 6f27f49be..000000000
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/ppc-module.png
+++ /dev/null
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/settings-module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/settings-module.png
new file mode 100644
index 000000000..f49b0318d
--- /dev/null
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Images/settings-module.png
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs
index a3087ab5a..227c9a00e 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/MachineSettingsModule.cs
@@ -47,7 +47,7 @@ namespace Tango.PPC.MachineSettings
{
get
{
- return ResourceHelper.GetImageFromResources("Images/ppc-module.png");
+ return ResourceHelper.GetImageFromResources("Images/settings-module.png");
}
}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
index 3e9635060..6db119f09 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj
@@ -150,7 +150,7 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <Resource Include="Images\ppc-module.png" />
+ <Resource Include="Images\settings-module.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<ProjectExtensions>
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Images/ppc-module.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Images/ppc-module.png
index 6f27f49be..d9ce03e7b 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Images/ppc-module.png
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Images/ppc-module.png
Binary files differ
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/MyModule.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/MyModule.cs
index 5de78a7f0..b2a85ffc8 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/MyModule.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/MyModule.cs
@@ -25,7 +25,7 @@ namespace Tango.PPC.Synchronization
{
get
{
- return "My Module";
+ return "Test Module";
}
}
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Views/MainView.xaml
index 2bba2019d..e935b22ec 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Views/MainView.xaml
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Synchronization/Views/MainView.xaml
@@ -9,6 +9,6 @@
mc:Ignorable="d"
d:DesignHeight="1280" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}">
<Grid>
-
+ <TextBlock HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoHeaderFontSize}">TEST MODULE</TextBlock>
</Grid>
</UserControl>