Changeset 56929 in webkit

Timestamp:

Apr 1, 2010 12:36:06 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-01 Jesus Sanchez-Palencia <​jesus.palencia@openbossa.org>

Reviewed by Kenneth Rohde Christiansen.

Add Single and Multiple Selection Popup for Maemo 5.

[Qt] Maemo5 theme - popup dialogs
​https://bugs.webkit.org/show_bug.cgi?id=36789

• WebCoreSupport/QtMaemoWebPopup.cpp: (WebCore::Maemo5Popup::populateList): (WebCore::Maemo5Popup::onItemSelected): (WebCore::QtMaemoWebPopup::createSingleSelectionPopup): (WebCore::QtMaemoWebPopup::createMultipleSelectionPopup): (WebCore::Maemo5SingleSelectionPopup::Maemo5SingleSelectionPopup): (WebCore::MultipleItemListDelegate::MultipleItemListDelegate): (WebCore::MultipleItemListDelegate::paint): (WebCore::Maemo5MultipleSelectionPopup::Maemo5MultipleSelectionPopup):
• WebCoreSupport/QtMaemoWebPopup.h:

Location:

trunk/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/QtMaemoWebPopup.cpp (modified) (4 diffs)
• WebCoreSupport/QtMaemoWebPopup.h (modified) (3 diffs)

trunk/WebKit/qt/ChangeLog

@@ +1 @@
+2010-04-01  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Add Single and Multiple Selection Popup for Maemo 5.
+
+        [Qt] Maemo5 theme - popup dialogs
+        https://bugs.webkit.org/show_bug.cgi?id=36789
+
+        * WebCoreSupport/QtMaemoWebPopup.cpp:
+        (WebCore::Maemo5Popup::populateList):
+        (WebCore::Maemo5Popup::onItemSelected):
+        (WebCore::QtMaemoWebPopup::createSingleSelectionPopup):
+        (WebCore::QtMaemoWebPopup::createMultipleSelectionPopup):
+        (WebCore::Maemo5SingleSelectionPopup::Maemo5SingleSelectionPopup):
+        (WebCore::MultipleItemListDelegate::MultipleItemListDelegate):
+        (WebCore::MultipleItemListDelegate::paint):
+        (WebCore::Maemo5MultipleSelectionPopup::Maemo5MultipleSelectionPopup):
+        * WebCoreSupport/QtMaemoWebPopup.h:
+
 2010-03-31  Marcus Bulach  <bulach@chromium.org>
 

trunk/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp

@@ -21 +21 @@
 #include "QtMaemoWebPopup.h"
 
+#include <QHBoxLayout>
+#include <QListWidget>
+#include <QListWidgetItem>
+#include <QPainter>
+#include <QPushButton>
+#include <QStyledItemDelegate>
+#include <QVBoxLayout>
+
+#include <libintl.h>
+
+
 namespace WebCore {
+
+static const int gMaemoListItemSize = 70;
+static const int gMaemoListPadding = 38;
+static const int gMaemoMaxVisibleItems = 5;
+
+void Maemo5Popup::populateList()
+{
+    QListWidgetItem* listItem;
+    for (int i = 0; i < m_data.itemCount(); ++i) {
+        if (m_data.itemType(i) == QtAbstractWebPopup::Option) {
+            listItem = new QListWidgetItem(m_data.itemText(i));
+            m_list->addItem(listItem);
+            listItem->setSelected(m_data.itemIsSelected(i));
+        } else if (m_data.itemType(i) == QtAbstractWebPopup::Group) {
+            listItem = new QListWidgetItem(m_data.itemText(i));
+            m_list->addItem(listItem);
+            listItem->setSelected(false);
+            listItem->setFlags(Qt::NoItemFlags);
+        }
+    }
+    connect(m_list, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(onItemSelected(QListWidgetItem*)));
+}
+
+void Maemo5Popup::onItemSelected(QListWidgetItem* item)
+{
+    if (item->flags() != Qt::NoItemFlags)
+        emit itemClicked(m_list->row(item));
+}
 
 QtMaemoWebPopup::QtMaemoWebPopup()
@@ -37 +76 @@
 Maemo5Popup* QtMaemoWebPopup::createSingleSelectionPopup()
 {
+    return new Maemo5SingleSelectionPopup(*this);
 }
 
 Maemo5Popup* QtMaemoWebPopup::createMultipleSelectionPopup()
 {
+    return new Maemo5MultipleSelectionPopup(*this);
 }
 
@@ -51 +92 @@
 }
 
-
 void QtMaemoWebPopup::show()
 {
@@ -84 +124 @@
 }
 
