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

List:       kde-commits
Subject:    kdevelop/lib
From:       Alexander Dymo <cloudtemple () mksat ! net>
Date:       2003-09-09 20:55:36
[Download RAW message or body]

CVS commit by dymo: 

make sure that property editor is embedded into the parent widget


  A            widgets/propeditor/.cvsignore   1.1
  M +5 -2      interfaces/kdevbuildsystem.cpp   1.6
  M +8 -10     widgets/propeditor/propertyeditor.cpp   1.2
  M +2 -3      widgets/propeditor/propertyeditor.h   1.2


--- kdevelop/lib/widgets/propeditor/propertyeditor.cpp  #1.1:1.2
@@ -19,9 +19,9 @@
 #ifndef PURE_QT
 #include <klocale.h>
+#include <kdebug.h>
 #else
 #include "qlocale.h"
 #endif
  
-#include <qdockwindow.h>
 #include <qtable.h>
 #include <qlayout.h>
@@ -30,13 +30,12 @@
 #include "property.h"
 
-PropertyEditor::PropertyEditor( Place p, QWidget * parent, const char * name, WFlags f):
-    QDockWindow(p, parent, name, f)
+PropertyEditor::PropertyEditor( QWidget * parent, const char * name, WFlags f):
+    QWidget(parent, name, f)
 {
-    setCloseMode(QDockWindow::Always);
-    setResizeEnabled(true);
-
-    QWidget *container = new QWidget(this);
+    kdDebug() << "Creating property editor" << endl;
+//    setCloseMode(QDockWindow::Always);
+//    setResizeEnabled(true);
 
-    table = new QTable(container);
+    table = new QTable(this);
     table->setNumRows(0);
     table->setNumCols(2);
@@ -46,7 +45,6 @@ PropertyEditor::PropertyEditor( Place p,
     table->setColumnReadOnly(0, TRUE);
 
-    QGridLayout *gl = new QGridLayout(container);
+    QGridLayout *gl = new QGridLayout(this);
     gl->addWidget(table, 0, 0);
-    setWidget(container);
 
     props = 0;

--- kdevelop/lib/widgets/propeditor/propertyeditor.h  #1.1:1.2
@@ -21,5 +21,4 @@
 #define PROPERTYEDITOR_H
 
-#include <qdockwindow.h>
 #include <qwidget.h>
 #include <qstring.h>
@@ -36,8 +35,8 @@ class QString;
   */
 
-class PropertyEditor : public QDockWindow  {
+class PropertyEditor : public QWidget  {
    Q_OBJECT
 public:
-    PropertyEditor( Place p = InDock, QWidget * parent = 0, const char * name = 0, WFlags f = 0 );
+    PropertyEditor( QWidget * parent = 0, const char * name = 0, WFlags f = 0 );
     ~PropertyEditor();
 

--- kdevelop/lib/interfaces/kdevbuildsystem.cpp  #1.5:1.6
@@ -20,8 +20,9 @@
 #include <qvbox.h>
 #include <qtable.h>
-#include <qdockwindow.h>
+#include <qlayout.h>
 
 #include <kdialogbase.h>
 #include <klocale.h>
+#include <kdialog.h>
 
 #include "kdevbuildsystem.h"
@@ -215,6 +216,8 @@ BuildItemConfigWidget::BuildItemConfigWi
     :QWidget(parent, name)
 {
-    PropertyEditor *ed = new PropertyEditor(QDockWindow::InDock, this, "item_propeditor");
+    QVBoxLayout *l = new QVBoxLayout(this, 2, 0);
+    PropertyEditor *ed = new PropertyEditor(this, "item_propeditor");
     ed->populateProperties(it->pAttributes());
+    l->addWidget(ed);
 }
 


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