daniel
/
zaaReloaded2
1
0
Fork 0
Code Issues 4 Pull Requests Activity

Fix views. 

- Verbessert: Technische Verbesserungen bei Dialogen.
This commit is contained in:
daniel 2017-03-02 15:27:37 +01:00
parent acbd3833ed
commit 3a1559c4a3
13 changed files with 36 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
zaaReloaded2/Commands.cs
View File

@ -20,6 +20,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using Bovender.Extensions;
using zaaReloaded2.Controller;
using zaaReloaded2.Controller.Comments;
using zaaReloaded2.Formatter;
@ -74,7 +75,7 @@ namespace zaaReloaded2
DoFormat(settings);
UserSettings.Default.LastSettings = settings.Uid;
};
vm.InjectInto<SettingsRepositoryView>().ShowDialog();
vm.InjectInto<SettingsRepositoryView>().ShowDialogInForm();
}
/// <summary>
@ -121,13 +122,13 @@ namespace zaaReloaded2
public static void ShowAbout()
{
ViewModels.AboutViewModel vm = new ViewModels.AboutViewModel();
vm.InjectInto<Views.AboutView>().ShowDialog();
vm.InjectInto<Views.AboutView>().ShowDialogInForm();
}
public static void ShowPreferences()
{
ViewModels.PreferencesViewModel vm = new PreferencesViewModel();
vm.InjectInto<Views.PreferencesView>().ShowDialog();
vm.InjectInto<Views.PreferencesView>().ShowDialogInForm();
}
public static void ApplyDanielsStyle()
@ -263,7 +264,7 @@ namespace zaaReloaded2
{
Logger.Info("CommentPool_FillInComment: Requesting user interaction");
ItemCommentViewModel vm = new ItemCommentViewModel(e.Comment);
vm.InjectInto<ItemCommentView>().ShowDialog();
vm.InjectInto<ItemCommentView>().ShowDialogInForm();
}
}

4
zaaReloaded2/ExceptionHandler/ExceptionDetailView.xaml
View File

@ -25,8 +25,8 @@
xmlns:ei="http://schemas.microsoft.com/expression/2010/interactions"
xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
xmlns:converter="clr-namespace:Bovender.Mvvm.Converters;assembly=Bovender"
SizeToContent="Height" Width="700" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True" ResizeMode="CanResizeWithGrip"
SizeToContent="Height" Width="720"
ShowInTaskbar="False" ResizeMode="NoResize"
x:Name="exceptionDetailView"
Title="Technische Fehlerdetails"
settings:WindowState.Save="True"

4
zaaReloaded2/ExceptionHandler/ExceptionView.xaml
View File

@ -26,8 +26,8 @@
xmlns:ex="clr-namespace:zaaReloaded2.ExceptionHandler"
xmlns:actions="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
xmlns:settings="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
SizeToContent="WidthAndHeight" ResizeMode="CanResizeWithGrip"
WindowStyle="ToolWindow" ShowInTaskbar="False" Topmost="True"
SizeToContent="WidthAndHeight" ResizeMode="NoResize"
ShowInTaskbar="False"
WindowStartupLocation="CenterScreen"
Title="zaaReloaded2: Fehler!"
settings:WindowState.Save="True"

6
zaaReloaded2/ThisAddIn.cs
View File

@ -19,6 +19,7 @@ using System;
using System.IO;
using Bovender.Versioning;
using Bovender.Mvvm.Messaging;
using Bovender.Extensions;
using zaaReloaded2.ExceptionHandler;
using System.Windows;
using System.Windows.Input;
@ -71,7 +72,8 @@ namespace zaaReloaded2
Bovender.ExceptionHandler.CentralHandler.ManageExceptionCallback += CentralHandler_ManageExceptionCallback;
Bovender.Win32Window.MainWindowHandleProvider = () =>
{
return IntPtr.Zero;
return System.Diagnostics.Process.GetCurrentProcess().MainWindowHandle;
// return IntPtr.Zero;
};
Bovender.WpfHelpers.RegisterTextBoxSelectAll();
UserSettings userSettings = UserSettings.Default;
@ -172,7 +174,7 @@ namespace zaaReloaded2
{
e.IsHandled = true;
ExceptionViewModel vm = new ExceptionViewModel(e.Exception);
vm.InjectInto<ExceptionView>().ShowDialog();
vm.InjectInto<ExceptionView>().ShowDialogInForm();
}
#endregion

1
zaaReloaded2/Views/AboutView.xaml
View File

