Переглянути джерело

Rename ctkDynamicSpacer::activate into active

And add ctkDynamicSpacer::setInactive for conveniency
Julien Finet 14 роки тому
батько
коміт
42af8ae514
2 змінених файлів з 16 додано та 5 видалено
  1. 2 2
      Libs/Widgets/ctkDynamicSpacer.cpp
  2. 14 3
      Libs/Widgets/ctkDynamicSpacer.h

+ 2 - 2
Libs/Widgets/ctkDynamicSpacer.cpp

@@ -105,14 +105,14 @@ void ctkDynamicSpacer::setInactiveSizePolicy(QSizePolicy newInactiveSizePolicy)
 }
 
 // -----------------------------------------------------------------------------
-bool ctkDynamicSpacer::isActivated()const
+bool ctkDynamicSpacer::isActive()const
 {
   Q_D(const ctkDynamicSpacer);
   return d->Enable;
 }
 
 // -----------------------------------------------------------------------------
-void ctkDynamicSpacer::activate(bool enableSizePolicy)
+void ctkDynamicSpacer::setActive(bool enableSizePolicy)
 {
   Q_D(ctkDynamicSpacer);
   d->Enable = enableSizePolicy;

+ 14 - 3
Libs/Widgets/ctkDynamicSpacer.h

@@ -38,7 +38,7 @@ class CTK_WIDGETS_EXPORT ctkDynamicSpacer : public QWidget
   Q_OBJECT
   Q_PROPERTY(QSizePolicy activeSizePolicy READ activeSizePolicy WRITE setActiveSizePolicy);
   Q_PROPERTY(QSizePolicy inactiveSizePolicy READ inactiveSizePolicy WRITE setInactiveSizePolicy);
-  Q_PROPERTY(bool activate READ isActivated WRITE activate);
+  Q_PROPERTY(bool active READ isActive WRITE setActive);
 public:
   /// Constructor, builds a ctkDynamicSpacer, inactive by default
   ctkDynamicSpacer(QWidget *parent = 0);
@@ -57,12 +57,14 @@ public:
   /// Return the what size policy is current:
   /// false is inactive Size Policy that is current
   /// true is active SizePolicy that is current
-  bool isActivated()const;
+  bool isActive()const;
+  inline bool isInactive()const;
 
 public slots:
   /// Change the size policy. If enable is true, activeSizePolicy is used,
   /// inactiveSizePolicy otherwise
-  void activate(bool enable);
+  void setActive(bool enable);
+  inline void setInactive(bool disable);
 
 protected:
   QScopedPointer<ctkDynamicSpacerPrivate> d_ptr;
@@ -82,5 +84,14 @@ void ctkDynamicSpacer::setInactiveSizePolicy(QSizePolicy::Policy horizontal, QSi
   this->setInactiveSizePolicy(QSizePolicy(horizontal, vertical));
 }
 
+bool ctkDynamicSpacer::isInactive()const
+{
+  return !this->isActive();
+}
+
+void ctkDynamicSpacer::setInactive(bool disable)
+{
+  this->setActive(!disable);
+}
 
 #endif