@ -89,7 +89,7 @@ namespace v2rayN.Forms
e . Cancel = true ; e . Cancel = true ;
HideForm ( ) ; HideForm ( ) ;
return ; return ;
} }
} }
private void MainForm_Resize ( object sender , EventArgs e ) private void MainForm_Resize ( object sender , EventArgs e )
@ -109,24 +109,24 @@ namespace v2rayN.Forms
//config.uiItem.mainQRCodeWidth = splitContainer1.SplitterDistance; //config.uiItem.mainQRCodeWidth = splitContainer1.SplitterDistance;
} }
private const int WM_QUERYENDSESSION = 0x0011 ; //private const int WM_QUERYENDSESSION = 0x0011 ;
protected override void WndProc ( ref Message m ) //protected override void WndProc(ref Message m )
{ // {
switch ( m . Msg ) // switch (m.Msg )
{ // {
case WM_QUERYENDSESSION : // case WM_QUERYENDSESSION :
Utils . SaveLog ( "Windows shutdown UnsetProxy" ) ; // Utils.SaveLog("Windows shutdown UnsetProxy") ;
ConfigHandler . ToJsonFile ( config ) ; // ConfigHandler.ToJsonFile(config) ;
statistics ? . SaveToFile ( ) ; // statistics?.SaveToFile() ;
ProxySetting . UnsetProxy ( ) ; // ProxySetting.UnsetProxy() ;
m . Result = ( IntPtr ) 1 ; // m.Result = (IntPtr)1 ;
break ; // break ;
default : // default :
base . WndProc ( ref m ) ; // base.WndProc(ref m) ;
break ; // break ;
} // }
} // }
# endregion # endregion
#region 显示服务器 listview 和 menu #region 显示服务器 listview 和 menu
@ -593,44 +593,43 @@ namespace v2rayN.Forms
private void menuPingServer_Click ( object sender , EventArgs e ) private void menuPingServer_Click ( object sender , EventArgs e )
{ {
GetLvSelectedIndex ( ) ; Speedtest ( "ping" ) ;
ClearTestResult ( ) ;
var statistics = new SpeedtestHandler ( ref config , ref v2rayHandler , lvSelecteds , "ping" , UpdateSpeedtestHandler ) ;
} }
private void menuTcpingServer_Click ( object sender , EventArgs e ) private void menuTcpingServer_Click ( object sender , EventArgs e )
{ {
GetLvSelectedIndex ( ) ; Speedtest ( "tcping" ) ;
ClearTestResult ( ) ;
var statistics = new SpeedtestHandler ( ref config , ref v2rayHandler , lvSelecteds , "tcping" , UpdateSpeedtestHandler ) ;
} }
private void menuRealPingServer_Click ( object sender , EventArgs e ) private void menuRealPingServer_Click ( object sender , EventArgs e )
{ {
if ( ! config . sysAgentEnabled ) //if (!config.sysAgentEnabled )
{ // {
UI . Show ( UIRes . I18N ( "NeedHttpGlobalProxy" ) ) ; // UI.Show(UIRes.I18N("NeedHttpGlobalProxy")) ;
return ; // return ;
} // }
UI . Show ( UIRes . I18N ( "SpeedServerTips" ) ) ; //UI.Show(UIRes.I18N("SpeedServerTips")) ;
GetLvSelectedIndex ( ) ; Speedtest ( "realping" ) ;
ClearTestResult ( ) ;
var statistics = new SpeedtestHandler ( ref config , ref v2rayHandler , lvSelecteds , "realping" , UpdateSpeedtestHandler ) ;
} }
private void menuSpeedServer_Click ( object sender , EventArgs e ) private void menuSpeedServer_Click ( object sender , EventArgs e )
{ {
if ( ! config . sysAgentEnabled ) //if (!config.sysAgentEnabled )
{ // {
UI . Show ( UIRes . I18N ( "NeedHttpGlobalProxy" ) ) ; // UI.Show(UIRes.I18N("NeedHttpGlobalProxy")) ;
return ; // return ;
} // }
UI . Show ( UIRes . I18N ( "SpeedServerTips" ) ) ; //UI.Show(UIRes.I18N("SpeedServerTips")) ;
Speedtest ( "speedtest" ) ;
}
private void Speedtest ( string actionType )
{
GetLvSelectedIndex ( ) ; GetLvSelectedIndex ( ) ;
var statistics = new SpeedtestHandler ( ref config , ref v2rayHandler , lvSelecteds , "speedtest" , UpdateSpeedtestHandler ) ; ClearTestResult ( ) ;
var statistics = new SpeedtestHandler ( ref config , ref v2rayHandler , lvSelecteds , actionType , UpdateSpeedtestHandler ) ;
} }
private void menuExport2ClientConfig_Click ( object sender , EventArgs e ) private void menuExport2ClientConfig_Click ( object sender , EventArgs e )
@ -1005,11 +1004,11 @@ namespace v2rayN.Forms
} }
private void menuExit_Click ( object sender , EventArgs e ) private void menuExit_Click ( object sender , EventArgs e )
{ {
this . Visible = false ; this . Visible = false ;
this . Close ( ) ; this . Close ( ) ;
Application . Exit ( ) ; Application . Exit ( ) ;
} }
2dust
5 years ago