v9.28.12

[极速定位]优化工具栏的极速定位框，允许用户编辑会话属性。 [会话导入]支持xshell及securcrt的会话导入。 [SFTP]优化远程文件,允许创建空白文件。 [SFTP]增强远程文件的本地编辑能力，允许根据不同的文件类型优先级设置并选择不同的编辑工具。 [SFTP]修复因.bashrc等配置如echo输出而导致的SFTP初始化失败缺陷。 [MacOS]修复MacOS13.x下潜在的机器码生成异常缺陷。 [Fast Positioning] Optimize the toolbar's fast positioning box, allowing users to edit session properties. [Session Import] Support session import for xshell and securcrt. [SFTP] Optimize remote files to allow the creation of blank files. [SFTP] enhances the local editing capability of remote files, allowing for setting and selecting different editing tools based on different file type priorities. [SFTP] Fixed a defect in SFTP initialization failure caused by configurations such as. bashrc and echo output. [MacOS] Fix potential machine code generation anomalies under MacOS13.x.
aoyiduo · Sep 23, 2023 · 8de476f · 8de476f
1 parent 4c34b87
commit 8de476f
Show file tree

Hide file tree

Showing 46 changed files with 2,903 additions and 432 deletions.
diff --git a/private/languages/woterm_zh.ts b/private/languages/woterm_zh.ts
diff --git a/private/skins/black/desktop.qss b/private/skins/black/desktop.qss
@@ -137,6 +137,10 @@ QDockWidget {
     margin 0px;
 }
 
+QListView::item {
+    min-height:24px;
+}
+
 QListView::item:selected {
     background-color: rgba(0, 46, 128, 200);
 }
@@ -395,4 +399,4 @@ QTabWidget {
 
 QTabWidget > QWidget {
     border: 1px solid #313131; 
-}
+}
diff --git a/private/skins/blue/desktop.qss b/private/skins/blue/desktop.qss
@@ -132,6 +132,10 @@ QToolBar QLineEdit:hover {
     border: 1px solid darkgray;
 }
 
