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

List:       kde-commits
Subject:    branches/KDE/3.5/kdepim
From:       Pradeepto Bhattacharya <pradeepto () kde ! org>
Date:       2008-02-28 5:49:00
Message-ID: 1204177740.163359.30630.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 780155 by pradeepto:

Merged revisions 768929 via svnmerge from 
svn+ssh://pradeepto@svn.kde.org/home/kde/branches/kdepim/enterprise/kdepim

........
  r768929 | osterfeld | 2008-01-31 04:25:27 +0530 (Thu, 31 Jan 2008) | 3 lines
  
  focus last line edit
  make dialog wider
  add some spacing between name le and entries
........


 _M            . (directory)  
 M  +24 -15    kaddressbook/distributionlisteditor.cpp  
 M  +6 -1      kaddressbook/distributionlisteditor_p.h  


** branches/KDE/3.5/kdepim #property svnmerge-integrated
   - /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-76 \
7946,767948-768928,768930-769032,769034,769036-769040,769043-769044,769046,769048-7690 \
50,769052-769057,769059-769139,769142-769318,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
  + /branches/kdepim/enterprise/kdepim:1-767022,767033,767233-767554,767556,767558-767 \
946,767948-769032,769034,769036-769040,769043-769044,769046,769048-769050,769052-76905 \
7,769059-769139,769142-769318,769320-769354,769356-769462,769464-769924,769926-771105,771107-771251,771253-771345,771705,772039,774162
                
--- branches/KDE/3.5/kdepim/kaddressbook/distributionlisteditor.cpp #780154:780155
@@ -56,7 +56,7 @@
     QVBoxLayout* addresseeLayout;
     QValueList<KPIM::DistributionListEditor::Line*> addressees;
     KPIM::DistributionList distributionList;
-    void addLineForEntry( const KPIM::DistributionList::Entry& entry );
+    KPIM::DistributionListEditor::Line* addLineForEntry( const \
KPIM::DistributionList::Entry& entry );  int lastLineId;
 };
 
@@ -70,21 +70,26 @@
     connect( m_lineEdit, SIGNAL( textChanged( const QString& ) ),
              this, SLOT( textChanged( const QString& ) ) );
     layout->addWidget( m_lineEdit );
-    QToolButton *button = new QToolButton( this );
-    button->setIconSet( KApplication::reverseLayout() ? \
                SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) );
- 
-
-    layout->addWidget( button );
-    connect( button, SIGNAL( clicked() ), m_lineEdit, SLOT( clear() ) );
+    m_clearButton = new QToolButton( this );
+    m_clearButton->setIconSet( KApplication::reverseLayout() ? \
SmallIconSet("locationbar_erase") : SmallIconSet( "clear_left" ) ); +    \
m_clearButton->setEnabled( false ); +    layout->addWidget( m_clearButton );
+    connect( m_clearButton, SIGNAL( clicked() ), m_lineEdit, SLOT( clear() ) );
 }
 
 void KPIM::DistributionListEditor::Line::textChanged( const QString& text )
 {
+    m_clearButton->setEnabled( !text.isEmpty() );
     if ( text.isEmpty() )
         emit cleared();
     emit textChanged();
 }
 
+void KPIM::DistributionListEditor::Line::setFocusToLineEdit()
+{
+    m_lineEdit->setFocus();
+}
+
 void KPIM::DistributionListEditor::Line::setEntry( const \
KPIM::DistributionList::Entry& entry )  {
     m_uid = entry.addressee.uid();
@@ -155,13 +160,12 @@
              this, SLOT( lineTextChanged( int ) ) ); 
     setCaption( i18n( "Edit Distribution List" ) );
     QWidget* main = new QWidget( this );
