Compare commits
21 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 45e45d44af | |||
| d0d39ccd62 | |||
| ff96d727f1 | |||
| 828430adf8 | |||
| a6b60a4cc8 | |||
| 2fb0e1f73b | |||
| 2a8bbf76bf | |||
| bc5ce3e311 | |||
| 64dc54bb70 | |||
| c6273ed8b3 | |||
| 16f6aa511c | |||
| b2917eda6b | |||
| 2075a0be20 | |||
| cc821da4da | |||
| a466f04d20 | |||
| f4ed36ad38 | |||
| f6c7a205a8 | |||
| b197f43341 | |||
| 6e23371858 | |||
| 75beb3d584 | |||
| 9ed6755072 |
@@ -10,7 +10,7 @@
|
||||
"request": "launch",
|
||||
"preLaunchTask": "build",
|
||||
// If you have changed target frameworks, make sure to update the program path.
|
||||
"program": "${workspaceFolder}/bin/Debug/net10.0/osx-arm64/ReceiptPDFBuilder.dll",
|
||||
"program": "${workspaceFolder}/src/bin/Debug/net10.0/osx-arm64/MayShow.dll",
|
||||
"args": [],
|
||||
"cwd": "${workspaceFolder}",
|
||||
// For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
"type": "process",
|
||||
"args": [
|
||||
"build",
|
||||
"${workspaceFolder}/ReceiptPDFBuilder.csproj",
|
||||
"${workspaceFolder}/src/MayShow.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||
],
|
||||
@@ -19,7 +19,7 @@
|
||||
"type": "process",
|
||||
"args": [
|
||||
"publish",
|
||||
"${workspaceFolder}/ReceiptPDFBuilder.csproj",
|
||||
"${workspaceFolder}/src/MayShow.csproj",
|
||||
"/property:GenerateFullPaths=true",
|
||||
"/consoleloggerparameters:NoSummary;ForceNoAlign"
|
||||
],
|
||||
@@ -33,7 +33,7 @@
|
||||
"watch",
|
||||
"run",
|
||||
"--project",
|
||||
"${workspaceFolder}/ReceiptPDFBuilder.csproj"
|
||||
"${workspaceFolder}/src/MayShow.csproj"
|
||||
],
|
||||
"problemMatcher": "$msCompile"
|
||||
}
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
using ReceiptPDFBuilder.ViewModels;
|
||||
|
||||
namespace ReceiptPDFBuilder.Interfaces
|
||||
{
|
||||
interface IChangeViewModel
|
||||
{
|
||||
void PushViewModel(BaseViewModel model);
|
||||
void PopViewModel();
|
||||
}
|
||||
}
|
||||
@@ -1,9 +0,0 @@
|
||||
using Avalonia.Controls;
|
||||
|
||||
namespace ReceiptPDFBuilder.Interfaces
|
||||
{
|
||||
interface ITopLevelGrabber
|
||||
{
|
||||
TopLevel GetTopLevel();
|
||||
}
|
||||
}
|
||||
@@ -1,19 +0,0 @@
|
||||
using Avalonia.Controls;
|
||||
using ReceiptPDFBuilder.Interfaces;
|
||||
using ReceiptPDFBuilder.ViewModels;
|
||||
|
||||
namespace ReceiptPDFBuilder;
|
||||
|
||||
public partial class MainWindow : Window, ITopLevelGrabber
|
||||
{
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
DataContext = new MainWindowViewModel(this);
|
||||
}
|
||||
|
||||
public TopLevel GetTopLevel()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,10 @@
|
||||
# MayShow
|
||||
|
||||
MayShow (an intentional misspelling of 明証, pronounced may-shō, a Japanese word meaning proof, evidence, or corroboration) is a PDF report creation tool.
|
||||
|
||||
Throws a folder of images and PDFs into a single PDF. Simple tool for my own use, really, but maybe helpful to someone else.
|
||||
|
||||

|
||||

