Browse Source

fix first run check update

tags/3.2
Gang Zhuo 9 years ago
parent
commit
87ff1c158d
1 changed files with 25 additions and 16 deletions
  1. +25
    -16
      shadowsocks-csharp/View/MenuViewController.cs

+ 25
- 16
shadowsocks-csharp/View/MenuViewController.cs View File

@@ -82,17 +82,16 @@ namespace Shadowsocks.View
Configuration config = controller.GetConfigurationCopy();
if (config.autoCheckUpdate)
{
_isStartupChecking = true;
updateChecker.CheckUpdate(config, 3000);
}
if (config.isDefault)
{
_isFirstRun = true;
ShowConfigForm();
}
else if(config.autoCheckUpdate)
{
_isStartupChecking = true;
updateChecker.CheckUpdate(config, 3000);
}
}
void controller_Errored(object sender, System.IO.ErrorEventArgs e)
@@ -261,13 +260,12 @@ namespace Shadowsocks.View
{
if (updateChecker.NewVersionFound)
{
Logging.Debug($"New version {updateChecker.LatestVersionNumber} found");
ShowBalloonTip(String.Format(I18N.GetString("Shadowsocks {0} Update Found"), updateChecker.LatestVersionNumber), I18N.GetString("Click here to update"), ToolTipIcon.Info, 5000);
_isFirstRun = false;
}
else if (!_isStartupChecking)
{
ShowBalloonTip(I18N.GetString("Shadowsocks"), I18N.GetString("No update is available"), ToolTipIcon.Info, 5000);
_isFirstRun = false;
}
_isStartupChecking = false;
}
@@ -389,7 +387,12 @@ namespace Shadowsocks.View
{
configForm = null;
Utils.ReleaseMemory(true);
ShowFirstTimeBalloon();
if (_isFirstRun)
{
CheckUpdateForFirstRun();
ShowFirstTimeBalloon();
_isFirstRun = false;
}
}
private void Config_Click(object sender, EventArgs e)
@@ -404,18 +407,24 @@ namespace Shadowsocks.View
Application.Exit();
}
private void ShowFirstTimeBalloon()
private void CheckUpdateForFirstRun()
{
if (_isFirstRun)
Configuration config = controller.GetConfigurationCopy();
if (!config.isDefault)
{
_notifyIcon.BalloonTipTitle = I18N.GetString("Shadowsocks is here");
_notifyIcon.BalloonTipText = I18N.GetString("You can turn on/off Shadowsocks in the context menu");
_notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
_notifyIcon.ShowBalloonTip(0);
_isFirstRun = false;
_isStartupChecking = true;
updateChecker.CheckUpdate(config, 3000);
}
}
private void ShowFirstTimeBalloon()
{
_notifyIcon.BalloonTipTitle = I18N.GetString("Shadowsocks is here");
_notifyIcon.BalloonTipText = I18N.GetString("You can turn on/off Shadowsocks in the context menu");
_notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
_notifyIcon.ShowBalloonTip(0);
}
private void AboutItem_Click(object sender, EventArgs e)
{
Process.Start("https://github.com/shadowsocks/shadowsocks-windows");


Loading…
Cancel
Save