#include "keymenu.h"
#include "mainwindow.h"
#include "preferences.h"
+#include "scrollarea.h"
#include "vncview.h"
#ifdef Q_WS_MAEMO_5
#endif
-
MainWindow::MainWindow(QString url, int quality):
QMainWindow(0),
vnc_view(0),
scroll_area(new ScrollArea(0)),
- key_menu(0)
+ key_menu(new KeyMenu(this))
{
setWindowTitle("Presence VNC");
-
- migrateConfiguration();
- QSettings settings;
-
+ setContextMenuPolicy(Qt::NoContextMenu);
#ifdef Q_WS_MAEMO_5
setAttribute(Qt::WA_Maemo5StackedWindow);
#endif
+ migrateConfiguration();
+
//set up toolbar
toolbar = new QToolBar(0);
toolbar->addAction(QChar(0x2026), this, SLOT(showKeyMenu())); //"..." button
toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/control_keyboard.png"), "", this, SLOT(showInputPanel()));
#endif
- //move remaining buttons to the right
- QWidget *spacer = new QWidget();
- spacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
- toolbar->addWidget(spacer);
-
- toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"), "", this, SLOT(toggleFullscreen()));
- addToolBar(toolbar);
- toolbar->setVisible(settings.value("show_toolbar", true).toBool());
-
- //set up zoombar
- zoombar = new QToolBar(0);
+ QSettings settings;
zoom_slider = new QSlider(Qt::Horizontal, 0);
zoom_slider->setRange(0, 100);
connect(zoom_slider, SIGNAL(valueChanged(int)),
this, SLOT(setZoomLevel(int)));
+ connect(zoom_slider, SIGNAL(sliderReleased()),
+ this, SLOT(forceRepaint()));
zoom_slider->setValue(settings.value("zoomlevel", 95).toInt());
- zoombar->addWidget(zoom_slider);
- addToolBar(zoombar);
+ toolbar->addWidget(zoom_slider);
+
+ toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"), "", this, SLOT(toggleFullscreen()));
+ addToolBar(toolbar);
+ toolbar->setVisible(settings.value("show_toolbar", true).toBool());
+ toolbar->setEnabled(false);
//set up menu
QAction *connect_action = new QAction(tr("Connect"), this);
connect(show_toolbar, SIGNAL(toggled(bool)),
toolbar, SLOT(setVisible(bool)));
connect(show_toolbar, SIGNAL(toggled(bool)),
- this, SLOT(forceResizeDelayed()));
+ this, SLOT(updateScreenSpaceDelayed()));
setCentralWidget(scroll_area);
new FullScreenExitButton(this);
if(url.isNull()) {
disconnect_action->setEnabled(false);
- toolbar->setEnabled(false);
showConnectDialog();
} else {
vnc_view = new VncView(this, url, RemoteView::Quality(quality));
this, SLOT(statusChanged(RemoteView::RemoteStatus)));
scroll_area->setWidget(vnc_view);
vnc_view->start();
- key_menu = new KeyMenu(this);
}
-
- //QTimer::singleShot(500, this, SLOT(close()));
}
void MainWindow::grabZoomKeys(bool grab)
void MainWindow::about() {
QMessageBox::about(this, tr("About Presence VNC"),
- tr("<center><h1>Presence VNC 0.6</h1>\
+ tr("<center><h1>Presence VNC 0.7</h1>\
<p>A touchscreen friendly VNC client</p>\
<p><a href=\"https://garage.maemo.org/projects/presencevnc/\">https://garage.maemo.org/projects/presencevnc</a></p></center>\
<small><p>©2010 Christian Pulvermacher <pulvermacher@gmx.de><br />\
void MainWindow::showConnectDialog()
{
ConnectDialog *connect_dialog = new ConnectDialog(this);
- connect(connect_dialog, SIGNAL(connectToHost(QString, int)),
- this, SLOT(connectToHost(QString, int)));
+ connect(connect_dialog, SIGNAL(connectToHost(QString, int, int)),
+ this, SLOT(connectToHost(QString, int, int)));
connect_dialog->exec();
}
-void MainWindow::connectToHost(QString url, int quality)
+void MainWindow::connectToHost(QString url, int quality, int listen_port)
{
disconnectFromHost();
- vnc_view = new VncView(this, url, RemoteView::Quality(quality));
+ vnc_view = new VncView(this, url, RemoteView::Quality(quality), listen_port);
connect(vnc_view, SIGNAL(statusChanged(RemoteView::RemoteStatus)),
this, SLOT(statusChanged(RemoteView::RemoteStatus)));
scroll_area->setWidget(vnc_view);
vnc_view->start();
+
disconnect_action->setEnabled(true);
- toolbar->setEnabled(true);
- if(key_menu) //reset
- delete key_menu;
+ //reset key menu
+ delete key_menu;
key_menu = new KeyMenu(this);
}
if(!vnc_view)
return;
+ disconnect_action->setEnabled(false);
+ toolbar->setEnabled(false);
scroll_area->setWidget(0);
- vnc_view->disconnect(); //remove all signal-slot connections
delete vnc_view;
vnc_view = 0;
- disconnect_action->setEnabled(false);
- toolbar->setEnabled(false);
}
void MainWindow::statusChanged(RemoteView::RemoteStatus status)
#ifdef Q_WS_MAEMO_5
setAttribute(Qt::WA_Maemo5ShowProgressIndicator, false);
#endif
+ toolbar->setEnabled(true);
+
vnc_view->setZoomLevel(zoom_slider->value());
vnc_view->forceFullRepaint();
break;
case RemoteView::Disconnecting:
- if(old_status != RemoteView::Disconnected) { //Disconnecting also occurs while connecting, so check last state
-#ifdef Q_WS_MAEMO_5
- QMaemo5InformationBox::information(this, tr("Connection lost"));
-#endif
-
- //clean up
- scroll_area->setWidget(0);
- vnc_view = 0;
- disconnect_action->setEnabled(false);
- toolbar->setEnabled(false);
-
- //exit fullscreen mode
- if(windowState() & Qt::WindowFullScreen)
- setWindowState(windowState() ^ Qt::WindowFullScreen);
- }
+ if(old_status == RemoteView::Disconnected) //Disconnecting also occurs while connecting, so check last state
+ break;
+
+ if(disconnect_action->isEnabled()) //don't show when manually disconnecting
+ scroll_area->showMessage(tr("Connection lost"));
+
+ //clean up
+ scroll_area->setWidget(0);
+ vnc_view = 0;
+ disconnect_action->setEnabled(false);
+ toolbar->setEnabled(false);
+
+ //exit fullscreen mode
+ if(windowState() & Qt::WindowFullScreen)
+ setWindowState(windowState() ^ Qt::WindowFullScreen);
break;
case RemoteView::Disconnected:
#ifdef Q_WS_MAEMO_5
scroll_area->setWidget(0); //remove widget
}
break;
+ default: //avoid compiler warnings
+ break;
}
old_status = status;
}
-//resizes the widget to use available screen space
+void MainWindow::forceRepaint()
+{
+ if(vnc_view)
+ vnc_view->forceFullRepaint();
+}
+
+//updates available screen space for current zoom level
//necessary when rotating, showing fullscreen, etc.
-void MainWindow::forceResize()
+void MainWindow::updateScreenSpace()
{
if(vnc_view) {
- vnc_view->resize(scroll_area->size());
+ vnc_view->setZoomLevel();
}
}
-void MainWindow::forceResizeDelayed()
+void MainWindow::updateScreenSpaceDelayed()
{
- QTimer::singleShot(500, this, SLOT(forceResize()));
+ QTimer::singleShot(500, this, SLOT(updateScreenSpace()));
}
void MainWindow::toggleFullscreen()
#endif
setWindowState(windowState() ^ Qt::WindowFullScreen);
- forceResizeDelayed();
+ updateScreenSpaceDelayed();
}
void MainWindow::showKeyMenu()
void MainWindow::reloadSettings()
{
- QSettings settings;
#ifdef Q_WS_MAEMO_5
+ QSettings settings;
int rotation = settings.value("screen_rotation", 0).toInt();
setAttribute(Qt::WA_Maemo5AutoOrientation, rotation == 0);
setAttribute(Qt::WA_Maemo5LandscapeOrientation, rotation == 1);
{
QMainWindow::resizeEvent(event);
- forceResize();
+ updateScreenSpace();
if(vnc_view)
vnc_view->setZoomLevel(zoom_slider->value());
+
+#ifdef Q_WS_MAEMO_5
+ //hide zoom slider in portrait mode
+ zoom_slider->setVisible(height() < width());
+#endif
}
void MainWindow::showInputPanel()
void MainWindow::setZoomLevel(int level)
{
- if(vnc_view)
- vnc_view->setZoomLevel(level);
+ if(!vnc_view)
+ return;
+
+ //TODO: use getZoomFactor() instead
+ int old_width = vnc_view->width();
+ QPoint center = vnc_view->visibleRegion().boundingRect().center();
+
+ vnc_view->setZoomLevel(level);
+
+ int new_width = vnc_view->width();
+
+ //scroll to center, if zoom level actually changed
+ if(new_width != old_width) {
+ center = center * (double(new_width)/old_width);
+ scroll_area->ensureVisible(center.x(), center.y(),
+ vnc_view->visibleRegion().boundingRect().width()/2,
+ vnc_view->visibleRegion().boundingRect().height()/2);
+ vnc_view->update();
+
+ scroll_area->showMessage(tr("Zoom: %1\%").arg(qRound(100*vnc_view->getZoomFactor())));
+ }
}
projects / presencevnc / blobdiff