More small Symbian fixes.

[dorian] / widgets / listwindow.cpp

diff --git a/widgets/listwindow.cpp b/widgets/listwindow.cpp
index bc3c65f..37d34a4 100644 (file)
--- a/widgets/listwindow.cpp
+++ b/widgets/listwindow.cpp
@@ -2,59 +2,133 @@
 
 #include "listwindow.h"
 #include "trace.h"
+#include "listview.h"
+#include "platform.h"
+
+#ifdef Q_OS_SYMBIAN
+#include "flickcharm.h"
+#endif
 
 ListWindow::ListWindow(QWidget *parent): QMainWindow(parent), list(0)
 {
-#ifdef Q_WS_MAEMO_5
+#if defined(Q_WS_MAEMO_5)
     setAttribute(Qt::WA_Maemo5StackedWindow, true);
-#endif
+    popup = new QMenu(this);
 
+    QScrollArea *scroller = new QScrollArea(this);
+    setCentralWidget(scroller);
+    scroller->setProperty("FingerScrollable", true);
+    // scroller->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    // scroller->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    scroller->setFrameStyle(QFrame::NoFrame);
+    scroller->show();
+
+    QWidget *content = new QWidget(scroller);
+    contentLayout = new QVBoxLayout(content);
+    contentLayout->setMargin(0);
+    content->setLayout(contentLayout);
+    content->show();
+
+    scroller->setWidget(content);
+    scroller->setWidgetResizable(true);
+#else
     QFrame *frame = new QFrame(this);
     setCentralWidget(frame);
-    frameLayout = new QHBoxLayout(frame);
-    frame->setLayout(frameLayout);
-
-#ifndef Q_WS_MAEMO_5
+    contentLayout = new QHBoxLayout();
+    frame->setLayout(contentLayout);
     buttonBox = new QDialogButtonBox(Qt::Vertical, this);
-    frameLayout->addWidget(buttonBox);
-#endif
+    contentLayout->addWidget(buttonBox);
+#endif // Q_WS_MAEMO_5
+
+#ifdef Q_OS_SYMBIAN
+    charm = 0;
+    QAction *closeAction = new QAction(parent? tr("Back"): tr("Exit"), this);
+    closeAction->setSoftKeyRole(QAction::NegativeSoftKey);
+    connect(closeAction, SIGNAL(triggered()), this, SLOT(close()));
+    QMainWindow::addAction(closeAction);
+#endif // Q_OS_SYMBIAN
+
+#ifdef Q_WS_MAC
+    addAction(tr("Close"), this, SLOT(close()), QString(),
+              QDialogButtonBox::RejectRole);
+#endif // Q_WS_MAC
 }
 
