Compare commits
No commits in common. "12a6836badf32572d679cb3557529163378472a8" and "9a336742ac80f64dfd1a7d0209f6d6cdea69cd5c" have entirely different histories.
12a6836bad
...
9a336742ac
29
.idea/.idea.MaterialModernWPF/.idea/workspace.xml
generated
29
.idea/.idea.MaterialModernWPF/.idea/workspace.xml
generated
@ -31,7 +31,7 @@
|
|||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent">
|
||||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
||||||
<property name="WebServerToolWindowFactoryState" value="false" />
|
<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>
|
||||||
<component name="RunManager">
|
<component name="RunManager">
|
||||||
<configuration name="MaterialModernWPF" type="DotNetProject" factoryName=".NET Project">
|
<configuration name="MaterialModernWPF" type="DotNetProject" factoryName=".NET Project">
|
||||||
@ -77,9 +77,6 @@
|
|||||||
<updated>1575410043658</updated>
|
<updated>1575410043658</updated>
|
||||||
<workItem from="1575410047320" duration="169000" />
|
<workItem from="1575410047320" duration="169000" />
|
||||||
<workItem from="1575410375342" duration="108000" />
|
<workItem from="1575410375342" duration="108000" />
|
||||||
<workItem from="1575613421526" duration="42000" />
|
|
||||||
<workItem from="1575613498703" duration="207000" />
|
|
||||||
<workItem from="1575845320947" duration="101000" />
|
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
@ -91,29 +88,25 @@
|
|||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state x="450" y="152" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1536.824@0.0.1536.824" timestamp="1575410166767" />
|
<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" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</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.bottom/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
|
||||||
<state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1575845421502">
|
<state width="1493" height="211" key="GridCell.Tab.0.center" timestamp="1575410483502">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</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.center/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
|
||||||
<state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1575845421501">
|
<state width="1493" height="211" key="GridCell.Tab.0.left" timestamp="1575410483502">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</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.left/0.0.1536.824@0.0.1536.824" timestamp="1575410483502" />
|
||||||
<state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1575845421502">
|
<state width="1493" height="211" key="GridCell.Tab.0.right" timestamp="1575410483502">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state width="1493" height="211" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1575845421502" />
|
<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="1575613676681">
|
<state x="281" y="58" key="SettingsEditor" timestamp="1575410433417">
|
||||||
<screen x="0" y="0" width="1536" height="824" />
|
<screen x="0" y="0" width="1536" height="824" />
|
||||||
</state>
|
</state>
|
||||||
<state x="281" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1575613676681" />
|
<state x="281" y="58" key="SettingsEditor/0.0.1536.824@0.0.1536.824" timestamp="1575410433417" />
|
||||||
<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>
|
</component>
|
||||||
</project>
|
</project>
|
25
.vscode/launch.json
vendored
25
.vscode/launch.json
vendored
@ -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
42
.vscode/tasks.json
vendored
@ -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"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
@ -10,6 +10,10 @@
|
|||||||
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
|
<materialDesign:BundledTheme BaseTheme="Light" PrimaryColor="DeepPurple" SecondaryColor="Lime" />
|
||||||
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
|
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Application.Resources>
|
</Application.Resources>
|
||||||
</prism:PrismApplication>
|
</prism:PrismApplication>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,10 +1,10 @@
|
|||||||
using DryIoc;
|
using System.Windows;
|
||||||
|
using DryIoc;
|
||||||
using MaterialModernWPF.Module;
|
using MaterialModernWPF.Module;
|
||||||
using MaterialModernWPF.Service;
|
using MaterialModernWPF.Service;
|
||||||
using MaterialModernWPF.View;
|
using MaterialModernWPF.View;
|
||||||
using Prism.Ioc;
|
using Prism.Ioc;
|
||||||
using Prism.Modularity;
|
using Prism.Modularity;
|
||||||
using System.Windows;
|
|
||||||
|
|
||||||
namespace MaterialModernWPF
|
namespace MaterialModernWPF
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
<OutputType>WinExe</OutputType>
|
<OutputType>WinExe</OutputType>
|
||||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||||
<UseWPF>true</UseWPF>
|
<UseWPF>true</UseWPF>
|
||||||
<ApplicationIcon >airballoon.ico</ApplicationIcon>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
using Prism.Ioc;
|
using System;
|
||||||
|
using Prism.Ioc;
|
||||||
using Prism.Modularity;
|
using Prism.Modularity;
|
||||||
using Prism.Regions;
|
using Prism.Regions;
|
||||||
using System;
|
|
||||||
|
|
||||||
namespace MaterialModernWPF.Module
|
namespace MaterialModernWPF.Module
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using MaterialModernWPF.Service;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Generic;
|
using MaterialModernWPF.Service;
|
||||||
|
|
||||||
namespace MaterialModernWPF.Module
|
namespace MaterialModernWPF.Module
|
||||||
{
|
{
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
using Prism.Events;
|
using System;
|
||||||
using System;
|
using Prism.Events;
|
||||||
|
|
||||||
namespace MaterialModernWPF.Service
|
namespace MaterialModernWPF.Service
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
using Prism.Events;
|
using System;
|
||||||
using System;
|
|
||||||
using System.Windows.Controls;
|
using System.Windows.Controls;
|
||||||
|
using Prism.Events;
|
||||||
|
|
||||||
namespace MaterialModernWPF.Service
|
namespace MaterialModernWPF.Service
|
||||||
{
|
{
|
||||||
@ -32,5 +32,6 @@ namespace MaterialModernWPF.Service
|
|||||||
|
|
||||||
public class CalculationView : UserControl
|
public class CalculationView : UserControl
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,7 +1,7 @@
|
|||||||
using DryIoc;
|
using System.Linq;
|
||||||
|
using DryIoc;
|
||||||
using Prism.Events;
|
using Prism.Events;
|
||||||
using Prism.Regions;
|
using Prism.Regions;
|
||||||
using System.Linq;
|
|
||||||
|
|
||||||
namespace MaterialModernWPF.Service
|
namespace MaterialModernWPF.Service
|
||||||
{
|
{
|
||||||
|
@ -4,5 +4,6 @@ namespace MaterialModernWPF.Service
|
|||||||
{
|
{
|
||||||
public class CalculationPackageSelectionChangedEvent : PubSubEvent<(Package, bool)>
|
public class CalculationPackageSelectionChangedEvent : PubSubEvent<(Package, bool)>
|
||||||
{
|
{
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -1,5 +1,5 @@
|
|||||||
using Prism.Events;
|
using System;
|
||||||
using System;
|
using Prism.Events;
|
||||||
|
|
||||||
namespace MaterialModernWPF.Service
|
namespace MaterialModernWPF.Service
|
||||||
{
|
{
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
using Prism.Commands;
|
using System.Windows.Input;
|
||||||
|
using Prism.Commands;
|
||||||
using Prism.Mvvm;
|
using Prism.Mvvm;
|
||||||
using System.Windows.Input;
|
|
||||||
|
|
||||||
namespace MaterialModernWPF.View
|
namespace MaterialModernWPF.View
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user