Skip to content

Commit f19bebb

Browse files
Peter XiePeter Xie
Peter Xie
authored and
Peter Xie
committed
v0.8.10
1 parent 1b12d45 commit f19bebb

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

‎app/public/scripts/home.js‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,7 @@ const infoDefine = [
742742
title: 'QTGate连接',
743743
mainImapAccount: 'QTGate通讯用邮箱',
744744
QTGateConnectStatus: 'QTGate连接状态',
745+
QTGateConnectResultWaiting: '已向QTGate系统发送连接请求Email。由于是首次连接QTGate系统，系统需要几分钟时间来完成与您的对接，请耐心等待。',
745746
QTGateSignButton: '',
746747
QTGateConnectError: ['给QTGate发送连接请求Email出现发送错误，请检查IMAP邮件帐户的SMTP设定！'],
747748
QTGateConnectResult: ['QTGate未联机，请点击连接QTGate！', '正在和QTGate联机中', '已经连接QTGate', '连接QTGate时发生错误，请修改IMAP账号设定', '已经连接QTGate'],
@@ -1158,6 +1159,7 @@ const infoDefine = [
11581159
},
11591160
qtGateView: {
11601161
title: 'QTGates接続',
1162+
QTGateConnectResultWaiting: 'QTGateシステムへ接続請求メールを送信しました。初めてのQTGateシステムへ接続請求ですから、接続完成したまで数分かかる場合もあるかもしれませんが、暫くお待ちをください。',
11611163
mainImapAccount: 'QTGateへ情報交換用Emailアカンウト',
11621164
QTGateConnectError: ['QTG'],
11631165
QTGateConnectStatus: 'QTGate接続状態',
@@ -1556,6 +1558,7 @@ const infoDefine = [
15561558
disconnecting: 'Disconnecting'
15571559
},
15581560
qtGateView: {
1561+
QTGateConnectResultWaiting: 'It will take a few minutes to response to your connection request via QTGATE System. Please keep waiting.',
15591562
title: 'QTGate connect',
15601563
mainImapAccount: 'Email account for communicate with QTGate',
15611564
QTGateConnectStatus: 'Status of QTGate connect',
@@ -1954,6 +1957,7 @@ const infoDefine = [
19541957
},
19551958
qtGateView: {
19561959
title: 'QTGate連接',
1960+
QTGateConnectResultWaiting: '已向QTGate系統發送連接請求Email。由於是首次連接QTGate系統，系統需要幾分鐘時間來完成與您的對接，請耐心等待。',
19571961
mainImapAccount: 'QTGate通訊用郵箱',
19581962
QTGateConnectStatus: 'QTGate連接狀態',
19591963
QTGateConnectResult: ['QTGate未聯機，請點擊連接QTGate！', '正在和QTGate聯機中', '已經連接QTGate', '連接QTGate時發生錯誤，請修改IMAP賬號設定',
@@ -2774,6 +2778,7 @@ var view_layout;
27742778
}
27752779
return (check);
27762780
});
2781+
this.connectQTGateShow = ko.observable(false);
27772782
this.disconnecting = ko.observable(false);
27782783
this.newVersionInstallLoading = ko.observable(false);
27792784
this.QTGateLocalProxyPort.subscribe(newValue => {
@@ -2942,6 +2947,9 @@ var view_layout;
29422947
this.QTGateConnectActive(true);
29432948
this.QTGateConnectError(data.error);
29442949
// connected to QTGate system
2950+
if (data.qtGateConnecting > 1) {
2951+
this.connectQTGateShow(false);
2952+
}
29452953
if (data.qtGateConnecting === 2) {
29462954
return $('.activating.element').popup({
29472955
on: 'click',
@@ -3380,6 +3388,7 @@ var view_layout;
33803388
return socketIo.emit('checkActiveEmailSubmit', this.conformText());
33813389
}
33823390
connectQTGate() {
3391+
this.connectQTGateShow(true);
33833392
this.emailPool()[this.qtgateImapAccount()];
33843393
socketIo.emit('connectQTGate', this.emailPool()[this.qtgateImapAccount()].uuid);
33853394
}

‎app/public/scripts/home.ts‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -806,6 +806,7 @@ const infoDefine = [
806806
title: 'QTGate连接',
807807
mainImapAccount: 'QTGate通讯用邮箱',
808808
QTGateConnectStatus: 'QTGate连接状态',
809+
QTGateConnectResultWaiting: '已向QTGate系统发送连接请求Email。由于是首次连接QTGate系统，系统需要几分钟时间来完成与您的对接，请耐心等待。',
809810
QTGateSignButton: '',
810811
QTGateConnectError: ['给QTGate发送连接请求Email出现发送错误，请检查IMAP邮件帐户的SMTP设定！'],
811812
QTGateConnectResult: ['QTGate未联机，请点击连接QTGate！', '正在和QTGate联机中', '已经连接QTGate', '连接QTGate时发生错误，请修改IMAP账号设定','已经连接QTGate'],
@@ -1235,6 +1236,7 @@ const infoDefine = [
12351236

12361237
qtGateView: {
12371238
title: 'QTGates接続',
1239+
QTGateConnectResultWaiting: 'QTGateシステムへ接続請求メールを送信しました。初めてのQTGateシステムへ接続請求ですから、接続完成したまで数分かかる場合もあるかもしれませんが、暫くお待ちをください。',
12381240
mainImapAccount: 'QTGateへ情報交換用Emailアカンウト',
12391241
QTGateConnectError: ['QTG'],
12401242
QTGateConnectStatus: 'QTGate接続状態',
@@ -1649,6 +1651,7 @@ const infoDefine = [
16491651
},
16501652

16511653
qtGateView: {
1654+
QTGateConnectResultWaiting: 'It will take a few minutes to response to your connection request via QTGATE System. Please keep waiting.',
16521655
title: 'QTGate connect',
16531656
mainImapAccount: 'Email account for communicate with QTGate',
16541657
QTGateConnectStatus: 'Status of QTGate connect',
@@ -2049,6 +2052,7 @@ const infoDefine = [
20492052

20502053
QTGateGateway: {
20512054
title: 'QTGate服務使用詳細',
2055+
20522056
processing: '正在嘗試连接QTGate代理服务器...',
20532057
error: ['錯誤：您的賬號下已經有一個正在使用QTGate代理伺服器的連接，請先把它斷開後再嘗試連接。', '錯誤：您的賬號已經無可使用流量，如果您需要繼續使用QTGate代理伺服器，請升級您的賬戶類型。如果是免費用戶已經使用當天100M流量，請等待到明天繼續使用，如您是免費用戶已經用完當月1G流量，請等待到下月繼續使用。',
20542058
'錯誤：數據錯誤，請退出並重新啟動QTGate！','非常抱歉，您請求的代理區域無資源，請選擇其他區域或稍後再試','對不起，您所請求連接的區域不支持這樣的連接技術，請換其他連接方法或選擇其他區域連接'],
@@ -2066,6 +2070,7 @@ const infoDefine = [
20662070

20672071
qtGateView: {
20682072
title: 'QTGate連接',
2073+
QTGateConnectResultWaiting: '已向QTGate系統發送連接請求Email。由於是首次連接QTGate系統，系統需要幾分鐘時間來完成與您的對接，請耐心等待。',
20692074
mainImapAccount: 'QTGate通訊用郵箱',
20702075
QTGateConnectStatus: 'QTGate連接狀態',
20712076
QTGateConnectResult: ['QTGate未聯機，請點擊連接QTGate！', '正在和QTGate聯機中', '已經連接QTGate', '連接QTGate時發生錯誤，請修改IMAP賬號設定',
@@ -3140,7 +3145,11 @@ module view_layout {
31403145
this.QTGateConnectError ( data.error )
31413146

31423147
// connected to QTGate system
3148+
if ( data.qtGateConnecting > 1 ) {
3149+
this.connectQTGateShow ( false )
3150+
}
31433151
if ( data.qtGateConnecting === 2 ) {
3152+
31443153
return $( '.activating.element' ).popup ({
31453154
on: 'click',
31463155
onHidden: () => {
@@ -3157,7 +3166,7 @@ module view_layout {
31573166
on: 'click',
31583167
onHidden: () => {
31593168
this.emailPool()[ this.qtgateImapAccount()].callBackError ( data.error )
3160-
this.MenuItems ([false, false, true, false, false])
3169+
this.MenuItems ([ false, false, true, false, false ])
31613170
this.QTGateConnectActive ( false )
31623171
},
31633172
position: 'bottom left'
@@ -3696,8 +3705,9 @@ module view_layout {
36963705
return socketIo.emit ( 'checkActiveEmailSubmit', this.conformText ())
36973706

36983707
}
3699-
3708+
public connectQTGateShow = ko.observable (false)
37003709
public connectQTGate () {
3710+
this.connectQTGateShow ( true )
37013711
this.emailPool()[ this.qtgateImapAccount() ]
37023712
socketIo.emit ( 'connectQTGate', this.emailPool()[ this.qtgateImapAccount() ].uuid )
37033713
}

‎app/views/home/index.pug‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ block jumbotron1
454454

455455
//-
456456
#QTGateConnectContent.content( data-bind = " visible: QTGateConnectActive() && MenuItems()[3] && showActiveMail () " style = "margin-top: 3em;")
457-
#QTGateConnecting.ui.tiny.steps.top.attached.hideArea( data-bind = "css: { 'two': QTGateConnecting() < 2, 'three': QTGateConnecting () === 2 || QTGateConnecting () > 3 && QTGateConnecting() < 6}, visible: QTGateConnecting() < 6 ")
457+
#QTGateConnecting.ui.tiny.steps.top.attached.hideArea( data-bind = "css: { 'two': QTGateConnecting() < 2, 'three': QTGateConnecting () === 2 || QTGateConnecting () > 3 && QTGateConnecting() < 6 }, visible: QTGateConnecting () < 6 ")
458458
.step.completed( style = "padding: 8px;")
459459
a.floating.ui.red.circular.label.activating.element( data-bind = " text: '!', visible: QTGateConnecting() === 3, attr: { 'data-html': infoDefine[ languageIndex() ].error_message.imapErrorMessage [ QTGateConnectError() ]}")
460460
.content
@@ -478,7 +478,8 @@ block jumbotron1
478478
//-.description
479479
span( data-bind = " text: infoDefine [ languageIndex() ].qtGateView.QTGateSign [ QTGateConnecting() === 2 ? 1: QTGateConnecting() === 5 ? 5 : 3 ] " style="color:rgba(0,0,0,.5);")
480480
.loader( data-bind = " css: { 'ui active': QTGateConnecting() === 4 } ")
481-
481+
.LongTimeWaitting.ui.segment( data-bind = "visible: connectQTGateShow()")
482+
span( data-bind=" text: infoDefine [ languageIndex() ].qtGateView.QTGateConnectResultWaiting " style = "color:red;")
482483
.KeypairSign.ui.attached.segment( data-bind = " visible: QTGateConnecting() === 2" )
483484
.KeypairSignTitle.AccordionBox-shadow-delete.title( data-bind = " visible: QTGateConnecting() === 2" )
484485
span( data-bind = " text: infoDefine [ $root.languageIndex() ].emailConform.info1_1 " style="color:rgba(0,0,0,.5);")

‎index.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ function handleSquirrelEvent() {
6262
}
6363
if (handleSquirrelEvent()) {
6464
// squirrel event handled and app will exit in 1000ms, so don't do anything else
65-
return;
6665
}
6766
// squirrel event handled and app will exit in 1000ms, so don't do anything else
6867
const version = app.getVersion();

0 commit comments

Comments
 (0)