Set fullscreen button text if icon is unavailable

[presencevnc] / src / fullscreenexitbutton.h

diff --git a/src/fullscreenexitbutton.h b/src/fullscreenexitbutton.h
index 69b3352..c968eb9 100644 (file)
--- a/src/fullscreenexitbutton.h
+++ b/src/fullscreenexitbutton.h
@@ -64,8 +64,12 @@ FullScreenExitButton::FullScreenExitButton(QWidget *parent)
 {
     Q_ASSERT(parent);
 
+#ifdef Q_WS_MAEMO_5
     // set the fullsize icon from Maemo's theme
     setIcon(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"));
+#else
+    setText(tr("Toggle Fullscreen"));
+#endif
 
     // ensure that our size is fixed to our ideal size
     setFixedSize(sizeHint());
@@ -89,7 +93,6 @@ FullScreenExitButton::FullScreenExitButton(QWidget *parent)
     parent->installEventFilter(this);
 
     setVisible(false); //assuming we don't start in fullscreen
-    timer.start();
 }
 
 bool FullScreenExitButton::eventFilter(QObject *obj, QEvent *ev)
@@ -110,6 +113,8 @@ bool FullScreenExitButton::eventFilter(QObject *obj, QEvent *ev)
         setVisible(isFullScreen);
         if (isFullScreen)
             raise();
+        timer.start();
+        break;
         // fall through
     case QEvent::Resize:
         if (isVisible()) {