Make coding style more consistent

[presencevnc] / src / mainwindow.cpp

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e9c1456..cf9dfdb 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)
 {
@@ -134,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);
@@ -183,7 +181,7 @@ void MainWindow::about()
                        tr("<center><h1>Presence VNC 0.8</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>"));
@@ -207,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]"):""));
@@ -271,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
@@ -321,7 +321,11 @@ 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());
 }