Changeset 174 in tspsg-svn for trunk/src

Timestamp:

May 30, 2011, 3:11:22 PM (13 years ago)

Author:

laleppa

Message:

FIX: Main Window is cut in landscape mode in Symbian (fixed bug:11).
When switching to landscape mode in Symbian, TSPSG will hide toolbar and go into full screen mode.

Location:

trunk/src

Files:

• mainwindow.cpp (modified) (4 diffs)
• mainwindow.h (modified) (1 diff)

trunk/src/mainwindow.cpp

@@ -439 +439 @@
 {
 SettingsDialog sd(this);
+#ifdef Q_WS_S60
+    sd.setWindowState(Qt::WindowMaximized);
+#endif
     if (sd.exec() != QDialog::Accepted)
         return;
@@ -693 +696 @@
 #ifndef HANDHELD
     dlg->resize(450, 350);
+#elif defined(Q_WS_S60)
+    dlg->setWindowState(Qt::WindowMaximized);
 #endif
     QApplication::restoreOverrideCursor();
@@ -1537 +1542 @@
 }
 
+#ifdef Q_WS_S60
+void MainWindow::resizeEvent(QResizeEvent *ev)
+{
+    static bool tb = toolBarMain->isVisible();
+    if ((ev->size().width() < ev->size().height())
+            && (ev->oldSize().width() > ev->oldSize().height())) {
+        // From landscape to portrait
+        if (tb)
+            toolBarMain->show();
+        setWindowState(Qt::WindowMaximized);
+    } else if ((ev->size().width() > ev->size().height())
+               && (ev->oldSize().width() < ev->oldSize().height())) {
+        // From portrait to landscape
+        if (tb = toolBarMain->isVisible())
+            toolBarMain->hide();
+        setWindowState(Qt::WindowFullScreen);
+    }
+
+    QWidget::resizeEvent(ev);
+}
+#endif // Q_WS_S60
+
 void MainWindow::retranslateUi(bool all)
 {
@@ -1642 +1669 @@
 {
     Ui_MainWindow::setupUi(this);
+
+#ifdef Q_WS_S60
+    setWindowFlags(windowFlags() | Qt::WindowSoftkeysVisibleHint);
+#endif // Q_WS_S60
 
     // File Menu

trunk/src/mainwindow.h

@@ -153 +153 @@
     void outputMatrix(QTextCursor &cur, const TMatrix &matrix);
     void outputMatrix(QTextCursor &cur, const SStep &step);
+#ifdef Q_WS_S60
+    void resizeEvent(QResizeEvent *ev);
+#endif // Q_WS_S60
     void retranslateUi(bool all = true);
     bool saveTask();