fix hdd / floppy dialog contextx

This commit is contained in:
April Ayres-Griffiths 2019-04-14 17:27:18 +10:00
parent 51363b1e1e
commit 577227b552
10 changed files with 85 additions and 75 deletions

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm object GUIForm: TGUIForm
Left = 102 Left = 116
Height = 668 Height = 668
Top = 82 Top = 91
Width = 1014 Width = 1014
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
@ -10465,7 +10465,7 @@ object GUIForm: TGUIForm
object odDiskImages: TOpenDialog object odDiskImages: TOpenDialog
Title = 'Open Disk Image' Title = 'Open Disk Image'
DefaultExt = '.*' DefaultExt = '.*'
Filter = 'Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv' Filter = 'All Floppy Images|*.dsk; *.do; *.po; *.woz; *.nib|All HDD Images|*.po; *.2mg; *.hdv|Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv'
left = 24 left = 24
top = 104 top = 104
end end

View File

@ -730,6 +730,7 @@ begin
Image1.PopupMenu := nil; Image1.PopupMenu := nil;
case bi of case bi of
0: begin 0: begin
odDiskImages.FilterIndex := 1;
if Button = mbRight then if Button = mbRight then
begin begin
DiskMenu.Tag := 0; DiskMenu.Tag := 0;
@ -747,6 +748,7 @@ begin
end; end;
end; end;
1: begin 1: begin
odDiskImages.FilterIndex := 1;
if Button = mbRight then if Button = mbRight then
begin begin
DiskMenu.Tag := 1; DiskMenu.Tag := 1;
@ -770,6 +772,7 @@ begin
3: begin 3: begin
{smart port} {smart port}
odDiskImages.FilterIndex := 2;
if Button = mbRight then if Button = mbRight then
begin begin
DiskMenu.Tag := 2; DiskMenu.Tag := 2;
@ -902,6 +905,8 @@ end;
procedure TGUIForm.miCameraResetClick(Sender: TObject); procedure TGUIForm.miCameraResetClick(Sender: TObject);
begin begin
SimpleGet(baseUrl+'/api/control/system/camera/reset'); SimpleGet(baseUrl+'/api/control/system/camera/reset');
UpdateConfig('video/current.mousemovecamera.enabled', '0', false);
UpdateConfig('video/current.mousemovecamera.alternate', '0', false);
end; end;
procedure TGUIForm.miColorDotsClick(Sender: TObject); procedure TGUIForm.miColorDotsClick(Sender: TObject);

View File

