Multi columns support

diff --git a/src/Qtx/QtxListView.cxx b/src/Qtx/QtxListView.cxx
index 801c59cb2cbdecef1b194f6bb120dcbd4ff233d2..ad8be3cfd0eb8ee249ce96b86f55b9396c288ed7 100755 (executable)
--- a/src/Qtx/QtxListView.cxx
+++ b/src/Qtx/QtxListView.cxx
@@ -77,6 +77,8 @@ QtxListView::~QtxListView()
 int QtxListView::addColumn( const QString& label, int width )
 {
   int res = QListView::addColumn( label, width );
+  for ( int i = myAppropriate.count(); i <= res; i++ )
+    myAppropriate.append( 1 );
   onHeaderResized();
   return res;
 }
@@ -84,6 +86,8 @@ int QtxListView::addColumn( const QString& label, int width )
 int QtxListView::addColumn( const QIconSet& iconset, const QString& label, int width ) 
 {
   int res = QListView::addColumn( iconset, label, width );
+  for ( int i = myAppropriate.count(); i <= res; i++ )
+    myAppropriate.append( 1 );
   onHeaderResized();
   return res;
 }
@@ -91,9 +95,24 @@ int QtxListView::addColumn( const QIconSet& iconset, const QString& label, int w
 void QtxListView::removeColumn( int index ) 
 {
   QListView::removeColumn( index );
+  if ( index >= 0 && index < (int)myAppropriate.count() )
+    myAppropriate.remove( myAppropriate.at( index ) );
   onHeaderResized();
 }
 
+bool QtxListView::appropriate( const int index ) const
+{
+  return index >= 0 && index < (int)myAppropriate.count() && myAppropriate[index];
+}
+
+void QtxListView::setAppropriate( const int index, const bool on )
+{
+  if ( index < 0 || index >= (int)myAppropriate.count() )
+    return;
+
+  myAppropriate[index] = on ? 1 : 0;
+}
+
 void QtxListView::resize( int w, int h )
 {
   QListView::resize( w, h );
@@ -216,14 +235,18 @@ void QtxListView::onButtonClicked()
     return;
 
   myPopup->clear();
-  for( int i=0, n=header()->count(); i<n; i++ )
+  for ( int i = 0; i < columns(); i++ )
   {
-    int id = myPopup->insertItem( header()->label( i ) );
-    myPopup->setItemChecked( id, isShown( i ) );
+    if ( appropriate( i ) )
+    {
+      int id = myPopup->insertItem( header()->label( i ), i );
+      myPopup->setItemChecked( id, isShown( i ) );
+    }
   }
   int x = myButton->x(),
       y = myButton->y() + myButton->height();
-  myPopup->exec( mapToGlobal( QPoint( x, y ) ) );
+  if ( myPopup->count() )
+    myPopup->exec( mapToGlobal( QPoint( x, y ) ) );
 }
 
 void QtxListView::onShowHide( int id )
@@ -231,8 +254,7 @@ void QtxListView::onShowHide( int id )
   if ( myHeaderState != HeaderButton )
     return;
 
-  int ind = myPopup->indexOf( id );
-  setShown( ind, !isShown( ind ) );
+  setShown( id, !isShown( id ) );
 }
 
 void QtxListView::viewportResizeEvent( QResizeEvent* e )

diff --git a/src/Qtx/QtxListView.h b/src/Qtx/QtxListView.h
index 354b7a8855fac39e8d9278aa634c0364e8074207..d17ad59e3748444e1e6ccb55e7745ffcd7c3dafe 100755 (executable)
--- a/src/Qtx/QtxListView.h
+++ b/src/Qtx/QtxListView.h
@@ -39,6 +39,9 @@ public:
   bool          isShown( int ) const;
   void          setShown( int, bool );
 
+  bool          appropriate( const int ) const;
+  virtual void  setAppropriate( const int, const bool );
+
   virtual QSize sizeHint() const;
   virtual QSize minimumSizeHint() const;
 
@@ -65,6 +68,7 @@ private:
   QPopupMenu*   myPopup;
   QButton*      myButton;
   ColumnsMap    myColumns;
+  QIntList      myAppropriate;
   int           myHeaderState;
 };