@ -23,6 +23,7 @@
Width="360" SizeToContent="Height" ResizeMode="NoResize" ShowInTaskbar="False"
b:WindowState.CenterScreen="True"
Title="Über..."
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />

5
zaaReloaded2/Views/ElementPickerView.xaml
View File

@ -21,11 +21,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
Width="280" Height="320" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
Width="360" Height="320"
ShowInTaskbar="False" ResizeMode="NoResize"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Neues Element auswählen"
FocusManager.FocusedElement="{Binding ElementName=treeview}"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />

8
zaaReloaded2/Views/ElementView.xaml
View File

@ -21,13 +21,13 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
Width="280" Height="180" MinWidth="280" MinHeight="180"
ResizeMode="NoResize" ShowInTaskbar="False"
Width="460" Height="180" MinWidth="280" MinHeight="180"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Element bearbeiten"
FocusManager.FocusedElement="{Binding ElementName=ContentTextBox}"
>
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
</Window.Resources>

3
zaaReloaded2/Views/FirstRunView.xaml
View File

@ -23,10 +23,11 @@
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
ResizeMode="NoResize" ShowInTaskbar="False" Topmost="True"
ResizeMode="NoResize" ShowInTaskbar="False"
SizeToContent="Height" Width="480"
b:WindowState.CenterScreen="True"
Title="Willkommen bei zaaReloaded"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />

2
zaaReloaded2/Views/IoErrorView.xaml
View File

@ -22,10 +22,10 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
SizeToContent="WidthAndHeight" MaxWidth="480"
WindowStyle="ToolWindow" Topmost="True"
ResizeMode="NoResize" ShowInTaskbar="False"
b:WindowState.CenterScreen="True"
Title="Import/Export-Fehler"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />

8
zaaReloaded2/Views/ItemCommentView.xaml
View File

@ -21,12 +21,12 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
WindowStyle="ToolWindow" Topmost="True"
ResizeMode="NoResize" ShowInTaskbar="False"
SizeToContent="WidthAndHeight" MaxWidth="500"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Kommentar angeben"
FocusManager.FocusedElement="{Binding ElementName=ValueTextBox}"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />
@ -42,7 +42,7 @@
<TextBlock DockPanel.Dock="Left" Text="{Binding Prefix}" VerticalAlignment="Center" />
<TextBlock DockPanel.Dock="Right" Text="{Binding Suffix}" VerticalAlignment="Center" />
<TextBox Text="{Binding Value,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"
MinWidth="120" MaxWidth="240" VerticalAlignment="Center"
x:Name="ValueTextBox" Margin="5 0 5 0" />
MinWidth="240" MaxWidth="240" VerticalAlignment="Center"
x:Name="ValueTextBox" />
</DockPanel>
</Window>

3
zaaReloaded2/Views/PreferencesView.xaml
View File

@ -24,9 +24,10 @@
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
SizeToContent="WidthAndHeight" ResizeMode="NoResize"
ShowInTaskbar="False" Topmost="True"
ShowInTaskbar="False"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Einstellungen"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />

6
zaaReloaded2/Views/SettingsRepositoryView.xaml
View File

@ -23,9 +23,9 @@
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
Width="480" Height="340"
MinWidth="420" MinHeight="340" WindowStyle="ToolWindow"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
Width="520" Height="320"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
ShowInTaskbar="False" ResizeMode="NoResize"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Stil auswählen"
FocusManager.FocusedElement="{Binding ElementName=settingsList}"

5
zaaReloaded2/Views/SettingsView.xaml
View File

@ -23,12 +23,13 @@
xmlns:b="clr-namespace:Bovender.Mvvm.Views.Settings;assembly=Bovender"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:action="clr-namespace:Bovender.Mvvm.Actions;assembly=Bovender"
Width="460" Height="400" ResizeMode="CanResizeWithGrip" ShowInTaskbar="False"
Width="600" Height="420"
ResizeMode="CanResizeWithGrip" ShowInTaskbar="True"
MinWidth="460" MinHeight="400"
WindowStyle="ToolWindow" Topmost="True"
b:WindowState.CenterScreen="True" b:WindowState.Save="True"
Title="Stil bearbeiten"
FocusManager.FocusedElement="{Binding ElementName=NameTextBox}"
Icon="pack://application:,,,/zaaReloaded2;component/Icons/icon.png"
>
<Window.Resources>
<ResourceDictionary Source="/Bovender;component/Style.xaml" />