From: vsr Date: Mon, 30 Jul 2007 14:11:13 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: qt4_porting_delivery_220807~71 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=743b7ef5fa94ca8460125ddcca406e8941792539;p=modules%2Fgui.git *** empty log message *** --- diff --git a/src/Plot2d/resources/Plot2d_msg_en.ts b/src/Plot2d/resources/Plot2d_msg_en.ts index 57b717de6..367bde8d0 100644 --- a/src/Plot2d/resources/Plot2d_msg_en.ts +++ b/src/Plot2d/resources/Plot2d_msg_en.ts @@ -221,6 +221,10 @@ CURVE_COLOR_LAB Color: + + CURVE_PREVIEW_LAB + Preview: + DIAMOND_MARKER_LBL Diamond diff --git a/src/Qtx/QtxTreeView.cxx b/src/Qtx/QtxTreeView.cxx index 908ad086d..d7a52ebc7 100644 --- a/src/Qtx/QtxTreeView.cxx +++ b/src/Qtx/QtxTreeView.cxx @@ -138,6 +138,7 @@ void QtxTreeView::Header::contextMenuEvent( QContextMenuEvent* e ) setClickable( a->isChecked() ); QtxTreeView* view = qobject_cast( parent() ); if ( view ) { + view->emitSortingEnabled( a->isChecked() ); if ( a->isChecked() ) { connect( this, SIGNAL( sectionClicked( int ) ), view, SLOT( onHeaderClicked( int ) ) ); view->sortByColumn( sortIndicatorSection(), sortIndicatorOrder() ); @@ -277,3 +278,12 @@ void QtxTreeView::setOpened( const QModelIndex& index, const int levels, bool op setOpened( child, levels-1, open ); } } + +/*! + \brief Emit sortingEnabled(bool) signal. + \param enabled "enable sorting" flag state +*/ +void QtxTreeView::emitSortingEnabled( bool enabled ) +{ + emit( sortingEnabled( enabled ) ); +} diff --git a/src/Qtx/QtxTreeView.h b/src/Qtx/QtxTreeView.h index 2ad69a91d..0d760caf1 100644 --- a/src/Qtx/QtxTreeView.h +++ b/src/Qtx/QtxTreeView.h @@ -53,6 +53,14 @@ protected slots: protected: void setOpened( const QModelIndex&, const int, bool ); + +signals: + void sortingEnabled( bool ); + +private: + void emitSortingEnabled( bool ); + + friend class QtxTreeView::Header; }; #ifdef WIN32