Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 6.5.0.2408 #434

Merged
merged 22 commits into from
Aug 18, 2024
Merged

Version 6.5.0.2408 #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
ef49d9b
Bump Betalgo.OpenAI from 7.4.6 to 8.6.1
dependabot[bot] Jul 25, 2024
d089262
Merge pull request #427 from Leo-Corporation/dependabot/nuget/vNext/B…
lpeyr Aug 13, 2024
7bd84fe
Added translations (#428)
lpeyr Aug 17, 2024
f5e4b87
Added tooltips in MainWindow (#428)
lpeyr Aug 17, 2024
891d0df
Added tooltips in Color Window (#428)
lpeyr Aug 17, 2024
78dba3c
Fixed tooltip style issues (#428)
lpeyr Aug 17, 2024
453ae2f
Added new About section (#429)
lpeyr Aug 17, 2024
08d1007
Updated Setup
lpeyr Aug 17, 2024
8053719
Version 6.5.0.2408-pre1
lpeyr Aug 17, 2024
c7467b7
Added Placeholder resources (#430)
lpeyr Aug 18, 2024
5155112
Added placeholder in Bookmarks (#430)
lpeyr Aug 18, 2024
417415b
Added Placeholder when deleting an item (#430)
lpeyr Aug 18, 2024
64a7d95
Added new Details section on Selector page (#431)
lpeyr Aug 18, 2024
516b528
Added new Details section on Converter page (#431)
lpeyr Aug 18, 2024
e983e9e
Added new Details section on Chromatic page (#431)
lpeyr Aug 18, 2024
803cb16
Added new Details section on AI page (#431)
lpeyr Aug 18, 2024
4859a50
Updated Setup
lpeyr Aug 18, 2024
9fa652e
Version 6.5.0.2408-rc1
lpeyr Aug 18, 2024
6547e74
Added missing translations
lpeyr Aug 18, 2024
57eb4f7
Fixed wrong tooltips in Bookmarks
lpeyr Aug 18, 2024
8ceda09
Updated Setup
lpeyr Aug 18, 2024
261bb75
Version 6.5.0.2408
lpeyr Aug 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ColorPicker.Setup/Setup.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "ColorPicker Max"
#define MyAppVersion "6.4.0.2407"
#define MyAppFullVersion "6.4.0.2407"
#define MyAppVersion "6.5.0.2408"
#define MyAppFullVersion "6.5.0.2408"
#define MyAppPublisher "Léo Corporation"
#define MyAppURL "https://leocorporation.dev/"
#define MyAppExeName "ColorPicker.exe"
Expand Down
7 changes: 5 additions & 2 deletions ColorPicker/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1965,6 +1965,9 @@
<Style x:Key="{x:Type ToolTip}" TargetType="ToolTip">
<Setter Property="OverridesDefaultStyle" Value="true" />
<Setter Property="HasDropShadow" Value="True" />
<Setter Property="Foreground" Value="{DynamicResource Foreground1}" />
<Setter Property="FontSize" Value="12" />
<Setter Property="FontWeight" Value="Normal" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ToolTip">
Expand All @@ -1973,7 +1976,7 @@
Width="{TemplateBinding Width}"
Height="{TemplateBinding Height}"
Margin="5"
Background="{TemplateBinding Background}"
Background="{DynamicResource Background1}"
BorderBrush="{DynamicResource LightAccentColor}"
BorderThickness="1">
<Border.Effect>
Expand All @@ -1985,7 +1988,7 @@
Color="{DynamicResource Accent}" />
</Border.Effect>
<ContentPresenter
Margin="4"
Margin="4 2 4 4"
HorizontalAlignment="Left"
VerticalAlignment="Top" />
</Border>
Expand Down
2 changes: 1 addition & 1 deletion ColorPicker/Classes/Global.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
public static BookmarksPage? BookmarksPage { get; set; }
public static SettingsPage? SettingsPage { get; set; }

public static Bookmarks Bookmarks { get; set; }

Check warning on line 55 in ColorPicker/Classes/Global.cs

View workflow job for this annotation

GitHub Actions / build 

Non-nullable property 'Bookmarks' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.
public static Settings Settings { get; set; } = XmlSerializerManager.LoadFromXml<Settings>(SettingsPath) ?? new();

public static SynethiaConfig SynethiaConfig { get; set; } = GetSynethiaConfig();
Expand Down Expand Up @@ -93,7 +93,7 @@
internal static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\ColorPicker Max\Settings.xml";
public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/ColorPicker/5.0/Version.txt";

public static string Version => "6.4.0.2407";
public static string Version => "6.5.0.2408";

public static string HiSentence
{
Expand Down
4 changes: 2 additions & 2 deletions ColorPicker/ColorPicker.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<Title>ColorPicker</Title>
<Description>Maximize your creativity.</Description>
<RepositoryUrl>https://github.com/Leo-Corporation/ColorPicker</RepositoryUrl>
<Version>6.4.0.2407</Version>
<Version>6.5.0.2408</Version>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>logo.png</PackageIcon>
<ApplicationIcon>CPM.ico</ApplicationIcon>
Expand Down Expand Up @@ -48,7 +48,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Betalgo.OpenAI" Version="7.4.6" />
<PackageReference Include="Betalgo.OpenAI" Version="8.6.1" />
<PackageReference Include="ColorHelper" Version="1.8.1" />
<PackageReference Include="MouseKeyHook" Version="5.7.1" />
<PackageReference Include="PeyrSharp.Core" Version="2.1.0.2312" />
Expand Down
24 changes: 20 additions & 4 deletions ColorPicker/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,11 @@
FontSize="14"
Foreground="{DynamicResource Foreground1}"
RenderOptions.EdgeMode="Aliased"
Style="{StaticResource TitleBarButtonStyle}" />
Style="{StaticResource TitleBarButtonStyle}">
<Button.ToolTip>
<ToolTip x:Name="PinTooltip" Content="{x:Static lang:Resources.Pin}" />
</Button.ToolTip>
</Button>
<Button
x:Name="MinimizeBtn"
Grid.Column="3"
Expand All @@ -173,7 +177,11 @@
FontSize="14"
Foreground="{DynamicResource Foreground1}"
RenderOptions.EdgeMode="Aliased"
Style="{StaticResource TitleBarButtonStyle}" />
Style="{StaticResource TitleBarButtonStyle}">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.Minimize}" />
</Button.ToolTip>
</Button>
<Button
x:Name="MaximizeRestoreBtn"
Grid.Column="4"
Expand All @@ -186,7 +194,11 @@
FontSize="14"
Foreground="{DynamicResource Foreground1}"
RenderOptions.EdgeMode="Aliased"
Style="{StaticResource TitleBarButtonStyle}" />
Style="{StaticResource TitleBarButtonStyle}">
<Button.ToolTip>
<ToolTip x:Name="MaximizeTooltip" Content="{x:Static lang:Resources.Maximize}" />
</Button.ToolTip>
</Button>
<Button
x:Name="CloseBtn"
Grid.Column="5"
Expand All @@ -199,7 +211,11 @@
FontSize="14"
Foreground="{DynamicResource Foreground1}"
RenderOptions.EdgeMode="Aliased"
Style="{StaticResource TitleBarCloseButtonStyle}" />
Style="{StaticResource TitleBarCloseButtonStyle}">
<Button.ToolTip>
<ToolTip Content="{x:Static lang:Resources.Close}" />
</Button.ToolTip>
</Button>
</Grid>
</Border>
<Border Grid.Row="1" Style="{StaticResource WindowMainPanelStyle}">
Expand Down
6 changes: 5 additions & 1 deletion ColorPicker/MainWindow.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ private void InitUI()
AppPages.ContrastGrid => Global.ContrastPage,
_ => Global.HomePage
});
PinTooltip.Content = Topmost ? Properties.Resources.Unpin : Properties.Resources.Pin;
}

private void PageCard_OnCardClick(object? sender, PageEventArgs e)
Expand Down Expand Up @@ -257,6 +258,7 @@ private void PinBtn_Click(object sender, RoutedEventArgs e)
{
Topmost = !Topmost; // Toggle
PinBtn.Content = Topmost ? "\uF604" : "\uF602"; // Set text
PinTooltip.Content = Topmost ? Properties.Resources.Unpin : Properties.Resources.Pin;
}

private void HandleWindowStateChanged()
Expand All @@ -267,7 +269,9 @@ private void HandleWindowStateChanged()
MaximizeRestoreBtn.FontSize = WindowState == WindowState.Maximized
? 18
: 14;

MaximizeTooltip.Content = WindowState == WindowState.Maximized
? Properties.Resources.Restore // Restore icon
: Properties.Resources.Maximize; // Maximize icon
DefineMaximumSize();

WindowBorder.Margin = WindowState == WindowState.Maximized ? new(10, 10, 0, 0) : new(10); // Set
Expand Down
Loading
Loading