increment version number

[presencevnc] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 042b685..f6bdda7 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -21,6 +21,7 @@
 #include "keymenu.h"
 #include "mainwindow.h"
 #include "preferences.h"
+#include "scrollarea.h"
 #include "vncview.h"
 
 #ifdef Q_WS_MAEMO_5
@@ -58,13 +59,6 @@ MainWindow::MainWindow(QString url, int quality):
        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);
@@ -122,7 +116,7 @@ MainWindow::MainWindow(QString url, int quality):
        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);
@@ -171,7 +165,7 @@ void MainWindow::closeEvent(QCloseEvent*) {
 
 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>&copy;2010 Christian Pulvermacher &lt;pulvermacher@gmx.de&gt;<br />\
@@ -239,22 +233,21 @@ void MainWindow::statusChanged(RemoteView::RemoteStatus status)
                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
-                       if(disconnect_action->isEnabled()) //don't show when manually disconnecting
-                               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
@@ -279,16 +272,16 @@ void MainWindow::forceRepaint()
 
 //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()
@@ -304,7 +297,7 @@ void MainWindow::toggleFullscreen()
 #endif
 
        setWindowState(windowState() ^ Qt::WindowFullScreen); 
-       forceResizeDelayed();
+       updateScreenSpaceDelayed();
 }
 
 void MainWindow::showKeyMenu()
@@ -324,8 +317,8 @@ void MainWindow::showPreferences()
 
 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);
@@ -340,7 +333,7 @@ void MainWindow::resizeEvent(QResizeEvent *event)
 {
        QMainWindow::resizeEvent(event);
 
-       forceResize();
+       updateScreenSpace();
        if(vnc_view)
                vnc_view->setZoomLevel(zoom_slider->value());
        
@@ -367,6 +360,7 @@ void MainWindow::setZoomLevel(int level)
        if(!vnc_view)
                return;
        
+       //TODO: use getZoomFactor() instead
        int old_width = vnc_view->width();
        QPoint center = vnc_view->visibleRegion().boundingRect().center();
 
@@ -378,7 +372,10 @@ void MainWindow::setZoomLevel(int level)
        if(new_width != old_width) {
                center = center * (double(new_width)/old_width);
                scroll_area->ensureVisible(center.x(), center.y(),
-                       scroll_area->width()/2, scroll_area->height()/2);
+                       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())));
        }
 }