From kde-commits  Mon Sep 13 22:27:15 2010
From: =?utf-8?q?Jaros=C5=82aw=20Staniek?= <staniek () kde ! org>
Date: Mon, 13 Sep 2010 22:27:15 +0000
To: kde-commits
Subject: koffice/kexi
Message-Id: <20100913222715.87F0BAC888 () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=128441656623718

SVN commit 1175025 by staniek:

Forms
*proper margin for the widgets tree box


 M  +1 -1      formeditor/WidgetTreeWidget.h  
 M  +16 -8     plugins/forms/kexiformpart.cpp  


--- trunk/koffice/kexi/formeditor/WidgetTreeWidget.h #1175024:1175025
@@ -98,7 +98,7 @@
     };
     Q_DECLARE_FLAGS(Options, Option)
 
-    WidgetTreeWidget(QWidget *parent, Options options = NoOptions);
+    WidgetTreeWidget(QWidget *parent = 0, Options options = NoOptions);
 
     virtual ~WidgetTreeWidget();
 
--- trunk/koffice/kexi/plugins/forms/kexiformpart.cpp #1175024:1175025
@@ -19,9 +19,10 @@
  * Boston, MA 02110-1301, USA.
 */
 
-#include <kdebug.h>
+#include <QVBoxLayout>
+
+#include <KDebug>
 #include <KDialog>
-#include <k3listview.h>
 #include <ktabwidget.h>
 #include <kiconloader.h>
 #include <kcombobox.h>
@@ -65,15 +66,14 @@
 {
 public:
     Private() {
-        widgetTree = new KFormDesigner::WidgetTreeWidget(0);
-        widgetTree->setObjectName("KexiFormPart:WidgetTreeWidget");
     }
     ~Private() {
-        delete static_cast<KFormDesigner::WidgetTreeWidget*>(widgetTree);
+        delete static_cast<QWidget*>(widgetTreeWidget);
         delete static_cast<KexiDataSourcePage*>(dataSourcePage);
     }
+    QPointer<KexiDataSourcePage> dataSourcePage;
     QPointer<KFormDesigner::WidgetTreeWidget> widgetTree;
-    QPointer<KexiDataSourcePage> dataSourcePage;
+    QPointer<QWidget> widgetTreeWidget;
     KexiDataSourceComboBox *dataSourceCombo;
 };
 
@@ -491,9 +491,17 @@
     tab->addTab(d->dataSourcePage, KIcon("server-database"), QString());
     tab->setTabToolTip(tab->indexOf(d->dataSourcePage), i18n("Data Source"));
 
-    tab->addTab(d->widgetTree, KIcon("widgets"), QString());
-    tab->setTabToolTip(tab->indexOf(d->widgetTree), i18n("Widgets"));
+    if (!d->widgetTreeWidget) {
+        d->widgetTreeWidget = new QWidget;
+        QVBoxLayout *lyr = new QVBoxLayout(d->widgetTreeWidget);
+        lyr->setContentsMargins(2, 2, 2, 2);
+        d->widgetTree = new KFormDesigner::WidgetTreeWidget;
+        d->widgetTree->setObjectName("KexiFormPart:WidgetTreeWidget");
+        lyr->addWidget(d->widgetTree);
 }
+    tab->addTab(d->widgetTreeWidget, KIcon("widgets"), QString());
+    tab->setTabToolTip(tab->indexOf(d->widgetTreeWidget), i18n("Widgets"));
+}
 
 //----------------