summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp')
-rw-r--r--Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp13
1 files changed, 10 insertions, 3 deletions
diff --git a/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp b/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp
index e6cd291..a1f1a88 100644
--- a/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp
+++ b/Swift/QtUI/ScreenSharing/QtRemoteScreenWindow.cpp
@@ -8,15 +8,22 @@
#include "RemoteScreenViewerWidget.h"
#include <QToolBar>
+#include <QVBoxLayout>
#include <Swiften/ScreenSharing/IncomingScreenSharing.h>
namespace Swift {
QtRemoteScreenWindow::QtRemoteScreenWindow(boost::shared_ptr<IncomingScreenSharing> incScreenSharing, QWidget *parent)
- : QMainWindow(parent), RemoteScreenWindow(incScreenSharing)
+ : QMainWindow(parent), RemoteScreenWindow(incScreenSharing), viewer(new RemoteScreenViewerWidget(iss))
{
- setCentralWidget(new RemoteScreenViewerWidget(iss));
+ QVBoxLayout* centralLayout = new QVBoxLayout;
+ centralLayout->addWidget(viewer);
+
+ QWidget* central = new QWidget(this);
+ central->setLayout(centralLayout);
+
+ setCentralWidget(central);
controlToolBar = addToolBar(tr("Control"));
closeAction = controlToolBar->addAction(QIcon::fromTheme("window-close"), tr("&Terminate session"), this, SLOT(handleCloseTriggered()));
@@ -28,7 +35,7 @@ QtRemoteScreenWindow::~QtRemoteScreenWindow()
void QtRemoteScreenWindow::handleCloseTriggered()
{
- iss->stop();
+ onStopRequest();
}
}