bump version

[presencevnc] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 34b740f..79da379 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -17,7 +17,6 @@
    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
    */
 #include "connectdialog.h"
-#include "fullscreenexitbutton.h"
 #include "keymenu.h"
 #include "mainwindow.h"
 #include "preferences.h"
@@ -40,7 +39,7 @@
 MainWindow::MainWindow(QString url, int quality, int listen_port, bool view_only):
     QMainWindow(0),
     vnc_view(0),
-    scroll_area(new ScrollArea(0)),
+    scroll_area(new ScrollArea(this)),
     input_toolbuttons(new QActionGroup(this)),
     key_menu(0)
 {
@@ -54,7 +53,8 @@ MainWindow::MainWindow(QString url, int quality, int listen_port, bool view_only
 
     //set up toolbar
     toolbar = new QToolBar(0);
-    input_toolbuttons->addAction(toolbar->addAction(QChar(0x2026), this, SLOT(showKeyMenu()))); //"..." button
+    key_menu_button = input_toolbuttons->addAction(toolbar->addAction(QChar(0x2026), this, SLOT(showKeyMenu()))); //"..." button
+    key_menu_button->setCheckable(true); //used to indicate wether a modifier key is still pressed
     input_toolbuttons->addAction(toolbar->addAction(tr("Tab"), this, SLOT(sendTab())));
     input_toolbuttons->addAction(toolbar->addAction(tr("Esc"), this, SLOT(sendEsc())));
     input_toolbuttons->addAction(toolbar->addAction(tr("PgUp"), this, SLOT(sendPgUp())));
@@ -74,7 +74,11 @@ MainWindow::MainWindow(QString url, int quality, int listen_port, bool view_only
     zoom_slider->setValue(settings.value("zoomlevel", 95).toInt());
     toolbar->addWidget(zoom_slider);
 
+#ifdef Q_WS_MAEMO_5
     toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"), "", this, SLOT(toggleFullscreen()));
+#else
+    toolbar->addAction(tr("Toggle Fullscreen"), this, SLOT(toggleFullscreen()));
+#endif
     addToolBar(toolbar);
     toolbar->setVisible(settings.value("show_toolbar", true).toBool());
     toolbar->setEnabled(false);
@@ -129,8 +133,7 @@ MainWindow::MainWindow(QString url, int quality, int listen_port, bool view_only
 
     setCentralWidget(scroll_area);
 
-    FullScreenExitButton* fullscreen_exit_button = new FullScreenExitButton(this);
-    connect(fullscreen_exit_button, SIGNAL(clicked()),
+    connect(scroll_area, SIGNAL(fullscreenButtonClicked()),
             this, SLOT(toggleFullscreen()));
 
     grabZoomKeys(true);
@@ -175,10 +178,10 @@ void MainWindow::closeEvent(QCloseEvent*)
 void MainWindow::about()
 {
     QMessageBox::about(this, tr("About Presence VNC"),
-                       tr("<center><h1>Presence VNC 0.8</h1>\
+                       tr("<center><h1>Presence VNC 0.9</h1>\
                 <p>A touchscreen friendly VNC client</p>\
                 <p><a href=\"http://presencevnc.garage.maemo.org/\">http://presencevnc.garage.maemo.org/</a></p></center>\
-                <small><p>&copy;2010 Christian Pulvermacher &lt;pulvermacher@gmx.de&gt;<br />\
+                <small><p>&copy;2010-2012 Christian Pulvermacher &lt;pulvermacher@gmx.de&gt;<br />\
                 Based on KRDC, &copy; 2007-2008 Urs Wolfer<br />\
                 and LibVNCServer, &copy; 2001-2003 Johannes E. Schindelin</p>\
                 <p>This program is free software; License: <a href=\"http://www.gnu.org/licenses/gpl-2.0.html\">GNU GPL 2</a> or later.</p></small>"));
@@ -202,6 +205,8 @@ void MainWindow::connectToHost(QString url, int quality, int listen_port, bool v
 
     connect(vnc_view, SIGNAL(statusChanged(RemoteView::RemoteStatus)),
             this, SLOT(statusChanged(RemoteView::RemoteStatus)));
+    connect(vnc_view, SIGNAL(errorMessage(QString, QString)),
+        scroll_area, SLOT(showMessage(QString, QString)));
     scroll_area->setWidget(vnc_view);
     vnc_view->start();
     setWindowTitle(QString("Presence VNC - %1").arg(vnc_view->host()) + (view_only?tr(" [View Only]"):""));
@@ -248,7 +253,7 @@ void MainWindow::statusChanged(RemoteView::RemoteStatus status)
 
         vnc_view->setZoomLevel(zoom_slider->value());
         vnc_view->useFastTransformations(false);
-        vnc_view->repaint();
+        vnc_view->update();
         break;
     case RemoteView::Disconnecting:
         if(old_status == RemoteView::Disconnected) //Disconnecting also occurs while connecting, so check last state
@@ -266,7 +271,7 @@ void MainWindow::statusChanged(RemoteView::RemoteStatus status)
 
         //exit fullscreen mode
         if(windowState() & Qt::WindowFullScreen)
-            setWindowState(windowState() ^ Qt::WindowFullScreen);
+            toggleFullscreen();
         break;
     case RemoteView::Disconnected:
 #ifdef Q_WS_MAEMO_5
@@ -316,7 +321,12 @@ void MainWindow::toggleFullscreen()
 void MainWindow::showKeyMenu()
 {
     key_menu->exec();
-    vnc_view->sendKeySequence(key_menu->getKeySequence());
+    if(!key_menu)
+        return;
+
+    if(vnc_view)
+        vnc_view->sendKeySequence(key_menu->getKeySequence());
+    key_menu_button->setChecked(key_menu->isAltChecked() or key_menu->isWinChecked());
 }
 
 void MainWindow::showPreferences()
@@ -353,8 +363,11 @@ void MainWindow::resizeEvent(QResizeEvent *event)
         vnc_view->setZoomLevel(zoom_slider->value());
 
 #ifdef Q_WS_MAEMO_5
-    //hide zoom slider in portrait mode
-    zoom_slider->setVisible(height() < width());
+    //in portrait mode, show only zoom slider and fullscreen button
+    //(opening HW keyboard or OSK will return to landscape)
+    const bool portrait = height() > width();
+    for(int i = 0; i < 7; i++)
+        toolbar->actions()[i]->setVisible(!portrait);
 #endif
 }