+QListView::item {
+    min-height:24px;
+}
+
 QListView::item:selected {
     background-color: rgba(128,128,128,128);
     color: white;

diff --git a/private/skins/gold/desktop.qss b/private/skins/gold/desktop.qss
@@ -132,6 +132,10 @@ QToolBar QLineEdit:hover {
     border: 1px solid darkgray;
 }
 
+QListView::item {
+    min-height:24px;
+}
+
 QListView::item:selected {
     background-color: #CD9B1D;
     color: white;

diff --git a/private/skins/light/desktop.qss b/private/skins/light/desktop.qss
@@ -133,6 +133,10 @@ QToolBar QLineEdit:hover {
     border: 1px solid gray;
 }
 
+QListView::item {
+    min-height:24px;
+}
+
 QListView::item:selected {
     background-color: rgb(0, 46, 128);
     color: white;
@@ -393,4 +397,4 @@ QTabWidget {
 
 QTabWidget > QWidget {
     border: 1px solid #313131; 
-}
+}
diff --git a/woterm/CMakeLists.txt b/woterm/CMakeLists.txt
@@ -78,7 +78,9 @@ set(SOURCE_FILES
     qwosessionrdpproperty.cpp
     qwosessionvncproperty.cpp
     qwosessionttyproperty.cpp
-    qwosessiontoolconfiguredialog.cpp
+    qwosessionftpproperty.cpp
+    qwosessionfileassociationmodel.cpp
+    qwosessionfileassociationadddialog.cpp
     qwosetting.cpp
     qwosettingdialog.cpp
     qwoshower.cpp
@@ -102,6 +104,7 @@ set(SOURCE_FILES
     qworlogintermwidgetimpl.cpp
     qwotreeview.cpp
     qwosftptask.cpp
+    qwosftpeditordialog.cpp
     qwosftpwidget.cpp
     qwosftpwidgetimpl.cpp
     qwosftplocalmodel.cpp
@@ -138,6 +141,7 @@ set(SOURCE_FILES
     qwodbsftpdetaildialog.cpp
     qwodbrestoredialog.cpp
     qwodbbackupdialog.cpp
+    qwodbmigratedialog.cpp
     qwodbpowerbackupdialog.cpp
     qwodbpowerrestoredialog.cpp
     qwobindportpermissiondialog.cpp
@@ -257,7 +261,9 @@ set(HEADER_FILES
     qwosessionrdpproperty.h
     qwosessionvncproperty.h
     qwosessionttyproperty.h
-    qwosessiontoolconfiguredialog.h
+    qwosessionftpproperty.h
+    qwosessionfileassociationmodel.h
+    qwosessionfileassociationadddialog.h
     qwosetting.h
     qwosettingdialog.h
     qwoshower.h
@@ -282,6 +288,7 @@ set(HEADER_FILES
     qwotreeview.h
     qwosftptask.h
     qwosftpwidget.h
+    qwosftpeditordialog.h
     qwosftpwidgetimpl.h
     qwosftplocalmodel.h
     qwosftpremotemodel.h
@@ -317,6 +324,7 @@ set(HEADER_FILES
     qwodbsftpdetaildialog.h
     qwodbrestoredialog.h
     qwodbbackupdialog.h
+    qwodbmigratedialog.h
     qwodbpowerbackupdialog.h
     qwodbpowerrestoredialog.h
     qwobindportpermissiondialog.h
@@ -414,14 +422,16 @@ set(OTHER_FILES
     qwosessionrdpproperty.ui
     qwosessionvncproperty.ui
     qwosessionttyproperty.ui
-    qwosessiontoolconfiguredialog.ui
+    qwosessionftpproperty.ui
+    qwosessionfileassociationadddialog.ui
     qwosettingdialog.ui
     qwotermmask.ui
     qwoserialinput.ui
     qwoserialinputhistorydialog.ui
     qwounioninputitem.ui
     qwounioninputconfiguredialog.ui
     qwosftpwidget.ui
+    qwosftpeditordialog.ui
     qwosftptransferwidget.ui
     qwosftppermissiondialog.ui
     qwosftprenamedialog.ui
@@ -431,6 +441,7 @@ set(OTHER_FILES
     qwodbsftpdetaildialog.ui
     qwodbrestoredialog.ui
     qwodbbackupdialog.ui
+    qwodbmigratedialog.ui
     qwodbpowerbackupdialog.ui
     qwodbpowerrestoredialog.ui
     qwoplaybookconsole.ui

diff --git a/woterm/main.cpp b/woterm/main.cpp
@@ -110,7 +110,11 @@ void test()
 
 int main_pc_tunnel(int argc, char *argv[])
 {
+#ifdef QT_DEBUG
+    QGuiApplication::setApplicationName("wotermd");
+#else
     QGuiApplication::setApplicationName("woterm");
+#endif
     QGuiApplication::setOrganizationName("aoyiduo");
     QGuiApplication::setOrganizationDomain("aoyiduo.com");
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
@@ -147,7 +151,11 @@ int main_pc_tunnel(int argc, char *argv[])
 
 int main_pc_main(int argc, char *argv[])
 {
+#ifdef QT_DEBUG
+    QGuiApplication::setApplicationName("wotermd");
+#else
     QGuiApplication::setApplicationName("woterm");
+#endif
     QGuiApplication::setOrganizationName("aoyiduo");
     QGuiApplication::setOrganizationDomain("aoyiduo.com");
     QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);

diff --git a/woterm/qkxbuttonassist.h b/woterm/qkxbuttonassist.h
@@ -27,7 +27,7 @@ class QKxButtonAssist : public QObject
     void setMargins(int n);
     void setSpacing(int n);
     QToolButton *append(const QString &icon, bool frame);
-    QToolButton *button(int idx);
+    QToolButton *button(int idx);    
     void appendSeperator();
     void setEnabled(int idx, bool on);
     bool isEnabled(int idx);

diff --git a/woterm/qkxfilterlineedit.cpp b/woterm/qkxfilterlineedit.cpp
@@ -21,6 +21,8 @@
 #include <QListView>
 #include <QDebug>
 #include <QDateTime>
+#include <QToolButton>
+#include <QIcon>
 
 QKxFilterLineEdit::QKxFilterLineEdit(QWidget *parent)
     : QLineEdit(parent)
@@ -31,6 +33,15 @@ QKxFilterLineEdit::QKxFilterLineEdit(QWidget *parent)
     assist->append("../private/skins/black/connect.png", true);
     QObject::connect(assist, SIGNAL(clicked(int)), this, SLOT(onAssistButtonClicked(int)));
     QObject::connect(this, SIGNAL(returnPressed()), this, SLOT(onAssistReturnPressed()));
+
+    QObject::connect(this, &QLineEdit::textChanged, this, [=](const QString& name){
+        QToolButton *btn = assist->button(1);
+        if(btn == nullptr) {
+            return ;
+        }
+        bool has = QWoSshConf::instance()->exists(name);
+        btn->setIcon(has ? QIcon("../private/skins/black/edit.png") : QIcon("../private/skins/black/add2.png"));
+    });
 }
 
 QKxFilterLineEdit::~QKxFilterLineEdit()
@@ -50,12 +61,15 @@ void QKxFilterLineEdit::onAssistButtonClicked(int idx)
 {
     if(idx == 0) {
         // add
-        emit createArrived(text());
+        QString name = text();
+        bool has = QWoSshConf::instance()->exists(name);
+        if(has) {
+            emit editArrived(name);
+        }else{
+            emit createArrived(name);
+        }
     }else {
         // connect
-        if(!m_listView->isVisible()) {
-            return;
-        }
         onAssistReturnPressed();
     }
 }

diff --git a/woterm/qkxfilterlineedit.h b/woterm/qkxfilterlineedit.h
@@ -23,6 +23,7 @@ class QKxFilterLineEdit : public QLineEdit
     explicit QKxFilterLineEdit(QWidget *parent);
     virtual ~QKxFilterLineEdit();
 signals:
+    void editArrived(const QString& name);
     void targetArrived(const QString& name, int type);
     void createArrived(const QString& name);
 private slots:

diff --git a/woterm/qkxfilterlistview.h b/woterm/qkxfilterlistview.h
@@ -48,6 +48,7 @@ class QSessionButtonActionDelegate : public QStyledItemDelegate
     QPointer<QWidget> m_parent;
     QPointer<QListView> m_listView;
     QToolButton *m_btnSftp;
+    QToolButton *m_btnEdit;
     QPoint m_ptMouse;
     QEvent::Type m_event;
 };

diff --git a/woterm/qwoadmindialog.cpp b/woterm/qwoadmindialog.cpp
@@ -52,9 +52,9 @@ QWoAdminDialog::QWoAdminDialog(QWidget *parent) :
         QWoSetting::setAllowToUseExternalIdentityFiles(ui->chkSshAgent->isChecked());
     });
 
-    ui->chkOpenLocalFile->setChecked(QWoSetting::allowSftpToOpenLocalFile());
-    QObject::connect(ui->chkOpenLocalFile, &QCheckBox::clicked, this, [=](){
-        QWoSetting::setAllowSftpToOpenLocalFile(ui->chkOpenLocalFile->isChecked());
+    ui->chkSftpOpenFile->setChecked(QWoSetting::allowSftpToOpenFile());
+    QObject::connect(ui->chkSftpOpenFile, &QCheckBox::clicked, this, [=](){
+        QWoSetting::setAllowSftpToOpenFile(ui->chkSftpOpenFile->isChecked());
     });
 
     adjustSize();

diff --git a/woterm/qwoadmindialog.ui b/woterm/qwoadmindialog.ui
@@ -138,9 +138,9 @@
          </widget>
         </item>
         <item>
-         <widget class="QCheckBox" name="chkOpenLocalFile">
+         <widget class="QCheckBox" name="chkSftpOpenFile">
           <property name="text">
-           <string>[SFTP]Allow to open the local file by double click.</string>
+           <string>[SFTP]Allow to open file by mouse double click.</string>
           </property>
          </widget>
         </item>