OSDN Git Service
(root)
/
handbrake-jp
/
handbrake-jp-git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WinGui:
[handbrake-jp/handbrake-jp-git.git]
/
win
/
C#
/
HandBrakeWPF
/
App.xaml.cs
diff --git
a/win/C#/HandBrakeWPF/App.xaml.cs
b/win/C#/HandBrakeWPF/App.xaml.cs
index
ae8d6a3
..
c0ed622
100644
(file)
--- a/
win/C#/HandBrakeWPF/App.xaml.cs
+++ b/
win/C#/HandBrakeWPF/App.xaml.cs
@@
-5,8
+5,10
@@
\r
namespace HandBrakeWPF
\r
{
\r
\r
namespace HandBrakeWPF
\r
{
\r
+ using Caliburn.PresentationFramework;
\r
using Caliburn.PresentationFramework.ApplicationModel;
\r
\r
using Caliburn.PresentationFramework.ApplicationModel;
\r
\r
+ using HandBrakeWPF.Services;
\r
using HandBrakeWPF.ViewModels;
\r
\r
/// <summary>
\r
using HandBrakeWPF.ViewModels;
\r
\r
/// <summary>
\r
@@
-37,12
+39,18
@@
namespace HandBrakeWPF
/// </returns>
\r
protected override object CreateRootModel()
\r
{
\r
/// </returns>
\r
protected override object CreateRootModel()
\r
{
\r
- var binder = (DefaultBinder)Container.GetInstance<
I
Binder>();
\r
+ var binder = (DefaultBinder)Container.GetInstance<
Default
Binder>();
\r
\r
binder.EnableBindingConventions();
\r
binder.EnableMessageConventions();
\r
\r
\r
binder.EnableBindingConventions();
\r
binder.EnableMessageConventions();
\r
\r
- return new MainViewModel();
\r
+ return Container.GetInstance<MainViewModel>();
\r
+ }
\r
+
\r
+
\r
+ protected override void ConfigurePresentationFramework(PresentationFrameworkModule module)
\r
+ {
\r
+ module.UsingWindowManager<WindowManager>();
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r