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

Compare commits

base: holger:12a6836badf32572d679cb3557529163378472a8
Branches Tags
holger:master
..
compare: holger:9a336742ac80f64dfd1a7d0209f6d6cdea69cd5c
Branches Tags
holger:master

No commits in common. "12a6836badf32572d679cb3557529163378472a8" and "9a336742ac80f64dfd1a7d0209f6d6cdea69cd5c" have entirely different histories.
12a6836bad ... 9a336742ac

20 changed files with 42 additions and 111 deletions
Show Stats 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="preferences.pluginManager" />
<property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
</component>
<component name="RunManager">
<configuration name="MaterialModernWPF" type="DotNetProject" factoryName=".NET Project">
@ -77,9 +77,6 @@
<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>
@ -91,29 +88,25 @@
<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="1575845421502">
<state width="1493" height="211" key="GridCell.Tab.0.bottom" timestamp="1575410483502">
<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="1575845421502" />
<state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1575845421502">
<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">
<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="1575845421502" />
<state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1575845421501">
<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">
<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="1575845421501" />
<state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1575845421502">
<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">
<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="1575845421502" />
<state x="281" y="58" key="SettingsEditor" timestamp="1575613676681">
<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">
<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="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" />
<state x="281" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1575410433417" />
</component>
</project>

25
.vscode/launch.json vendored
View File

@ -1,25 +0,0 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": ".NET Core Launch (console)",
"type": "coreclr",
"request": "launch",
"preLaunchTask": "build",
"program": "${workspaceFolder}/src/bin/Debug/netcoreapp3.1/MaterialModernWPF.dll",
"args": [],
"cwd": "${workspaceFolder}/src",
"console": "internalConsole",
"stopAtEntry": false
},
{
"name": ".NET Core Attach",
"type": "coreclr",
"request": "attach",
"processId": "${command:pickProcess}"
}
]
}

42
.vscode/tasks.json vendored
View File

@ -1,42 +0,0 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "build",
"command": "dotnet",
"type": "process",
"args": [
"build",
"${workspaceFolder}/src/MaterialModernWPF.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "publish",
"command": "dotnet",
"type": "process",
"args": [
"publish",
"${workspaceFolder}/src/MaterialModernWPF.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
},
{
"label": "watch",
"command": "dotnet",
"type": "process",
"args": [
"watch",
"run",
"${workspaceFolder}/src/MaterialModernWPF.csproj",
"/property:GenerateFullPaths=true",
"/consoleloggerparameters:NoSummary"
],
"problemMatcher": "$msCompile"
}
]
}

4
src/App.xaml
View File

@ -10,6 +10,10 @@
<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>

4
src/App.xaml.cs
View File

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

2
src/AssemblyInfo.cs
View File

@ -1,6 +1,6 @@
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)

1
src/MaterialModernWPF.csproj
View File

@ -4,7 +4,6 @@
<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 Prism.Ioc;
using System;
using Prism.Ioc;
using Prism.Modularity;
using Prism.Regions;
using System;
namespace MaterialModernWPF.Module
{

4
src/Module/MainViewModel.cs
View File

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

4
src/Service/AdditionalMoments.cs
View File

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

5
src/Service/CalculationPackage.cs
View File

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

4
src/Service/CalculationPackageContainer.cs
View File

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

1
src/Service/CalculationPackageSelectionChangedEvent.cs
View File

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

4
src/Service/DetailedGeometryPackage.cs
View File

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

6
src/View/ShellViewModel.cs
View File

@ -1,6 +1,6 @@
using Prism.Commands;
using System.Windows.Input;
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; }
}
}