src:persistent storage of session information

Signed-off-by: xiaoming <2014500726@smail.xtu.edu.cn>
QQxiaoming · Oct 19, 2023 · 4928db4 · 4928db4
1 parent 4f6d55d
commit 4928db4
Show file tree

Hide file tree

Showing 42 changed files with 7,714 additions and 7,305 deletions.
diff --git a/lang/quardCRT_en_US.ts b/lang/quardCRT_en_US.ts
diff --git a/lang/quardCRT_ja_JP.ts b/lang/quardCRT_ja_JP.ts
diff --git a/lang/quardCRT_zh_CN.ts b/lang/quardCRT_zh_CN.ts
diff --git a/lib/qtermwidget/translations/qtermwidget.ts b/lib/qtermwidget/translations/qtermwidget.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_arn.ts b/lib/qtermwidget/translations/qtermwidget_arn.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_ast.ts b/lib/qtermwidget/translations/qtermwidget_ast.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_bg.ts b/lib/qtermwidget/translations/qtermwidget_bg.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_ca.ts b/lib/qtermwidget/translations/qtermwidget_ca.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_cs.ts b/lib/qtermwidget/translations/qtermwidget_cs.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_cy.ts b/lib/qtermwidget/translations/qtermwidget_cy.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_da.ts b/lib/qtermwidget/translations/qtermwidget_da.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_de.ts b/lib/qtermwidget/translations/qtermwidget_de.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_el.ts b/lib/qtermwidget/translations/qtermwidget_el.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_es.ts b/lib/qtermwidget/translations/qtermwidget_es.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_et.ts b/lib/qtermwidget/translations/qtermwidget_et.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_fr.ts b/lib/qtermwidget/translations/qtermwidget_fr.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_gl.ts b/lib/qtermwidget/translations/qtermwidget_gl.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_he.ts b/lib/qtermwidget/translations/qtermwidget_he.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_hr.ts b/lib/qtermwidget/translations/qtermwidget_hr.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_hu.ts b/lib/qtermwidget/translations/qtermwidget_hu.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_it.ts b/lib/qtermwidget/translations/qtermwidget_it.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_ja.ts b/lib/qtermwidget/translations/qtermwidget_ja.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_ko.ts b/lib/qtermwidget/translations/qtermwidget_ko.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_lt.ts b/lib/qtermwidget/translations/qtermwidget_lt.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_nb_NO.ts b/lib/qtermwidget/translations/qtermwidget_nb_NO.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_nl.ts b/lib/qtermwidget/translations/qtermwidget_nl.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_pl.ts b/lib/qtermwidget/translations/qtermwidget_pl.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_pt.ts b/lib/qtermwidget/translations/qtermwidget_pt.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_pt_BR.ts b/lib/qtermwidget/translations/qtermwidget_pt_BR.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_ru.ts b/lib/qtermwidget/translations/qtermwidget_ru.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_si.ts b/lib/qtermwidget/translations/qtermwidget_si.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_sk.ts b/lib/qtermwidget/translations/qtermwidget_sk.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_tr.ts b/lib/qtermwidget/translations/qtermwidget_tr.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_uk.ts b/lib/qtermwidget/translations/qtermwidget_uk.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_zh_CN.ts b/lib/qtermwidget/translations/qtermwidget_zh_CN.ts
diff --git a/lib/qtermwidget/translations/qtermwidget_zh_TW.ts b/lib/qtermwidget/translations/qtermwidget_zh_TW.ts
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
diff --git a/src/mainwindow.h b/src/mainwindow.h
@@ -70,23 +70,28 @@ class MainWindow : public QMainWindow
     void menuAndToolBarInit(void);
     void menuAndToolBarRetranslateUi(void);
     void menuAndToolBarConnectSignals(void);
-    SessionsWindow *startTelnetSession(MainWidgetGroup *group, QString hostname, quint16 port, QTelnet::SocketType type);
+    SessionsWindow *startTelnetSession(MainWidgetGroup *group, QString hostname, quint16 port, QTelnet::SocketType type, bool addTab = false, QString name = QString());
     SessionsWindow *startSerialSession(MainWidgetGroup *group, QString portName, uint32_t baudRate,
-                int dataBits, int parity, int stopBits, bool flowControl, bool xEnable);
-    SessionsWindow *startLocalShellSession(MainWidgetGroup *group, const QString &command = QString(), const QString &workingDirectory = QDir::homePath());
-    SessionsWindow *startRawSocketSession(MainWidgetGroup *group, QString hostname, quint16 port);
+                int dataBits, int parity, int stopBits, bool flowControl, bool xEnable, bool addTab = false, QString name = QString());
+    SessionsWindow *startLocalShellSession(MainWidgetGroup *group, const QString &command = QString(), const QString &workingDirectory = QDir::homePath(), bool addTab = false, QString name = QString());
+    SessionsWindow *startRawSocketSession(MainWidgetGroup *group, QString hostname, quint16 port, bool addTab = false, QString name = QString());
     SessionsWindow *startSSH2Session(MainWidgetGroup *group,
-        QString hostname, quint16 port, QString username, QString password);
+        QString hostname, quint16 port, QString username, QString password, bool addTab = false, QString name = QString());
     int stopSession(MainWidgetGroup *group, int index);
     int stopAllSession(void);
