diff --git a/App.config b/App.config index 511cc1f..8f9544d 100644 --- a/App.config +++ b/App.config @@ -2,20 +2,20 @@ -
+
- - - - - - - - + + + + + + + + diff --git a/App.xaml b/App.xaml index e9821a3..e47afbc 100644 --- a/App.xaml +++ b/App.xaml @@ -1,7 +1,7 @@ - + - + \ No newline at end of file diff --git a/App.xaml.cs b/App.xaml.cs index 6b3a647..cb3bee9 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -4,11 +4,11 @@ using System.Runtime.CompilerServices; using System.Windows; using System.Xml; using System.Xml.Serialization; -using DebtMgr.Data; -using DebtMgr.ViewModel; +using eJay.Data; +using eJay.ViewModel; using SQLite.Net; -namespace DebtMgr +namespace eJay { /// /// Interaktionslogik für "App.xaml" diff --git a/Converters/AmountToColorConverter.cs b/Converters/AmountToColorConverter.cs index 3017f99..148de91 100644 --- a/Converters/AmountToColorConverter.cs +++ b/Converters/AmountToColorConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows.Data; using System.Windows.Media; -namespace DebtMgr.Converters +namespace eJay.Converters { //////////////////////////////////////////////////////////////////////////////////////////////////// /// An amount to color converter. diff --git a/Converters/BoolToVisibilityConverter.cs b/Converters/BoolToVisibilityConverter.cs index 8f57f87..92073ab 100644 --- a/Converters/BoolToVisibilityConverter.cs +++ b/Converters/BoolToVisibilityConverter.cs @@ -3,7 +3,7 @@ using System.Globalization; using System.Windows; using System.Windows.Data; -namespace DebtMgr.Converters +namespace eJay.Converters { [ValueConversion(typeof(bool), typeof(Visibility))] public class BoolToVisibilityConverter : IValueConverter diff --git a/Data/Database.cs b/Data/Database.cs index 5a7a4d4..f1b7de5 100644 --- a/Data/Database.cs +++ b/Data/Database.cs @@ -1,11 +1,11 @@ using System; using System.Collections.Generic; -using DebtMgr.Model; +using eJay.Model; using SQLite.Net; using SQLite.Net.Interop; using SQLite.Net.Platform.Generic; -namespace DebtMgr.Data +namespace eJay.Data { public class Database : SQLiteConnection { diff --git a/Data/EJaySettings.cs b/Data/EJaySettings.cs index 9d574a9..6e09e12 100644 --- a/Data/EJaySettings.cs +++ b/Data/EJaySettings.cs @@ -1,4 +1,4 @@ -namespace DebtMgr.Data +namespace eJay.Data { public class EJaySettings { diff --git a/Extensions/ExtensionMethods.cs b/Extensions/ExtensionMethods.cs index 4429b38..cc2b0e7 100644 --- a/Extensions/ExtensionMethods.cs +++ b/Extensions/ExtensionMethods.cs @@ -1,7 +1,7 @@ using System.Globalization; using System.Windows; -namespace DebtMgr.Extensions +namespace eJay.Extensions { //////////////////////////////////////////////////////////////////////////////////////////////////// /// An extension methods. diff --git a/Helper/PrintHelper.cs b/Helper/PrintHelper.cs index cd82a0d..9a43168 100644 --- a/Helper/PrintHelper.cs +++ b/Helper/PrintHelper.cs @@ -3,7 +3,7 @@ using System.Windows; using System.Windows.Media; using System.Windows.Media.Imaging; -namespace DebtMgr.Helper +namespace eJay.Helper { public class PrintHelper { diff --git a/Model/Enums.cs b/Model/Enums.cs index fe4b092..8cb67cd 100644 --- a/Model/Enums.cs +++ b/Model/Enums.cs @@ -1,6 +1,6 @@ using System.ComponentModel; -namespace DebtMgr.Model +namespace eJay.Model { //////////////////////////////////////////////////////////////////////////////////////////////////// /// Values that represent transaction types. diff --git a/Model/Person.cs b/Model/Person.cs index 9a07d76..d678dd1 100644 --- a/Model/Person.cs +++ b/Model/Person.cs @@ -1,10 +1,9 @@ using System; using System.Collections.Generic; -using System.Linq; using SQLite.Net.Attributes; using SQLiteNetExtensions.Attributes; -namespace DebtMgr.Model +namespace eJay.Model { //////////////////////////////////////////////////////////////////////////////////////////////////// /// A person. diff --git a/Model/Transaction.cs b/Model/Transaction.cs index 1679d7d..67b8889 100644 --- a/Model/Transaction.cs +++ b/Model/Transaction.cs @@ -2,7 +2,7 @@ using SQLite.Net.Attributes; using SQLiteNetExtensions.Attributes; -namespace DebtMgr.Model +namespace eJay.Model { //////////////////////////////////////////////////////////////////////////////////////////////////// /// A transaction. diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs index 61c55bb..1a64b67 100644 --- a/Properties/AssemblyInfo.cs +++ b/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ using System.Windows; // Allgemeine Informationen über eine Assembly werden über die folgenden // Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, // die einer Assembly zugeordnet sind. -[assembly: AssemblyTitle("DebtMgr")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("eJay")] +[assembly: AssemblyDescription("A tool to keep track of your private debts")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DebtMgr")] -[assembly: AssemblyCopyright("Copyright © 2017")] +[assembly: AssemblyCompany("TroogS")] +[assembly: AssemblyProduct("eJay")] +[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index ce52b19..96fc286 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace DebtMgr.Properties { +namespace eJay.Properties { using System; @@ -19,7 +19,7 @@ namespace DebtMgr.Properties { // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert. // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ namespace DebtMgr.Properties { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DebtMgr.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("eJay.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/View/Dialogs/AddTransactionView.xaml b/View/Dialogs/AddTransactionView.xaml index b9a68ed..e17df22 100644 --- a/View/Dialogs/AddTransactionView.xaml +++ b/View/Dialogs/AddTransactionView.xaml @@ -1,4 +1,4 @@ - /// Interaktionslogik für AddTransactionView.xaml diff --git a/View/Dialogs/DatabaseSelectorDialogView.xaml b/View/Dialogs/DatabaseSelectorDialogView.xaml index 5385eb6..f505db7 100644 --- a/View/Dialogs/DatabaseSelectorDialogView.xaml +++ b/View/Dialogs/DatabaseSelectorDialogView.xaml @@ -1,4 +1,4 @@ - /// Interaktionslogik für DatabaseSelectorDialogView.xaml diff --git a/View/Dialogs/EditTransactionDialogView.xaml b/View/Dialogs/EditTransactionDialogView.xaml index ba9becf..987d1c6 100644 --- a/View/Dialogs/EditTransactionDialogView.xaml +++ b/View/Dialogs/EditTransactionDialogView.xaml @@ -1,9 +1,9 @@ - /// Interaktionslogik für EditTransactionDialogView.xaml diff --git a/View/Dialogs/NewPersonDialogView.xaml b/View/Dialogs/NewPersonDialogView.xaml index 26247aa..0d547ba 100644 --- a/View/Dialogs/NewPersonDialogView.xaml +++ b/View/Dialogs/NewPersonDialogView.xaml @@ -1,9 +1,9 @@ - /// Interaktionslogik für NewPersonDialogView.xaml diff --git a/View/MainView.xaml b/View/MainView.xaml index 99d279e..1f4cb71 100644 --- a/View/MainView.xaml +++ b/View/MainView.xaml @@ -1,9 +1,10 @@ - - + diff --git a/View/MainView.xaml.cs b/View/MainView.xaml.cs index e2e2766..34b4103 100644 --- a/View/MainView.xaml.cs +++ b/View/MainView.xaml.cs @@ -5,7 +5,7 @@ using System.Windows.Input; using System.Windows.Media; using Squirrel; -namespace DebtMgr.View +namespace eJay.View { /// /// Interaktionslogik für MainView.xaml diff --git a/View/ScreenshotView.xaml b/View/ScreenshotView.xaml index 876bcd0..05e0f99 100644 --- a/View/ScreenshotView.xaml +++ b/View/ScreenshotView.xaml @@ -1,9 +1,9 @@ - diff --git a/View/ScreenshotView.xaml.cs b/View/ScreenshotView.xaml.cs index 84c51e4..495a578 100644 --- a/View/ScreenshotView.xaml.cs +++ b/View/ScreenshotView.xaml.cs @@ -13,7 +13,7 @@ using System.Windows.Media; using System.Windows.Media.Imaging; using System.Windows.Shapes; -namespace DebtMgr.View +namespace eJay.View { /// /// Interaktionslogik für ScreenshotView.xaml diff --git a/ViewModel/Dialogs/AddTransactionViewModel.cs b/ViewModel/Dialogs/AddTransactionViewModel.cs index 08aa99d..addc481 100644 --- a/ViewModel/Dialogs/AddTransactionViewModel.cs +++ b/ViewModel/Dialogs/AddTransactionViewModel.cs @@ -1,4 +1,4 @@ -using DebtMgr.Model; +using eJay.Model; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using SQLiteNetExtensions.Extensions; @@ -8,7 +8,7 @@ using System.Globalization; using System.Linq; using System.Windows; -namespace DebtMgr.ViewModel.Dialogs +namespace eJay.ViewModel.Dialogs { public class AddTransactionViewModel : ViewModelBase { diff --git a/ViewModel/Dialogs/DatabaseSelectorDialogViewModel.cs b/ViewModel/Dialogs/DatabaseSelectorDialogViewModel.cs index 33dcd18..3be867e 100644 --- a/ViewModel/Dialogs/DatabaseSelectorDialogViewModel.cs +++ b/ViewModel/Dialogs/DatabaseSelectorDialogViewModel.cs @@ -1,14 +1,14 @@ using System; using System.Linq; using System.Windows; -using DebtMgr.Model; +using eJay.Model; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using Microsoft.Win32; using SQLite.Net; using SQLite.Net.Platform.Generic; -namespace DebtMgr.ViewModel.Dialogs +namespace eJay.ViewModel.Dialogs { public class DatabaseSelectorDialogViewModel : ViewModelBase { diff --git a/ViewModel/Dialogs/EditTransactionDialogViewModel.cs b/ViewModel/Dialogs/EditTransactionDialogViewModel.cs index 85ff504..4f31227 100644 --- a/ViewModel/Dialogs/EditTransactionDialogViewModel.cs +++ b/ViewModel/Dialogs/EditTransactionDialogViewModel.cs @@ -1,11 +1,11 @@ using System; using System.Globalization; -using DebtMgr.Model; +using eJay.Model; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using SQLiteNetExtensions.Extensions; -namespace DebtMgr.ViewModel.Dialogs +namespace eJay.ViewModel.Dialogs { public class EditTransactionDialogViewModel : ViewModelBase { diff --git a/ViewModel/Dialogs/NewPersonDialogViewModel.cs b/ViewModel/Dialogs/NewPersonDialogViewModel.cs index 411ffb0..59253a4 100644 --- a/ViewModel/Dialogs/NewPersonDialogViewModel.cs +++ b/ViewModel/Dialogs/NewPersonDialogViewModel.cs @@ -1,10 +1,10 @@ using System; using System.Windows; -using DebtMgr.Model; +using eJay.Model; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; -namespace DebtMgr.ViewModel.Dialogs +namespace eJay.ViewModel.Dialogs { public class NewPersonDialogViewModel : ViewModelBase { diff --git a/ViewModel/MainViewModel.cs b/ViewModel/MainViewModel.cs index 37fd66c..60304bb 100644 --- a/ViewModel/MainViewModel.cs +++ b/ViewModel/MainViewModel.cs @@ -1,5 +1,5 @@ -using DebtMgr.Model; -using DebtMgr.View.Dialogs; +using eJay.Model; +using eJay.View.Dialogs; using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using SQLiteNetExtensions.Extensions; @@ -11,7 +11,7 @@ using System.Threading; using System.IO; using System.Diagnostics; using System.Windows.Controls; -using DebtMgr.Helper; +using eJay.Helper; using Microsoft.Win32; using System.Windows.Markup; using System.Xml; @@ -19,7 +19,7 @@ using Squirrel; using NuGet; using System.Threading.Tasks; -namespace DebtMgr.ViewModel +namespace eJay.ViewModel { public class MainViewModel : ViewModelBase { diff --git a/ViewModel/ViewModelLocator.cs b/ViewModel/ViewModelLocator.cs index bff0a36..0283117 100644 --- a/ViewModel/ViewModelLocator.cs +++ b/ViewModel/ViewModelLocator.cs @@ -12,11 +12,11 @@ See http://www.galasoft.ch/mvvm */ -using DebtMgr.ViewModel.Dialogs; +using eJay.ViewModel.Dialogs; using GalaSoft.MvvmLight.Ioc; using Microsoft.Practices.ServiceLocation; -namespace DebtMgr.ViewModel +namespace eJay.ViewModel { /// /// This class contains static references to all the view models in the diff --git a/DebtMgr.csproj b/eJay.csproj similarity index 91% rename from DebtMgr.csproj rename to eJay.csproj index 3b6e629..854f1e1 100644 --- a/DebtMgr.csproj +++ b/eJay.csproj @@ -6,8 +6,8 @@ AnyCPU {11FFBAAB-CE28-4B77-8C7A-8B15F0007133} WinExe - DebtMgr - DebtMgr + eJay + eJay v4.6 512 {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -16,6 +16,21 @@ + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true AnyCPU @@ -34,7 +49,7 @@ bin\Release\ TRACE prompt - 4 + 0 Content\money_green.ico @@ -276,6 +291,18 @@ + + + False + Microsoft .NET Framework 4.6 %28x86 und x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + @@ -302,10 +329,9 @@ set releaseDir="C:\Squirrel\eJay" set longVersion=@(VersionNumber) set version=%25longVersion:~0,5%25 -echo %25version%25 cd ..\..\nuget nuget pack ..\nuspec\ejay.nuspec -Squirrel --releasify ..\nuget\eJay.%25version%25.nupkg --releaseDir %25releaseDir%25 -echo RELEASED IN %25releaseDir%25 +Squirrel --releasify eJay.%25version%25.nupkg --releaseDir %25releaseDir%25 +echo RELEASED Version %25version%25 IN %25releaseDir%25 \ No newline at end of file diff --git a/DebtMgr.sln b/eJay.sln similarity index 77% rename from DebtMgr.sln rename to eJay.sln index 4690b4c..90c2cbf 100644 --- a/DebtMgr.sln +++ b/eJay.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26430.13 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebtMgr", "DebtMgr.csproj", "{11FFBAAB-CE28-4B77-8C7A-8B15F0007133}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "eJay", "eJay.csproj", "{11FFBAAB-CE28-4B77-8C7A-8B15F0007133}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,4 +19,7 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0EDFC77D-57B3-4C52-8B89-4FF93FAC5665} + EndGlobalSection EndGlobal