tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused windows forms buttons and streamline dialogs

Browse Source
This commit is contained in:
Michael Bucari-Tovo 2025-03-18 21:14:47 -06:00
parent faa2e04b9f
commit e509f842e4
30 changed files with 90 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/LibationAvalonia/App.axaml
View File

@ -90,6 +90,7 @@
<Style Selector="dialogs|DialogWindow">
<Setter Property="SystemDecorations" Value="Full"/>
<Setter Property="Icon" Value="/Assets/libation.ico"/>
<Setter Property="Template">
<ControlTemplate>
<ContentPresenter Background="{DynamicResource SystemRegionColor}" Content="{TemplateBinding Content}" />

3
Source/LibationAvalonia/Dialogs/AboutDialog.axaml
View File

@ -7,8 +7,7 @@
Width="400" Height="520"
x:Class="LibationAvalonia.Dialogs.AboutDialog"
xmlns:controls="clr-namespace:LibationAvalonia.Controls"
Title="About Libation"
Icon="/Assets/libation.ico">
Title="About Libation">
<Grid Margin="10" ColumnDefinitions="Auto,*" RowDefinitions="Auto,Auto,Auto,*">

3
Source/LibationAvalonia/Dialogs/AccountsDialog.axaml
View File

@ -5,8 +5,7 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
Width="800" Height="450"
x:Class="LibationAvalonia.Dialogs.AccountsDialog"
Title="Audible Accounts"
Icon="/Assets/libation.ico">
Title="Audible Accounts">
<Grid RowDefinitions="*,Auto">
<Grid.Styles>

3
Source/LibationAvalonia/Dialogs/BookDetailsDialog.axaml
View File

@ -7,8 +7,7 @@
Width="650" Height="500"
x:Class="LibationAvalonia.Dialogs.BookDetailsDialog"
xmlns:controls="clr-namespace:LibationAvalonia.Controls"
Title="Book Details" Name="BookDetails"
Icon="/Assets/libation.ico">
Title="Book Details" Name="BookDetails">
<Grid RowDefinitions="*,Auto,Auto,40">
<Grid.Styles>

3
Source/LibationAvalonia/Dialogs/BookRecordsDialog.axaml
View File

@ -5,8 +5,7 @@
mc:Ignorable="d" d:DesignWidth="700" d:DesignHeight="450"
Width="700" Height="450"
x:Class="LibationAvalonia.Dialogs.BookRecordsDialog"
Title="BookRecordsDialog"
Icon="/Assets/libation.ico">
Title="BookRecordsDialog">
<Grid RowDefinitions="*,Auto">

12
Source/LibationAvalonia/Dialogs/DialogWindow.cs
View File

