Qt4 porting: Registry Dialog regression

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
index 47d48a94e13ec3cdec8cac3148c1b6e728789a74..8c7fca3547cb909a56ee550fcdda2a15978091ee 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.cxx
@@ -543,8 +543,8 @@ ToolsGUI_RegWidget::ToolsGUI_RegWidget( CORBA::ORB_var& orb, QWidget* parent )
   _tabWidget->addTab( _clients, tr( "Running" ) );
   _tabWidget->addTab( _history, tr( "History" ) );
   connect( _tabWidget, SIGNAL( currentChanged( QWidget* )), this, SLOT( slotListeSelect() ) );
-  connect( _clients,   SIGNAL( clicked( QTreeWidgetItem* ) ),        this, SLOT( slotClientChanged( QTreeWidgetItem* ) ) );
-  connect( _history,   SIGNAL( clicked( QTreeWidgetItem* ) ),        this, SLOT( slotHistoryChanged( QTreeWidgetItem* ) ) );
+  connect( _clients,   SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ),        this, SLOT( slotClientChanged( QTreeWidgetItem* , int ) ) );
+  connect( _history,   SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ),        this, SLOT( slotHistoryChanged( QTreeWidgetItem* , int ) ) );
   setCentralWidget( _tabWidget );
   
   // Timer definition (used to automaticaly refresh the display area)
@@ -560,6 +560,8 @@ ToolsGUI_RegWidget::ToolsGUI_RegWidget( CORBA::ORB_var& orb, QWidget* parent )
   setGeometry( xpos, ypos, largeur, hauteur ) ;
   setWindowTitle( tr( "Registry" ) ) ;
   statusBar()->showMessage("    ");
+
+  slotListeSelect();
 }
 
 /*!
@@ -592,13 +594,13 @@ bool ToolsGUI_RegWidget::eventFilter( QObject* object, QEvent* event )
     else if ( object == _clients && event->type() == QEvent::KeyPress ) {
       QKeyEvent* ke = (QKeyEvent*)event;
       if ( ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return ) {
-       slotClientChanged( _clients->currentItem() );
+       slotClientChanged( _clients->currentItem(), 0 );
       }
     }
     else if ( object == _history && event->type() == QEvent::KeyPress ) {
       QKeyEvent* ke = (QKeyEvent*)event;
       if ( ke->key() == Qt::Key_Enter || ke->key() == Qt::Key_Return ) {
-       slotHistoryChanged( _history->currentItem() );
+       slotHistoryChanged( _history->currentItem(), 0 );
       }
     }
   }
@@ -883,9 +885,9 @@ void ToolsGUI_RegWidget::slotHelp()
   \brief Called when user clicks on item in \c Running list
   \param item item clicked by the user
 */
-void ToolsGUI_RegWidget::slotClientChanged( QTreeWidgetItem* item )
+void ToolsGUI_RegWidget::slotClientChanged( QTreeWidgetItem* item, int col )
 {
-  if ( item <= 0)
+  if ( !item || col < 0 )
     return;
 
   blockSignals( true ); // for sure that item will not be deleted when refreshing
@@ -917,9 +919,9 @@ void ToolsGUI_RegWidget::slotClientChanged( QTreeWidgetItem* item )
   \brief Called when user clicks on item in \c History list
   \param item item clicked by the user
 */
-void ToolsGUI_RegWidget::slotHistoryChanged( QTreeWidgetItem* item )
+void ToolsGUI_RegWidget::slotHistoryChanged( QTreeWidgetItem* item, int col )
 {
-  if ( item <= 0)
+  if ( !item || col < 0 )
     return;
 
   blockSignals( true ); // for sure that item will not be deleted when refreshing

diff --git a/src/TOOLSGUI/ToolsGUI_RegWidget.h b/src/TOOLSGUI/ToolsGUI_RegWidget.h
index c11b214aba9b3fca9641daf969f042ec28f83c22..1c9b3d5492055098a73b9bdaff83ed2dc1ad1d35 100755 (executable)
--- a/src/TOOLSGUI/ToolsGUI_RegWidget.h
+++ b/src/TOOLSGUI/ToolsGUI_RegWidget.h
@@ -69,8 +69,8 @@ public:
 public slots:
   void                       slotHelp();
   void                       slotListeSelect();
-  void                       slotClientChanged( QTreeWidgetItem* );
-  void                       slotHistoryChanged( QTreeWidgetItem* );
+  void                       slotClientChanged( QTreeWidgetItem*, int );
+  void                       slotHistoryChanged( QTreeWidgetItem*, int );
   void                       slotSelectRefresh();
   void                       slotIntervalOk();