#include "keymenu.h"
#include "mainwindow.h"
#include "preferences.h"
+#include "scrollarea.h"
#include "vncview.h"
#ifdef Q_WS_MAEMO_5
key_menu(new KeyMenu(this))
{
setWindowTitle("Presence VNC");
+ setContextMenuPolicy(Qt::NoContextMenu);
#ifdef Q_WS_MAEMO_5
setAttribute(Qt::WA_Maemo5StackedWindow);
#endif
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);
- */
-
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(zoomSliderReleased()));
zoom_slider->setValue(settings.value("zoomlevel", 95).toInt());
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);
+
+ FullScreenExitButton* fullscreen_exit_button = new FullScreenExitButton(this);
+ connect(fullscreen_exit_button, SIGNAL(clicked()),
+ this, SLOT(toggleFullscreen()));
grabZoomKeys(true);
reloadSettings();
if(url.isNull()) {
disconnect_action->setEnabled(false);
- toolbar->setEnabled(false);
showConnectDialog();
} else {
vnc_view = new VncView(this, url, RemoteView::Quality(quality));
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 />\
vnc_view->start();
disconnect_action->setEnabled(true);
- toolbar->setEnabled(true);
//reset key menu
delete key_menu;
if(!vnc_view)
return;
+ disconnect_action->setEnabled(false);
+ toolbar->setEnabled(false);
scroll_area->setWidget(0);
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();
+ vnc_view->useFastTransformations(false);
+ vnc_view->repaint();
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
old_status = status;
}
-//resizes the widget to use available screen space
+//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;
+ zoom_to_cursor = settings.value("zoom_to_cursor", true).toBool();
+
#ifdef Q_WS_MAEMO_5
int rotation = settings.value("screen_rotation", 0).toInt();
setAttribute(Qt::WA_Maemo5AutoOrientation, rotation == 0);
{
QMainWindow::resizeEvent(event);
- forceResize();
+ updateScreenSpace();
if(vnc_view)
vnc_view->setZoomLevel(zoom_slider->value());
if(!vnc_view)
return;
- int old_width = vnc_view->width();
+ const qreal old_factor = vnc_view->zoomFactor();
QPoint center = vnc_view->visibleRegion().boundingRect().center();
vnc_view->setZoomLevel(level);
- int new_width = vnc_view->width();
- center = center * (double(new_width)/old_width);
+ const qreal new_factor = vnc_view->zoomFactor();
+
+ //scroll to center, if zoom level actually changed
+ if(old_factor != new_factor) {
+ if(zoom_to_cursor)
+ center = new_factor * vnc_view->cursorPosition();
+ else //zoom to center of visible region
+ center = center * (double(new_factor)/old_factor);
+
+ scroll_area->ensureVisible(center.x(), center.y(),
+ vnc_view->visibleRegion().boundingRect().width()/2,
+ vnc_view->visibleRegion().boundingRect().height()/2);
+
+ vnc_view->useFastTransformations(zoom_slider->isSliderDown());
+ vnc_view->update();
+
+ scroll_area->showMessage(tr("Zoom: %1\%").arg(qRound(100*new_factor)));
+ }
+}
+
+void MainWindow::zoomSliderReleased()
+{
+ static QTime time;
+ if(!time.isNull() and time.elapsed() < 500) //double clicked
+ zoom_slider->setValue(95); //100%
+
+ time.restart();
- //scroll to center
- scroll_area->ensureVisible(center.x(), center.y(),
- scroll_area->width()/2, scroll_area->height()/2);
+ //stopped zooming, reenable high quality
+ vnc_view->useFastTransformations(false);
}
projects / presencevnc / blobdiff