@ -21,8 +21,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="859"/> <TopLine Value="716"/>
<CursorPos X="8" Y="862"/> <CursorPos X="6" Y="716"/>
<UsageCount Value="323"/> <UsageCount Value="323"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -67,123 +67,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2087" Column="42" TopLine="2078"/> <Caret Line="635" Column="54" TopLine="604"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2467" Column="38" TopLine="2452"/> <Caret Line="656" Column="22" TopLine="625"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="35" Column="19" TopLine="16"/> <Caret Line="657" Column="15" TopLine="626"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="392" Column="29" TopLine="362"/> <Caret Line="672" Column="6" TopLine="670"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="537" Column="14" TopLine="507"/> <Caret Line="766" Column="45" TopLine="743"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="542" Column="17" TopLine="512"/> <Caret Line="1280" Column="6" TopLine="1278"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="635" Column="54" TopLine="604"/> <Caret Line="786" Column="46" TopLine="761"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="656" Column="22" TopLine="625"/> <Caret Line="1280" Column="65" TopLine="1259"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="657" Column="15" TopLine="626"/> <Caret Line="1324" Column="31" TopLine="1307"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="672" Column="6" TopLine="670"/> <Caret Line="1685" Column="63" TopLine="1663"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="766" Column="45" TopLine="743"/> <Caret Line="2109" Column="33" TopLine="2099"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1280" Column="6" TopLine="1278"/> <Caret Line="2116" Column="33" TopLine="2106"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="786" Column="46" TopLine="761"/> <Caret Line="638" Column="15" TopLine="634"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1280" Column="65" TopLine="1259"/> <Caret Line="1206" TopLine="1203"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1324" Column="31" TopLine="1307"/> <Caret Line="2427" Column="3" TopLine="2424"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1685" Column="63" TopLine="1663"/> <Caret Line="2808" Column="26" TopLine="2798"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2109" Column="33" TopLine="2099"/> <Caret Line="535" Column="15" TopLine="530"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2116" Column="33" TopLine="2106"/> <Caret Line="2813" Column="13" TopLine="2805"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="638" Column="15" TopLine="634"/> <Caret Line="757" Column="53" TopLine="747"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1206" TopLine="1203"/> <Caret Line="758" Column="53" TopLine="748"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2427" Column="3" TopLine="2424"/> <Caret Line="759" Column="53" TopLine="749"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2808" Column="26" TopLine="2798"/> <Caret Line="760" Column="53" TopLine="750"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="535" Column="15" TopLine="530"/> <Caret Line="762" Column="53" TopLine="752"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2813" Column="13" TopLine="2805"/> <Caret Line="862" Column="52" TopLine="859"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="757" Column="53" TopLine="747"/> <Caret Line="864" Column="82" TopLine="860"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="758" Column="53" TopLine="748"/> <Caret Line="875" TopLine="861"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="759" Column="53" TopLine="749"/> <Caret Line="871" Column="60" TopLine="861"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="760" Column="53" TopLine="750"/> <Caret Line="883" Column="39" TopLine="859"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="762" Column="53" TopLine="752"/> <Caret Line="714" Column="6" TopLine="777"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="862" TopLine="859"/> <Caret Line="715" Column="6" TopLine="715"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
<RunParams> <RunParams>

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm object GUIForm: TGUIForm
Left = 102 Left = 116
Height = 668 Height = 668
Top = 82 Top = 91
Width = 1014 Width = 1014
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
@ -10465,7 +10465,7 @@ object GUIForm: TGUIForm
object odDiskImages: TOpenDialog object odDiskImages: TOpenDialog
Title = 'Open Disk Image' Title = 'Open Disk Image'
DefaultExt = '.*' DefaultExt = '.*'
Filter = 'Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv' Filter = 'All Floppy Images|*.dsk; *.do; *.po; *.woz; *.nib|All HDD Images|*.po; *.2mg; *.hdv|Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv'
left = 24 left = 24
top = 104 top = 104
end end

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,7 @@
object GUIForm: TGUIForm object GUIForm: TGUIForm
Left = 102 Left = 116
Height = 668 Height = 668
Top = 82 Top = 91
Width = 1014 Width = 1014
AlphaBlendValue = 128 AlphaBlendValue = 128
Caption = 'microM8 GUI' Caption = 'microM8 GUI'
@ -10465,7 +10465,7 @@ object GUIForm: TGUIForm
object odDiskImages: TOpenDialog object odDiskImages: TOpenDialog
Title = 'Open Disk Image' Title = 'Open Disk Image'
DefaultExt = '.*' DefaultExt = '.*'
Filter = 'Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv' Filter = 'All Floppy Images|*.dsk; *.do; *.po; *.woz; *.nib|All HDD Images|*.po; *.2mg; *.hdv|Disk Image|*.dsk|ProDOS Ordered Image|*.po|DOS Ordered Image|*.do|Nibble Image|*.nib|WOZ Image|*.woz|2MG Image|*.2mg|HDV Image|*.hdv'
left = 24 left = 24
top = 104 top = 104
end end

View File

@ -730,6 +730,7 @@ begin
Image1.PopupMenu := nil; Image1.PopupMenu := nil;
case bi of case bi of
0: begin 0: begin
odDiskImages.FilterIndex := 1;
if Button = mbRight then if Button = mbRight then
begin begin
DiskMenu.Tag := 0; DiskMenu.Tag := 0;
@ -747,6 +748,7 @@ begin
end; end;
end; end;
1: begin 1: begin
odDiskImages.FilterIndex := 1;
if Button = mbRight then if Button = mbRight then
begin begin
DiskMenu.Tag := 1; DiskMenu.Tag := 1;
@ -770,6 +772,7 @@ begin
3: begin 3: begin
{smart port} {smart port}
odDiskImages.FilterIndex := 2;
if Button = mbRight then if Button = mbRight then
begin begin
DiskMenu.Tag := 2; DiskMenu.Tag := 2;
@ -902,8 +905,8 @@ end;
procedure TGUIForm.miCameraResetClick(Sender: TObject); procedure TGUIForm.miCameraResetClick(Sender: TObject);
begin begin
SimpleGet(baseUrl+'/api/control/system/camera/reset'); SimpleGet(baseUrl+'/api/control/system/camera/reset');
UpdateConfig('video/current.mousemovecamera.enabled', '0', false) UpdateConfig('video/current.mousemovecamera.enabled', '0', false);
UpdateConfig('video/current.mousemovecamera.alternate', '0', false) UpdateConfig('video/current.mousemovecamera.alternate', '0', false);
end; end;
procedure TGUIForm.miColorDotsClick(Sender: TObject); procedure TGUIForm.miColorDotsClick(Sender: TObject);
@ -960,6 +963,7 @@ end;
procedure TGUIForm.miD1FileClick(Sender: TObject); procedure TGUIForm.miD1FileClick(Sender: TObject);
begin begin
odDiskImages.FilterIndex := 1;
RepaintWindow; RepaintWindow;
HideM8; HideM8;
if odDiskImages.Execute then if odDiskImages.Execute then
@ -976,6 +980,7 @@ end;
procedure TGUIForm.miD2FileClick(Sender: TObject); procedure TGUIForm.miD2FileClick(Sender: TObject);
begin begin
odDiskImages.FilterIndex := 1;
RepaintWindow; RepaintWindow;
HideM8; HideM8;
if odDiskImages.Execute then if odDiskImages.Execute then