-}
+Maemo5SingleSelectionPopup::Maemo5SingleSelectionPopup(QtAbstractWebPopup& data)
+    : Maemo5Popup(data)
+{
+    // we try to get the standard list title the web browser is using
+    const char* title = ::dgettext("osso-browser-ui", "weba_ti_texlist_single");
+    if (qstrcmp(title, "weba_ti_texlist_single"))
+        setWindowTitle(QString::fromUtf8(title));
+    else
+        setWindowTitle("Select item");
+
+    QHBoxLayout* hLayout = new QHBoxLayout(this);
+    hLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_list = new QListWidget(this);
+    populateList();
+
+    hLayout->addSpacing(gMaemoListPadding);
+    hLayout->addWidget(m_list);
+    hLayout->addSpacing(gMaemoListPadding);
+
+    connect(m_list, SIGNAL(itemClicked(QListWidgetItem*)), this, SLOT(accept()));
+
+    const int visibleItemCount = (m_list->count() > gMaemoMaxVisibleItems) ? gMaemoMaxVisibleItems : m_list->count();
+    resize(size().width(), visibleItemCount * gMaemoListItemSize);
+}
+
+
+class MultipleItemListDelegate : public QStyledItemDelegate {
+public:
+    MultipleItemListDelegate(QObject* parent = 0)
+           : QStyledItemDelegate(parent)
+    {
+        tickMark = QIcon::fromTheme("widgets_tickmark_list").pixmap(48, 48);
+    }
+
+    void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const
+    {
+        QStyledItemDelegate::paint(painter, option, index);
+
+        if (option.state & QStyle::State_Selected)
+            painter->drawPixmap(option.rect.width() - tickMark.rect().width(), option.rect.y() + (option.rect.height() / 2 - tickMark.rect().height() / 2), tickMark);
+    }
+
+private:
+    QPixmap tickMark;
+};
+
+Maemo5MultipleSelectionPopup::Maemo5MultipleSelectionPopup(QtAbstractWebPopup& data)
+    : Maemo5Popup(data)
+{
+    // we try to get the standard list title the web browser is using
+    const char* title = ::dgettext("osso-browser-ui", "weba_ti_textlist_multi");
+    if (qstrcmp(title, "weba_ti_textlist_multi"))
+        setWindowTitle(QString::fromUtf8(title));
+    else
+        setWindowTitle("Select items");
+
+    QHBoxLayout* hLayout = new QHBoxLayout(this);
+    hLayout->setContentsMargins(0, 0, 0, 0);
+
+    m_list = new QListWidget(this);
+    m_list->setSelectionMode(QAbstractItemView::MultiSelection);
+    populateList();
+
+    MultipleItemListDelegate* delegate = new MultipleItemListDelegate(this);
+    m_list->setItemDelegate(delegate);
+
+    hLayout->addSpacing(gMaemoListPadding);
+    hLayout->addWidget(m_list);
+
+    QVBoxLayout* vLayout = new QVBoxLayout();
+
+    const int visibleItemCount = (m_list->count() > gMaemoMaxVisibleItems) ? gMaemoMaxVisibleItems : m_list->count();
+    vLayout->addSpacing((visibleItemCount - 1) * gMaemoListItemSize);
+
+    // we try to get the standard Done button title
+    QPushButton* done = new QPushButton(this);
+    title = ::dgettext("hildon-libs", "wdgt_bd_done");
+    if (qstrcmp(title, "wdgt_bd_done"))
+        done->setText(QString::fromUtf8(title));
+    else
+        done->setText("Done");
+
+    done->setMinimumWidth(178);
+    vLayout->addWidget(done);
+
+    hLayout->addSpacing(8);
+    hLayout->addLayout(vLayout);
+    hLayout->addSpacing(18);
+
+    connect(done, SIGNAL(clicked()), this, SLOT(accept()));
+    resize(size().width(), visibleItemCount * gMaemoListItemSize);
+}
+
+}

trunk/WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h

@@ -25 +25 @@
 #include <QDialog>
 
+class QListWidgetItem;
+class QListWidget;
+
+
 namespace WebCore {
 
@@ -35 +39 @@
     void itemClicked(int idx);
 
+protected slots:
+    void onItemSelected(QListWidgetItem* item);
+
 protected:
+    void populateList();
+
     QtAbstractWebPopup& m_data;
+    QListWidget* m_list;
 };
+
 
 class QtMaemoWebPopup : public QObject, public QtAbstractWebPopup {
@@ -60 +71 @@
 };
 
+
+class Maemo5SingleSelectionPopup : public Maemo5Popup {
+    Q_OBJECT
+public:
+    Maemo5SingleSelectionPopup(QtAbstractWebPopup& data);
+};
+
+
+class Maemo5MultipleSelectionPopup : public Maemo5Popup {
+    Q_OBJECT
+public:
+    Maemo5MultipleSelectionPopup(QtAbstractWebPopup& data);
+};
+
 }