Skip to content

Commit 159e10c

Browse files
Digitoxin1Digitoxin1
committed
PcImgCnv support is disabled by default while the application is still in development. Support can be manually enabled by modifying settings.json.
1 parent 5fe117f commit 159e10c

File tree

7 files changed

+138
-145
lines changed

7 files changed

+138
-145
lines changed

‎DiskImageTool/Flux/Forms/ConfigurationForm.Designer.vb‎

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎DiskImageTool/Flux/Forms/ConfigurationForm.resx‎

Lines changed: 65 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -126,75 +126,11 @@
126126
<metadata name="BtnCancel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
127127
<value>True</value>
128128
</metadata>
129-
<metadata name="BtnUpdate.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
130-
<value>True</value>
131-
</metadata>
132-
<data name="&gt;&gt;BtnCancel.Name" xml:space="preserve">
133-
<value>BtnCancel</value>
134-
</data>
135-
<data name="&gt;&gt;BtnCancel.Type" xml:space="preserve">
136-
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
137-
</data>
138-
<data name="&gt;&gt;BtnCancel.Parent" xml:space="preserve">
139-
<value>PanelBottom</value>
140-
</data>
141-
<data name="&gt;&gt;BtnCancel.ZOrder" xml:space="preserve">
142-
<value>0</value>
143-
</data>
144-
<data name="&gt;&gt;BtnUpdate.Name" xml:space="preserve">
145-
<value>BtnUpdate</value>
146-
</data>
147-
<data name="&gt;&gt;BtnUpdate.Type" xml:space="preserve">
148-
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
149-
</data>
150-
<data name="&gt;&gt;BtnUpdate.Parent" xml:space="preserve">
151-
<value>PanelBottom</value>
152-
</data>
153-
<data name="&gt;&gt;BtnUpdate.ZOrder" xml:space="preserve">
154-
<value>1</value>
155-
</data>
156129
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
157-
<data name="PanelBottom.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
158-
<value>Bottom</value>
159-
</data>
160-
<data name="PanelBottom.FlowDirection" type="System.Windows.Forms.FlowDirection, System.Windows.Forms">
161-
<value>RightToLeft</value>
162-
</data>
163-
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
164-
<data name="PanelBottom.Location" type="System.Drawing.Point, System.Drawing">
165-
<value>0, 263</value>
166-
</data>
167-
<data name="PanelBottom.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
168-
<value>6, 10, 6, 10</value>
169-
</data>
170-
<data name="PanelBottom.Size" type="System.Drawing.Size, System.Drawing">
171-
<value>724, 43</value>
172-
</data>
173-
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
174-
<data name="PanelBottom.TabIndex" type="System.Int32, mscorlib">
175-
<value>1</value>
176-
</data>
177-
<data name="PanelBottom.WrapContents" type="System.Boolean, mscorlib">
178-
<value>False</value>
179-
</data>
180-
<data name="&gt;&gt;PanelBottom.Name" xml:space="preserve">
181-
<value>PanelBottom</value>
182-
</data>
183-
<data name="&gt;&gt;PanelBottom.Type" xml:space="preserve">
184-
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
185-
</data>
186-
<data name="&gt;&gt;PanelBottom.Parent" xml:space="preserve">
187-
<value>$this</value>
188-
</data>
189-
<data name="&gt;&gt;PanelBottom.ZOrder" xml:space="preserve">
190-
<value>1</value>
191-
</data>
192-
<metadata name="BtnCancel.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
193-
<value>True</value>
194-
</metadata>
195130
<data name="BtnCancel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
196131
<value>NoControl</value>
197132
</data>
133+
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
198134
<data name="BtnCancel.Location" type="System.Drawing.Point, System.Drawing">
199135
<value>631, 10</value>
200136
</data>
@@ -204,6 +140,7 @@
204140
<data name="BtnCancel.Size" type="System.Drawing.Size, System.Drawing">
205141
<value>75, 23</value>
206142
</data>
143+
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
207144
<data name="BtnCancel.TabIndex" type="System.Int32, mscorlib">
208145
<value>1</value>
209146
</data>
@@ -255,6 +192,39 @@
255192
<data name="&gt;&gt;BtnUpdate.ZOrder" xml:space="preserve">
256193
<value>1</value>
257194
</data>
195+
<data name="PanelBottom.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
196+
<value>Bottom</value>
197+
</data>
198+
<data name="PanelBottom.FlowDirection" type="System.Windows.Forms.FlowDirection, System.Windows.Forms">
199+
<value>RightToLeft</value>
200+
</data>
201+
<data name="PanelBottom.Location" type="System.Drawing.Point, System.Drawing">
202+
<value>0, 263</value>
203+
</data>
204+
<data name="PanelBottom.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
205+
<value>6, 10, 6, 10</value>
206+
</data>
207+
<data name="PanelBottom.Size" type="System.Drawing.Size, System.Drawing">
208+
<value>724, 43</value>
209+
</data>
210+
<data name="PanelBottom.TabIndex" type="System.Int32, mscorlib">
211+
<value>1</value>
212+
</data>
213+
<data name="PanelBottom.WrapContents" type="System.Boolean, mscorlib">
214+
<value>False</value>
215+
</data>
216+
<data name="&gt;&gt;PanelBottom.Name" xml:space="preserve">
217+
<value>PanelBottom</value>
218+
</data>
219+
<data name="&gt;&gt;PanelBottom.Type" xml:space="preserve">
220+
<value>System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
221+
</data>
222+
<data name="&gt;&gt;PanelBottom.Parent" xml:space="preserve">
223+
<value>$this</value>
224+
</data>
225+
<data name="&gt;&gt;PanelBottom.ZOrder" xml:space="preserve">
226+
<value>1</value>
227+
</data>
258228
<metadata name="PanelMain.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
259229
<value>False</value>
260230
</metadata>
@@ -267,9 +237,6 @@
267237
<data name="PanelMain.AutoSizeMode" type="System.Windows.Forms.AutoSizeMode, System.Windows.Forms">
268238
<value>GrowAndShrink</value>
269239
</data>
270-
<metadata name="TabControl1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
271-
<value>False</value>
272-
</metadata>
273240
<metadata name="TabControl1.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
274241
<value>True</value>
275242
</metadata>
@@ -282,6 +249,21 @@
282249
<metadata name="SettingsPanelGreaseweazle.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
283250
<value>True</value>
284251
</metadata>
252+
<data name="SettingsPanelGreaseweazle.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
253+
<value>Fill</value>
254+
</data>
255+
<data name="SettingsPanelGreaseweazle.Location" type="System.Drawing.Point, System.Drawing">
256+
<value>3, 3</value>
257+
</data>
258+
<data name="SettingsPanelGreaseweazle.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
259+
<value>6, 6, 6, 6</value>
260+
</data>
261+
<data name="SettingsPanelGreaseweazle.Size" type="System.Drawing.Size, System.Drawing">
262+
<value>698, 225</value>
263+
</data>
264+
<data name="SettingsPanelGreaseweazle.TabIndex" type="System.Int32, mscorlib">
265+
<value>0</value>
266+
</data>
285267
<data name="&gt;&gt;SettingsPanelGreaseweazle.Name" xml:space="preserve">
286268
<value>SettingsPanelGreaseweazle</value>
287269
</data>
@@ -331,6 +313,21 @@
331313
<metadata name="SettingsPanelKryoflux.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
332314
<value>True</value>
333315
</metadata>
316+
<data name="SettingsPanelKryoflux.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
317+
<value>Fill</value>
318+
</data>
319+
<data name="SettingsPanelKryoflux.Location" type="System.Drawing.Point, System.Drawing">
320+
<value>3, 3</value>
321+
</data>
322+
<data name="SettingsPanelKryoflux.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
323+
<value>6, 6, 6, 6</value>
324+
</data>
325+
<data name="SettingsPanelKryoflux.Size" type="System.Drawing.Size, System.Drawing">
326+
<value>698, 225</value>
327+
</data>
328+
<data name="SettingsPanelKryoflux.TabIndex" type="System.Int32, mscorlib">
329+
<value>0</value>
330+
</data>
334331
<data name="&gt;&gt;SettingsPanelKryoflux.Name" xml:space="preserve">
335332
<value>SettingsPanelKryoflux</value>
336333
</data>
@@ -486,66 +483,6 @@
486483
<data name="&gt;&gt;PanelMain.ZOrder" xml:space="preserve">
487484
<value>0</value>
488485
</data>
489-
<metadata name="SettingsPanelGreaseweazle.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
490-
<value>True</value>
491-
</metadata>
492-
<data name="SettingsPanelGreaseweazle.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
493-
<value>Fill</value>
494-
</data>
495-
<data name="SettingsPanelGreaseweazle.Location" type="System.Drawing.Point, System.Drawing">
496-
<value>3, 3</value>
497-
</data>
498-
<data name="SettingsPanelGreaseweazle.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
499-
<value>6, 6, 6, 6</value>
500-
</data>
501-
<data name="SettingsPanelGreaseweazle.Size" type="System.Drawing.Size, System.Drawing">
502-
<value>698, 225</value>
503-
</data>
504-
<data name="SettingsPanelGreaseweazle.TabIndex" type="System.Int32, mscorlib">
505-
<value>0</value>
506-
</data>
507-
<data name="&gt;&gt;SettingsPanelGreaseweazle.Name" xml:space="preserve">
508-
<value>SettingsPanelGreaseweazle</value>
509-
</data>
510-
<data name="&gt;&gt;SettingsPanelGreaseweazle.Type" xml:space="preserve">
511-
<value>DiskImageTool.Flux.Greaseweazle.SettingsPanel, DiskImageTool, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
512-
</data>
513-
<data name="&gt;&gt;SettingsPanelGreaseweazle.Parent" xml:space="preserve">
514-
<value>TabPageGreaseweazle</value>
515-
</data>
516-
<data name="&gt;&gt;SettingsPanelGreaseweazle.ZOrder" xml:space="preserve">
517-
<value>0</value>
518-
</data>
519-
<metadata name="SettingsPanelKryoflux.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
520-
<value>True</value>
521-
</metadata>
522-
<data name="SettingsPanelKryoflux.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
523-
<value>Fill</value>
524-
</data>
525-
<data name="SettingsPanelKryoflux.Location" type="System.Drawing.Point, System.Drawing">
526-
<value>3, 3</value>
527-
</data>
528-
<data name="SettingsPanelKryoflux.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
529-
<value>6, 6, 6, 6</value>
530-
</data>
531-
<data name="SettingsPanelKryoflux.Size" type="System.Drawing.Size, System.Drawing">
532-
<value>698, 225</value>
533-
</data>
534-
<data name="SettingsPanelKryoflux.TabIndex" type="System.Int32, mscorlib">
535-
<value>0</value>
536-
</data>
537-
<data name="&gt;&gt;SettingsPanelKryoflux.Name" xml:space="preserve">
538-
<value>SettingsPanelKryoflux</value>
539-
</data>
540-
<data name="&gt;&gt;SettingsPanelKryoflux.Type" xml:space="preserve">
541-
<value>DiskImageTool.Flux.Kryoflux.SettingsPanel, DiskImageTool, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
542-
</data>
543-
<data name="&gt;&gt;SettingsPanelKryoflux.Parent" xml:space="preserve">
544-
<value>TabPageKryoflux</value>
545-
</data>
546-
<data name="&gt;&gt;SettingsPanelKryoflux.ZOrder" xml:space="preserve">
547-
<value>0</value>
548-
</data>
549486
<metadata name="TwoColumnToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
550487
<value>17, 17</value>
551488
</metadata>

