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

List:       kde-commits
Subject:    koffice/kexi/plugins/forms/widgets
From:       Jarosław Staniek <staniek () kde ! org>
Date:       2009-11-04 18:40:40
Message-ID: 1257360040.557607.24493.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1044837 by staniek:

Forms
*image box widget:
**make frame always null by default




 M  +8 -7      kexidbimagebox.cpp  
 M  +1 -1      kexidbimagebox.h  


--- trunk/koffice/kexi/plugins/forms/widgets/kexidbimagebox.cpp #1044836:1044837
@@ -82,7 +82,7 @@
         , m_keepAspectRatio(true)
         , m_insideSetData(false)
         , m_setFocusOnButtonAfterClosingPopup(false)
-        , m_lineWidthChanged(false)
+//        , m_lineWidthChanged(false)
         , m_paintEventEnabled(true)
         , m_dropDownButtonVisible(true)
         , m_insideSetPalette(false)
@@ -141,6 +141,7 @@
 //  connect(m_chooser, SIGNAL(toggled(bool)), this, SLOT(slotToggled(bool)));
 // }
 
+    KexiFrame::setLineWidth(0);
     setDataSource(QString());   //to initialize popup menu and actions availability
 }
 
@@ -609,11 +610,11 @@
         }
     }
 
-    // update some properties s not changed by user
-//! @todo get default line width from global style settings
-    if (!m_lineWidthChanged) {
-        KexiFrame::setLineWidth(ds.isEmpty() ? 0 : 1);
-    }
+    // update some properties not changed by user
+// //! @todo get default line width from global style settings
+//    if (!m_lineWidthChanged) {
+//        KexiFrame::setLineWidth(ds.isEmpty() ? 0 : 1);
+//    }
     if (!m_paletteBackgroundColorChanged && parentWidget()) {
         KexiFrame::setPaletteBackgroundColor(
             dataSource().isEmpty() ? parentWidget()->paletteBackgroundColor() : \
palette().active().base()); @@ -825,7 +826,7 @@
 
 void KexiDBImageBox::setLineWidth(int width)
 {
-    m_lineWidthChanged = true;
+//    m_lineWidthChanged = true;
     KexiFrame::setLineWidth(width);
 }
 
--- trunk/koffice/kexi/plugins/forms/widgets/kexidbimagebox.h #1044836:1044837
@@ -280,7 +280,7 @@
     bool m_keepAspectRatio : 1;
     bool m_insideSetData : 1;
     bool m_setFocusOnButtonAfterClosingPopup : 1;
-    bool m_lineWidthChanged : 1;
+//    bool m_lineWidthChanged : 1;
     bool m_paletteBackgroundColorChanged : 1;
     bool m_paintEventEnabled : 1; //!< used to disable paintEvent()
     bool m_dropDownButtonVisible : 1;


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