Documentation update

BornToBeRoot · BornToBeRoot · commit 58acdaec7d56 · 2018-02-19T04:12:07.000+01:00
diff --git a/Documentation/de-DE/Help/Custom_themes_and_accents.md b/Documentation/de-DE/Help/Custom_themes_and_accents.md
diff --git a/Documentation/de-DE/HowTo/Create_custom_theme_and_accent.md b/Documentation/de-DE/HowTo/Create_custom_theme_and_accent.md
@@ -0,0 +1,17 @@
+# Wie erstelle ich ein benutzerdefiniertes Thema und Akzent?
+
+Seit der Version 1.5.0.0, können Sie benutzerdefinierte Designs erstellen, die mit [MahApps.Metro](https://github.com/MahApps/MahApps.Metro) kompatible sind.
+
+Eigene Designs werden im Programmordner unter `themes` abgelegt.
+
+## Thema
+
+Laden Sie ein Thema von MahApps.Metro (z.B. [BaseLight](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/BaseLight.xaml), [BaseDark](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/BaseDark.xaml)) herunter und modifizieren Sie die Werte nach belieben. Speichern Sie die Datei im `themes`-Ordner mit folgendem Dateinamen `CUSTOMNAME.Theme.xaml`.
+
+Nach einem Neustart der Anwendung können Sie das Thema in den Programmeinstellungen laden.
+
+## Akzent
+
+Laden Sie einen Akzent von MahApps.Metro (z.B. [Lime](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/Lime.xaml), [Red](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/Red.xaml)) herunter und modifizieren Sie die Werte nach belieben. Speichern Sie die Datei im `themes`-Ordner mit folgendem Dateinamen `CUSTOMNAME.Accent.xaml`.
+
+Nach einem Neustart der Anwendung können Sie den Akzent in den Programmeinstellungen laden.
diff --git a/Documentation/de-DE/HowTo/Install_RDP_8dot1_on_Windows6dot1.md b/Documentation/de-DE/HowTo/Install_RDP_8dot1_on_Windows6dot1.md
diff --git a/Documentation/de-DE/README.md b/Documentation/de-DE/README.md
@@ -1,4 +1,5 @@
 # Dokumentation
 
-## Hilfe
-- [Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?](Help/Install_RDP_8dot1_on_Windows6dot1.md)
+## HowTo
+- [Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?](HowTo/Install_RDP_8dot1_on_Windows6dot1.md)
+- [Wie erstelle ich ein benutzerdefiniertes Thema und Akzent?](HowTo/Create_custom_theme_and_accent.md)
diff --git a/Documentation/en-US/Help/Custom_themes_and_accents.md b/Documentation/en-US/Help/Custom_themes_and_accents.md
diff --git a/Documentation/en-US/HowTo/Create_custom_theme_and_accent.md b/Documentation/en-US/HowTo/Create_custom_theme_and_accent.md
@@ -0,0 +1,17 @@
+# How to create a custom theme and accent?
+
+Since version 1.5.0.0, you can create custom designs that are compatible with [MahApps.Metro](https://github.com/MahApps/MahApps.Metro).
+
+Own designs are stored in the program folder under `themes`.
+
+## Theme
+
+Download a theme from MahApps.Metro (eg [BaseLight](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/BaseLight.xaml), [BaseDark](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/BaseDark.xaml)) and modify the values as you like. Save the file in the `themes` folder with the following filename `CUSTOMNAME.Theme.xaml`.
+
+After restarting the application, you can load the theme in the program settings.
+
+## Accent
+
+Download an accent from MahApps.Metro (eg [Lime](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/Lime.xaml), [Red](https://github.com/MahApps/MahApps.Metro/blob/develop/src/MahApps.Metro/MahApps.Metro/Styles/Accents/Red.xaml)) and modify the values as you like. Save the file in the `themes` folder with the following file name `CUSTOMNAME.Accent.xaml`.
+
+After restarting the application, you can load the accent in the program settings.
diff --git a/Documentation/en-US/HowTo/Install_RDP_8dot1_on_Windows6dot1.md b/Documentation/en-US/HowTo/Install_RDP_8dot1_on_Windows6dot1.md
diff --git a/Documentation/en-US/README.md b/Documentation/en-US/README.md
@@ -1,4 +1,5 @@
 # Documentation
 
-## Help
-- [How to install RDP 8.1 on Windows 7/Server 2008 R2?](Help/Install_RDP_8dot1_on_Windows6dot1.md)
+## HowTo
+- [How to install RDP 8.1 on Windows 7/Server 2008 R2?](HowTo/Install_RDP_8dot1_on_Windows6dot1.md)
+- [How to create a custom theme and accent?](HowTo/Create_custom_theme_and_accent.md)
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ _On Windows 10 systems, SmartScreen may prevent the execution of the_ `NETworkMa
 
 - Windows 7 or later
 - .NET-Framework 4.6
-- RDP 8.1 ([How to install RDP 8.1 on Windows 7/Server 2008 R2?](Documentation/en-US/Help/Install_RDP_8dot1_on_Windows6dot1.md))
+- RDP 8.1 ([How to install RDP 8.1 on Windows 7/Server 2008 R2?](Documentation/en-US/HowTo/Install_RDP_8dot1_on_Windows6dot1.md))
 
 <h2>Documentation</h2>
 
diff --git a/Source/NETworkManager/Models/Documentation/DocumentationManager.cs b/Source/NETworkManager/Models/Documentation/DocumentationManager.cs
@@ -1,5 +1,8 @@
-﻿using System.Collections.Generic;
+﻿using NETworkManager.ViewModels;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Windows.Input;
 
 namespace NETworkManager.Models.Documentation
 {
@@ -18,7 +21,8 @@ public static List<DocumentationInfo> List
             {
                 return new List<DocumentationInfo>
                 {
-                    new DocumentationInfo(00001, @"/Help/Install_RDP_8dot1_on_Windows6dot1.md", GetLocalizationInfoList("en-US", "de-DE"))
+                    new DocumentationInfo(00001, @"/Help/Install_RDP_8dot1_on_Windows6dot1.md", GetLocalizationInfoList("en-US", "de-DE")),
+                    new DocumentationInfo(00002, @"/Help/Create_custom_theme_and_accent.md", GetLocalizationInfoList("en-US", "de-DE"))
                 };
             }
         }
@@ -44,5 +48,15 @@ public static string GetLocalizedURLbyID(int id)
 
             return list;
         }
+
+        public static ICommand OpenDocumentationCommand
+        {
+            get { return new RelayCommand(p => OpenDocumentationAction(p)); }
+        }
+
+        private static void OpenDocumentationAction(object id)
+        {
+            Process.Start(DocumentationManager.GetLocalizedURLbyID(int.Parse((string)id)));
+        }
     }
 }
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -363,6 +363,7 @@
     
     <!-- Documentation title -->
     <system:String x:Key="String_DocumentationTitle_00001">Wie installiere ich RDP 8.1 unter Windows 7 / Server 2008 R2?</system:String>
+    <system:String x:Key="String_DocumentationTitle_00002">Wie erstelle ich ein benutzerdefiniertes Thema und Akzent?</system:String>
     
     <!-- Help message -->
     <system:String x:Key="String_HelpMessage_ParameterHelp">Zeigt diesen Dialog an.</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -362,8 +362,9 @@
     <system:String x:Key="String_Mode">Mode</system:String>
     
     <!-- Documentation title -->
-    <system:String x:Key="String_DocumentationTitle_00001">How to install RDP 8.1 on Windows 7/Server 2008 R2?</system:String>
-    
+    <system:String x:Key="String_DocumentationTitle_00001">How to install RDP 8.1 on Windows 7/Server 2008 R2</system:String>
+    <system:String x:Key="String_DocumentationTitle_00002">How to create a custom theme and accent?</system:String>
+
     <!-- Help message -->
     <system:String x:Key="String_HelpMessage_ParameterHelp">Displays this dialog.</system:String>
     <system:String x:Key="String_HelpMessage_ParameterResetSettings">Reset all settings.</system:String>
diff --git a/Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs b/Source/NETworkManager/ViewModels/Applications/RemoteDesktopViewModel.cs
@@ -535,16 +535,6 @@ private async void DeleteSessionAction()
             ConfigurationManager.Current.FixAirspace = true;
             await dialogCoordinator.ShowMetroDialogAsync(this, customDialog);
         }
-
-        public ICommand OpenDocumentationCommand
-        {
-            get { return new RelayCommand(p => OpenDocumentationAction(p)); }
-        }
-
-        private void OpenDocumentationAction(object id)
-        {
-            Process.Start(DocumentationManager.GetLocalizedURLbyID(int.Parse((string)id)));
-        }
         #endregion
 
         #region Methods
diff --git a/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml b/Source/NETworkManager/Views/Applications/RemoteDesktopView.xaml
@@ -8,7 +8,7 @@
         xmlns:Dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro"
         xmlns:Converter="clr-namespace:NETworkManager.Converters"
         xmlns:Settings="clr-namespace:NETworkManager.Models.Settings"
-        xmlns:Resources="clr-namespace:NETworkManager.Properties"
+        xmlns:Documentation="clr-namespace:NETworkManager.Models.Documentation"
         Dialog:DialogParticipation.Register="{Binding}"
         mc:Ignorable="d">
     <UserControl.Resources>
@@ -196,7 +196,7 @@
             <TextBlock Text="{DynamicResource String_InstallRDP8dot1Message}" Style="{StaticResource MessageTextBlock}" Margin="0,0,0,10" />
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                 <StackPanel.InputBindings>
-                    <MouseBinding Gesture="LeftClick" Command="{Binding OpenDocumentationCommand}" CommandParameter="00001" />
+                    <MouseBinding Gesture="LeftClick" Command="{x:Static Documentation:DocumentationManager.OpenDocumentationCommand}" CommandParameter="00001" />
                 </StackPanel.InputBindings>
                 <StackPanel.Style>
                     <Style TargetType="{x:Type StackPanel}">
diff --git a/Source/NETworkManager/Views/Settings/SettingsGeneralAppearanceView.xaml b/Source/NETworkManager/Views/Settings/SettingsGeneralAppearanceView.xaml
@@ -7,6 +7,8 @@
         xmlns:Validator="clr-namespace:NETworkManager.Validators"
         xmlns:metro="clr-namespace:MahApps.Metro;assembly=MahApps.Metro"
         xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
+        xmlns:IconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
+        xmlns:Documentation="clr-namespace:NETworkManager.Models.Documentation"
         mc:Ignorable="d">
     <UserControl.Resources>
         <!-- Converters -->
@@ -33,7 +35,7 @@
             </ListView.SelectedItem>
         </ListView>
         <TextBlock Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Accent}" />
-        <ListView ItemsSource="{x:Static metro:ThemeManager.Accents}" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,20">
+        <ListView ItemsSource="{x:Static metro:ThemeManager.Accents}" BorderThickness="0" SelectionMode="Single" Margin="0,0,0,10">
             <ListView.ItemTemplate>
                 <DataTemplate >
                     <Rectangle Width="48" Height="48" Margin="-1,2" Fill="{Binding Converter={StaticResource AccentToBrushConverter}, ConverterParameter='Name'}" ToolTip="{Binding Converter={StaticResource AccentToStringConverter}, ConverterParameter='Name'}"  />
@@ -48,6 +50,37 @@
                 <Binding Path="AccentSelectedItem" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
             </ListView.SelectedItem>
         </ListView>
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,20">
+            <StackPanel.InputBindings>
+                <MouseBinding Gesture="LeftClick" Command="{x:Static Documentation:DocumentationManager.OpenDocumentationCommand}" CommandParameter="00002" />
+            </StackPanel.InputBindings>
+            <StackPanel.Style>
+                <Style TargetType="{x:Type StackPanel}">
+                    <Setter Property="TextBlock.Foreground" Value="{DynamicResource AccentColorBrush}" />
+                    <Style.Triggers>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="TextBlock.Foreground" Value="{DynamicResource BlackColorBrush}" />
+                        </Trigger>
+                    </Style.Triggers>
+                </Style>
+            </StackPanel.Style>
+            <Rectangle Width="16" Height="20">
+                <Rectangle.OpacityMask>
+                    <VisualBrush Stretch="Uniform" Visual="{IconPacks:Material Kind=OpenInNew}"/>
+                </Rectangle.OpacityMask>
+                <Rectangle.Style>
+                    <Style TargetType="{x:Type Rectangle}">
+                        <Setter Property="Fill" Value="{DynamicResource AccentColorBrush}" />
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type StackPanel}}, Path=IsMouseOver}" Value="True">
+                                <Setter Property="Fill" Value="{DynamicResource BlackColorBrush}" />
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Rectangle.Style>
+            </Rectangle>
+            <TextBlock Text="{DynamicResource String_DocumentationTitle_00002}" VerticalAlignment="Center" FontSize="14" Margin="10,0,0,0" />
+        </StackPanel>
         <Grid>
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*" />

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using NETworkManager.ViewModels;`
	`2`	`+using System.Collections.Generic;`
	`3`	`+using System.Diagnostics;`
`2`	`4`	`using System.Linq;`
	`5`	`+using System.Windows.Input;`
`3`	`6`
`4`	`7`	`namespace NETworkManager.Models.Documentation`
`5`	`8`	`{`
`@@ -18,7 +21,8 @@ public static List<DocumentationInfo> List`
`18`	`21`	`{`
`19`	`22`	`return new List<DocumentationInfo>`
`20`	`23`	`{`
`21`		`- new DocumentationInfo(00001, @"/Help/Install_RDP_8dot1_on_Windows6dot1.md", GetLocalizationInfoList("en-US", "de-DE"))`
	`24`	`+ new DocumentationInfo(00001, @"/Help/Install_RDP_8dot1_on_Windows6dot1.md", GetLocalizationInfoList("en-US", "de-DE")),`
	`25`	`+ new DocumentationInfo(00002, @"/Help/Create_custom_theme_and_accent.md", GetLocalizationInfoList("en-US", "de-DE"))`
`22`	`26`	`};`
`23`	`27`	`}`
`24`	`28`	`}`
`@@ -44,5 +48,15 @@ public static string GetLocalizedURLbyID(int id)`
`44`	`48`
`45`	`49`	`return list;`
`46`	`50`	`}`
	`51`	`+`
	`52`	`+ public static ICommand OpenDocumentationCommand`
	`53`	`+ {`
	`54`	`+ get { return new RelayCommand(p => OpenDocumentationAction(p)); }`
	`55`	`+ }`
	`56`	`+`
	`57`	`+ private static void OpenDocumentationAction(object id)`
	`58`	`+ {`
	`59`	`+ Process.Start(DocumentationManager.GetLocalizedURLbyID(int.Parse((string)id)));`
	`60`	`+ }`
`47`	`61`	`}`
`48`	`62`	`}`