Skip to content

Commit d74a020

Browse files
committed
Plugins::Terminal: add cygwin64 bash
1 parent 0f4cbd3 commit d74a020

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
- Plugin
2929
- Terminal
3030
- Terminal SSH
31+
- Terminal telnet
32+
- Add activity menu
3133

3234
### v0.0.36
3335
- Client:

ChangeLog_zh_CN.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
- 插件
2828
- 终端
2929
- SSH 终端
30+
- Telnet
31+
32+
- 增加活动菜单
3033

3134
### v0.0.36
3235
- Client:

Plugins/Terminal/DlgSettingsTerminal.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,17 @@ CDlgSettingsTerminal::CDlgSettingsTerminal(CParameterTerminalBase *pPara, QWidge
2828
AddShell("C:\\Windows\\System32\\cmd.exe");
2929
AddShell("C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe");
3030
AddShell("C:\\Windows\\System32\\cmd.exe", "msys64");
31+
AddShell("C:\\Windows\\System32\\cmd.exe", "cygwin64");
3132
AddShell(qgetenv("ComSpec"));
3233
QString szHelp;
3334
szHelp = tr("Help:") + "\n";
3435
szHelp += tr("- Set bash shell:") + "\n";
3536
szHelp += tr(" cmd shell with parameters:") + " '/k %BASH_PATH% -l'\n";
3637
szHelp += tr(" eg:") + "\n";
37-
szHelp += tr(" msys64 bash path:") + " 'c:\\msys64\\usr\\bin\\bash.exe'\n";
38-
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\msys64\\usr\\bin\\bash.exe -l'";
38+
szHelp += tr(" msys64 default bash path:") + " 'c:\\msys64\\usr\\bin\\bash.exe'\n";
39+
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\msys64\\usr\\bin\\bash.exe -l'\n";
40+
szHelp += tr(" cygwin64 default bash path:") + " 'c:\\cygwin64\\bin\\bash.exe'\n";
41+
szHelp += tr(" So that cmd shell with parameters:") + " '/k c:\\cygwin64\\bin\\bash.exe -l'";
3942
ui->teHelp->setText(szHelp);
4043
ui->teHelp->show();
4144
#endif
@@ -133,5 +136,8 @@ void CDlgSettingsTerminal::on_cbShell_currentIndexChanged(int index)
133136
if("msys64" == szName && ui->leParameters->text().isEmpty()) {
134137
ui->leParameters->setText("/k c:\\msys64\\usr\\bin\\bash.exe -l");
135138
}
139+
if("cygwin64" == szName && ui->leParameters->text().isEmpty()) {
140+
ui->leParameters->setText("/k c:\\cygwin64\\bin\\bash.exe -l");
141+
}
136142
}
137143

0 commit comments

Comments
 (0)