|
||||
|
||||
Icon is from [Font Awesome](https://fontawesome.com/license/free) and generated via [Gauger's FontAwesome icon tool](https://gauger.me/fonticon/) and the macOS software [Icon Composer](https://developer.apple.com/icon-composer/).
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 421 KiB After Width: | Height: | Size: 421 KiB |
|
Before Width: | Height: | Size: 1.9 MiB After Width: | Height: | Size: 1.9 MiB |
|
After Width: | Height: | Size: 36 KiB |
@@ -0,0 +1,27 @@
|
||||
{
|
||||
"fill" : "system-dark",
|
||||
"groups" : [
|
||||
{
|
||||
"layers" : [
|
||||
{
|
||||
"image-name" : "favicon(2).png",
|
||||
"name" : "favicon(2)"
|
||||
}
|
||||
],
|
||||
"shadow" : {
|
||||
"kind" : "neutral",
|
||||
"opacity" : 0.5
|
||||
},
|
||||
"translucency" : {
|
||||
"enabled" : true,
|
||||
"value" : 0.5
|
||||
}
|
||||
}
|
||||
],
|
||||
"supported-platforms" : {
|
||||
"circles" : [
|
||||
"watchOS"
|
||||
],
|
||||
"squares" : "shared"
|
||||
}
|
||||
}
|
||||
|
After Width: | Height: | Size: 1.9 MiB |
@@ -3,7 +3,7 @@
|
||||
; Non-commercial use only
|
||||
|
||||
#define MyAppName "MayShow"
|
||||
#define MyAppVersion "1.1.0"
|
||||
#define MyAppVersion "1.2.0"
|
||||
#define MyAppPublisher "Quickity Quack Productions"
|
||||
#define MyAppExeName "MayShow.exe"
|
||||
|
||||
@@ -31,8 +31,8 @@ DisableProgramGroupPage=yes
|
||||
OutputBaseFilename=Install {#MyAppName} {#MyAppVersion}
|
||||
SolidCompression=yes
|
||||
WizardStyle=modern dynamic
|
||||
SetupIconFile=ReceiptPDFBuilder-icon.ico
|
||||
OutputDir=bin
|
||||
SetupIconFile=../src/MayShow-icon.ico
|
||||
OutputDir=..\src\bin
|
||||
|
||||
[Languages]
|
||||
Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
@@ -41,12 +41,12 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
|
||||
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
|
||||
|
||||
[Files]
|
||||
Source: "bin\Release\net10.0\win-x64\publish\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "bin\Release\net10.0\win-x64\publish\av_libglesv2.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "bin\Release\net10.0\win-x64\publish\libHarfBuzzSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "bin\Release\net10.0\win-x64\publish\libSkiaSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "bin\Release\net10.0\win-x64\publish\Magick.Native-Q16-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "bin\Release\net10.0\win-x64\publish\Assets\*"; DestDir: "{app}\Assets"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
Source: "..\src\bin\Release\net10.0\win-x64\publish\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\src\bin\Release\net10.0\win-x64\publish\av_libglesv2.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\src\bin\Release\net10.0\win-x64\publish\libHarfBuzzSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\src\bin\Release\net10.0\win-x64\publish\libSkiaSharp.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\src\bin\Release\net10.0\win-x64\publish\Magick.Native-Q16-x64.dll"; DestDir: "{app}"; Flags: ignoreversion
|
||||
Source: "..\src\bin\Release\net10.0\win-x64\publish\Assets\*"; DestDir: "{app}\Assets"; Flags: ignoreversion recursesubdirs createallsubdirs
|
||||
; NOTE: Don't use "Flags: ignoreversion" on any shared system files
|
||||
|
||||
[Icons]
|
||||
@@ -0,0 +1,16 @@
|
||||
#!/bin/bash
|
||||
|
||||
SRC_DIR="src" # user ran script from main folder
|
||||
if [ ! -d "$SRC_DIR" ]; then
|
||||
SRC_DIR= "../src" # try
|
||||
fi
|
||||
if [ ! -d "$SRC_DIR" ]; then
|
||||
echo "Please run from "installers" dir or from main repo directory"
|
||||
exit 1
|
||||
fi
|
||||
cd "$SRC_DIR"
|
||||
echo "Building release for linux-x64..."
|
||||
dotnet publish -c Release -r linux-x64 -p:StripSymbols=False -p:PublishAot=False
|
||||
echo "Building release for linux-arm64..."
|
||||
dotnet publish -c Release -r linux-arm64 -p:StripSymbols=False -p:PublishAot=False
|
||||
# TODO: add automatic zipping and version number setting for ease of use
|
||||
@@ -1,11 +1,11 @@
|
||||
<Application xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
x:Class="ReceiptPDFBuilder.App"
|
||||
xmlns:viewModels="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
xmlns:views="clr-namespace:ReceiptPDFBuilder.Views"
|
||||
x:Class="MayShow.App"
|
||||
xmlns:viewModels="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:views="clr-namespace:MayShow.Views"
|
||||
xmlns:dialogHostAvalonia="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
xmlns:behaviors="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
xmlns:helpers="clr-namespace:ReceiptPDFBuilder.Helpers"
|
||||
xmlns:helpers="clr-namespace:MayShow.Helpers"
|
||||
RequestedThemeVariant="Default"
|
||||
Name="MayShow">
|
||||
<Application.Styles>
|
||||
@@ -88,7 +88,7 @@
|
||||
<DataTemplate DataType="{x:Type viewModels:MainViewModel}">
|
||||
<views:MainView/>
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewModels:WarningDeleteItemModel}">
|
||||
<DataTemplate DataType="{x:Type viewModels:WarningDeleteItemViewModel}">
|
||||
<views:WarningDeleteItem/>
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewModels:EditFileViewModel}">
|
||||
@@ -100,6 +100,9 @@
|
||||
<DataTemplate DataType="{x:Type viewModels:WarningViewModel}">
|
||||
<views:WarningView/>
|
||||
</DataTemplate>
|
||||
<DataTemplate DataType="{x:Type viewModels:ShutdownCheckViewModel}">
|
||||
<views:ShutdownCheckView/>
|
||||
</DataTemplate>
|
||||
</Application.DataTemplates>
|
||||
<Application.Resources>
|
||||
<ResourceDictionary>
|
||||
@@ -4,10 +4,10 @@ using Avalonia.Controls.ApplicationLifetimes;
|
||||
using Avalonia.Interactivity;
|
||||
using Avalonia.Markup.Xaml;
|
||||
using DialogHostAvalonia;
|
||||
using ReceiptPDFBuilder;
|
||||
using ReceiptPDFBuilder.ViewModels;
|
||||
using MayShow;
|
||||
using MayShow.ViewModels;
|
||||
|
||||
namespace ReceiptPDFBuilder;
|
||||
namespace MayShow;
|
||||
|
||||
public partial class App : Application
|
||||
{
|
||||
@@ -4,7 +4,7 @@ using System.ComponentModel;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
|
||||
namespace ReceiptPDFBuilder.Helpers
|
||||
namespace MayShow.Helpers
|
||||
{
|
||||
|
||||
// https://docs.microsoft.com/en-us/dotnet/api/system.componentmodel.inotifypropertychanged?view=netframework-4.7.2
|
||||
@@ -1,11 +1,11 @@
|
||||
|
||||
using System;
|
||||
|
||||
namespace ReceiptPDFBuilder.Helpers;
|
||||
namespace MayShow.Helpers;
|
||||
|
||||
class Constants
|
||||
{
|
||||
public static string AppVersion = "1.1.0";
|
||||
public static string AppVersion = "1.2.0";
|
||||
|
||||
public static string[] GetQuotes()
|
||||
{
|
||||
@@ -3,10 +3,10 @@ using Avalonia.Controls;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.VisualTree;
|
||||
using Avalonia.Xaml.Interactions.DragAndDrop;
|
||||
using ReceiptPDFBuilder.Models;
|
||||
using ReceiptPDFBuilder.ViewModels;
|
||||
using MayShow.Models;
|
||||
using MayShow.ViewModels;
|
||||
|
||||
namespace ReceiptPDFBuilder.Helpers;
|
||||
namespace MayShow.Helpers;
|
||||
|
||||
class DataGridDropHandler : BaseDataGridDropHandler<ReportFile>
|
||||
{
|
||||
@@ -2,7 +2,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Threading;
|
||||
|
||||
namespace ReceiptPDFBuilders.Helpers;
|
||||
namespace MayShows.Helpers;
|
||||
|
||||
public static class ThreadSafeRandom
|
||||
{
|
||||
@@ -1,7 +1,7 @@
|
||||
using System.Text.Json.Serialization;
|
||||
using ReceiptPDFBuilder.Models;
|
||||
using MayShow.Models;
|
||||
|
||||
namespace ReceiptPDFBuilder.Helpers;
|
||||
namespace MayShow.Helpers;
|
||||
|
||||
[JsonSerializable(typeof(Settings))]
|
||||
[JsonSerializable(typeof(ReportFile))]
|
||||
@@ -5,7 +5,7 @@ using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace ReceiptPDFBuilders.Helpers;
|
||||
namespace MayShows.Helpers;
|
||||
|
||||
class Utilities
|
||||
{
|
||||
@@ -0,0 +1,8 @@
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace MayShow.Interfaces;
|
||||
|
||||
interface ICanCheckShutdown
|
||||
{
|
||||
Task<bool> CheckIsSafeToShutdown();
|
||||
}
|
||||
@@ -0,0 +1,9 @@
|
||||
using MayShow.ViewModels;
|
||||
|
||||
namespace MayShow.Interfaces;
|
||||
|
||||
interface IChangeViewModel
|
||||
{
|
||||
void PushViewModel(BaseViewModel model);
|
||||
void PopViewModel();
|
||||
}
|
||||
@@ -0,0 +1,8 @@
|
||||
using Avalonia.Controls;
|
||||
|
||||
namespace MayShow.Interfaces;
|
||||
|
||||
interface ITopLevelGrabber
|
||||
{
|
||||
TopLevel GetTopLevel();
|
||||
}
|
||||
@@ -3,9 +3,9 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="ReceiptPDFBuilder.MainWindow"
|
||||
x:Class="MayShow.MainWindow"
|
||||
Title="MayShow"
|
||||
xmlns:vm="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
x:DataType="vm:MainWindowViewModel"
|
||||
Width="800"
|
||||
@@ -13,7 +13,8 @@
|
||||
Height="650"
|
||||
MinHeight="550">
|
||||
<dialogHost:DialogHost CloseOnClickAway="False"
|
||||
Identifier="DialogHost">
|
||||
Identifier="DialogHost"
|
||||
x:Name="WindowDialogHost">
|
||||
<dialogHost:DialogHost.DialogContent>
|
||||
<StackPanel/>
|
||||
</dialogHost:DialogHost.DialogContent>
|
||||
@@ -0,0 +1,78 @@
|
||||
using System;
|
||||
using System.Threading.Tasks;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Controls.ApplicationLifetimes;
|
||||
using DialogHostAvalonia;
|
||||
using MayShow.Interfaces;
|
||||
using MayShow.ViewModels;
|
||||
|
||||
namespace MayShow;
|
||||
|
||||
public partial class MainWindow : Window, ITopLevelGrabber
|
||||
{
|
||||
public MainWindow()
|
||||
{
|
||||
InitializeComponent();
|
||||
DataContext = new MainWindowViewModel(this);
|
||||
|
||||
Closing += WindowIsClosing;
|
||||
|
||||
var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
|
||||
// lifetime?.ShutdownRequested += ApplicationIsShuttingDown;
|
||||
}
|
||||
|
||||
private async void WindowIsClosing(object? sender, WindowClosingEventArgs e)
|
||||
{
|
||||
e.Cancel = true; // async -> need to cancel immediately
|
||||
if (await CheckIfClosePossible())
|
||||
{
|
||||
Closing -= WindowIsClosing;
|
||||
var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
|
||||
lifetime?.ShutdownRequested -= ApplicationIsShuttingDown;
|
||||
Close();
|
||||
}
|
||||
}
|
||||
|
||||
private async void ApplicationIsShuttingDown(object? sender, ShutdownRequestedEventArgs e)
|
||||
{
|
||||
e.Cancel = true; // async -> need to cancel immediately
|
||||
if (await CheckIfClosePossible())
|
||||
{
|
||||
Closing -= WindowIsClosing;
|
||||
var lifetime = Application.Current?.ApplicationLifetime as IClassicDesktopStyleApplicationLifetime;
|
||||
lifetime?.ShutdownRequested -= ApplicationIsShuttingDown;
|
||||
lifetime?.TryShutdown();
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<bool> CheckIfClosePossible()
|
||||
{
|
||||
var canShutdown = true;
|
||||
if (DataContext is MainWindowViewModel mwvm)
|
||||
{
|
||||
if (mwvm is ICanCheckShutdown canCheck)
|
||||
{
|
||||
canShutdown = await canCheck.CheckIsSafeToShutdown();
|
||||
}
|
||||
// only checking 1 level but for this app that is OK
|
||||
if (canShutdown && mwvm.CurrentViewModel is ICanCheckShutdown currModel)
|
||||
{
|
||||
try
|
||||
{
|
||||
canShutdown = await currModel.CheckIsSafeToShutdown();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
canShutdown = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return canShutdown;
|
||||
}
|
||||
|
||||
public TopLevel GetTopLevel()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
}
|
||||
|
Before Width: | Height: | Size: 401 KiB After Width: | Height: | Size: 401 KiB |
@@ -12,8 +12,8 @@
|
||||
<PublishTrimmed>true</PublishTrimmed>
|
||||
<PublishAot>true</PublishAot>
|
||||
<AssemblyName>MayShow</AssemblyName>
|
||||
<AssemblyVersion>1.1.0</AssemblyVersion> <!-- Also update Constants version -->
|
||||
<ApplicationIcon>ReceiptPDFBuilder-icon.ico</ApplicationIcon>
|
||||
<AssemblyVersion>1.2.0</AssemblyVersion> <!-- Also update Constants version -->
|
||||
<ApplicationIcon>MayShow-icon.ico</ApplicationIcon>
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<TrimmerRootAssembly Include="PdfSharp" />
|
||||
@@ -5,9 +5,9 @@ using System.Text;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using System.Threading.Tasks;
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using MayShow.Helpers;
|
||||
|
||||
namespace ReceiptPDFBuilder.Models;
|
||||
namespace MayShow.Models;
|
||||
|
||||
class PDFReport : ChangeNotifier
|
||||
{
|
||||
@@ -1,9 +1,9 @@
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.Text.Json.Serialization;
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using MayShow.Helpers;
|
||||
|
||||
namespace ReceiptPDFBuilder.Models;
|
||||
namespace MayShow.Models;
|
||||
|
||||
class ReportFile : ChangeNotifier
|
||||
{
|
||||
@@ -4,10 +4,10 @@ using System.Text;
|
||||
using System.Text.Json;
|
||||
using System.Text.Json.Serialization;
|
||||
using System.Threading.Tasks;
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using ReceiptPDFBuilders.Helpers;
|
||||
using MayShow.Helpers;
|
||||
using MayShows.Helpers;
|
||||
|
||||
namespace ReceiptPDFBuilder.Models;
|
||||
namespace MayShow.Models;
|
||||
|
||||
class Settings : ChangeNotifier
|
||||
{
|
||||
@@ -34,7 +34,7 @@ class Settings : ChangeNotifier
|
||||
{
|
||||
var path = Path.Combine(
|
||||
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||
"ReceiptPDFBuilder"
|
||||
"MayShow"
|
||||
);
|
||||
if (!Directory.Exists(path))
|
||||
{
|
||||
@@ -0,0 +1,8 @@
|
||||
namespace MayShow.Models;
|
||||
|
||||
enum ShutdownCheckOptions
|
||||
{
|
||||
SaveAndShutdown,
|
||||
NoSaveShutdown,
|
||||
CancelShutdown,
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
using Avalonia;
|
||||
using System;
|
||||
|
||||
namespace ReceiptPDFBuilder;
|
||||
namespace MayShow;
|
||||
|
||||
class Program
|
||||
{
|
||||
@@ -15,10 +15,10 @@ using MigraDoc.Rendering;
|
||||
using PdfSharp.Fonts;
|
||||
using PdfSharp.Pdf.IO;
|
||||
using PdfSharp.Snippets.Font;
|
||||
using ReceiptPDFBuilder.Interfaces;
|
||||
using ReceiptPDFBuilder.Models;
|
||||
using MayShow.Interfaces;
|
||||
using MayShow.Models;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels;
|
||||
namespace MayShow.ViewModels;
|
||||
|
||||
class AboutViewModel
|
||||
{
|
||||
@@ -1,11 +1,11 @@
|
||||
using Avalonia.Controls;
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using ReceiptPDFBuilder.Interfaces;
|
||||
using MayShow.Helpers;
|
||||
using MayShow.Interfaces;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels
|
||||
namespace MayShow.ViewModels
|
||||
{
|
||||
class BaseViewModel : ChangeNotifier
|
||||
{
|
||||
@@ -15,10 +15,10 @@ using MigraDoc.Rendering;
|
||||
using PdfSharp.Fonts;
|
||||
using PdfSharp.Pdf.IO;
|
||||
using PdfSharp.Snippets.Font;
|
||||
using ReceiptPDFBuilder.Interfaces;
|
||||
using ReceiptPDFBuilder.Models;
|
||||
using MayShow.Interfaces;
|
||||
using MayShow.Models;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels;
|
||||
namespace MayShow.ViewModels;
|
||||
|
||||
class EditFileViewModel : BaseViewModel
|
||||
{
|
||||
@@ -16,15 +16,16 @@ using MigraDoc.Rendering;
|
||||
using PdfSharp.Fonts;
|
||||
using PdfSharp.Pdf.IO;
|
||||
using PdfSharp.Snippets.Font;
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using ReceiptPDFBuilder.Interfaces;
|
||||
using ReceiptPDFBuilder.Models;
|
||||
using ReceiptPDFBuilders.Helpers;
|
||||
using MayShow.Helpers;
|
||||
using MayShow.Interfaces;
|
||||
using MayShow.Models;
|
||||
using MayShows.Helpers;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels;
|
||||
namespace MayShow.ViewModels;
|
||||
|
||||
class MainViewModel : BaseViewModel, IFontResolver
|
||||
class MainViewModel : BaseViewModel, IFontResolver, ICanCheckShutdown
|
||||
{
|
||||
private bool _isPerformingInitialLoad;
|
||||
private string _processDir;
|
||||
private bool _isCreatingPDF;
|
||||
private string _createPDFLog;
|
||||
@@ -36,21 +37,24 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
|
||||
private Settings _settings;
|
||||
|
||||
private bool _hasUnsavedWork;
|
||||
|
||||
public MainViewModel(IChangeViewModel viewModelChanger) : base(viewModelChanger)
|
||||
{
|
||||
_isPerformingInitialLoad = true;
|
||||
_processDir = Path.GetDirectoryName(Environment.ProcessPath) ?? "";
|
||||
Console.WriteLine("Process is running from: {0}", _processDir);
|
||||
_isCreatingPDF = false;
|
||||
var quotes = Constants.GetQuotes();
|
||||
Random random = new Random();
|
||||
var quoteIndex = random.Next(0, quotes.Length);
|
||||
_createPDFLog = "----- MayShow v" + Constants.AppVersion + "------" + Environment.NewLine;
|
||||
_createPDFLog = "----- MayShow v" + Constants.AppVersion + " ------" + Environment.NewLine;
|
||||
_createPDFLog += quotes[quoteIndex] + Environment.NewLine;
|
||||
_createPDFLog += "---------------------------------------" + Environment.NewLine;
|
||||
_createPDFLog += "Ready to create PDF!";
|
||||
_createPDFLog += "Loaded and ready to create report!" + Environment.NewLine;
|
||||
_createPDFLog += "Please copy and send this Program Log when reporting any issues with the software.";
|
||||
_workingFolder = "";
|
||||
_reportFiles = new ObservableCollection<ReportFile>();
|
||||
_reportFiles.CollectionChanged += ( sender, e ) => { NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled)); };
|
||||
ReportFiles = _reportFiles = new ObservableCollection<ReportFile>();
|
||||
_reportTitle = "";
|
||||
_lastGeneratedTime = null;
|
||||
_settings = Settings.LoadSettings();
|
||||
@@ -59,12 +63,24 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
LogInfo("Loading data at last used path of {0}", _settings.LastUsedPath);
|
||||
ScanFolder(_settings.LastUsedPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
LogInfo("Choose a receipt folder to begin...");
|
||||
}
|
||||
HasUnsavedWork = false;
|
||||
_isPerformingInitialLoad = false;
|
||||
}
|
||||
|
||||
public string ReportTitle
|
||||
{
|
||||
get => _reportTitle;
|
||||
set { _reportTitle = value; NotifyPropertyChanged(); NotifyPropertyChanged(nameof(IsTitleBoxVisible)); }
|
||||
set
|
||||
{
|
||||
_reportTitle = value;
|
||||
NotifyPropertyChanged();
|
||||
NotifyPropertyChanged(nameof(IsTitleBoxVisible));
|
||||
NotifyPropertyChanged(nameof(CanAddItem));
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsTitleBoxVisible
|
||||
@@ -72,6 +88,11 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
get => !string.IsNullOrWhiteSpace(_workingFolder);
|
||||
}
|
||||
|
||||
public bool CanAddItem
|
||||
{
|
||||
get => IsTitleBoxVisible && !IsCreatingPDF;
|
||||
}
|
||||
|
||||
public bool IsCreatingPDF
|
||||
{
|
||||
get => _isCreatingPDF;
|
||||
@@ -81,6 +102,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
NotifyPropertyChanged();
|
||||
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
|
||||
NotifyPropertyChanged(nameof(HasWorkingFolderAndNotMakingPDF));
|
||||
NotifyPropertyChanged(nameof(CanAddItem));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -117,6 +139,16 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
set { _createPDFLog = value; NotifyPropertyChanged(); }
|
||||
}
|
||||
|
||||
public bool HasUnsavedWork
|
||||
{
|
||||
get => _hasUnsavedWork;
|
||||
set
|
||||
{
|
||||
_hasUnsavedWork = value;
|
||||
NotifyPropertyChanged();
|
||||
}
|
||||
}
|
||||
|
||||
public ObservableCollection<ReportFile> ReportFiles
|
||||
{
|
||||
get => _reportFiles;
|
||||
@@ -126,7 +158,8 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
NotifyPropertyChanged();
|
||||
_reportFiles.CollectionChanged += ( sender, e ) =>
|
||||
{
|
||||
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
|
||||
NotifyPropertyChanged(nameof(IsCreatePDFButtonEnabled));
|
||||
HasUnsavedWork = true;
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -157,6 +190,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
_settings.LastUsedPath = folder.Path.LocalPath;
|
||||
await _settings.SaveSettingsAsync();
|
||||
ResortPDFItemsByDate();
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -167,6 +201,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
{
|
||||
WorkingFolder = path;
|
||||
NotifyPropertyChanged(nameof(IsTitleBoxVisible));
|
||||
NotifyPropertyChanged(nameof(CanAddItem));
|
||||
var reportFilePath = Path.Combine(path, GetReportSavedDataFileName());
|
||||
var successfullyLoadedPriorReport = false;
|
||||
if (File.Exists(reportFilePath))
|
||||
@@ -195,7 +230,11 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
{
|
||||
AddFileBasedOnPath(filePath);
|
||||
}
|
||||
ResortPDFItemsByDate();
|
||||
if (!_isPerformingInitialLoad)
|
||||
{
|
||||
ResortPDFItemsByDate();
|
||||
}
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -214,13 +253,14 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
|
||||
public async void RemoveFileImpl(ReportFile file)
|
||||
{
|
||||
var result = await DialogHost.Show(new WarningDeleteItemModel(file));
|
||||
var result = await DialogHost.Show(new WarningDeleteItemViewModel(file));
|
||||
if (result != null && (bool)result)
|
||||
{
|
||||
var idx = ReportFiles.IndexOf(file);
|
||||
if (idx != -1)
|
||||
{
|
||||
ReportFiles.RemoveAt(idx);
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -236,18 +276,20 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
file.Title = updatedData.Title;
|
||||
file.ReceiptDateTime = updatedData.ReceiptDateTime;
|
||||
file.Notes = updatedData.Notes;
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
|
||||
private string[] GetAllowedFileExtensionPatterns()
|
||||
{
|
||||
// update GetAllowedFileExtensionPatternsWithoutStar if this is edited
|
||||
return [ "*.png", "*.jpg", "*.jpeg", "*.gif", "*.bmp", "*.webp", "*.pdf", "*.heic", ];
|
||||
}
|
||||
|
||||
private string[] GetAllowedFileExtensionPatternsWithoutStar()
|
||||
{
|
||||
var list = GetAllowedFileExtensionPatterns();
|
||||
return list.Select(x => x.Replace("*.", "")).ToArray();
|
||||
// update GetAllowedFileExtensionPatterns if this is edited
|
||||
return [ "png", "jpg", "jpeg", "gif", "bmp", "webp", "pdf", "heic", ];
|
||||
}
|
||||
|
||||
public async void AddItem()
|
||||
@@ -316,6 +358,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
Notes = "",
|
||||
FilePath = filePath,
|
||||
});
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -351,6 +394,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
{
|
||||
var file = files[0];
|
||||
reportFile.FilePath = file.Path.LocalPath;
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -389,6 +433,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
{
|
||||
LogInfo("Sorting report files list...");
|
||||
ReportFiles = new ObservableCollection<ReportFile>(ReportFiles.OrderBy(x => x.ReceiptDateTime));
|
||||
HasUnsavedWork = true;
|
||||
}
|
||||
|
||||
public async void BuildPDF()
|
||||
@@ -423,7 +468,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
}
|
||||
}
|
||||
|
||||
public async void SaveInterimReportInfo()
|
||||
public async Task SaveInterimReportInfo()
|
||||
{
|
||||
var report = new PDFReport()
|
||||
{
|
||||
@@ -447,6 +492,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
var savePath = Path.Combine(_workingFolder, GetReportSavedDataFileName());
|
||||
await File.WriteAllTextAsync(savePath, json);
|
||||
LogInfo("Saved report information to {0}", savePath);
|
||||
HasUnsavedWork = false;
|
||||
}
|
||||
|
||||
private async Task CreateAndSaveReportObjectAfterReportCreation()
|
||||
@@ -585,14 +631,7 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
imageTitlePar.Format.Font.Size = 12;
|
||||
imageTitlePar.Format.Font.Bold = true;
|
||||
imageTitlePar.Format.Font.Name = "Noto Sans JP"; // has english letters in it, too
|
||||
if (string.IsNullOrWhiteSpace(file.Title))
|
||||
{
|
||||
imageTitlePar.AddText(file.FileName);
|
||||
}
|
||||
else
|
||||
{
|
||||
imageTitlePar.AddText(file.Title);
|
||||
}
|
||||
imageTitlePar.AddText(string.IsNullOrWhiteSpace(file.Title) ? file.FileName : file.Title);
|
||||
var receiptDatePar = section.AddParagraph();
|
||||
receiptDatePar.Format.Alignment = ParagraphAlignment.Center;
|
||||
receiptDatePar.Format.Font.Size = 12;
|
||||
@@ -698,4 +737,33 @@ class MainViewModel : BaseViewModel, IFontResolver
|
||||
OpenFolderForFileInFileViewer(outputPDFFileName);
|
||||
IsCreatingPDF = false;
|
||||
}
|
||||
|
||||
public async Task<bool> CheckIsSafeToShutdown()
|
||||
{
|
||||
if (!HasUnsavedWork || string.IsNullOrWhiteSpace(WorkingFolder))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else
|
||||
{
|
||||
var result = await DialogHost.Show(new ShutdownCheckViewModel());
|
||||
if (result != null && result is ShutdownCheckOptions opt)
|
||||
{
|
||||
if (opt == ShutdownCheckOptions.SaveAndShutdown)
|
||||
{
|
||||
await SaveInterimReportInfo();
|
||||
return true;
|
||||
}
|
||||
else if (opt == ShutdownCheckOptions.NoSaveShutdown)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
else if (opt == ShutdownCheckOptions.CancelShutdown)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,10 @@
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using ReceiptPDFBuilder.Interfaces;
|
||||
using MayShow.Helpers;
|
||||
using MayShow.Interfaces;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels
|
||||
namespace MayShow.ViewModels
|
||||
{
|
||||
class MainWindowViewModel : ChangeNotifier, IChangeViewModel
|
||||
{
|
||||
@@ -0,0 +1,29 @@
|
||||
#nullable enable
|
||||
|
||||
using DialogHostAvalonia;
|
||||
using MayShow.Models;
|
||||
|
||||
namespace MayShow.ViewModels;
|
||||
|
||||
class ShutdownCheckViewModel
|
||||
{
|
||||
|
||||
public ShutdownCheckViewModel()
|
||||
{
|
||||
}
|
||||
|
||||
public void SaveAndShutdown()
|
||||
{
|
||||
DialogHost.Close("DialogHost", ShutdownCheckOptions.SaveAndShutdown);
|
||||
}
|
||||
|
||||
public void DoNotSaveAndShutdown()
|
||||
{
|
||||
DialogHost.Close("DialogHost", ShutdownCheckOptions.NoSaveShutdown);
|
||||
}
|
||||
|
||||
public void CancelShutdown()
|
||||
{
|
||||
DialogHost.Close("DialogHost", ShutdownCheckOptions.CancelShutdown);
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,14 @@
|
||||
using DialogHostAvalonia;
|
||||
using ReceiptPDFBuilder.Helpers;
|
||||
using ReceiptPDFBuilder.Models;
|
||||
using MayShow.Helpers;
|
||||
using MayShow.Models;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels
|
||||
namespace MayShow.ViewModels
|
||||
{
|
||||
class WarningDeleteItemModel : ChangeNotifier
|
||||
class WarningDeleteItemViewModel : ChangeNotifier
|
||||
{
|
||||
ReportFile _file;
|
||||
|
||||
public WarningDeleteItemModel(ReportFile file)
|
||||
public WarningDeleteItemViewModel(ReportFile file)
|
||||
{
|
||||
_file = file;
|
||||
}
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
using DialogHostAvalonia;
|
||||
|
||||
namespace ReceiptPDFBuilder.ViewModels;
|
||||
namespace MayShow.ViewModels;
|
||||
|
||||
class WarningViewModel
|
||||
{
|
||||
@@ -3,11 +3,12 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="ReceiptPDFBuilder.Views.AboutView"
|
||||
xmlns:models="clr-namespace:ReceiptPDFBuilder.Models"
|
||||
xmlns:vm="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
x:Class="MayShow.Views.AboutView"
|
||||
xmlns:models="clr-namespace:MayShow.Models"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
x:DataType="vm:AboutViewModel">
|
||||
x:DataType="vm:AboutViewModel"
|
||||
MaxWidth="450">
|
||||
<StackPanel Orientation="Vertical"
|
||||
Spacing="4">
|
||||
<TextBlock Text="MayShow"
|
||||
@@ -15,16 +16,13 @@
|
||||
TextWrapping="Wrap"
|
||||
FontSize="18"
|
||||
FontWeight="Bold"/>
|
||||
<TextBlock Text="MayShow (an intentional mispelling of 明証, pronounced may-shō, a Japanese word meaning proof, evidence, or corroboration) is a PDF report creation tool. It was built by MB for A in 2026. May the quacking of ducks always be in your favor. Thanks for using our software!"
|
||||
MaxWidth="300"
|
||||
<TextBlock Text="MayShow (an intentional misspelling of 明証, pronounced may-shō, a Japanese word meaning proof, evidence, or corroboration) is a PDF report creation tool. It was built by MB for A in 2026. May the quacking of ducks always be in your favor. Thanks for using our software!"
|
||||
TextWrapping="Wrap"
|
||||
FontSize="14"/>
|
||||
<TextBlock Text="App icon made using https://gauger.me/fonticon/ with FontAwesome icon 'file-invoice-dollar' and the macOS software Icon Composer."
|
||||
MaxWidth="300"
|
||||
TextWrapping="Wrap"
|
||||
FontSize="14"/>
|
||||
<TextBlock Text="Copyright 2026 - Quickity Quack Productions"
|
||||
MaxWidth="300"
|
||||
TextWrapping="Wrap"
|
||||
HorizontalAlignment="Center"
|
||||
Margin="0,4,0,4"
|
||||
@@ -3,7 +3,7 @@ using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace ReceiptPDFBuilder.Views
|
||||
namespace MayShow.Views
|
||||
{
|
||||
public partial class AboutView : UserControl
|
||||
{
|
||||
@@ -5,11 +5,12 @@
|
||||
mc:Ignorable="d"
|
||||
d:DesignWidth="800"
|
||||
d:DesignHeight="450"
|
||||
x:Class="ReceiptPDFBuilder.Views.EditFile"
|
||||
xmlns:models="clr-namespace:ReceiptPDFBuilder.Models"
|
||||
xmlns:vm="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
x:Class="MayShow.Views.EditFile"
|
||||
xmlns:models="clr-namespace:MayShow.Models"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
x:DataType="vm:EditFileViewModel">
|
||||
x:DataType="vm:EditFileViewModel"
|
||||
MaxWidth="350">
|
||||
<ScrollViewer AllowAutoHide="False">
|
||||
<StackPanel Orientation="Vertical"
|
||||
Spacing="4"
|
||||
@@ -33,7 +34,8 @@
|
||||
<Label Content="Receipt Date" />
|
||||
<Calendar SelectionMode="SingleDate"
|
||||
SelectedDate="{Binding ClonedFile.ReceiptDateTime}"
|
||||
DisplayDate="{Binding ClonedFile.ReceiptDateTime}" />
|
||||
DisplayDate="{Binding ClonedFile.ReceiptDateTime}"
|
||||
IsTodayHighlighted="False" />
|
||||
<StackPanel Orientation="Horizontal"
|
||||
Spacing="12"
|
||||
Margin="0,4,0,0"
|
||||
@@ -3,7 +3,7 @@ using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace ReceiptPDFBuilder.Views
|
||||
namespace MayShow.Views
|
||||
{
|
||||
public partial class EditFile : UserControl
|
||||
{
|
||||
@@ -3,11 +3,11 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="ReceiptPDFBuilder.Views.MainView"
|
||||
xmlns:helpers="clr-namespace:ReceiptPDFBuilder.Helpers"
|
||||
xmlns:models="clr-namespace:ReceiptPDFBuilder.Models"
|
||||
xmlns:views="clr-namespace:ReceiptPDFBuilder.Views"
|
||||
xmlns:vm="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
x:Class="MayShow.Views.MainView"
|
||||
xmlns:helpers="clr-namespace:MayShow.Helpers"
|
||||
xmlns:models="clr-namespace:MayShow.Models"
|
||||
xmlns:views="clr-namespace:MayShow.Views"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:progRing="clr-namespace:AvaloniaProgressRing;assembly=AvaloniaProgressRing"
|
||||
x:DataType="vm:MainViewModel">
|
||||
<Grid ColumnDefinitions="*"
|
||||
@@ -167,7 +167,7 @@
|
||||
Margin="2"
|
||||
IsEnabled="{Binding !$parent[DataGrid].((vm:MainViewModel)DataContext).IsCreatingPDF}">
|
||||
<Button.Content>
|
||||
<TextBlock><Run Text="" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
|
||||
<TextBlock><Run Text="" FontFamily="{StaticResource FontAwesomeSolid}"/> Edit</TextBlock>
|
||||
</Button.Content>
|
||||
</Button>
|
||||
<Button Command="{Binding $parent[DataGrid].((vm:MainViewModel)DataContext).RemoveFile}"
|
||||
@@ -223,8 +223,8 @@
|
||||
<StackPanel Orientation="Horizontal"
|
||||
Spacing="4">
|
||||
<Button Command="{Binding AddItem}"
|
||||
IsEnabled="{Binding !IsCreatingPDF}">
|
||||
<TextBlock><Run Text="+" FontFamily="{StaticResource FontAwesomeSolid}"/> Add Item</TextBlock>
|
||||
IsEnabled="{Binding CanAddItem}">
|
||||
<TextBlock><Run Text="+" FontFamily="{StaticResource FontAwesomeSolid}"/> Add Item(s)</TextBlock>
|
||||
</Button>
|
||||
<Button Command="{Binding SaveInterimReportInfo}"
|
||||
IsEnabled="{Binding HasWorkingFolderAndNotMakingPDF}">
|
||||
@@ -3,8 +3,9 @@ using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Input;
|
||||
using Avalonia.Markup.Xaml;
|
||||
using MayShow.ViewModels;
|
||||
|
||||
namespace ReceiptPDFBuilder.Views
|
||||
namespace MayShow.Views
|
||||
{
|
||||
public partial class MainView : UserControl
|
||||
{
|
||||
@@ -12,6 +13,7 @@ namespace ReceiptPDFBuilder.Views
|
||||
{
|
||||
this.InitializeComponent();
|
||||
LogBlock.PropertyChanged += LogBlock_PropertyChanged;
|
||||
FilesGrid.CellEditEnded += FileCellEditEnded;
|
||||
}
|
||||
|
||||
private void LogBlock_PropertyChanged(object? sender, AvaloniaPropertyChangedEventArgs e)
|
||||
@@ -26,6 +28,18 @@ namespace ReceiptPDFBuilder.Views
|
||||
{
|
||||
var topLevel = TopLevel.GetTopLevel(this);
|
||||
topLevel?.FocusManager?.ClearFocus();
|
||||
if (DataContext is MainViewModel mvm)
|
||||
{
|
||||
mvm?.HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void FileCellEditEnded(object? sender, DataGridCellEditEndedEventArgs args)
|
||||
{
|
||||
if (args.EditAction == DataGridEditAction.Commit && DataContext is MainViewModel mvm)
|
||||
{
|
||||
mvm?.HasUnsavedWork = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,39 @@
|
||||
<UserControl xmlns="https://github.com/avaloniaui"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="MayShow.Views.ShutdownCheckView"
|
||||
xmlns:models="clr-namespace:MayShow.Models"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
x:DataType="vm:ShutdownCheckViewModel">
|
||||
<StackPanel Orientation="Vertical"
|
||||
Spacing="4">
|
||||
<TextBlock TextAlignment="Center"
|
||||
FontWeight="Bold"
|
||||
FontSize="18"
|
||||
Text="Warning: You have unsaved report data!"/>
|
||||
<TextBlock TextAlignment="Center"
|
||||
FontWeight="Bold"
|
||||
TextWrapping="Wrap"
|
||||
FontSize="14"
|
||||
Text="Do you want to save your data before the program is closed?"/>
|
||||
<StackPanel Orientation="Horizontal"
|
||||
Spacing="8">
|
||||
<Button Command="{Binding SaveAndShutdown}"
|
||||
Classes="accent"
|
||||
Content="Save Data and Close"
|
||||
HorizontalAlignment="Right"
|
||||
Margin="0,4,0,4"/>
|
||||
<Button Command="{Binding DoNotSaveAndShutdown}"
|
||||
Content="Do NOT Save Data and Close"
|
||||
HorizontalAlignment="Right"
|
||||
Margin="0,4,0,4"/>
|
||||
<Button Command="{Binding CancelShutdown}"
|
||||
Content="Cancel Program Shutdown"
|
||||
HorizontalAlignment="Right"
|
||||
Margin="0,4,0,4"/>
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</UserControl>
|
||||
@@ -0,0 +1,14 @@
|
||||
using System;
|
||||
using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace MayShow.Views;
|
||||
|
||||
public partial class ShutdownCheckView : UserControl
|
||||
{
|
||||
public ShutdownCheckView()
|
||||
{
|
||||
this.InitializeComponent();
|
||||
}
|
||||
}
|
||||
@@ -3,11 +3,11 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="ReceiptPDFBuilder.Views.WarningDeleteItem"
|
||||
xmlns:models="clr-namespace:ReceiptPDFBuilder.Models"
|
||||
xmlns:vm="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
x:Class="MayShow.Views.WarningDeleteItem"
|
||||
xmlns:models="clr-namespace:MayShow.Models"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
x:DataType="vm:WarningDeleteItemModel">
|
||||
x:DataType="vm:WarningDeleteItemViewModel">
|
||||
<StackPanel HorizontalAlignment="Center"
|
||||
Margin="6"
|
||||
Spacing="8">
|
||||
@@ -3,7 +3,7 @@ using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace ReceiptPDFBuilder.Views
|
||||
namespace MayShow.Views
|
||||
{
|
||||
public partial class WarningDeleteItem : UserControl
|
||||
{
|
||||
@@ -3,9 +3,9 @@
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
x:Class="ReceiptPDFBuilder.Views.WarningView"
|
||||
xmlns:models="clr-namespace:ReceiptPDFBuilder.Models"
|
||||
xmlns:vm="clr-namespace:ReceiptPDFBuilder.ViewModels"
|
||||
x:Class="MayShow.Views.WarningView"
|
||||
xmlns:models="clr-namespace:MayShow.Models"
|
||||
xmlns:vm="clr-namespace:MayShow.ViewModels"
|
||||
xmlns:dialogHost="clr-namespace:DialogHostAvalonia;assembly=DialogHost.Avalonia"
|
||||
x:DataType="vm:WarningViewModel">
|
||||
<StackPanel Orientation="Vertical"
|
||||
@@ -3,7 +3,7 @@ using Avalonia;
|
||||
using Avalonia.Controls;
|
||||
using Avalonia.Markup.Xaml;
|
||||
|
||||
namespace ReceiptPDFBuilder.Views
|
||||
namespace MayShow.Views
|
||||
{
|
||||
public partial class WarningView : UserControl
|
||||
{
|
||||
@@ -3,7 +3,7 @@
|
||||
<!-- This manifest is used on Windows only.
|
||||
Don't remove it as it might cause problems with window transparency and embedded controls.
|
||||
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
|
||||
<assemblyIdentity version="1.1.0.0" name="ReceiptPDFBuilder.Desktop"/>
|
||||
<assemblyIdentity version="1.2.0.0" name="MayShow.Desktop"/>
|
||||
|
||||
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
|
||||
<application>
|
||||