Reworking.

Author: dchapyshev

source/client/ui/chat/chat_window.cc

@@ -22,6 +22,7 @@
 #include "base/crypto/generic_hash.h"
 #include "client/client_text_chat.h"
 #include "common/ui/chat_widget.h"
+#include "common/ui/session_type.h"
 #include "ui_chat_window.h"
 
 namespace {
@@ -62,6 +63,21 @@ ChatWindow::ChatWindow(QWidget* parent)
         chat.mutable_chat_status()->CopyFrom(status);
         emit sig_chatMessage(chat);
     });
+
+    auto make_action = [this](proto::peer::SessionType type)
+    {
+        QAction* action = new QAction(sessionIcon(type), sessionName(type), this);
+        connect(action, &QAction::triggered, this, [this, type]()
+        {
+            const ComputerConfig& computer = sessionState()->computer();
+            emit sig_connectRequested(computer.id, computer, type);
+        });
+        return action;
+    };
+
+    action_desktop_ = make_action(proto::peer::SESSION_TYPE_DESKTOP);
+    action_file_transfer_ = make_action(proto::peer::SESSION_TYPE_FILE_TRANSFER);
+    action_system_info_ = make_action(proto::peer::SESSION_TYPE_SYSTEM_INFO);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -96,7 +112,10 @@ void ChatWindow::setTabbedMode(bool tabbed)
 //--------------------------------------------------------------------------------------------------
 QList<QPair<Tab::ActionRole, QList<QAction*>>> ChatWindow::tabActionGroups() const
 {
-    return {{ Tab::ActionRole::FILE, ui->text_chat_widget->tabActions() }};
+    return {
+        { Tab::ActionRole::FILE, ui->text_chat_widget->tabActions() },
+        { Tab::ActionRole::ACTION, { action_desktop_, action_file_transfer_, action_system_info_ } }
+    };
 }
 
 //--------------------------------------------------------------------------------------------------

source/client/ui/chat/chat_window.h

@@ -56,6 +56,9 @@ public slots:
 
 private:
     std::unique_ptr<Ui::ChatWindow> ui;
+    QAction* action_desktop_ = nullptr;
+    QAction* action_file_transfer_ = nullptr;
+    QAction* action_system_info_ = nullptr;
     Q_DISABLE_COPY_MOVE(ChatWindow)
 };
 

source/client/ui/file_transfer/file_transfer_window.cc

@@ -29,6 +29,7 @@
 #include "client/ui/file_transfer/file_transfer_widget.h"
 
 #include "common/ui/msg_box.h"
+#include "common/ui/session_type.h"
 
 //--------------------------------------------------------------------------------------------------
 FileTransferWindow::FileTransferWindow(QWidget* parent)
@@ -49,6 +50,21 @@ FileTransferWindow::FileTransferWindow(QWidget* parent)
     connect(ui->remove_widget, &FileRemoveWidget::sig_finished,
             this, &FileTransferWindow::onRemoveWidgetFinished);
 
+    auto make_action = [this](proto::peer::SessionType type)
+    {
+        QAction* action = new QAction(sessionIcon(type), sessionName(type), this);
+        connect(action, &QAction::triggered, this, [this, type]()
+        {
+            const ComputerConfig& computer = sessionState()->computer();
+            emit sig_connectRequested(computer.id, computer, type);
+        });
+        return action;
+    };
+
+    action_desktop_ = make_action(proto::peer::SESSION_TYPE_DESKTOP);
+    action_text_chat_ = make_action(proto::peer::SESSION_TYPE_TEXT_CHAT);
+    action_system_info_ = make_action(proto::peer::SESSION_TYPE_SYSTEM_INFO);
+
     ui->local_panel->setFocus();
 }
 
@@ -94,6 +110,12 @@ Client* FileTransferWindow::createClient()
     return client;
 }
 
+//--------------------------------------------------------------------------------------------------
+QList<QPair<Tab::ActionRole, QList<QAction*>>> FileTransferWindow::tabActionGroups() const
+{
+    return {{ Tab::ActionRole::ACTION, { action_desktop_, action_text_chat_, action_system_info_ }}};
+}
+
 //--------------------------------------------------------------------------------------------------
 QByteArray FileTransferWindow::saveState() const
 {

source/client/ui/file_transfer/file_transfer_window.h

@@ -39,6 +39,7 @@ class FileTransferWindow final : public ClientWindow
 
     // ClientWindow implementation.
     Client* createClient() final;
+    QList<QPair<Tab::ActionRole, QList<QAction*>>> tabActionGroups() const final;
     QByteArray saveState() const final;
     void restoreState(const QByteArray& state) final;
 
@@ -95,6 +96,9 @@ private slots:
     void setFilePanelsEnabled(bool enabled);
 
     std::unique_ptr<Ui::FileTransferWindow> ui;
+    QAction* action_desktop_ = nullptr;
+    QAction* action_text_chat_ = nullptr;
+    QAction* action_system_info_ = nullptr;
 
     Q_DISABLE_COPY_MOVE(FileTransferWindow)
 };

source/client/ui/sys_info/system_info_window.cc

@@ -52,6 +52,7 @@
 #include "client/ui/sys_info/sys_info_widget_video_adapters.h"
 #include "client/ui/sys_info/tree_to_html.h"
 #include "common/system_info_constants.h"
+#include "common/ui/session_type.h"
 #include "ui_system_info_window.h"
 
 namespace {
@@ -295,6 +296,21 @@ SystemInfoWindow::SystemInfoWindow(QWidget* parent)
     layout_ = new QHBoxLayout(ui->widget);
     layout_->setContentsMargins(0, 0, 0, 0);
     layout_->addWidget(sys_info_widgets_[current_widget_]);
+
+    auto make_action = [this](proto::peer::SessionType type)
+    {
+        QAction* action = new QAction(sessionIcon(type), sessionName(type), this);
+        connect(action, &QAction::triggered, this, [this, type]()
+        {
+            const ComputerConfig& computer = sessionState()->computer();
+            emit sig_connectRequested(computer.id, computer, type);
+        });
+        return action;
+    };
+
+    action_desktop_ = make_action(proto::peer::SESSION_TYPE_DESKTOP);
+    action_file_transfer_ = make_action(proto::peer::SESSION_TYPE_FILE_TRANSFER);
+    action_text_chat_ = make_action(proto::peer::SESSION_TYPE_TEXT_CHAT);
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -332,7 +348,8 @@ QList<QPair<Tab::ActionRole, QList<QAction*>>> SystemInfoWindow::tabActionGroups
 {
     return {
         { Tab::ActionRole::FILE, { ui->action_save, ui->action_print } },
-        { Tab::ActionRole::VIEW, { ui->action_refresh } }
+        { Tab::ActionRole::VIEW, { ui->action_refresh } },
+        { Tab::ActionRole::ACTION, { action_desktop_, action_file_transfer_, action_text_chat_ } }
     };
 }
 

source/client/ui/sys_info/system_info_window.h

@@ -66,6 +66,9 @@ private slots:
     QHBoxLayout* layout_ = nullptr;
     QList<SysInfoWidget*> sys_info_widgets_;
     int current_widget_ = 0;
+    QAction* action_desktop_ = nullptr;
+    QAction* action_file_transfer_ = nullptr;
+    QAction* action_text_chat_ = nullptr;
 
     Q_DISABLE_COPY_MOVE(SystemInfoWindow)
 };