64
poc.lps
View File

@ -21,8 +21,8 @@
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<TopLine Value="716"/> <TopLine Value="878"/>
<CursorPos X="6" Y="716"/> <CursorPos X="56" Y="906"/>
<UsageCount Value="323"/> <UsageCount Value="323"/>
<Loaded Value="True"/> <Loaded Value="True"/>
<LoadedDesigner Value="True"/> <LoadedDesigner Value="True"/>
@ -67,123 +67,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="635" Column="54" TopLine="604"/> <Caret Line="1280" Column="6" TopLine="1278"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="656" Column="22" TopLine="625"/> <Caret Line="786" Column="46" TopLine="761"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="657" Column="15" TopLine="626"/> <Caret Line="1280" Column="65" TopLine="1259"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="672" Column="6" TopLine="670"/> <Caret Line="1324" Column="31" TopLine="1307"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="766" Column="45" TopLine="743"/> <Caret Line="1685" Column="63" TopLine="1663"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1280" Column="6" TopLine="1278"/> <Caret Line="2109" Column="33" TopLine="2099"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="786" Column="46" TopLine="761"/> <Caret Line="2116" Column="33" TopLine="2106"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1280" Column="65" TopLine="1259"/> <Caret Line="638" Column="15" TopLine="634"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1324" Column="31" TopLine="1307"/> <Caret Line="1206" TopLine="1203"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1685" Column="63" TopLine="1663"/> <Caret Line="2427" Column="3" TopLine="2424"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2109" Column="33" TopLine="2099"/> <Caret Line="2808" Column="26" TopLine="2798"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2116" Column="33" TopLine="2106"/> <Caret Line="535" Column="15" TopLine="530"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="638" Column="15" TopLine="634"/> <Caret Line="2813" Column="13" TopLine="2805"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="1206" TopLine="1203"/> <Caret Line="757" Column="53" TopLine="747"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2427" Column="3" TopLine="2424"/> <Caret Line="758" Column="53" TopLine="748"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2808" Column="26" TopLine="2798"/> <Caret Line="759" Column="53" TopLine="749"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="535" Column="15" TopLine="530"/> <Caret Line="760" Column="53" TopLine="750"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="2813" Column="13" TopLine="2805"/> <Caret Line="762" Column="53" TopLine="752"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="757" Column="53" TopLine="747"/> <Caret Line="862" Column="52" TopLine="859"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="758" Column="53" TopLine="748"/> <Caret Line="864" Column="82" TopLine="860"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="759" Column="53" TopLine="749"/> <Caret Line="875" TopLine="861"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="760" Column="53" TopLine="750"/> <Caret Line="871" Column="60" TopLine="861"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="762" Column="53" TopLine="752"/> <Caret Line="883" Column="39" TopLine="859"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="862" Column="52" TopLine="859"/> <Caret Line="714" Column="6" TopLine="777"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="864" Column="82" TopLine="860"/> <Caret Line="715" Column="6" TopLine="715"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="875" TopLine="861"/> <Caret Line="717" Column="6" TopLine="717"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="871" Column="60" TopLine="861"/> <Caret Line="1353" Column="39" TopLine="1329"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="883" Column="39" TopLine="859"/> <Caret Line="1354" Column="39" TopLine="1330"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="714" Column="6" TopLine="777"/> <Caret Line="1361" Column="39" TopLine="1337"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="main.pas"/> <Filename Value="main.pas"/>
<Caret Line="715" Column="6" TopLine="715"/> <Caret Line="919" Column="39" TopLine="902"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
<RunParams> <RunParams>