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

List:       kde-commits
Subject:    KDE/kdepim/kleopatra/view
From:       Marc Mutz <mutz () kde ! org>
Date:       2008-03-04 14:58:04
Message-ID: 1204642684.088769.13036.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 782198 by mutz:

Move QAbstractItemView setup from KeyListController into TabWidget

 M  +0 -31     keylistcontroller.cpp  
 M  +21 -0     tabwidget.cpp  


--- trunk/KDE/kdepim/kleopatra/view/keylistcontroller.cpp #782197:782198
@@ -38,8 +38,6 @@
 #include <models/keycache.h>
 #include <models/keylistmodel.h>
 
-#include <utils/headerview.h>
-
 #include <gpgme++/key.h>
 
 #include <QAbstractItemView>
@@ -57,23 +55,6 @@
 using namespace boost;
 using namespace GpgME;
 
-static const QHeaderView::ResizeMode \
                resize_modes[Kleo::AbstractKeyListModel::NumColumns] = {
-    QHeaderView::Stretch,          // Name
-    QHeaderView::Stretch, // EMail
-    QHeaderView::Fixed, // Valid From
-    QHeaderView::Fixed, // Valid Until
-    QHeaderView::Fixed, // Details
-    QHeaderView::Fixed, // Fingerprint
-};
-
-static HeaderView * get_header_view( QAbstractItemView * view ) {
-    if ( const QTableView * const table = qobject_cast<QTableView*>( view ) )
-        return qobject_cast<HeaderView*>( table->horizontalHeader() );
-    if ( const QTreeView * const tree = qobject_cast<QTreeView*>( view ) )
-        return qobject_cast<HeaderView*>( tree->header() );
-    return 0;
-}
-
 class KeyListController::Private {
     friend class ::Kleo::KeyListController;
     KeyListController * const q;
@@ -233,18 +214,6 @@
     view->setContextMenuPolicy( Qt::CustomContextMenu );
     connect( view, SIGNAL(customContextMenuRequested(QPoint)),
              q, SLOT(slotContextMenu(QPoint)) );
-
-    view->setSelectionBehavior( QAbstractItemView::SelectRows );
-    view->setSelectionMode( QAbstractItemView::ExtendedSelection );
-    //view->setAlternatingRowColors( true );
-    view->setProperty( "allColumnsShowFocus", true );
-    view->setProperty( "sortingEnabled", true );
-
-#if 1
-    if ( HeaderView * const hv = get_header_view( view ) )
-        for ( int i = 0, end = std::min<int>( hv->count(), \
                AbstractKeyListModel::NumColumns ) ; i < end ; ++i )
-            hv->setSectionResizeMode( i, resize_modes[i] );
-#endif
 }
 
 void KeyListController::Private::connectCommand( Command * cmd ) {
--- trunk/KDE/kdepim/kleopatra/view/tabwidget.cpp #782197:782198
@@ -220,6 +220,20 @@
     }
 }
 
+static const QHeaderView::ResizeMode resize_modes[AbstractKeyListModel::NumColumns] \
= { +    QHeaderView::Stretch,          // Name
+    QHeaderView::Stretch, // EMail
+    QHeaderView::Fixed, // Valid From
+    QHeaderView::Fixed, // Valid Until
+    QHeaderView::Fixed, // Details
+    QHeaderView::Fixed, // Fingerprint
+};
+
+static void adjust_header( HeaderView * hv ) {
+    for ( int i = 0, end = AbstractKeyListModel::NumColumns ; i < end ; ++i )
+        hv->setSectionResizeMode( i, resize_modes[i] );
+}
+
 void Page::init() {
     KDAB_SET_OBJECT_NAME( m_proxy );
     KDAB_SET_OBJECT_NAME( m_view );
@@ -227,7 +241,14 @@
     HeaderView * headerView = new HeaderView( Qt::Horizontal );
     KDAB_SET_OBJECT_NAME( headerView );
     m_view->setHeader( headerView );
+    adjust_header( headerView );
 
+    m_view->setSelectionBehavior( QAbstractItemView::SelectRows );
+    m_view->setSelectionMode( QAbstractItemView::ExtendedSelection );
+    //m_view->setAlternatingRowColors( true );
+    m_view->setAllColumnsShowFocus( true );
+    m_view->setSortingEnabled( true );
+
     if ( model() )
         m_proxy.setSourceModel( model() );
     m_proxy.setFilterFixedString( m_stringFilter );


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