Skip to content

Commit 6119271

Browse files
committed
move install chrome driver to splash form
1 parent 7480df1 commit 6119271

File tree

3 files changed

+36
-40
lines changed

3 files changed

+36
-40
lines changed

TbsWinformNet6/ControlPanel.Designer.cs

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

TbsWinformNet6/ControlPanel.cs

Lines changed: 34 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,40 @@ public ControlPanel()
2323
{
2424
closing = false;
2525
InitializeComponent();
26+
27+
SerilogSingleton.Init();
28+
29+
LoadAccounts();
30+
accListView.Select();
31+
32+
// Be sure to have these in correct order!
33+
Ucs = new ITbsUc[]
34+
{
35+
generalUc1,
36+
heroUc1,
37+
villagesUc1,
38+
overviewUc1,
39+
overviewTroopsUc1,
40+
farmingUc1,
41+
newVillagesUc1,
42+
questsUc1,
43+
debugUc1,
44+
};
45+
46+
// Initialize all the views
47+
foreach (var uc in Ucs) uc.Init(this);
48+
49+
saveAccountsTimer = new System.Timers.Timer(1000 * 60 * 30); // Every 30 min
50+
saveAccountsTimer.Elapsed += SaveAccounts_TimerElapsed;
51+
saveAccountsTimer.AutoReset = true;
52+
saveAccountsTimer.Start();
53+
54+
// So TbsCore can access forms and alert user
55+
IoHelperCore.AlertUser = IoHelperForms.AlertUser;
56+
57+
checkNewVersion();
58+
debugUc1.InitLog(LogOutput.Instance);
59+
UseragentDatabase.Instance.Load();
2660
}
2761

2862
private void SaveAccounts_TimerElapsed(object sender, ElapsedEventArgs e) => IoHelperCore.SaveAccounts(accounts);
@@ -391,45 +425,6 @@ private void button8_Click(object sender, EventArgs e)
391425
}
392426
}
393427

394-
private async void ControlPanel_Load(object sender, EventArgs e)
395-
{
396-
SerilogSingleton.Init();
397-
398-
LoadAccounts();
399-
accListView.Select();
400-
401-
// Be sure to have these in correct order!
402-
Ucs = new ITbsUc[]
403-
{
404-
generalUc1,
405-
heroUc1,
406-
villagesUc1,
407-
overviewUc1,
408-
overviewTroopsUc1,
409-
farmingUc1,
410-
newVillagesUc1,
411-
questsUc1,
412-
debugUc1,
413-
};
414-
415-
// Initialize all the views
416-
foreach (var uc in Ucs) uc.Init(this);
417-
418-
saveAccountsTimer = new System.Timers.Timer(1000 * 60 * 30); // Every 30 min
419-
saveAccountsTimer.Elapsed += SaveAccounts_TimerElapsed;
420-
saveAccountsTimer.AutoReset = true;
421-
saveAccountsTimer.Start();
422-
423-
// So TbsCore can access forms and alert user
424-
IoHelperCore.AlertUser = IoHelperForms.AlertUser;
425-
426-
checkNewVersion();
427-
debugUc1.InitLog(LogOutput.Instance);
428-
UseragentDatabase.Instance.Load();
429-
430-
await ChromeDriverInstaller.Install();
431-
}
432-
433428
private void ControlPanel_FormClosed(object sender, FormClosedEventArgs e)
434429
{
435430
Application.Exit();

TbsWinformNet6/Forms/Splash.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Threading;
22
using System.Windows.Forms;
3+
using TbsWinformNet6.Helpers;
34

45
namespace TbsWinformNet6.Forms
56
{
@@ -14,6 +15,7 @@ private async void Splash_Shown(object sender, EventArgs e)
1415
{
1516
await Task.Delay(500); // random delay ._.
1617
var mainForm = new ControlPanel();
18+
await ChromeDriverInstaller.Install();
1719
mainForm.Show();
1820
Hide();
1921
}

0 commit comments

Comments
 (0)