holger/MaterialModernGUI
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changes

Browse Source
This commit is contained in:
Holger Börchers 2019-12-14 23:36:21 +01:00
parent a0b820f3bd
commit 12a6836bad
18 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
.idea/.idea.MaterialModernWPF/.idea/workspace.xml generated
View File

@ -31,7 +31,7 @@
<component name="PropertiesComponent">
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
<property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
</component>
<component name="RunManager">
<configuration name="MaterialModernWPF" type="DotNetProject" factoryName=".NET Project">
@ -77,6 +77,9 @@
<updated>1575410043658</updated>
<workItem from="1575410047320" duration="169000" />
<workItem from="1575410375342" duration="108000" />
<workItem from="1575613421526" duration="42000" />
<workItem from="1575613498703" duration="207000" />
<workItem from="1575845320947" duration="101000" />
</task>
<servers />
</component>
@ -88,25 +91,29 @@
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="450" y="152" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1536.824@0.0.1536.824" timestamp="1575410166767" />
<state width="1493" height="211" key="GridCell.Tab.0.bottom" timestamp="1575410483502">
<state width="1493" height="211" key="GridCell.Tab.0.bottom" timestamp="1575845421502">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="211" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
<state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1575410483502">
<state width="1493" height="211" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1575845421502" />
<state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1575845421502">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="211" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
<state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1575410483502">
<state width="1493" height="211" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1575845421502" />
<state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1575845421501">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="211" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
<state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1575410483502">
<state width="1493" height="211" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1575845421501" />
<state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1575845421502">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state width="1493" height="211" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
<state x="281" y="58" key="SettingsEditor" timestamp="1575410433417">
<state width="1493" height="211" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1575845421502" />
<state x="281" y="58" key="SettingsEditor" timestamp="1575613676681">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="281" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1575410433417" />
<state x="281" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1575613676681" />
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup" timestamp="1575613633735">
<screen x="0" y="0" width="1536" height="824" />
</state>
<state x="431" y="145" width="672" height="678" key="search.everywhere.popup/0.0.1536.824@0.0.1536.824" timestamp="1575613633735" />
</component>
</project>

6
src/App.xaml
View File

@ -10,10 +10,6 @@
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>
</prism:PrismApplication>
</prism:PrismApplication>

4
src/App.xaml.cs
View File

@ -1,10 +1,10 @@
using System.Windows;
using DryIoc;
using DryIoc;
using MaterialModernWPF.Module;
using MaterialModernWPF.Service;
using MaterialModernWPF.View;
using Prism.Ioc;
using Prism.Modularity;
using System.Windows;
namespace MaterialModernWPF
{

4
src/AssemblyInfo.cs
View File

@ -1,10 +1,10 @@
using System.Windows;
[assembly:ThemeInfo(
[assembly: ThemeInfo(
ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
//(used if a resource is not found in the page,
// or application resource dictionaries)
ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
//(used if a resource is not found in the page,
// app, or any theme specific resource dictionaries)
)]
)]

1
src/MaterialModernWPF.csproj
View File

@ -4,6 +4,7 @@
<OutputType>WinExe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework>
<UseWPF>true</UseWPF>
<ApplicationIcon >airballoon.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>

4
src/Module/MainModule.cs
View File

@ -1,7 +1,7 @@
using System;
using Prism.Ioc;
using Prism.Ioc;
using Prism.Modularity;
using Prism.Regions;
using System;
namespace MaterialModernWPF.Module
{

2
src/Module/MainView.xaml
View File

@ -30,4 +30,4 @@
</ListBox>
<ItemsControl Grid.Column="1" prism:RegionManager.RegionName="{x:Static root:Constants.PackagesRegion}" />
</Grid>
</UserControl>
</UserControl>

2
src/Module/MainView.xaml.cs
View File

@ -10,4 +10,4 @@
InitializeComponent();
}
}
}
}

4
src/Module/MainViewModel.cs
View File

@ -1,5 +1,5 @@
using System.Collections.Generic;
using MaterialModernWPF.Service;
using MaterialModernWPF.Service;
using System.Collections.Generic;
namespace MaterialModernWPF.Module
{

4
src/Service/AdditionalMoments.cs
View File

@ -1,5 +1,5 @@
using System;
using Prism.Events;
using Prism.Events;
using System;
namespace MaterialModernWPF.Service
{

5
src/Service/CalculationPackage.cs
View File

@ -1,6 +1,6 @@
using System;
using Prism.Events;
using System;
using System.Windows.Controls;
using Prism.Events;
namespace MaterialModernWPF.Service
{
@ -32,6 +32,5 @@ namespace MaterialModernWPF.Service
public class CalculationView : UserControl
{
}
}

4
src/Service/CalculationPackageContainer.cs
View File

@ -1,7 +1,7 @@
using System.Linq;
using DryIoc;
using DryIoc;
using Prism.Events;
using Prism.Regions;
using System.Linq;
namespace MaterialModernWPF.Service
{

1
src/Service/CalculationPackageSelectionChangedEvent.cs
View File

@ -4,6 +4,5 @@ namespace MaterialModernWPF.Service
{
public class CalculationPackageSelectionChangedEvent : PubSubEvent<(Package, bool)>
{
}
}

4
src/Service/DetailedGeometryPackage.cs
View File

@ -1,5 +1,5 @@
using System;
using Prism.Events;
using Prism.Events;
using System;
namespace MaterialModernWPF.Service
{

2
src/Service/DetailedGeometryView.xaml
View File

@ -11,4 +11,4 @@
<GroupBox Margin="10" Header="Detailed Geometry">
<TextBlock FontSize="100" Text="Hallo Welt" />
</GroupBox>
</local:CalculationView>
</local:CalculationView>

2
src/Service/DetailedGeometryView.xaml.cs
View File

@ -10,4 +10,4 @@
InitializeComponent();
}
}
}
}

2
src/View/InfoDialog.xaml
View File

@ -27,4 +27,4 @@
</Button>
</StackPanel>
</StackPanel>
</UserControl>
</UserControl>

6
src/View/ShellViewModel.cs
View File

@ -1,6 +1,6 @@
using System.Windows.Input;
using Prism.Commands;
using Prism.Commands;
using Prism.Mvvm;
using System.Windows.Input;
namespace MaterialModernWPF.View
{
@ -11,6 +11,6 @@ namespace MaterialModernWPF.View
GcCollectCommand = new DelegateCommand(System.GC.Collect);
}
public ICommand GcCollectCommand {get; }
public ICommand GcCollectCommand { get; }
}
}