Skip to content

Commit 5abe3d1

Browse files
DuefectuDuefectu
committed
Bug launching emulators in Linux
Stiles for ZX Graphics toobars fixed
1 parent 83b7b3e commit 5abe3d1

3 files changed

Lines changed: 63 additions & 42 deletions

File tree

‎ZXBStudio/App.axaml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,47 @@
8787
<Setter Property="CornerRadius" Value="4" />
8888
<Setter Property="Focusable" Value="False"></Setter>
8989
</Style>
90+
91+
<Style Selector="Button.toolbar_r90">
92+
<Setter Property="Background" Value="#ffb0b0b0" />
93+
<Setter Property="Width" Value="24" />
94+
<Setter Property="Height" Value="24" />
95+
<Setter Property="Padding" Value="2" />
96+
<Setter Property="CornerRadius" Value="4" />
97+
<Setter Property="Focusable" Value="False"></Setter>
98+
<Setter Property="RenderTransform">
99+
<Setter.Value>
100+
<RotateTransform Angle="90"/>
101+
</Setter.Value>
102+
</Setter>
103+
</Style>
104+
<Style Selector="Button.toolbar_r270">
105+
<Setter Property="Background" Value="#ffb0b0b0" />
106+
<Setter Property="Width" Value="24" />
107+
<Setter Property="Height" Value="24" />
108+
<Setter Property="Padding" Value="2" />
109+
<Setter Property="CornerRadius" Value="4" />
110+
<Setter Property="Focusable" Value="False"></Setter>
111+
<Setter Property="RenderTransform">
112+
<Setter.Value>
113+
<RotateTransform Angle="270"/>
114+
</Setter.Value>
115+
</Setter>
116+
</Style>
117+
<Style Selector="Button.toolbar_hMirror">
118+
<Setter Property="Background" Value="#ffb0b0b0" />
119+
<Setter Property="Width" Value="24" />
120+
<Setter Property="Height" Value="24" />
121+
<Setter Property="Padding" Value="2" />
122+
<Setter Property="CornerRadius" Value="4" />
123+
<Setter Property="Focusable" Value="False"></Setter>
124+
<Setter Property="RenderTransform">
125+
<Setter.Value>
126+
<ScaleTransform ScaleX="-1"/>
127+
</Setter.Value>
128+
</Setter>
129+
</Style>
130+
90131
<Style Selector="ToggleButton.toolbar">
91132
<Setter Property="Background" Value="#fff0f0f0" />
92133
<Setter Property="Width" Value="24" />
@@ -105,6 +146,24 @@
105146
<Style Selector="Button.toolbar:pressed /template/ ContentPresenter#PART_ContentPresenter">
106147
<Setter Property="Background" Value="#ff606060" />
107148
</Style>
149+
<Style Selector="Button.toolbar_r90:pointerover /template/ ContentPresenter#PART_ContentPresenter">
150+
<Setter Property="Background" Value="#fff0f0f0" />
151+
</Style>
152+
<Style Selector="Button.toolbar_r90:pressed /template/ ContentPresenter#PART_ContentPresenter">
153+
<Setter Property="Background" Value="#ff606060" />
154+
</Style>
155+
<Style Selector="Button.toolbar_r270:pointerover /template/ ContentPresenter#PART_ContentPresenter">
156+
<Setter Property="Background" Value="#fff0f0f0" />
157+
</Style>
158+
<Style Selector="Button.toolbar_r270:pressed /template/ ContentPresenter#PART_ContentPresenter">
159+
<Setter Property="Background" Value="#ff606060" />
160+
</Style>
161+
<Style Selector="Button.toolbar_hMirror:pointerover /template/ ContentPresenter#PART_ContentPresenter">
162+
<Setter Property="Background" Value="#fff0f0f0" />
163+
</Style>
164+
<Style Selector="Button.toolbar_hMirror:pressed /template/ ContentPresenter#PART_ContentPresenter">
165+
<Setter Property="Background" Value="#ff606060" />
166+
</Style>
108167
<Style Selector="ComboBox.toolbar">
109168
<Setter Property="Margin" Value="0"></Setter>
110169
<Setter Property="CornerRadius" Value="5"></Setter>

‎ZXBStudio/DocumentEditors/ZXGraphics/FontGDUEditor.axaml‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -8,45 +8,7 @@
88
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
99
Focusable ="True"
1010
Background="#ff202020"
11-
x:Class="ZXBasicStudio.DocumentEditors.ZXGraphics.FontGDUEditor">
12-
<UserControl.Styles>
13-
<Style Selector="Button.toolbar_r90">
14-
<Setter Property="Background" Value="#fff0f0f0" />
15-
<Setter Property="Width" Value="32" />
16-
<Setter Property="Height" Value="32" />
17-
<Setter Property="Padding" Value="4" />
18-
<Setter Property="CornerRadius" Value="4" />
19-
<Setter Property="RenderTransform">
20-
<Setter.Value>
21-
<RotateTransform Angle="90"/>
22-
</Setter.Value>
23-
</Setter>
24-
</Style>
25-
<Style Selector="Button.toolbar_r270">
26-
<Setter Property="Background" Value="#fff0f0f0" />
27-
<Setter Property="Width" Value="32" />
28-
<Setter Property="Height" Value="32" />
29-
<Setter Property="Padding" Value="4" />
30-
<Setter Property="CornerRadius" Value="4" />
31-
<Setter Property="RenderTransform">
32-
<Setter.Value>
33-
<RotateTransform Angle="270"/>
34-
</Setter.Value>
35-
</Setter>
36-
</Style>
37-
<Style Selector="Button.toolbar_hMirror">
38-
<Setter Property="Background" Value="#fff0f0f0" />
39-
<Setter Property="Width" Value="32" />
40-
<Setter Property="Height" Value="32" />
41-
<Setter Property="Padding" Value="4" />
42-
<Setter Property="CornerRadius" Value="4" />
43-
<Setter Property="RenderTransform">
44-
<Setter.Value>
45-
<ScaleTransform ScaleX="-1"/>
46-
</Setter.Value>
47-
</Setter>
48-
</Style>
49-
</UserControl.Styles>
11+
x:Class="ZXBasicStudio.DocumentEditors.ZXGraphics.FontGDUEditor">
5012

5113
<Grid Name="grdMain">
5214
<Grid Name="grdEditor" ColumnDefinitions="180,4,*,4,200" Margin="0,8,0,0">

‎ZXBStudio/MainWindow.axaml.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,10 +1453,10 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven
14531453

14541454
try
14551455
{
1456-
var emulatorName = Path.GetFileName(emulatorPath);
1456+
var emulatorName = Path.GetFileNameWithoutExtension(emulatorPath);
14571457
switch (emulatorName.ToLower())
14581458
{
1459-
case "cspect.exe":
1459+
case "cspect":
14601460
{
14611461
outLog.Writer.WriteLine("Launching CSpect...");
14621462
Process process = new Process();
@@ -1471,7 +1471,7 @@ private async void BuildAndRun(object? sender, Avalonia.Interactivity.RoutedEven
14711471
process.WaitForExit();
14721472
}
14731473
break;
1474-
case "zesarux.exe":
1474+
case "zesarux":
14751475
{
14761476
outLog.Writer.WriteLine("Launching ZEsarUX...");
14771477
Process process = new Process();

0 commit comments

Comments
 (0)