DIAGRAM issues 0004250: External 642: Add a search function to DIAGRAM

diff --git a/src/Qtx/QtxSearchTool.cxx b/src/Qtx/QtxSearchTool.cxx
index 5656a695a4a58bc754bd8e4fdd4c130b36713e8d..25040ca5effc3cd481f95b369aa6c47a48af5a8e 100644 (file)
--- a/src/Qtx/QtxSearchTool.cxx
+++ b/src/Qtx/QtxSearchTool.cxx
@@ -451,23 +451,27 @@ QList<QKeySequence> QtxSearchTool::shortcuts() const
 /*!
   \brief Set shortcuts.
   \param accel shortcut binding(s) to be used
+  \param addDefault flag used to add default shortcuts
   \sa shortcuts()
 */
-void QtxSearchTool::setShortcuts( const QKeySequence& accel )
+void QtxSearchTool::setShortcuts( const QKeySequence& accel,
+                                  const bool addDefault )
 {
   QList<QKeySequence> ks;
   ks << accel;
-  setShortcuts( ks );
+  setShortcuts( ks, addDefault );
 }
 
 /*!
   \brief Set shortcuts.
   \param accel shortcut bindings to be used
+  \param addDefault flag used to add default shortcuts
   \sa shortcuts()
 */
-void QtxSearchTool::setShortcuts( const QList<QKeySequence>& accels )
+void QtxSearchTool::setShortcuts( const QList<QKeySequence>& accels,
+                                  const bool addDefault )
 {
-  initShortcuts( accels );
+  initShortcuts( accels, addDefault );
 }
 
 /*!
@@ -1004,28 +1008,33 @@ void QtxSearchTool::clearShortcuts()
   \brief Install shortcuts.
   \internal
   \param accels shortcuts list
+  \param addDefault flag used to add default shortcuts
 */
-void QtxSearchTool::initShortcuts( const QList<QKeySequence>& accels )
+void QtxSearchTool::initShortcuts( const QList<QKeySequence>& accels,
+                                   const bool addDefault )
 {
   clearShortcuts();
 
   QWidget* p = myWatched ? myWatched : ( parentWidget() ? parentWidget() : this );
   QShortcut* sc;
 
-  sc = new QShortcut( QKeySequence::Find, p );
-  connect( sc, SIGNAL( activated() ), this, SLOT( find() ) );
-  sc->setContext( Qt::WidgetShortcut );
-  myShortcuts.append( sc );
+  if( addDefault )
+  {
+    sc = new QShortcut( QKeySequence::Find, p );
+    connect( sc, SIGNAL( activated() ), this, SLOT( find() ) );
+    sc->setContext( Qt::WidgetShortcut );
+    myShortcuts.append( sc );
 
-  sc = new QShortcut( QKeySequence::FindNext, p );
-  sc->setContext( Qt::WidgetShortcut );
-  connect( sc, SIGNAL( activated() ), this, SLOT( findNext() ) );
-  myShortcuts.append( sc );
+    sc = new QShortcut( QKeySequence::FindNext, p );
+    sc->setContext( Qt::WidgetShortcut );
+    connect( sc, SIGNAL( activated() ), this, SLOT( findNext() ) );
+    myShortcuts.append( sc );
 
-  sc = new QShortcut( QKeySequence::FindPrevious, p );
-  sc->setContext( Qt::WidgetShortcut );
-  connect( sc, SIGNAL( activated() ), this, SLOT( findPrevious() ) );
-  myShortcuts.append( sc );
+    sc = new QShortcut( QKeySequence::FindPrevious, p );
+    sc->setContext( Qt::WidgetShortcut );
+    connect( sc, SIGNAL( activated() ), this, SLOT( findPrevious() ) );
+    myShortcuts.append( sc );
+  }
 
   QList<QKeySequence>::ConstIterator it;
   for ( it = accels.begin(); it != accels.end(); ++it )

diff --git a/src/Qtx/QtxSearchTool.h b/src/Qtx/QtxSearchTool.h
index 674eaca67673ea397140e9c77dc1b7c43a8806cc..40225cc517803debf7c2d8cf14ca5cfa3be0cd79 100644 (file)
--- a/src/Qtx/QtxSearchTool.h
+++ b/src/Qtx/QtxSearchTool.h
@@ -96,8 +96,8 @@ public:
   void                setControls( const int );
 
   QList<QKeySequence> shortcuts() const;
-  void                setShortcuts( const QKeySequence& );
-  void                setShortcuts( const QList<QKeySequence>& );
+  void                setShortcuts( const QKeySequence&, const bool = true );
+  void                setShortcuts( const QList<QKeySequence>&, const bool = true );
 
   void                setShortcutContext( const Qt::ShortcutContext );
 
@@ -134,7 +134,7 @@ private:
   void                init();
   bool                focused() const;
   void                clearShortcuts();
-  void                initShortcuts( const QList<QKeySequence>& );
+  void                initShortcuts( const QList<QKeySequence>&, const bool = true );
   void                updateShortcuts();
   void                updateControls();