FCL/sf/mw/qt: comparison tools/qml/qmlruntime.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 #include <QProcess>
 #include <QMenuBar>
 #include <QMenu>
 #include <QAction>
 #include <QFileDialog>
+#include <QInputDialog>
 #include <QTimer>
 #include <QGraphicsObject>
 #include <QNetworkProxyFactory>
 #include <QKeyEvent>
 #include <QMutex>
 #ifdef GL_SUPPORTED
 #include <QGLWidget>
 #endif
+#if defined(Q_WS_S60)
+#include <aknappui.h> // For locking app orientation
+#endif
 #include <qdeclarativetester.h>
 QT_BEGIN_NAMESPACE
+class DragAndDropView : public QDeclarativeView
+{
+Q_OBJECT
+public:
+DragAndDropView(QDeclarativeViewer *parent = 0)
+: QDeclarativeView(parent)
+{
+setAcceptDrops(true);
+}
+void dragEnterEvent(QDragEnterEvent *event)
+{
+const QMimeData *mimeData = event->mimeData();
+if (mimeData->hasUrls())
+event->acceptProposedAction();
+}
+void dragMoveEvent(QDragMoveEvent *event)
+{
+event->acceptProposedAction();
+}
+void dragLeaveEvent(QDragLeaveEvent *event)
+{
+event->accept();
+}
+void dropEvent(QDropEvent *event)
+{
+const QMimeData *mimeData = event->mimeData();
+if (!mimeData->hasUrls())
+return;
+const QList<QUrl> urlList = mimeData->urls();
+foreach (const QUrl &url, urlList) {
+if (url.scheme() == QLatin1String("file")) {
+static_cast<QDeclarativeViewer *>(parent())->open(url.toLocalFile());
+event->accept();
+return;
+}
+}
+}
+};
 class Runtime : public QObject
 {
 Q_OBJECT
 QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags)
 : QMainWindow(parent, flags)
 , loggerWindow(new LoggerWidget(this))
 , frame_stream(0)
+, rotateAction(0)
 , orientation(0)
 , showWarningsWindow(0)
 , m_scriptOptions(0)
 , tester(0)
 , useQmlFileBrowser(true)
 recdlg->warning->setText(warn);
 } else {
 recdlg->warning->hide();
 }
-canvas = new QDeclarativeView(this);
+canvas = new DragAndDropView(this);
 canvas->setAttribute(Qt::WA_OpaquePaintEvent);
 canvas->setAttribute(Qt::WA_NoSystemBackground);
 canvas->setFocus();
 QObject::connect(canvas, SIGNAL(sceneResized(QSize)), this, SLOT(sceneResized(QSize)));
 QObject::connect(canvas, SIGNAL(statusChanged(QDeclarativeView::Status)), this, SLOT(statusChanged()));
