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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/crypto/gui
From:       Frank Osterfeld <frank.osterfeld () kdemail ! net>
Date:       2008-04-25 10:30:57
Message-ID: 1209119457.755682.5991.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 800966 by osterfeld:

fix layout for the single result case
do not use task->label, as the information will be merged into Result::overview()

 M  +2 -2      resultitemwidget.cpp  
 M  +1 -1      resultitemwidget.h  
 M  +3 -4      resultlistwidget.cpp  


--- trunk/KDE/kdepim/kleopatra/crypto/gui/resultitemwidget.cpp #800965:800966
@@ -91,7 +91,7 @@
     m_showDetailsLabel->setText( QString("<a \
href=\"kleoresultitem://toggledetails/\">%1</a>").arg( show ? i18n( "Show Details" ) \
: i18n( "Hide Details" ) ) );  }
 
-ResultItemWidget::ResultItemWidget( const shared_ptr<const Task::Result> & result, \
const QString & label, QWidget * parent, Qt::WindowFlags flags) : QWidget( parent, \
flags ), d( new Private( result, this ) ) +ResultItemWidget::ResultItemWidget( const \
shared_ptr<const Task::Result> & result, QWidget * parent, Qt::WindowFlags flags ) : \
QWidget( parent, flags ), d( new Private( result, this ) )  {
     assert( d->m_result );
     const QColor color = colorForVisualCode( d->m_result->code() );
@@ -112,7 +112,7 @@
     QLabel* overview = new QLabel;
     overview->setWordWrap( true );
     overview->setTextFormat( Qt::RichText );
-    overview->setText( i18nc( "%1: action %2: result; example: Decrypting foo.txt: \
Succeeded", "%1: %2", label, d->m_result->overview() ) ); +    overview->setText( \
                d->m_result->overview() );
     connect( overview, SIGNAL(linkActivated(QString)), this, \
SLOT(slotLinkActivated(QString)) );  
     hlay->addWidget( overview, 1 );
--- trunk/KDE/kdepim/kleopatra/crypto/gui/resultitemwidget.h #800965:800966
@@ -53,7 +53,7 @@
     class ResultItemWidget : public QWidget {
         Q_OBJECT
     public:
-        ResultItemWidget( const boost::shared_ptr<const Task::Result> &result, const \
QString & taskLabel, QWidget * parent=0, Qt::WindowFlags flags=0 ); +        \
ResultItemWidget( const boost::shared_ptr<const Task::Result> &result, QWidget * \
parent=0, Qt::WindowFlags flags=0 );  ~ResultItemWidget();
 
         bool detailsVisible() const;
--- trunk/KDE/kdepim/kleopatra/crypto/gui/resultlistwidget.cpp #800965:800966
@@ -109,6 +109,7 @@
 
 void ResultListWidget::Private::setupSingle()
 {
+    m_layout->addStretch();
 }
 
 void ResultListWidget::Private::setupMulti()
@@ -134,7 +135,7 @@
         blay.insertWidget( widget->hasErrorResult() ? m_lastErrorItemIndex++ : ( \
blay.count() - 1 ), widget );  } else { // single task
         widget->showCloseButton( m_standaloneMode );
-        m_layout->addWidget( widget );
+        m_layout->insertWidget( m_layout->count() - 1, widget );
     }
     if ( m_standaloneMode )
         q->resize( q->size().expandedTo( q->sizeHint() ) );
@@ -144,9 +145,7 @@
 {
     assert( result );
     assert( m_tasks && !m_tasks->isEmpty() );
-    const shared_ptr<const Task> task = m_tasks->taskById( result->id() );
-    assert( task );
-    ResultItemWidget* wid = new ResultItemWidget( result, task->label() );
+    ResultItemWidget* wid = new ResultItemWidget( result );
     q->connect( wid, SIGNAL(detailsToggled(bool)), q, SLOT(detailsToggled(bool)) );
     q->connect( wid, SIGNAL(linkActivated(QString)), q, \
SIGNAL(linkActivated(QString)) );  q->connect( wid, SIGNAL(closeButtonClicked()), q, \
SLOT(close()) );


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