Changeset 846 for trunk/tools/designer/src/components/widgetbox

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/components/widgetbox/widgetbox.cpp (modified) (2 diffs)
• tools/designer/src/components/widgetbox/widgetbox.h (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetbox.xml (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetbox_dnditem.h (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetbox_global.h (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp (modified) (7 diffs)
• tools/designer/src/components/widgetbox/widgetboxcategorylistview.h (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp (modified) (1 diff)
• tools/designer/src/components/widgetbox/widgetboxtreewidget.h (modified) (1 diff)

trunk/tools/designer/src/components/widgetbox/widgetbox.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -75 +75 @@
     filterWidget->setRefuseFocus(true);
     connect(filterWidget, SIGNAL(filterChanged(QString)), m_view, SLOT(filter(QString)));
-    l->addWidget(filterWidget);
+
+    QToolBar *toolBar = new QToolBar(this);
+    toolBar->addWidget(filterWidget);
+    l->addWidget(toolBar);
 
     // View

trunk/tools/designer/src/components/widgetbox/widgetbox.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetbox.xml

@@ -2 +2 @@
 <!--************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetbox_dnditem.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetbox_global.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -89 +89 @@
 struct WidgetBoxCategoryEntry {
     WidgetBoxCategoryEntry();
-    explicit WidgetBoxCategoryEntry(const QDesignerWidgetBoxInterface::Widget &widget, const QIcon &icon, bool editable);
+    explicit WidgetBoxCategoryEntry(const QDesignerWidgetBoxInterface::Widget &widget,
+                                    const QString &filter,
+                                    const QIcon &icon,
+                                    bool editable);
 
     QDesignerWidgetBoxInterface::Widget widget;
     QString toolTip;
     QString whatsThis;
+
     QIcon icon;
     bool editable;
@@ -104 +108 @@
 }
 
-WidgetBoxCategoryEntry::WidgetBoxCategoryEntry(const QDesignerWidgetBoxInterface::Widget &w, const QIcon &i, bool e) :
+WidgetBoxCategoryEntry::WidgetBoxCategoryEntry(const QDesignerWidgetBoxInterface::Widget &w,
+                                               const QString &filterIn,
+                                               const QIcon &i, bool e) :
     widget(w),
+
     icon(i),
     editable(e)
@@ -143 +150 @@
     typedef QList<WidgetBoxCategoryEntry> WidgetBoxCategoryEntrys;
 
+
     QDesignerFormEditorInterface *m_core;
     WidgetBoxCategoryEntrys m_items;
@@ -150 +158 @@
 WidgetBoxCategoryModel::WidgetBoxCategoryModel(QDesignerFormEditorInterface *core, QObject *parent) :
     QAbstractListModel(parent),
+
     m_core(core),
     m_viewMode(QListView::ListMode)
 {
+
 }
 
@@ -206 +216 @@
 void WidgetBoxCategoryModel::addWidget(const QDesignerWidgetBoxInterface::Widget &widget, const QIcon &icon,bool editable)
 {
-    // build item
-    WidgetBoxCategoryEntry item(widget, icon, editable);
+    // build item. Filter on name + class name if it is different and not a layout.
+    QString filter = widget.name();
+    if (!filter.contains(QLatin1String("Layout")) && m_classNameRegExp.indexIn(widget.domXml()) != -1) {
+        const QString className = m_classNameRegExp.cap(1);
+        if (!filter.contains(className))
+            filter += className;
+    }
+    WidgetBoxCategoryEntry item(widget, filter, icon, editable);
     const QDesignerWidgetDataBaseInterface *db = m_core->widgetDataBase();
     const int dbIndex = db->indexOfClassName(widget.name());
@@ -256 +272 @@
         return QVariant(item.whatsThis);
     case FilterRole:
-        return item.widget.name();
+        return item.;
     }
     return QVariant();

trunk/tools/designer/src/components/widgetbox/widgetboxcategorylistview.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/tools/designer/src/components/widgetbox/widgetboxtreewidget.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])