Skip to content

Commit

Permalink
Updated Avalondock to release 1.0.1 to fix Document Context Menu prob…
Browse files Browse the repository at this point in the history
…lem (Dirkster99/AvalonDock@105e9d9) and removed ModerDialogEx.xaml (unsused reference to mui)
  • Loading branch information
Dirkster99 committed Mar 6, 2018
1 parent 69ed0b1 commit b09e784
Show file tree
Hide file tree
Showing 28 changed files with 11 additions and 270 deletions.
2 changes: 0 additions & 2 deletions 02_Libs/00_bin/AvalonDock/Source_WinFormsTestApp_V1.0.0.txt

This file was deleted.

2 changes: 2 additions & 0 deletions 02_Libs/00_bin/AvalonDock/Source_WinFormsTestApp_V1.0.1.txt
@@ -0,0 +1,2 @@
AvalonDock Binary Source is here:
https://github.com/Dirkster99/AvalonDock/releases/tag/v1.0.1
Binary file not shown.
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/Xceed.Wpf.AvalonDock.Themes.Metro.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/Xceed.Wpf.AvalonDock.Themes.Metro.pdb
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/Xceed.Wpf.AvalonDock.Themes.VS2013.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/Xceed.Wpf.AvalonDock.Themes.VS2013.pdb
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/Xceed.Wpf.AvalonDock.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/Xceed.Wpf.AvalonDock.pdb
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/de/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/es/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/fr/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/hu/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/it/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/ro/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/ru/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file modified 02_Libs/00_bin/AvalonDock/sv/Xceed.Wpf.AvalonDock.resources.dll
Binary file not shown.
Binary file not shown.
10 changes: 2 additions & 8 deletions 02_Libs/00_bin/Readme.txt
@@ -1,14 +1,8 @@

1 Third Party Project Sources

MsgBox Source Download:
https://msgbox.codeplex.com/

YalvLib download
https://yalvlib.codeplex.com/

Modern UI for WPF
https://mui.codeplex.com/
https://github.com/Dirkster99/YalvLib

AvalonDock
https://avalondock.codeplex.com/
https://github.com/Dirkster99/AvalonDock
4 changes: 0 additions & 4 deletions CleanAll.bat
Expand Up @@ -29,10 +29,6 @@ ECHO MiniUML.Model
ECHO MiniUML.View
ECHO MiniUML.Plugins.UmlClassDiagram
ECHO.
ECHO FSC\FileListView
ECHO FSC\FileSystemModels
ECHO FSC\FolderBrowser
ECHO.
ECHO Debug and Release folders
ECHO.
REM Ask the user if hes really sure to continue beyond this point XXXXXXXX
Expand Down
8 changes: 0 additions & 8 deletions Edi/Edi.Apps/Edi.Apps.csproj
Expand Up @@ -236,14 +236,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\MetroDark.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\MetroLight.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\AvalonDockView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down
15 changes: 0 additions & 15 deletions Edi/Edi.Apps/Themes/MetroDark.xaml

This file was deleted.

12 changes: 0 additions & 12 deletions Edi/Edi.Apps/Themes/MetroLight.xaml

This file was deleted.

4 changes: 0 additions & 4 deletions Edi/Edi.Dialogs/Edi.Dialogs.csproj
Expand Up @@ -161,10 +161,6 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Themes\ModernDialogEx.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Edi.Core\Edi.Core.csproj">
Expand Down
197 changes: 0 additions & 197 deletions Edi/Edi.Dialogs/Themes/ModernDialogEx.xaml

This file was deleted.

