Skip to content

Commit 78280c8

Browse files
DuefectuDuefectu
authored
Merge pull request #16 from boriel-basic/releases/v.1.6.0-beta1
Releases/v.1.6.0 beta1 v1.6.0 - beta 1 ##New ‘Options -> Next -> Palette builder’. - Generates palettes for ZX Spectrum Next from .bmp, .jpg and .png images. - Allows to add classic Spectrum colours and greyscales - Adapts images to the loaded palette or adds new colours to the current palette - Allows to modify the colours of the palette - Loads palettes in .pal (Next palette standard format) and .gpl (Gimp palette) formats - Converts the loaded image to the current palette - Saves the converted image in .png and .nxi (Next standard format) formats ##6 [Bug]: Project Explorer bar doesn't show new files created ##Simplified version numbering in "Help -> About" dialog
2 parents d510524 + df4f8d0 commit 78280c8

File tree

4 files changed

+47
-25
lines changed

4 files changed

+47
-25
lines changed

‎ZXBStudio/Controls/ZXProjectExplorer.axaml.cs

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ public void UpdateProjectFolder()
183183
{
184184
fWatcher.Created -= FWatcher_Created;
185185
fWatcher.Deleted -= FWatcher_Deleted;
186+
fWatcher.Renamed -= FWatcher_Renamed;
186187
fWatcher.EnableRaisingEvents = false;
187188
fWatcher.Dispose();
188189
}
@@ -238,8 +239,15 @@ private void FWatcher_Renamed(object sender, RenamedEventArgs e)
238239
else
239240
{
240241
var parent = FindNode(pathWithoutNode, _nodes);
241-
if (parent != null)
242+
if (parent == null)
243+
{
244+
UpdateProjectFolder();
245+
return;
246+
}
247+
else
248+
{
242249
container = parent.ChildNodes;
250+
}
243251
}
244252

245253
if (container != null)
@@ -364,8 +372,15 @@ private void FWatcher_Deleted(object sender, FileSystemEventArgs e)
364372
else
365373
{
366374
var parent = FindNode(pathWithoutNode, _nodes);
367-
if (parent != null)
375+
if (parent == null)
376+
{
377+
UpdateProjectFolder();
378+
return;
379+
}
380+
else
381+
{
368382
container = parent.ChildNodes;
383+
}
369384
}
370385

371386
//Not found? ingnore...
@@ -404,8 +419,15 @@ private void FWatcher_Created(object sender, FileSystemEventArgs e)
404419
else
405420
{
406421
var node = FindNode(pathWithoutNode, _nodes);
407-
if (node != null)
422+
if (node == null)
423+
{
424+
UpdateProjectFolder();
425+
return;
426+
}
427+
else
428+
{
408429
container = node.ChildNodes;
430+
}
409431
}
410432

411433
//We didn't found where to add it... :(

