[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kexi/formeditor
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2010-09-09 19:33:30
Message-ID: 20100909193330.D8419AC884 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173588 by staniek:

Forms
*Widgets Tree: now displays icons for widget items



 M  +8 -4      WidgetTreeWidget.cpp  
 M  +3 -3      WidgetTreeWidget.h  
 M  +1 -1      kexiactionselectiondialog.h  


--- trunk/koffice/kexi/formeditor/WidgetTreeWidget.cpp #1173587:1173588
@@ -37,15 +37,19 @@
 
 WidgetTreeWidgetItem::WidgetTreeWidgetItem(WidgetTreeWidgetItem *parent, \
                ObjectTreeItem *data)
         : QTreeWidgetItem(parent, QStringList() << data->name() << \
data->className()) +        , m_data(data)
 {
-    m_item = data;
+    setIcon(0,
+        SmallIcon(
+            static_cast<WidgetTreeWidget*>(treeWidget())->iconNameForClass(m_data->widget()->metaObject()->className()))
 +    );
 }
 
 WidgetTreeWidgetItem::WidgetTreeWidgetItem(QTreeWidget *tree, ObjectTreeItem *data)
         : QTreeWidgetItem(tree, QStringList() << (data ? data->name() : QString())
                                               << (data ? data->className() : \
QString())) +        , m_data(data)
 {
-    m_item = data;
 }
 
 WidgetTreeWidgetItem::~WidgetTreeWidgetItem()
@@ -54,8 +58,8 @@
 
 QString WidgetTreeWidgetItem::name() const
 {
-    if (m_item)
-        return m_item->name();
+    if (m_data)
+        return m_data->name();
     else
         return QString();
 }
--- trunk/koffice/kexi/formeditor/WidgetTreeWidget.h #1173587:1173588
@@ -38,6 +38,7 @@
 {
 public:
     WidgetTreeWidgetItem(WidgetTreeWidgetItem *parent, ObjectTreeItem *data);
+    //! For TabStopDialog
     WidgetTreeWidgetItem(QTreeWidget *tree, ObjectTreeItem *data = 0);
     virtual ~WidgetTreeWidgetItem();
 
@@ -46,7 +47,7 @@
 
     //! \return the ObjectTreeItem information associated to this item.
     ObjectTreeItem* data() const {
-        return m_item;
+        return m_data;
     }
 
     //2.0 virtual void setOpen(bool o);
@@ -65,8 +66,7 @@
     //2.0 virtual void setup();
 
 private:
-    ObjectTreeItem *m_item;
-//    friend class WidgetTreeWidget;
+    ObjectTreeItem *m_data;
 };
 
 /*! @short A graphical view of Form's ObjectTree.
--- trunk/koffice/kexi/formeditor/kexiactionselectiondialog.h #1173587:1173588
@@ -29,7 +29,7 @@
 class Item;
 }
 
-//! @short A dialog for selecting an action to be executed for a form's command \
button +//! @short A dialog for selecting an action to be executed for a form's \
button  /*! Available actions are:
  - application's global actions like "edit->copy" (KAction-based)
  - opening/printing/executing of selected object (table/query/form/script/macrto, \
etc.)


[prev in list] [next in list] [prev in thread] [next in thread]