‎DiskImageTool/Flux/Forms/ConfigurationForm.vb‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,26 @@
11
Namespace Flux
22
Public Class ConfigurationForm
33
Private Sub BtnUpdate_Click(sender As Object, e As EventArgs) Handles BtnUpdate.Click
4-
SettingsPanelGreaseweazle.UpdateSettings()
5-
SettingsPanelKryoflux.UpdateSettings()
6-
SettingsPanelPcImgCnv.UpdateSettings()
4+
If SettingsPanelGreaseweazle.Initialized Then
5+
SettingsPanelGreaseweazle.UpdateSettings()
6+
End If
7+
If SettingsPanelKryoflux.Initialized Then
8+
SettingsPanelKryoflux.UpdateSettings()
9+
End If
10+
If SettingsPanelPcImgCnv.Initialized Then
11+
SettingsPanelPcImgCnv.UpdateSettings()
12+
End If
713
End Sub
814

915
Private Sub ConfigurationForm_Load(sender As Object, e As EventArgs) Handles Me.Load
1016
SettingsPanelGreaseweazle.Initialize()
1117
SettingsPanelKryoflux.Initialize()
12-
SettingsPanelPcImgCnv.Initialize()
18+
19+
If Not App.AppSettings.PcImgCnv.Enabled Then
20+
TabControl1.TabPages.Remove(TabPagePcImgCnv)
21+
Else
22+
SettingsPanelPcImgCnv.Initialize()
23+
End If
1324
End Sub
1425
End Class
1526
End Namespace

