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

List:       kde-commits
Subject:    koffice/kexi
From:       Cédric Pasteur <cedric.pasteur () free ! fr>
Date:       2005-05-01 11:51:09
Message-ID: 20050501115109.867FD669 () office ! kde ! org
[Download RAW message or body]

CVS commit by ccpasteur: 

* Fixed bug with position of pasted widgets (and when undeleting a widget), which was \
introduced by my commit on 04/17/2005


  M +4 -5      configure.in.in   1.13
  M +3 -3      main.cpp   1.48
  M +5 -5      formeditor/formIO.cpp   1.76


--- koffice/kexi/configure.in.in  #1.12:1.13
@@ -29,7 +29,7 @@
         use_kexi_compat_qextmdi="yes"
         kexi_compat_qextmdi_lib=libkexi_compat_qextmdi.so
-        
+
         # lets find qextmdi includes and lib:
-        
+
         dnl looking for $kexi_compat_qextmdi_lib
         kexi_compat_qextmdi_errmsg="For kde3.1 qextmdi library is needed from \
http://kexi-project.org/devresources.html" @@ -47,8 +47,8 @@
                 DO_NOT_COMPILE="$DO_NOT_COMPILE kexi"
         fi
-        
+
         AC_SUBST(LIB_KEXI_KMDI_INCLUDES, '-I'$kexi_compat_qextmdi_includes)
         AC_SUBST(LIB_KEXI_KMDI, -lkexi_compat_qextmdi)
-        
+
         AC_MSG_RESULT(no)
         echo "  libkexi_compat_qextmdi will be used instead of libkmdi."
@@ -61,3 +61,2 @@
 
 # -- End KDE 3.1 check ----------------------------------------------
-

--- koffice/kexi/formeditor/formIO.cpp  #1.75:1.76
@@ -881,13 +881,13 @@ FormIO::saveWidget(ObjectTreeItem *item,
 
         // We don't want to save the geometry if the widget is inside a layout (so \
                parent.tagName() == "grid" for example)
-        if(parent.tagName() == "widget") {
-                prop(tclass, domDoc, "geometry", \
                item->widget()->property("geometry"), item->widget());
-        } else if((parent.tagName() == "UI")) {
+        if(item && !item->parent()) {
                 // save form widget size, but not its position
                 prop(tclass, domDoc, "geometry",
-                        QRect( QPoint(0,0), \
item->widget()->property("geometry").toRect().size()), +                        \
QRect( QPoint(0,0), item->widget()->size()),  item->widget());
         }
-
+        // normal widget (if == "UI', it means we're copying widget)
+        else if(parent.tagName() == "widget" || parent.tagName() == "UI")
+                prop(tclass, domDoc, "geometry", \
item->widget()->property("geometry"), item->widget());  
         // Save the buddy widget for a label


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