-    int cloneCurrentSession(MainWidgetGroup *group);
+    int cloneCurrentSession(MainWidgetGroup *group, bool addTab = false, QString name = QString());
     MainWidgetGroup *findCurrentFocusGroup(void);
     QTermWidget *findCurrentFocusTermWidget(void);
     QMenu *createPopupMenu(void) override;
     void setSessionClassActionEnable(bool enable);
     void setGlobalOptions(SessionsWindow *window);
     QString getDirAndcheckeSysName(const QString &title);
     void addBookmark(const QString &path);
+    bool checkSessionName(QString &name);
+    int addSessionToSessionManager(SessionsWindow *sessionsWindow, QString &name);
+    void removeSessionFromSessionManager(QString name);
+    void connectSessionFromSessionManager(QString name);
+    void restoreSessionToSessionManager(void);
 
 private:
     Ui::MainWindow *ui;

diff --git a/src/sessionmanagerwidget.cpp b/src/sessionmanagerwidget.cpp
@@ -46,6 +46,9 @@ SessionManagerWidget::SessionManagerWidget(QWidget *parent) :
     tree = new SessionTreeView(this);
     ui->verticalLayout->addWidget(tree);
 
+    connect(tree, &SessionTreeView::sessionConnect, this, &SessionManagerWidget::sessionConnect);
+    connect(tree, &SessionTreeView::sessionRemove, this, &SessionManagerWidget::sessionRemove);
+
     retranslateUi();
 }
 

diff --git a/src/sessionmanagerwidget.h b/src/sessionmanagerwidget.h
@@ -43,7 +43,11 @@ class SessionManagerWidget : public QWidget
     void addSession(QString str, int type);
     void removeSession(QString str);
     bool checkSession(QString str);
-
+
+signals:
+    void sessionConnect(QString str);
+    void sessionRemove(QString str);
+
 private:
     Ui::SessionManagerWidget *ui;
     QToolBar *toolBar;

diff --git a/src/sessiontreeview.cpp b/src/sessiontreeview.cpp
@@ -68,14 +68,27 @@ void SessionTreeView::retranslateUi() {
 void SessionTreeView::contextMenuEvent(QContextMenuEvent *event) {
     QModelIndex tIndex = indexAt(viewport()->mapFromGlobal(event->globalPos()));
     if (tIndex.isValid()) {
+        int type; QString name;
+        mode->info(tIndex, type, name);
         QMenu *contextMenu = new QMenu(this); 
-        QAction *connectTerminalAction = new QAction(tr("Connect Terminal"), contextMenu);
-        contextMenu->addAction(connectTerminalAction);
-        QAction *connectInNewWindowAction = new QAction(tr("Connect in New Window"), contextMenu);
-        contextMenu->addAction(connectInNewWindowAction);
-        QAction *connectInNewTabGroupAction = new QAction(tr("Connect in New Tab Group"), contextMenu);
-        contextMenu->addAction(connectInNewTabGroupAction);
-        contextMenu->addSeparator();
+        if(type != -1) {
+            QAction *connectTerminalAction = new QAction(tr("Connect Terminal"), contextMenu);
+            contextMenu->addAction(connectTerminalAction);
+            connect(connectTerminalAction, &QAction::triggered, this, [=](){
+                emit sessionConnect(name);
+            });
+            QAction *connectInNewWindowAction = new QAction(tr("Connect in New Window"), contextMenu);
+            contextMenu->addAction(connectInNewWindowAction);
+            QAction *connectInNewTabGroupAction = new QAction(tr("Connect in New Tab Group"), contextMenu);
+            contextMenu->addAction(connectInNewTabGroupAction);
+            contextMenu->addSeparator();
+            QAction *deleteAction = new QAction(tr("Delete"), contextMenu);
+            contextMenu->addAction(deleteAction);
+            connect(deleteAction, &QAction::triggered, this, [=](){
+                emit sessionRemove(name);
+            });
+            contextMenu->addSeparator();
+        }
         QAction *propertiesAction = new QAction(tr("Properties"), contextMenu);
         contextMenu->addAction(propertiesAction);
         if(!contextMenu->isEmpty()) {

diff --git a/src/sessiontreeview.h b/src/sessiontreeview.h
@@ -38,6 +38,10 @@ class SessionTreeView : public QTreeView
     bool checkSession(QString str);
     void retranslateUi();
 
+signals:
+    void sessionConnect(QString str);
+    void sessionRemove(QString str);
+
 protected:
     void contextMenuEvent(QContextMenuEvent *event) override;