@ -22,12 +22,19 @@ namespace LibationAvalonia.Dialogs
KeyDown += DialogWindow_KeyDown;
Initialized += DialogWindow_Initialized;
Opened += DialogWindow_Opened;
Loaded += DialogWindow_Loaded;
Closing += DialogWindow_Closing;
if (Design.IsDesignMode)
RequestedThemeVariant = ThemeVariant.Dark;
}
private void DialogWindow_Loaded(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{
if (!CanResize)
this.HideMinMaxBtns();
}
protected override void OnApplyTemplate(TemplateAppliedEventArgs e)
{
base.OnApplyTemplate(e);
@ -40,11 +47,6 @@ namespace LibationAvalonia.Dialogs
}
}
private void CloseButton_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e)
{
CancelAndClose();
}
private void DialogWindow_Initialized(object sender, EventArgs e)
{
this.WindowStartupLocation = WindowStartupLocation.CenterOwner;

1
Source/LibationAvalonia/Dialogs/EditQuickFilters.axaml
View File

@ -7,7 +7,6 @@
Width="800" Height="450"
x:Class="LibationAvalonia.Dialogs.EditQuickFilters"
Title="Audible Accounts"
Icon="/Assets/libation.ico"
x:DataType="dialogs:EditQuickFilters">
<Grid RowDefinitions="*,Auto">

3
Source/LibationAvalonia/Dialogs/EditReplacementChars.axaml
View File

@ -6,8 +6,7 @@
MinWidth="500" MinHeight="450"
Width="500" Height="450"
x:Class="LibationAvalonia.Dialogs.EditReplacementChars"
Title="Illegal Character Replacement"
Icon="/Assets/libation.ico">
Title="Illegal Character Replacement">
<Grid
RowDefinitions="*,Auto"

1
Source/LibationAvalonia/Dialogs/EditTemplateDialog.axaml
View File

@ -6,7 +6,6 @@
Width="800" Height="450"
x:Class="LibationAvalonia.Dialogs.EditTemplateDialog"
xmlns:dialogs="clr-namespace:LibationAvalonia.Dialogs"
Icon="/Assets/libation.ico"
Title="EditTemplateDialog">
<Grid RowDefinitions="Auto,*,Auto">

3
Source/LibationAvalonia/Dialogs/ImageDisplayDialog.axaml
View File

@ -7,8 +7,7 @@
MinWidth="500" MinHeight="500"
Width="500" Height="520"
Title="Cover"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Image Stretch="Uniform" Source="{Binding CoverImage}">
<Image.ContextMenu>

3
Source/LibationAvalonia/Dialogs/LibationFilesDialog.axaml
View File

@ -9,8 +9,7 @@
x:Class="LibationAvalonia.Dialogs.LibationFilesDialog"
xmlns:controls="clr-namespace:LibationAvalonia.Controls"
WindowStartupLocation="CenterScreen"
Title="Book Details"
Icon="/Assets/libation.ico">
Title="Book Details">
<Grid
RowDefinitions="Auto,Auto">

3
Source/LibationAvalonia/Dialogs/LiberatedStatusBatchAutoDialog.axaml
View File

@ -9,8 +9,7 @@
MinHeight="135" MaxHeight="135"
MinWidth="550" MaxWidth="550"
Width="550" Height="135"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid Margin="10" RowDefinitions="Auto,Auto">

3
Source/LibationAvalonia/Dialogs/LiberatedStatusBatchManualDialog.axaml
View File

@ -9,8 +9,7 @@
MinWidth="400" MinHeight="100"
MaxWidth="400" MaxHeight="100"
Width="400" Height="100"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto">

3
Source/LibationAvalonia/Dialogs/LocateAudiobooksDialog.axaml
View File

@ -6,8 +6,7 @@
Width="600" Height="450"
x:Class="LibationAvalonia.Dialogs.LocateAudiobooksDialog"
Title="Locate Audiobooks"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid Margin="5" ColumnDefinitions="*,Auto" RowDefinitions="Auto,*">
<TextBlock Grid.Column="0" Text="Found Audiobooks" />

3
Source/LibationAvalonia/Dialogs/Login/ApprovalNeededDialog.axaml
View File

@ -8,8 +8,7 @@
Width="240" Height="140"
WindowStartupLocation="CenterOwner"
x:Class="LibationAvalonia.Dialogs.Login.ApprovalNeededDialog"
Title="Approval Alert Detected"
Icon="/Assets/libation.ico">
Title="Approval Alert Detected">
<Grid RowDefinitions="Auto,Auto,*">

3
Source/LibationAvalonia/Dialogs/Login/CaptchaDialog.axaml
View File

@ -8,8 +8,7 @@
Width="220" Height="250"
WindowStartupLocation="CenterOwner"
x:Class="LibationAvalonia.Dialogs.Login.CaptchaDialog"
Title="CAPTCHA"
Icon="/Assets/libation.ico">
Title="CAPTCHA">
<Grid
RowDefinitions="Auto,Auto,Auto,Auto,*"

3
Source/LibationAvalonia/Dialogs/Login/LoginCallbackDialog.axaml
View File

@ -7,8 +7,7 @@
Width="300" Height="120"
WindowStartupLocation="CenterOwner"
x:Class="LibationAvalonia.Dialogs.Login.LoginCallbackDialog"
Title="Audible Login"
Icon="/Assets/libation.ico">
Title="Audible Login">
<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">

3
Source/LibationAvalonia/Dialogs/Login/LoginChoiceEagerDialog.axaml
View File

@ -8,8 +8,7 @@
WindowStartupLocation="CenterOwner"
xmlns:controls="clr-namespace:LibationAvalonia.Controls"
x:Class="LibationAvalonia.Dialogs.Login.LoginChoiceEagerDialog"
Title="Audible Login"
Icon="/Assets/libation.ico" >
Title="Audible Login">
<Grid RowDefinitions="Auto,Auto,Auto,*" ColumnDefinitions="*" Margin="5">

3
Source/LibationAvalonia/Dialogs/Login/LoginExternalDialog.axaml
View File

@ -6,8 +6,7 @@
Width="650" Height="500"
WindowStartupLocation="CenterOwner"
x:Class="LibationAvalonia.Dialogs.Login.LoginExternalDialog"
Title="Audible Login External"
Icon="/Assets/libation.ico">
Title="Audible Login External">
<Grid RowDefinitions="Auto,Auto,*,Auto,*" ColumnDefinitions="*" Margin="5">

3
Source/LibationAvalonia/Dialogs/Login/MfaDialog.axaml
View File

@ -8,8 +8,7 @@
Width="400" Height="200"
WindowStartupLocation="CenterOwner"
x:Class="LibationAvalonia.Dialogs.Login.MfaDialog"
Title="Two-Step Verification"
Icon="/Assets/libation.ico">
Title="Two-Step Verification">
<Grid RowDefinitions="*,Auto">

1
Source/LibationAvalonia/Dialogs/Login/WebLoginDialog.axaml
View File

@ -7,7 +7,6 @@
x:Class="LibationAvalonia.Dialogs.Login.WebLoginDialog"
Width="500" Height="800"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico"
Title="Audible Login">
<controls:NativeWebView Name="webView" />
</Window>

3
Source/LibationAvalonia/Dialogs/Login/_2faCodeDialog.axaml
View File

@ -8,8 +8,7 @@
Width="200" Height="200"
WindowStartupLocation="CenterOwner"
x:Class="LibationAvalonia.Dialogs.Login._2faCodeDialog"
Title="2FA Code"
Icon="/Assets/libation.ico">
Title="2FA Code">
<Grid
VerticalAlignment="Stretch"

3
Source/LibationAvalonia/Dialogs/MessageBoxAlertAdminDialog.axaml
View File

@ -9,8 +9,7 @@
x:Class="LibationAvalonia.Dialogs.MessageBoxAlertAdminDialog"
xmlns:controls="clr-namespace:LibationAvalonia.Controls"
Title="MessageBoxAlertAdminDialog"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid RowDefinitions="Auto,*,Auto,Auto">

3
Source/LibationAvalonia/Dialogs/ScanAccountsDialog.axaml
View File

@ -7,8 +7,7 @@
MinWidth="500" MinHeight="160"
Width="500" Height="200"
Title="Which Accounts?"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid ColumnDefinitions="*,Auto" RowDefinitions="Auto,*,Auto">

3
Source/LibationAvalonia/Dialogs/SearchSyntaxDialog.axaml
View File

@ -8,8 +8,7 @@
Width="800" Height="650"
x:Class="LibationAvalonia.Dialogs.SearchSyntaxDialog"
Title="Filter Options"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid
Margin="10,0,10,10"

3
Source/LibationAvalonia/Dialogs/SettingsDialog.axaml
View File

@ -10,8 +10,7 @@
xmlns:settings="clr-namespace:LibationAvalonia.Controls.Settings"
xmlns:vm="clr-namespace:LibationAvalonia.ViewModels.Settings"
x:DataType="vm:SettingsVM"
Title="Edit Settings"
Icon="/Assets/libation.ico">
Title="Edit Settings">
<Grid RowDefinitions="*,Auto">

3
Source/LibationAvalonia/Dialogs/TagsBatchDialog.axaml
View File

@ -8,8 +8,7 @@
MaxWidth="630" MaxHeight="90"
Width="630" Height="110"
Title="Replace Tags"
WindowStartupLocation="CenterOwner"
Icon="/Assets/libation.ico">
WindowStartupLocation="CenterOwner">
<Grid RowDefinitions="Auto,Auto" ColumnDefinitions="*,Auto" Margin="10">
<TextBlock

4
Source/LibationAvalonia/Dialogs/UpgradeNotificationDialog.axaml
View File

@ -7,10 +7,8 @@
xmlns:controls="clr-namespace:LibationAvalonia.Controls"
MinWidth="500" MinHeight="400"
Height="450" Width="550"
WindowStartupLocation="CenterOwner"
Title="Upgrade Available"
Icon="/Assets/libation.ico">
Title="Upgrade Available">
<Grid Margin="6" RowDefinitions="Auto,*,Auto">
<TextBlock

59
Source/LibationAvalonia/FormSaveExtension.cs
View File

@ -2,6 +2,7 @@
using Avalonia.Controls;
using Avalonia.Controls.ApplicationLifetimes;
using Avalonia.Platform;
using Dinah.Core;
using LibationFileManager;
using System;
using System.Linq;
@ -111,5 +112,63 @@ namespace LibationAvalonia
public int Width;
public bool IsMaximized;
}
public static void HideMinMaxBtns(this Window form)
{
if (Design.IsDesignMode || !Configuration.IsWindows || form.TryGetPlatformHandle() is not IPlatformHandle handle)
return;
var windowStyle
= GetWindowStyle(handle.Handle)
.Remove(WINDOW_STYLE.WS_MINIMIZEBOX)
.Remove(WINDOW_STYLE.WS_MAXIMIZEBOX);
SetWindowStyle(handle.Handle, windowStyle);
}
const int GWL_STYLE = -16;
[System.Runtime.InteropServices.DllImport("user32.dll", EntryPoint = "GetWindowLong")]
static extern long GetWindowLong(IntPtr hWnd, int nIndex);
[System.Runtime.InteropServices.DllImport("user32.dll", EntryPoint = "SetWindowLong")]
static extern int SetWindowLong(IntPtr hWnd, int nIndex, long dwNewLong);
static WINDOW_STYLE GetWindowStyle(IntPtr hWnd) => (WINDOW_STYLE)GetWindowLong(hWnd, GWL_STYLE);
static void SetWindowStyle(IntPtr hWnd, WINDOW_STYLE style) => SetWindowLong(hWnd, GWL_STYLE, (long)style);
[Flags]
enum WINDOW_STYLE : long
{
WS_OVERLAPPED = 0x0,
WS_TILED = 0x0,
WS_ACTIVECAPTION = 0x1,
WS_MAXIMIZEBOX = 0x10000,
WS_TABSTOP = 0x10000,
WS_MINIMIZEBOX = 0x20000,
WS_GROUP = 0x20000,
WS_THICKFRAME = 0x40000,
WS_SIZEBOX = 0x40000,
WS_SYSMENU = 0x80000,
WS_HSCROLL = 0x100000,
WS_VSCROLL = 0x200000,
WS_DLGFRAME = 0x400000,
WS_BORDER = 0x800000,
WS_CAPTION = 0xc00000,
WS_OVERLAPPEDWINDOW = 0xcf0000,
WS_TILEDWINDOW = 0xcf0000,
WS_MAXIMIZE = 0x1000000,
WS_CLIPCHILDREN = 0x2000000,
WS_CLIPSIBLINGS = 0x4000000,
WS_DISABLED = 0x8000000,
WS_VISIBLE = 0x10000000,
WS_ICONIC = 0x20000000,
WS_MINIMIZE = 0x20000000,
WS_CHILD = 0x40000000,
WS_CHILDWINDOW = 0x40000000,
WS_POPUP = 0x80000000,
WS_POPUPWINDOW = 0x80880000
}
}
}

1
Source/LibationAvalonia/Views/SeriesViewDialog.axaml
View File

@ -4,7 +4,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="LibationAvalonia.Views.SeriesViewDialog"
Icon="/Assets/libation.ico"
Title="View All Items in Series">
<TabControl