Refactored progress dialogues

nazuke · nazuke · commit 1139dcc1f931 · 2018-04-16T18:28:11.000+09:00
diff --git a/SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeProgressForms/MacroscopeDoublePercentageProgressForm.cs b/SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeProgressForms/MacroscopeDoublePercentageProgressForm.cs
@@ -133,7 +133,10 @@ string ProgressLabelMinor
       if( ( !this.FormShown ) && ( this.OperationDuration.ElapsedMilliseconds >= OperationDurationLimit ) )
       {
         this.FormShown = true;
-        this.ShowDialog();
+        this.TopLevel = true;
+        this.ShowInTaskbar = true;
+        this.Show();
+        this.Activate();
       }
 
       try
diff --git a/SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeProgressForms/MacroscopeSinglePercentageProgressForm.cs b/SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeProgressForms/MacroscopeSinglePercentageProgressForm.cs
@@ -104,7 +104,10 @@ string ProgressLabelMajor
       if( ( !this.FormShown ) && ( this.OperationDuration.ElapsedMilliseconds >= OperationDurationLimit ) )
       {
         this.FormShown = true;
-        this.ShowDialog();
+        this.TopLevel = true;
+        this.ShowInTaskbar = true;
+        this.Show();
+        this.Activate();
       }
 
       try
diff --git a/SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeProgressForms/MacroscopeTriplePercentageProgressForm.cs b/SEOMacroscopeSeriesOne/src/MacroscopeForms/MacroscopeProgressForms/MacroscopeTriplePercentageProgressForm.cs
@@ -150,7 +150,10 @@ string ProgressLabelSubMinor
       if( ( !this.FormShown ) && ( this.OperationDuration.ElapsedMilliseconds >= OperationDurationLimit ) )
       {
         this.FormShown = true;
-        this.ShowDialog();
+        this.TopLevel = true;
+        this.ShowInTaskbar = true;
+        this.Show();
+        this.Activate();
       }
 
       try

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,10 @@ string ProgressLabelMinor`
`133`	`133`	`if( ( !this.FormShown ) && ( this.OperationDuration.ElapsedMilliseconds >= OperationDurationLimit ) )`
`134`	`134`	`{`
`135`	`135`	`this.FormShown = true;`
`136`		`- this.ShowDialog();`
	`136`	`+ this.TopLevel = true;`
	`137`	`+ this.ShowInTaskbar = true;`
	`138`	`+ this.Show();`
	`139`	`+ this.Activate();`
`137`	`140`	`}`
`138`	`141`
`139`	`142`	`try`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,10 @@ string ProgressLabelMajor`
`104`	`104`	`if( ( !this.FormShown ) && ( this.OperationDuration.ElapsedMilliseconds >= OperationDurationLimit ) )`
`105`	`105`	`{`
`106`	`106`	`this.FormShown = true;`
`107`		`- this.ShowDialog();`
	`107`	`+ this.TopLevel = true;`
	`108`	`+ this.ShowInTaskbar = true;`
	`109`	`+ this.Show();`
	`110`	`+ this.Activate();`
`108`	`111`	`}`
`109`	`112`
`110`	`113`	`try`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,10 @@ string ProgressLabelSubMinor`
`150`	`150`	`if( ( !this.FormShown ) && ( this.OperationDuration.ElapsedMilliseconds >= OperationDurationLimit ) )`
`151`	`151`	`{`
`152`	`152`	`this.FormShown = true;`
`153`		`- this.ShowDialog();`
	`153`	`+ this.TopLevel = true;`
	`154`	`+ this.ShowInTaskbar = true;`
	`155`	`+ this.Show();`
	`156`	`+ this.Activate();`
`154`	`157`	`}`
`155`	`158`
`156`	`159`	`try`