Merge branch 'master' of ssh://float.beyondsoft.de/git/beyondSoft/BeWo
Ein Arsch voll Konflikte.
This commit is contained in:
@@ -29,6 +29,7 @@ using BS.Shared;
|
||||
using BS.Shared.DataContracts;
|
||||
using BS.Shared.Extensions;
|
||||
using DevExpress.Xpf.Editors;
|
||||
using DevExpress.Xpf.Grid;
|
||||
using DevExpress.Xpf.Scheduler;
|
||||
using Hyperlink = System.Windows.Documents.Hyperlink;
|
||||
|
||||
@@ -76,8 +77,10 @@ namespace BeWo
|
||||
KeyDown += MainControl_KeyDown;
|
||||
NavigateToHomeView();
|
||||
|
||||
EditorLocalizer.Active = new CustomDXEditorLocalizer();
|
||||
SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
|
||||
//EditorLocalizer.Active = new CustomDXEditorLocalizer();
|
||||
//SchedulerControlLocalizer.Active = new CustomSchedulerLocalizer();
|
||||
//GridControlLocalizer.Active = new CustomGridLocalizer();
|
||||
|
||||
|
||||
OpenedModalViewWindows = new List<ModalViewWindow>();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user