From cd109d61a26ecbbad4342e2a694401bc41df6917 Mon Sep 17 00:00:00 2001 From: Robert Date: Wed, 26 Feb 2020 19:48:11 +0100 Subject: [PATCH] UI - Added WIP notices --- .../DisplayConditionsView.xaml | 12 +++++++ .../PropertyTree/PropertyTreeChildView.xaml | 3 +- src/Artemis.UI/Screens/News/NewsView.xaml | 15 ++++++-- .../Screens/Workshop/WorkshopView.xaml | 35 +++++++++---------- 4 files changed, 42 insertions(+), 23 deletions(-) diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml index 6668a43cf..494587396 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/DisplayConditions/DisplayConditionsView.xaml @@ -4,6 +4,7 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Artemis.UI.Screens.Module.ProfileEditor.DisplayConditions" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> @@ -12,6 +13,17 @@ Display conditions + + + + + Conditions are not yet implemented + + + Conditions will allow you to easily configure when a layer should be shown. + You'll also use this to set up how a layer reacts to its conditions being matched, like play the timeline once or keep repeating the timeline until the conditions are no longer matched. + + \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyTreeChildView.xaml b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyTreeChildView.xaml index c58a40810..4f4fec459 100644 --- a/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyTreeChildView.xaml +++ b/src/Artemis.UI/Screens/Module/ProfileEditor/LayerProperties/PropertyTree/PropertyTreeChildView.xaml @@ -46,7 +46,8 @@ Width="80" Height="20" ToolTip="Change the property's data binding" - VerticalAlignment="Center"> + VerticalAlignment="Center" + IsEnabled="False"> DATA BINDING diff --git a/src/Artemis.UI/Screens/News/NewsView.xaml b/src/Artemis.UI/Screens/News/NewsView.xaml index 84a82cb3c..381d8fa51 100644 --- a/src/Artemis.UI/Screens/News/NewsView.xaml +++ b/src/Artemis.UI/Screens/News/NewsView.xaml @@ -4,9 +4,18 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:local="clr-namespace:Artemis.UI.Screens.News" + xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> - - Today's news: There is no news (yet)! - + + + + News is not yet implemented + + + The news page will keep you up-to-date with the latest developments in the Artemis community. + You'll find the latest patch notes here and see featured workshop contributions. + + + \ No newline at end of file diff --git a/src/Artemis.UI/Screens/Workshop/WorkshopView.xaml b/src/Artemis.UI/Screens/Workshop/WorkshopView.xaml index 6251da775..9e85559ea 100644 --- a/src/Artemis.UI/Screens/Workshop/WorkshopView.xaml +++ b/src/Artemis.UI/Screens/Workshop/WorkshopView.xaml @@ -3,27 +3,24 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" - xmlns:local="clr-namespace:Artemis.UI.Screens.Workshop" - xmlns:s="https://github.com/canton7/Stylet" - xmlns:controls="clr-namespace:Artemis.UI.Shared;assembly=Artemis.UI.Shared" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" d:DesignHeight="450" d:DesignWidth="800"> - - - - - - - - - - Test - + + + + Workshop is not yet implemented + + + The workshop is one of the long-term goals of Artemis 2. It will be a hub where you can share your + creations with others and easily look for awesome new profiles and plugins. + These are some of the planned features that will be part of the workshop in the future: + - Profiles + - Custom brushes + - Support for extra devices + - Support for extra games and other modules + - All of the features mentioned above will be able to receive upvotes/downvotes and comments + - A web-based interface for the workshop so you can browse/manage uploads outside Artemis as well + - - \ No newline at end of file