Method setColorChooserEnabled() was added.

diff --git a/src/Qtx/QtxColorButton.cxx b/src/Qtx/QtxColorButton.cxx
index 9b9daec1796b077f600fd6ee51e8724a7f61593f..d84752b026db5e9909ab9ccb64971bdbbbea1baa 100644 (file)
--- a/src/Qtx/QtxColorButton.cxx
+++ b/src/Qtx/QtxColorButton.cxx
@@ -83,14 +83,14 @@ QtxColorButton::QtxColorButton( QWidget* parent )
     }
   }
 
-  QToolButton* other = new QToolButton( pm );
-  other->setText( tr( "Other colors..." ) );
-  other->setAutoRaise( true );
-  other->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
-  grid->addWidget( other, grid->rowCount(), 0, 1, grid->columnCount() );
-  connect( other, SIGNAL( clicked( bool ) ), this, SLOT( onDialogClicked( bool ) ) );
+  myOthers = new QToolButton( pm );
+  myOthers->setText( tr( "Other colors..." ) );
+  myOthers->setAutoRaise( true );
+  myOthers->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed );
+  grid->addWidget( myOthers, grid->rowCount(), 0, 1, grid->columnCount() );
+  connect( myOthers, SIGNAL( clicked( bool ) ), this, SLOT( onDialogClicked( bool ) ) );
 
-  other->installEventFilter( this );
+  myOthers->installEventFilter( this );
 
   setMenu( pm );
 
@@ -144,6 +144,16 @@ bool QtxColorButton::eventFilter( QObject* o, QEvent* e )
   return QToolButton::eventFilter( o, e );
 }
 
+bool QtxColorButton::isColorChooserEnabled() const
+{
+  return myOthers->isVisibleTo( myOthers->parentWidget() );
+}
+
+void QtxColorButton::setColorChooserEnabled( bool on )
+{
+  myOthers->setVisible( on );
+}
+
 /*!
   \brief Called when the popup menu is about to show.
 

diff --git a/src/Qtx/QtxColorButton.h b/src/Qtx/QtxColorButton.h
index bb7a37eec0b09a7bcf49233a2d2ad8f09e804702..b5733f7a1aa93633f431e3854e2d568bc50705a2 100644 (file)
--- a/src/Qtx/QtxColorButton.h
+++ b/src/Qtx/QtxColorButton.h
@@ -44,6 +44,9 @@ public:
 
   bool          eventFilter( QObject*, QEvent* );
 
+  bool          isColorChooserEnabled() const;
+  void          setColorChooserEnabled( bool );
+
 signals:
   void          clicked( QColor );
   void          changed( QColor );
@@ -70,6 +73,7 @@ private:
 
 private:
   ColorMap      myColors;
+  QToolButton*  myOthers;
 };
 
 #endif