Browse Source

Deleted Feedback dialog

flabbet 6 years ago
parent
commit
cf5bc61f46

+ 0 - 19
PixiEditor/Models/FeedbackDialog.cs

@@ -1,19 +0,0 @@
-using PixiEditor.Views;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace PixiEditor.Models
-{
-    public class FeedbackMenuDialog : CustomDialog
-    {
-        public override bool ShowDialog()
-        {
-            FeedbackDialog dialog = new FeedbackDialog();
-            dialog.ShowDialog();
-            return (bool)dialog.DialogResult;
-        }
-    }
-}

+ 7 - 0
PixiEditor/PixiEditor.csproj

@@ -111,6 +111,9 @@
     <Compile Include="Views\FeedbackDialog.xaml.cs">
     <Compile Include="Views\FeedbackDialog.xaml.cs">
       <DependentUpon>FeedbackDialog.xaml</DependentUpon>
       <DependentUpon>FeedbackDialog.xaml</DependentUpon>
     </Compile>
     </Compile>
+    <Compile Include="Views\ImportFilePopup.xaml.cs">
+      <DependentUpon>ImportFilePopup.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\MainDrawingPanel.xaml.cs">
     <Compile Include="Views\MainDrawingPanel.xaml.cs">
       <DependentUpon>MainDrawingPanel.xaml</DependentUpon>
       <DependentUpon>MainDrawingPanel.xaml</DependentUpon>
     </Compile>
     </Compile>
@@ -131,6 +134,10 @@
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>
     </Page>
     </Page>
+    <Page Include="Views\ImportFilePopup.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainDrawingPanel.xaml">
     <Page Include="Views\MainDrawingPanel.xaml">
       <SubType>Designer</SubType>
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
       <Generator>MSBuild:Compile</Generator>

+ 0 - 6
PixiEditor/ViewModels/ViewModelMain.cs

@@ -287,11 +287,5 @@ namespace PixiEditor.ViewModels
         {
         {
             MessageBox.Show("This feature is not implemented yet.", "Feature not implemented", MessageBoxButton.OK, MessageBoxImage.Information);
             MessageBox.Show("This feature is not implemented yet.", "Feature not implemented", MessageBoxButton.OK, MessageBoxImage.Information);
         }
         }
-
-        public void SendFeedback(object parameter)
-        {
-            FeedbackMenuDialog feedbackMenuDialog = new FeedbackMenuDialog();
-            feedbackMenuDialog.ShowDialog();
-        }
     }
     }
 }
 }

+ 0 - 46
PixiEditor/Views/FeedbackDialog.xaml

@@ -1,46 +0,0 @@
-<Window x:Class="PixiEditor.Views.FeedbackDialog"
-        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:local="clr-namespace:PixiEditor.Views"
-        xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
-        xmlns:behaviors="clr-namespace:PixiEditor.Helpers.Behaviours"
-        xmlns:vm="clr-namespace:PixiEditor.ViewModels"
-        mc:Ignorable="d"
-        Title="FeedbackDialog" WindowStyle="None" WindowStartupLocation="CenterScreen" ResizeMode="NoResize" Height="600" Width="450" Name="feedbackDialog" DataContext="{DynamicResource FeedbackDialogViewModel}">
-    <Window.Resources>
-        <vm:FeedbackDialogViewModel x:Key="FeedbackDialogViewModel"/>
-    </Window.Resources>
-    <Grid Background="#303030">
-        <Grid.RowDefinitions>
-            <RowDefinition/>
-            <RowDefinition Height="25*"/>
-        </Grid.RowDefinitions>
-        <Grid Grid.Row="0" Background="#FF2C2C2C">
-            <i:Interaction.Triggers>
-                <i:EventTrigger EventName="MouseDown">
-                    <i:InvokeCommandAction Command="{Binding DragMoveCommand}"/>
-                </i:EventTrigger>
-            </i:Interaction.Triggers>
-            <Button Width="20" Height="20" VerticalAlignment="Top" HorizontalAlignment="Right" BorderThickness="0" Command="{Binding CloseButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}">
-                <Button.Background>
-                    <ImageBrush ImageSource="/PixiEditor;component/Images/Cross.png" Stretch="Uniform"/>
-                </Button.Background>
-            </Button>
-        </Grid>
-        <StackPanel Grid.Row="2">
-        <Label Height="60" Width="200" VerticalAlignment="Top" Margin="0,40,0,0" Content="Feedback" FontSize="36" Foreground="Snow" HorizontalContentAlignment="Center"/>
-            <TextBox Style="{StaticResource DarkTextBoxStyle}" FontSize="22" Height="210" Width="365" Margin="0,10,0,0" Text="{Binding EmailBody, Mode=TwoWay}">
-                <i:Interaction.Behaviors>
-                <behaviors:HintTextBehavior Hint="I'd love to hear your feedback!"/>
-                </i:Interaction.Behaviors>
-            </TextBox>
-            <DockPanel Width="365">
-            <Label Height="42" Width="120" HorizontalAlignment="Left" Margin="0,20,0,0" Foreground="Snow" FontSize="22" Content="Your email"/>
-                <TextBox Height="35" Width="244" FontSize="20" VerticalAlignment="Bottom" Margin="-0,0,0,5" Style="{StaticResource DarkTextBoxStyle}" Text="{Binding MailFrom, Mode=TwoWay}"/>
-            </DockPanel>
-        </StackPanel>
-        <Button Style="{StaticResource DarkRoundButton}" Grid.Row="1" Height="35" Width="70" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="10" Content="Send" Command="{Binding SendButtonCommand}" CommandParameter="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}}"/>
-    </Grid>
-</Window>

+ 12 - 0
PixiEditor/Views/ImportFilePopup.xaml

@@ -0,0 +1,12 @@
+<Window x:Class="PixiEditor.Views.ImportFilePopup"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:PixiEditor.Views"
+        mc:Ignorable="d"
+        Title="ImportFilePopup" Height="450" Width="800">
+    <Grid>
+        
+    </Grid>
+</Window>

+ 3 - 3
PixiEditor/Views/FeedbackDialog.xaml.cs → PixiEditor/Views/ImportFilePopup.xaml.cs

@@ -15,11 +15,11 @@ using System.Windows.Shapes;
 namespace PixiEditor.Views
 namespace PixiEditor.Views
 {
 {
     /// <summary>
     /// <summary>
-    /// Interaction logic for FeedbackDialog.xaml
+    /// Interaction logic for ImportFilePopup.xaml
     /// </summary>
     /// </summary>
-    public partial class FeedbackDialog : Window
+    public partial class ImportFilePopup : Window
     {
     {
-        public FeedbackDialog()
+        public ImportFilePopup()
         {
         {
             InitializeComponent();
             InitializeComponent();
         }
         }