-    QGridLayout* mainLayout = new QGridLayout( main );
+    QVBoxLayout* mainLayout = new QVBoxLayout( main );
     mainLayout->setMargin( KDialog::marginHint() );
     mainLayout->setSpacing( KDialog::spacingHint() );
 
     QHBoxLayout* nameLayout = new QHBoxLayout;
     nameLayout->setSpacing( KDialog::spacingHint() );
-
     d->nameLabel = new QLabel( main );
     d->nameLabel->setText( i18n( "Name:" ) );
     nameLayout->addWidget( d->nameLabel );
@@ -169,15 +173,16 @@
     d->nameLineEdit = new KLineEdit( main );
     nameLayout->addWidget( d->nameLineEdit );
 
-    mainLayout->addLayout( nameLayout, 0, 0 );
+    mainLayout->addLayout( nameLayout );
+    mainLayout->addSpacing( 30 );
 
     d->memberListLabel = new QLabel( main );
     d->memberListLabel->setText( i18n( "Distribution list members:" ) );
-    mainLayout->addWidget( d->memberListLabel, 1, 0 );
+    mainLayout->addWidget( d->memberListLabel );
 
     d->scrollView = new QScrollView( main );
     d->scrollView->setFrameShape( QFrame::NoFrame );
-    mainLayout->addWidget( d->scrollView, 2, 0 );
+    mainLayout->addWidget( d->scrollView );
     d->memberListWidget = new QWidget( d->scrollView->viewport() );
     d->memberListWidget->setSizePolicy( QSizePolicy::MinimumExpanding, \
QSizePolicy::MinimumExpanding );  QVBoxLayout* memberLayout = new QVBoxLayout( \
d->memberListWidget ); @@ -190,7 +195,9 @@
     
     setMainWidget( main );
 
-    d->addLineForEntry( KPIM::DistributionList::Entry() );
+    KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( \
KPIM::DistributionList::Entry() ); +    const QSize hint = sizeHint();
+    resize( hint.width() * 1.5, hint.height() );
 }
 
 KPIM::DistributionListEditor::EditorWidget::~EditorWidget()
@@ -226,10 +233,11 @@
     {
         d->addLineForEntry( *it );
     }
-    d->addLineForEntry( Entry() );
+    KPIM::DistributionListEditor::Line* const last = d->addLineForEntry( Entry() );
+    last->setFocusToLineEdit();
 }
 
-void KPIM::DistributionListEditor::EditorWidgetPrivate::addLineForEntry( const \
KPIM::DistributionList::Entry& entry ) +KPIM::DistributionListEditor::Line* \
KPIM::DistributionListEditor::EditorWidgetPrivate::addLineForEntry( const \
KPIM::DistributionList::Entry& entry )  {  
     KPIM::DistributionListEditor::Line* line = new \
KPIM::DistributionListEditor::Line( addressBook, memberListWidget );  line->setEntry( \
entry ); @@ -239,6 +247,7 @@
                       mapper, SLOT( map() ) );
     mapper->setMapping( line, ++lastLineId );
     line->setShown( true );
+    return line;
 }
 
 void KPIM::DistributionListEditor::EditorWidget::slotOk()
--- branches/KDE/3.5/kdepim/kaddressbook/distributionlisteditor_p.h #780154:780155
@@ -26,8 +26,11 @@
 #include <libkdepim/addresseelineedit.h>
 #include <libkdepim/distributionlist.h>
 
+#include <qpushbutton.h>
 #include <qstring.h>
 
+class QToolButton;
+
 namespace KABC {
     class Addressee;
     class AddressBook;
@@ -52,7 +55,8 @@
 
     void setEntry( const KPIM::DistributionList::Entry& entry );
     KPIM::DistributionList::Entry entry() const; 
-
+    void setFocusToLineEdit();
+    
 signals:
     void cleared();
     void textChanged();
@@ -67,6 +71,7 @@
     QString m_uid;
     QString m_initialText;
     LineEdit* m_lineEdit;
+    QToolButton* m_clearButton;
     KABC::AddressBook* m_addressBook;
 };
 


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