-QObject::connect(canvas->engine(), SIGNAL(quit()), QCoreApplication::instance (), SLOT(quit()));
+QObject::connect(canvas->engine(), SIGNAL(quit()), this, SLOT(close()));
 QObject::connect(warningsWidget(), SIGNAL(opened()), this, SLOT(warningsWidgetOpened()));
 QObject::connect(warningsWidget(), SIGNAL(closed()), this, SLOT(warningsWidgetClosed()));
 if (!(flags & Qt::FramelessWindowHint)) {
 }
 void QDeclarativeViewer::createMenu()
 {
 QAction *openAction = new QAction(tr("&Open..."), this);
-openAction->setShortcut(QKeySequence("Ctrl+O"));
+openAction->setShortcuts(QKeySequence::Open);
 connect(openAction, SIGNAL(triggered()), this, SLOT(openFile()));
+QAction *openUrlAction = new QAction(tr("Open &URL..."), this);
+connect(openUrlAction, SIGNAL(triggered()), this, SLOT(openUrl()));
 QAction *reloadAction = new QAction(tr("&Reload"), this);
-reloadAction->setShortcut(QKeySequence("Ctrl+R"));
+reloadAction->setShortcuts(QKeySequence::Refresh);
 connect(reloadAction, SIGNAL(triggered()), this, SLOT(reload()));
 QAction *snapshotAction = new QAction(tr("&Take Snapshot"), this);
 snapshotAction->setShortcut(QKeySequence("F3"));
 connect(snapshotAction, SIGNAL(triggered()), this, SLOT(takeSnapShot()));
 QAction *fullscreenAction = new QAction(tr("Full Screen"), this);
 fullscreenAction->setCheckable(true);
 connect(fullscreenAction, SIGNAL(triggered()), this, SLOT(toggleFullScreen()));
-QAction *rotateOrientation = new QAction(tr("Rotate orientation"), this);
+rotateAction = new QAction(tr("Rotate orientation"), this);
-rotateOrientation->setShortcut(QKeySequence("Ctrl+T"));
+rotateAction->setShortcut(QKeySequence("Ctrl+T"));
-connect(rotateOrientation, SIGNAL(triggered()), this, SLOT(rotateOrientation()));
+connect(rotateAction, SIGNAL(triggered()), this, SLOT(rotateOrientation()));
 orientation = new QActionGroup(this);
 orientation->setExclusive(true);
 connect(orientation, SIGNAL(triggered(QAction*)), this, SLOT(changeOrientation(QAction*)));
+#if defined(Q_OS_SYMBIAN)
+QAction *autoOrientationAction = new QAction(tr("Auto-orientation"), this);
+autoOrientationAction->setCheckable(true);
+#endif
 QAction *portraitAction = new QAction(tr("Portrait"), this);
 portraitAction->setCheckable(true);
 QAction *landscapeAction = new QAction(tr("Landscape"), this);
 landscapeAction->setCheckable(true);
+#if !defined(Q_OS_SYMBIAN)
 QAction *portraitInvAction = new QAction(tr("Portrait (inverted)"), this);
 portraitInvAction->setCheckable(true);
 QAction *landscapeInvAction = new QAction(tr("Landscape (inverted)"), this);
 landscapeInvAction->setCheckable(true);
+#endif
 QAction *aboutAction = new QAction(tr("&About Qt..."), this);
+aboutAction->setMenuRole(QAction::AboutQtRole);
 connect(aboutAction, SIGNAL(triggered()), qApp, SLOT(aboutQt()));
+QAction *closeAction = new QAction(tr("&Close"), this);
+closeAction->setShortcuts(QKeySequence::Close);
+connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
 QAction *quitAction = new QAction(tr("&Quit"), this);
-quitAction->setShortcut(QKeySequence("Ctrl+Q"));
+quitAction->setMenuRole(QAction::QuitRole);
+quitAction->setShortcuts(QKeySequence::Quit);
 connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
 QMenuBar *menu = menuBar();
 if (!menu)
 	return;
 #if defined(Q_WS_MAEMO_5)
 menu->addAction(openAction);
+menu->addAction(openUrlAction);
 menu->addAction(reloadAction);
 menu->addAction(snapshotAction);
 menu->addAction(recordAction);
 return;
 #endif // Q_WS_MAEMO_5
 QMenu *fileMenu = menu->addMenu(tr("&File"));
 fileMenu->addAction(openAction);
+fileMenu->addAction(openUrlAction);
 fileMenu->addAction(reloadAction);
 fileMenu->addSeparator();
+fileMenu->addAction(closeAction);
+#if !defined(Q_OS_SYMBIAN)
 fileMenu->addAction(quitAction);
-#if !defined(Q_OS_SYMBIAN)
 QMenu *recordMenu = menu->addMenu(tr("&Recording"));
 recordMenu->addAction(snapshotAction);
 recordMenu->addAction(recordAction);
 QMenu *debugMenu = menu->addMenu(tr("&Debugging"));
 debugMenu->addAction(slowAction);
 debugMenu->addAction(showWarningsWindow);
 #endif // ! Q_OS_SYMBIAN
-QMenu *settingsMenu = menu->addMenu(tr("S&ettings"));
+QMenu *settingsMenu = menu->addMenu(tr("&Settings"));
 settingsMenu->addAction(proxyAction);
-#if !defined(Q_OS_SYMBIAN)
+#if defined(Q_OS_SYMBIAN)
+settingsMenu->addAction(fullscreenAction);
+#else
 settingsMenu->addAction(recordOptions);
 settingsMenu->addMenu(loggerWindow->preferencesMenu());
-#else // ! Q_OS_SYMBIAN
+#endif // !Q_OS_SYMBIAN
-settingsMenu->addAction(fullscreenAction);
+settingsMenu->addAction(rotateAction);
-#endif // Q_OS_SYMBIAN
-settingsMenu->addAction(rotateOrientation);
 QMenu *propertiesMenu = settingsMenu->addMenu(tr("Properties"));
+#if defined(Q_OS_SYMBIAN)
+orientation->addAction(autoOrientationAction);
+#endif
 orientation->addAction(portraitAction);
 orientation->addAction(landscapeAction);
+#if !defined(Q_OS_SYMBIAN)
 orientation->addAction(portraitInvAction);
 orientation->addAction(landscapeInvAction);
+#endif
 propertiesMenu->addActions(orientation->actions());
 QMenu *helpMenu = menu->addMenu(tr("&Help"));
 helpMenu->addAction(aboutAction);
 }
 reload ();
 }
 void QDeclarativeViewer::rotateOrientation()
 {
+#if defined(Q_WS_S60)
+CAknAppUi *appUi = static_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi());
+if (appUi) {
+CAknAppUi::TAppUiOrientation oldOrientation = appUi->Orientation();
+QString newOrientation;
+if (oldOrientation == CAknAppUi::EAppUiOrientationPortrait) {
+newOrientation = QLatin1String("Landscape");
+} else {
+newOrientation = QLatin1String("Portrait");
+}
+foreach (QAction *action, orientation->actions()) {
+if (action->text() == newOrientation) {
+changeOrientation(action);
+}
+}
+}
+#else
 QAction *current = orientation->checkedAction();
 QList<QAction *> actions = orientation->actions();
 int index = actions.indexOf(current);
 if (index < 0)
 return;
 QAction *newOrientation = actions[(index + 1) % actions.count()];
 changeOrientation(newOrientation);