‎ZXBStudio/Dialogs/ZXAboutDialog.axaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010
Title="About..." CanResize="False"
1111
WindowStartupLocation="CenterScreen"
1212
Topmost="True">
13-
<Grid RowDefinitions="Auto,Auto,Auto,*,*,Auto,Auto,Auto,Auto,*,Auto,Auto,*,32">
13+
<Grid RowDefinitions="Auto,Auto,Auto,Auto,*,Auto,Auto,Auto,*,Auto,Auto,*,32">
1414
<Image Margin="10" Width="128" Height="128" VerticalAlignment="Top" Source="avares://ZXBasicStudio/Assets/IconAbout.png"></Image>
1515
<TextBlock Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="36" FontWeight="Black">ZX Basic Studio</TextBlock>
16-
<TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24">Beta release</TextBlock>
17-
<TextBlock Grid.Row="3" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="16" Name="txtBuild">Build 1.3.5.6</TextBlock>
18-
<TextBlock Grid.Row="4" VerticalAlignment="Top" HorizontalAlignment="Center" FontSize="16" Name="txtDate">2023-10-29</TextBlock>
19-
<TextBlock Grid.Row="6" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextAlignment="Center" TextWrapping="Wrap" FontWeight="DemiBold">The ZX Basic Studio development team</TextBlock>
20-
<TextBlock Grid.Row="7" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="18" TextWrapping="Wrap">El Dr. Gusman, Boriel, Duefectu, AdolFITO, Hash6Iron, SirRickster</TextBlock>
21-
<TextBlock Grid.Row="9" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextWrapping="Wrap">Many thanks to Boriel for the ZX Basic compiler and his support to this project.</TextBlock>
22-
<TextBlock Grid.Row="11" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2023, El Dr. Gusman</TextBlock>
23-
<TextBlock Grid.Row="12" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2025, Boriel &amp; DuefectuCorp</TextBlock>
24-
<Button Name="btnClose" Grid.Row="14">Close</Button>
16+
<TextBlock Grid.Row="2" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="24" Name="txtBuild"></TextBlock>
17+
<TextBlock Grid.Row="3" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" Name="txtDate"></TextBlock>
18+
<TextBlock Grid.Row="5" VerticalAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextAlignment="Center" TextWrapping="Wrap" FontWeight="DemiBold">The ZX Basic Studio development team</TextBlock>
19+
<TextBlock Grid.Row="6" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="18" TextWrapping="Wrap">El Dr. Gusman, Boriel, Duefectu, AdolFITO, Hash6Iron, SirRickster</TextBlock>
20+
<TextBlock Grid.Row="7" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="16" TextWrapping="Wrap">Many thanks to Boriel for the ZX Basic compiler and his support to this project.</TextBlock>
21+
<TextBlock Grid.Row="9" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2023, El Dr. Gusman</TextBlock>
22+
<TextBlock Grid.Row="10" VerticalAlignment="Center" TextAlignment="Center" HorizontalAlignment="Center" FontSize="12" TextWrapping="Wrap">(C) 2025, Boriel &amp; DuefectuCorp</TextBlock>
23+
<Button Name="btnClose" Grid.Row="12">Close</Button>
2524
</Grid>
2625
</Window>

‎ZXBStudio/Dialogs/ZXAboutDialog.axaml.cs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,22 @@ public ZXAboutDialog()
1212
{
1313
InitializeComponent();
1414

15-
btnClose.Click += BtnClose_Click;
15+
txtBuild.Text = "1.6.0-beta1";
16+
txtDate.Text = "2025-04-26";
1617

17-
var name = System.Reflection.Assembly.GetExecutingAssembly().GetName();
18+
btnClose.Click += BtnClose_Click;
1819

19-
if(name == null || name.Version == null)
20-
{
21-
txtBuild.Text = "Unknown build";
22-
txtDate.Text = "Unknown date";
23-
return;
24-
}
20+
//var name = System.Reflection.Assembly.GetExecutingAssembly().GetName();
2521

26-
DateTime buildDate = new DateTime(2000, 1, 1).AddDays(name.Version.Build);
22+
//if(name == null || name.Version == null)
23+
//{
24+
// txtBuild.Text = "Unknown build";
25+
// txtDate.Text = "Unknown date";
26+
// return;
27+
//}
2728

28-
txtBuild.Text = $"Build {name.Version.ToString()}";
29-
txtDate.Text = buildDate.ToString("yyyy-MM-dd");
29+
//DateTime buildDate = new DateTime(2000, 1, 1).AddDays(name.Version.Revision);
30+
//txtBuild.Text = $"Build {name.Version.ToString()}";
3031
}
3132

3233
private void BtnClose_Click(object? sender, RoutedEventArgs e)

‎ZXBStudio/ZXBasicStudio.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<Platforms>AnyCPU;x64</Platforms>
1212
<ApplicationIcon>zxbs.ico</ApplicationIcon>
1313
<Title>ZX Basic Studio</Title>
14-
<AssemblyVersion>1.5.*</AssemblyVersion>
14+
<AssemblyVersion>1.6.0.*</AssemblyVersion>
1515
<Deterministic>False</Deterministic>
1616
<Version></Version>
1717
</PropertyGroup>

0 commit comments

Comments
 (0)