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

List:       kde-commits
Subject:    playground/office/kmymoney/kmymoney2/widgets
From:       Cristian Oneț <onet.cristian () gmail ! com>
Date:       2009-10-06 5:44:06
Message-ID: 1254807846.018412.25673.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1031798 by conet:

When the mymoney edit widget is focused select the text so it can be edited by the user.
Fix the layout of the category edit widget when the split button is visible.

 M  +2 -1      kmymoneycategory.cpp  
 M  +7 -8      kmymoneyedit.cpp  
 M  +7 -0      kmymoneylineedit.cpp  
 M  +1 -0      kmymoneylineedit.h  


--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneycategory.cpp #1031797:1031798
@@ -65,8 +65,9 @@
     d->frame = new QFrame(0);
     d->frame->setFocusProxy(this);
     QHBoxLayout* layout = new QHBoxLayout(d->frame);
+    layout->setContentsMargins(0, 0, 0, 0);
+
     // make sure not to use our own overridden version of reparent() here
-
     KMyMoneyCombo::reparent(d->frame, windowFlags ()  & ~Qt::WType_Mask, QPoint(0, 0), true);
     if(parent)
       d->frame->reparent(parent, QPoint(0, 0), true);
--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneyedit.cpp #1031797:1031798
@@ -19,12 +19,9 @@
 // QT Includes
 
 #include <QApplication>
-#include <qdesktopwidget.h>
-#include <qwidget.h>
-#include <kvbox.h>
-#include <khbox.h>
-//Added by qt3to4:
-#include <Q3Frame>
+#include <QDesktopWidget>
+#include <QWidget>
+#include <QFrame>
 #include <QPixmap>
 #include <QKeyEvent>
 #include <QEvent>
@@ -38,7 +35,9 @@
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kconfig.h>
-#include <KConfigGroup>
+#include <kvbox.h>
+#include <khbox.h>
+#include <kconfiggroup.h>
 
 // ----------------------------------------------------------------------------
 // Project Includes
@@ -221,7 +220,7 @@
   m_calculatorFrame = new KVBox(this);
   m_calculatorFrame->setWindowFlags(Qt::Popup);
 
-  m_calculatorFrame->setFrameStyle(Q3Frame::PopupPanel | Q3Frame::Raised);
+  m_calculatorFrame->setFrameStyle(QFrame::Panel | QFrame::Raised);
   m_calculatorFrame->setLineWidth(3);
 
   m_calculator = new kMyMoneyCalculator(m_calculatorFrame);
--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneylineedit.cpp #1031797:1031798
@@ -74,6 +74,13 @@
     repaint();
 }
 
+void kMyMoneyLineEdit::focusInEvent(QFocusEvent *ev)
+{
+  KLineEdit::focusInEvent(ev);
+  // select the text so it can be edited by the user
+  selectAll();
+}
+
 void kMyMoneyLineEdit::keyReleaseEvent(QKeyEvent* k)
 {
   if(m_forceMonetaryDecimalSymbol) {
--- trunk/playground/office/kmymoney/kmymoney2/widgets/kmymoneylineedit.h #1031797:1031798
@@ -82,6 +82,7 @@
 
 protected:
   void focusOutEvent(QFocusEvent *ev);
+  void focusInEvent(QFocusEvent *ev);
 
   /** reimplemented to support the hint display */
   void paintEvent(QPaintEvent* ev);
[prev in list] [next in list] [prev in thread] [next in thread]