-void ListWindow::addList(QListView *listView)
+void ListWindow::addList(ListView *listView)
 {
+    Trace t("ListWindow::addList");
     list = listView;
-    frameLayout->insertWidget(0, list);
+#if defined(Q_WS_MAEMO_5)
+    list->installEventFilter(this);
+    list->setMinimumHeight(list->contentsHeight());
+    contentLayout->addWidget(list);
+    connect(list->model(),
+            SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+            this, SLOT(onModelChanged()));
+    connect(list->model(),
+            SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
+            this, SLOT(onModelChanged()));
+#else
+    contentLayout->insertWidget(0, list);
+#endif // Q_WS_MAEMO5
+
+#ifdef Q_OS_SYMBIAN
+    if (!charm) {
+        charm = new FlickCharm(this);
+    }
+    // FIXME: Charm's need more work...: charm->activateOn(list);
+#endif // Q_OS_SYMBIAN
+
     connect(list->selectionModel(),
       SIGNAL(selectionChanged(const QItemSelection &, const QItemSelection &)),
       this,
-      SLOT(onSelectionChanged(const QItemSelection &, const QItemSelection&)));
+      SLOT(onSelectionChanged(const QItemSelection &, const QItemSelection &)));
 }
 
 void ListWindow::addAction(const QString &title, QObject *receiver,
-                           const char *slot, QDialogButtonBox::ButtonRole role)
+                           const char *slot, const QString &iconName,
+                           QDialogButtonBox::ButtonRole role)
 {
-#ifndef Q_WS_MAEMO_5
-    QPushButton *button = buttonBox->addButton(title, role);
+    Trace t("ListWindow::addAction");
+#ifdef Q_WS_MAEMO_5
+    Q_UNUSED(role);
+    QPushButton *button =
+            new QPushButton(QIcon(Platform::icon(iconName)), title, this);
+    contentLayout->addWidget(button);
     connect(button, SIGNAL(clicked()), receiver, slot);
-#else
+#elif defined(Q_OS_SYMBIAN)
     Q_UNUSED(role);
-    QAction *action = menuBar()->addAction(title);
+    Q_UNUSED(iconName);
+    QAction *action = new QAction(title, this);
     connect(action, SIGNAL(triggered()), receiver, slot);
-#endif // ! Q_WS_MAEMO_5
+    action->setSoftKeyRole(QAction::PositiveSoftKey);
+    menuBar()->addAction(action);
+#else
+    Q_UNUSED(iconName);
+    QPushButton *button = buttonBox->addButton(title, role);
+    connect(button, SIGNAL(clicked()), receiver, slot);
+#endif // Q_WS_MAEMO_5
 }
 
 void ListWindow::addItemAction(const QString &title, QObject *receiver,
                                const char *slot)
 {
-#ifndef Q_WS_MAEMO_5
+    Trace t("ListWindow::addItemAction");
+#ifdef Q_WS_MAEMO_5
+    popup->addAction(title, receiver, slot);
+#elif defined Q_OS_SYMBIAN
+    QAction *action = new QAction(title, this);
+    connect(action, SIGNAL(triggered()), receiver, slot);
+    action->setSoftKeyRole(QAction::PositiveSoftKey);
+    menuBar()->addAction(action);
+    // FIXME: Add action to the list of item specific actions
+#else
     QPushButton *button =
             buttonBox->addButton(title, QDialogButtonBox::ActionRole);
     connect(button, SIGNAL(clicked()), receiver, slot);
     itemButtons.append(button);
     activateItemButtons();
-#else
-    // FIXME
-#endif // ! Q_WS_MAEMO_5
+#endif // Q_WS_MAEMO_5
 }
 
 #ifdef Q_WS_MAEMO_5
@@ -92,3 +166,44 @@ void ListWindow::activateItemButtons()
 }
 
 #endif // ! Q_WS_MAEMO_5
+
+#ifdef Q_WS_MAEMO_5
+
+bool ListWindow::eventFilter(QObject *obj, QEvent *event)
+{
+    if (event->type() == QEvent::ContextMenu) {
+        qDebug() << "ListWindow::eventFiler: Received QEvent::ContextMenu";
+        if (popup->actions().size()) {
+            QMouseEvent *mouseEvent = static_cast<QMouseEvent*> (event);
+            QPoint pos = mouseEvent->globalPos();
+            pos.setX(pos.x() - 150);
+            if (pos.x() < 0) {
+                pos.setX(0);
+            }
+            popup->exec(pos);
+        }
+        return true;
+    } else {
+        return QObject::eventFilter(obj, event);
+    }
+}
+
+void ListWindow::onModelChanged()
+{
+    qDebug() << "ListWindow::onModelChanged";
+    list->setMinimumHeight(list->contentsHeight());
+}
+
+#endif // Q_WS_MAEMO_5
+
+#ifdef Q_OS_SYMBIAN
+
+void ListWindow::show()
+{
+    foreach (QWidget *w, QApplication::allWidgets()) {
+        w->setContextMenuPolicy(Qt::NoContextMenu);
+    }
+    showMaximized();
+}
+
+#endif // Q_OS_SYMBIAN