+#endif
 }
 void QDeclarativeViewer::toggleFullScreen()
 {
 if (isFullScreen())
 void QDeclarativeViewer::openFile()
 {
 QString cur = canvas->source().toLocalFile();
 if (useQmlFileBrowser) {
-open("qrc:/content/Browser.qml");
+open("qrc:/browser/Browser.qml");
 } else {
 QString fileName = QFileDialog::getOpenFileName(this, tr("Open QML file"), cur, tr("QML Files (*.qml)"));
 if (!fileName.isEmpty()) {
 QFileInfo fi(fileName);
 open(fi.absoluteFilePath());
 }
 }
+}
+void QDeclarativeViewer::openUrl()
+{
+QString cur = canvas->source().toLocalFile();
+QString url= QInputDialog::getText(this, tr("Open QML file"), tr("URL of main QML file:"), QLineEdit::Normal, cur);
+if (!url.isEmpty())
+open(url);
 }
 void QDeclarativeViewer::statusChanged()
 {
 if (canvas->status() == QDeclarativeView::Error && tester)
 bool QDeclarativeViewer::event(QEvent *event)
 {
 if (event->type() == QEvent::WindowActivate) {
 Runtime::instance()->setActiveWindow(true);
+DeviceOrientation::instance()->resumeListening();
 } else if (event->type() == QEvent::WindowDeactivate) {
 Runtime::instance()->setActiveWindow(false);
+DeviceOrientation::instance()->pauseListening();
 }
 return QWidget::event(event);
 }
 void QDeclarativeViewer::senseImageMagick()
 void QDeclarativeViewer::changeOrientation(QAction *action)
 {
 if (!action)
 return;
+QString o = action->text();
 action->setChecked(true);
+#if defined(Q_WS_S60)
-QString o = action->text();
+CAknAppUi *appUi = static_cast<CAknAppUi *>(CEikonEnv::Static()->AppUi());
+if (appUi) {
+CAknAppUi::TAppUiOrientation orientation = appUi->Orientation();
+if (o == QLatin1String("Auto-orientation")) {
+appUi->SetOrientationL(CAknAppUi::EAppUiOrientationAutomatic);
+rotateAction->setVisible(false);
+} else if (o == QLatin1String("Portrait")) {
+appUi->SetOrientationL(CAknAppUi::EAppUiOrientationPortrait);
+rotateAction->setVisible(true);
+} else if (o == QLatin1String("Landscape")) {
+appUi->SetOrientationL(CAknAppUi::EAppUiOrientationLandscape);
+rotateAction->setVisible(true);
+}
+}
+#else
 if (o == QLatin1String("Portrait"))
 DeviceOrientation::instance()->setOrientation(DeviceOrientation::Portrait);
 else if (o == QLatin1String("Landscape"))
 DeviceOrientation::instance()->setOrientation(DeviceOrientation::Landscape);
 else if (o == QLatin1String("Portrait (inverted)"))
 DeviceOrientation::instance()->setOrientation(DeviceOrientation::PortraitInverted);
 else if (o == QLatin1String("Landscape (inverted)"))
 DeviceOrientation::instance()->setOrientation(DeviceOrientation::LandscapeInverted);
+#endif
 }
 void QDeclarativeViewer::orientationChanged()
 {
 updateSizeHints();

changeset 37	758a864f9613
parent 33	3e2da88830cd