‎DiskImageTool/Flux/Greaseweazle/SettingsPanel.vb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,24 @@ Imports DiskImageTool.DiskImage.FloppyDiskFunctions
44
Namespace Flux.Greaseweazle
55
Public Class SettingsPanel
66
Private ReadOnly ToolTip1 As New ToolTip()
7+
Private _Initialized As Boolean = False
8+
9+
Public ReadOnly Property Initialized As Boolean
10+
Get
11+
Return _Initialized
12+
End Get
13+
End Property
714

815
Public Sub Initialize()
916
InitializeFields()
17+
_Initialized = True
1018
End Sub
1119

1220
Public Sub UpdateSettings()
21+
If Not _Initialized Then
22+
Exit Sub
23+
End If
24+
1325
If TextBoxPath.Text = "" OrElse IO.File.Exists(TextBoxPath.Text) Then
1426
Settings.AppPath = TextBoxPath.Text
1527
End If

‎DiskImageTool/Flux/Kryoflux/SettingsPanel.vb‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,24 @@
33
Namespace Flux.Kryoflux
44
Public Class SettingsPanel
55
Private ReadOnly ToolTip1 As New ToolTip()
6+
Private _Initialized As Boolean = False
7+
8+
Public ReadOnly Property Initialized As Boolean
9+
Get
10+
Return _Initialized
11+
End Get
12+
End Property
613

714
Public Sub Initialize()
815
InitializeFields()
16+
_Initialized = True
917
End Sub
1018

1119
Public Sub UpdateSettings()
20+
If Not _Initialized Then
21+
Exit Sub
22+
End If
23+
1224
If TextBoxPath.Text = "" OrElse IO.File.Exists(TextBoxPath.Text) Then
1325
Settings.AppPath = TextBoxPath.Text
1426
End If

0 commit comments

Comments
 (0)