- QMenu* session_menu = menuBar()->addMenu(tr("&Session"));
- session_menu->addAction(connect_action);
- session_menu->addAction(disconnect_action);
- session_menu->addSeparator();
- //session_menu->addAction(pref_action);
- //session_menu->addSeparator();
- session_menu->addAction(tr("&Quit"), this, SLOT(close()));
-
- QMenu* view_menu = menuBar()->addMenu(tr("&View"));
- view_menu->addAction(scaling);
- view_menu->addAction(show_toolbar);
-
- QMenu* help_menu = menuBar()->addMenu(tr("&Help"));
- help_menu->addAction(about_action);
+ toolbar->addAction(tr("Toggle Fullscreen"), this, SLOT(toggleFullscreen()));
+#endif
+ addToolBar(toolbar);
+ toolbar->setVisible(settings.value("show_toolbar", true).toBool());
+ toolbar->setEnabled(false);
+
+ //set up menu
+ QAction *connect_action = new QAction(tr("Connect"), this);
+ disconnect_action = new QAction(tr("Disconnect"), this);
+ show_toolbar = new QAction(tr("Show toolbar"), this);
+ show_toolbar->setCheckable(true);
+ show_toolbar->setChecked(settings.value("show_toolbar", true).toBool());
+ QAction *pref_action = new QAction(tr("Preferences"), this);
+ QAction *about_action = new QAction(tr("About"), this);
+
+#ifdef Q_WS_MAEMO_5
+ menuBar()->addAction(connect_action);
+ menuBar()->addAction(disconnect_action);
+ menuBar()->addAction(show_toolbar);
+ menuBar()->addAction(pref_action);
+ menuBar()->addAction(about_action);
+#else
+ QMenu* session_menu = menuBar()->addMenu(tr("&Session"));
+ session_menu->addAction(connect_action);
+ session_menu->addAction(disconnect_action);
+ session_menu->addSeparator();
+ session_menu->addAction(pref_action);
+ session_menu->addSeparator();
+ session_menu->addAction(tr("&Quit"), this, SLOT(close()));
+
+ QMenu* view_menu = menuBar()->addMenu(tr("&View"));
+ view_menu->addAction(show_toolbar);
+
+ QMenu* help_menu = menuBar()->addMenu(tr("&Help"));
+ help_menu->addAction(about_action);
+#endif
+
+ connect(about_action, SIGNAL(triggered()),
+ this, SLOT(about()));
+ connect(pref_action, SIGNAL(triggered()),
+ this, SLOT(showPreferences()));
+ connect(connect_action, SIGNAL(triggered()),
+ this, SLOT(showConnectDialog()));
+ connect(disconnect_action, SIGNAL(triggered()),
+ this, SLOT(disconnectFromHost()));
+ connect(show_toolbar, SIGNAL(toggled(bool)),
+ toolbar, SLOT(setVisible(bool)));
+ connect(show_toolbar, SIGNAL(toggled(bool)),
+ this, SLOT(updateScreenSpaceDelayed()));
+#ifdef Q_WS_MAEMO_5
+ QDBusConnection::systemBus().connect("", MCE_SIGNAL_PATH, MCE_SIGNAL_IF, MCE_DISPLAY_SIG,
+ this, SLOT(displayStateChanged(QString)));