27 changes: 7 additions & 20 deletions Edi/Edi.Themes/ThemesManager.cs
Expand Up @@ -24,7 +24,8 @@ public class ThemesManager : IThemesManager, IParentSelectedTheme
const string MetroDarkThemeName = "Metro Dark";
static readonly string[] MetroDarkResources =
{
"/Edi.Dialogs;component/Themes/ModernDialogEx.xaml",
"/Mlib;component/Themes/DarkTheme.xaml",
"/MWindowLib;component/Themes/DarkTheme.xaml",

"/DropDownButtonLib;component/Themes/MetroDark.xaml", // DropDownButtonLib theming
"/MsgBox;component/Themes/DarkBrushes.xaml",
Expand All @@ -36,19 +37,13 @@ public class ThemesManager : IThemesManager, IParentSelectedTheme
"/Edi.Themes;component/FileListView/Combobox.xaml",
"/Edi.Themes;component/MetroDark/Theme.xaml",

//"/Xceed.Wpf.AvalonDock.Themes.Expression;component/DarkTheme.xaml",
"/Xceed.Wpf.AvalonDock.Themes.VS2013;component/DarkTheme.xaml",

"/Edi.Apps;component/Themes/MetroDark.xaml",

"/DropDownButtonLib;component/Themes/MetroDark.xaml",
"/WatermarkControlsLib;component/Themes/DarkBrushs.xaml",
"/FolderBrowser;component/Themes/MetroDark.xaml",
"/FileListView;component/Images/MetroDarkIcons.xaml",
"/HistoryControlLib;component/Themes/DarkTheme.xaml",

"/Mlib;component/Themes/DarkTheme.xaml",
"/MWindowLib;component/Themes/DarkTheme.xaml",
"/Xceed.Wpf.AvalonDock.Themes.VS2013;component/DarkTheme.xaml",

"/Edi.Themes;component/BindToMLib/MWindowLib/DarkBrushs.xaml"

Expand All @@ -63,10 +58,7 @@ public class ThemesManager : IThemesManager, IParentSelectedTheme
const string GenericThemeName = "Generic";
static readonly string[] GenericResources =
{
"/Edi.Dialogs;component/Themes/ModernDialogEx.xaml",

"/Edi.Themes;component/Generic/Theme.xaml",
"/Edi.Apps;component/Themes/MetroLight.xaml",
"/FileListView;component/Images/GenericIcons.xaml"
};
#endregion Generic theme resources
Expand All @@ -75,7 +67,8 @@ public class ThemesManager : IThemesManager, IParentSelectedTheme
const string MetroLightThemeName = "Metro Light";
static readonly string[] MetroResources =
{
"/Edi.Dialogs;component/Themes/ModernDialogEx.xaml",
"/Mlib;component/Themes/LightTheme.xaml",
"/MWindowLib;component/Themes/LightTheme.xaml",

"/DropDownButtonLib;component/Themes/MetroLight.xaml", // DropDownButtonLib theming
"/MsgBox;component/Themes/LightBrushes.xaml",
Expand All @@ -87,19 +80,13 @@ public class ThemesManager : IThemesManager, IParentSelectedTheme
"/Edi.Themes;component/FileListView/Combobox.xaml",
"/Edi.Themes;component/MetroLight/Theme.xaml",

//"/Xceed.Wpf.AvalonDock.Themes.Expression;component/LightTheme.xaml",
"/Xceed.Wpf.AvalonDock.Themes.VS2013;component/LightTheme.xaml",

"/Edi.Apps;component/Themes/MetroLight.xaml",

"/DropDownButtonLib;component/Themes/MetroLight.xaml",
"/WatermarkControlsLib;component/Themes/LightBrushs.xaml",
"/FolderBrowser;component/Themes/MetroLight.xaml",
"/FileListView;component/Images/MetroLightIcons.xaml",
"/HistoryControlLib;component/Themes/LightTheme.xaml",

"/Mlib;component/Themes/LightTheme.xaml",
"/MWindowLib;component/Themes/LightTheme.xaml",

"/Xceed.Wpf.AvalonDock.Themes.VS2013;component/LightTheme.xaml",

"/Edi.Themes;component/BindToMLib/MWindowLib/LightBrushs.xaml"

Expand Down

0 comments on commit b09e784

Please sign in to comment.