From 9e53515b09dc85d627c9ad47eba5552ea842bc3f Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Sat, 11 Jun 2016 00:10:33 +0200 Subject: [PATCH] dcc: Add rudimentary view for file transfers For now this is just a stock QTableView for visualizing the TransferModel. Will be replaced by a proper view later. --- src/qtui/mainwin.cpp | 34 +++++++++++++++++++++++++++++----- src/qtui/mainwin.h | 1 + 2 files changed, 30 insertions(+), 5 deletions(-) diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp index 20430f15..efe18197 100644 --- a/src/qtui/mainwin.cpp +++ b/src/qtui/mainwin.cpp @@ -24,6 +24,7 @@ #include #include #include +#include #include #include @@ -98,6 +99,7 @@ #include "statusnotifieritem.h" #include "toolbaractionprovider.h" #include "topicwidget.h" +#include "transfermodel.h" #include "verticaldock.h" #ifndef HAVE_KDE @@ -221,10 +223,11 @@ void MainWin::init() setupActions(); setupBufferWidget(); setupMenus(); + setupTransferWidget(); + setupChatMonitor(); setupTopicWidget(); - setupNickWidget(); setupInputWidget(); - setupChatMonitor(); + setupNickWidget(); setupViewMenuTail(); setupStatusBar(); setupToolBars(); @@ -232,6 +235,9 @@ void MainWin::init() setupTitleSetter(); setupHotList(); + _bufferWidget->setFocusProxy(_inputWidget); + _chatMonitorView->setFocusProxy(_inputWidget); + #ifndef HAVE_KDE # ifdef HAVE_QTMULTIMEDIA QtUi::registerNotificationBackend(new QtMultimediaNotificationBackend(this)); @@ -915,7 +921,6 @@ void MainWin::setupChatMonitor() ChatMonitorFilter *filter = new ChatMonitorFilter(Client::messageModel(), this); _chatMonitorView = new ChatMonitorView(filter, this); - _chatMonitorView->setFocusProxy(_inputWidget); _chatMonitorView->show(); dock->setWidget(_chatMonitorView); dock->hide(); @@ -942,8 +947,6 @@ void MainWin::setupInputWidget() _inputWidget->setModel(Client::bufferModel()); _inputWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel()); - _bufferWidget->setFocusProxy(_inputWidget); - _inputWidget->inputLine()->installEventFilter(_bufferWidget); connect(_topicWidget, SIGNAL(switchedPlain()), _bufferWidget, SLOT(setFocus())); @@ -968,6 +971,27 @@ void MainWin::setupTopicWidget() } +void MainWin::setupTransferWidget() +{ + auto dock = new QDockWidget(tr("Transfers"), this); + dock->setObjectName("TransferDock"); + dock->setAllowedAreas(Qt::TopDockWidgetArea|Qt::BottomDockWidgetArea); + + auto view = new QTableView(dock); // to be replaced by the real thing + view->setModel(Client::transferModel()); + dock->setWidget(view); + dock->hide(); // hidden by default + addDockWidget(Qt::TopDockWidgetArea, dock, Qt::Vertical); + + auto action = dock->toggleViewAction(); + action->setText(tr("Show File Transfers")); + action->setIcon(QIcon::fromTheme("download")); + action->setShortcut(QKeySequence(Qt::Key_F6)); + QtUi::actionCollection("General")->addAction("ShowTransferWidget", action); + _viewMenu->addAction(action); +} + + void MainWin::setupViewMenuTail() { _viewMenu->addSeparator(); diff --git a/src/qtui/mainwin.h b/src/qtui/mainwin.h index efe91c65..afe099fb 100644 --- a/src/qtui/mainwin.h +++ b/src/qtui/mainwin.h @@ -192,6 +192,7 @@ private: void setupChatMonitor(); void setupInputWidget(); void setupTopicWidget(); + void setupTransferWidget(); void setupViewMenuTail(); void setupStatusBar(); void setupSystray(); -- 2.20.1