move local_shell_bin to fqterm_path, add the cmd to quickdialog

5 files changed, 9 insertions, 8 deletions

diff --git a/src/common/fqterm_path.cpp b/src/common/fqterm_path.cpp
index 3d192ee..7921da1 100644
--- a/src/common/fqterm_path.cpp
+++ b/src/common/fqterm_path.cpp
@@ -36,7 +36,7 @@
 #include "../protocol/fqterm_local_socket.h"
 
 namespace FQTerm {
-QString* FQTermLocalSocket::shell_bin_ = NULL;
+QString* local_shell_bin = NULL;
 static QString getUserDataDir();
 static QString getInstallPrefix();
 static QString getResourceDir(const QString &prefix);
@@ -197,9 +197,8 @@ bool iniSettings() {
 
   // fqterm local socket cmdline
   QString externSSH = conf->getItemValue("global", "externSSH");
-  if (!externSSH.isEmpty()) {
-    FQTermLocalSocket::shell_bin_ = new QString(externSSH);
-  }
+  if (!externSSH.isEmpty())
+    local_shell_bin = new QString(externSSH);
 
   delete conf;
   return true;
diff --git a/src/common/fqterm_path.h b/src/common/fqterm_path.h
index 08611be..8c92d92 100644
--- a/src/common/fqterm_path.h
+++ b/src/common/fqterm_path.h
@@ -29,6 +29,7 @@ class FQTermParam;
 
 namespace FQTerm {
 
+extern QString *local_shell_bin;
 enum PathCategory {RESOURCE, USER_CONFIG};
 
 const QString &getPath(PathCategory category);
diff --git a/src/protocol/fqterm_local_socket.cpp b/src/protocol/fqterm_local_socket.cpp
index dc81acd..34c70aa 100644
--- a/src/protocol/fqterm_local_socket.cpp
+++ b/src/protocol/fqterm_local_socket.cpp
@@ -1,5 +1,6 @@
 #include "fqterm.h"
 #include "fqterm_local_socket.h"
+#include "fqterm_path.h"
 
 namespace FQTerm {
 
@@ -25,8 +26,8 @@ FQTermLocalSocket::~FQTermLocalSocket()
 
 void FQTermLocalSocket::connectToHost( const QString &host, quint16 port )
 {
-  if (shell_bin_!=NULL) {
-    shell_process_->start(FQTermLocalSocket::shell_bin_->arg(QString::number(port), host),
+  if (local_shell_bin!=NULL) {
+    shell_process_->start(local_shell_bin->arg(QString::number(port), host),
                           QIODevice::ReadWrite | QIODevice::Unbuffered);
   } else {
     emit connectionClosed();
diff --git a/src/protocol/fqterm_local_socket.h b/src/protocol/fqterm_local_socket.h
index edb0bad..aa94b5f 100644
--- a/src/protocol/fqterm_local_socket.h
+++ b/src/protocol/fqterm_local_socket.h
@@ -10,8 +10,6 @@ class FQTermLocalSocket: public FQTermSocket {
 private:
   QProcess* shell_process_;
 public:
-  static QString *shell_bin_;
-
   FQTermLocalSocket();
   ~FQTermLocalSocket();
   void flush(){}
diff --git a/src/ui/quickdialog.cpp b/src/ui/quickdialog.cpp
index c8de4db..17ddbb5 100644
--- a/src/ui/quickdialog.cpp
+++ b/src/ui/quickdialog.cpp
@@ -54,6 +54,8 @@ quickDialog::quickDialog(FQTermConfig * config, QWidget *parent, Qt::WindowFlags
 
   ui_.connectPushButton->setDefault(true);
 
+  ui_.protocolComboBox->setItemText(2, QString("Local (%1)").arg(*local_shell_bin));
+
   connectSlots();
 
   loadHistory();