QEMenuButton labelText and font properties

configure/RELEASE

@@ -37,7 +37,7 @@ BUNDLE=
 QE_FRAMEWORK=$(BUNDLE)/gui/qeframework
 
 # EPICS_BASE usually appears last so other apps can override stuff:
-#
-EPICS_BASE=$(BUNDLE)/epics/base
+#EPICS_BASE=$(BUNDLE)/epics/base
+EPICS_BASE=/usr/local/epics/R3.14.12/base
 
 # end

qeframeworkSup/project/widgets/QEMenuButton/QEMenuButton.cpp

@@ -59,7 +59,9 @@ QEMenuButton::QEMenuButton (QWidget* parent) : QEAbstractWidget (parent)
    this->setVariableAsToolTip (false);
    this->setDisplayAlarmStateOption (DISPLAY_ALARM_STATE_NEVER);
 
-   this->button->setText ("MenuButton");
+   setLabelTextProperty(getLabelTextProperty());
+   this->button->setFont(font());
+   //this->button->setText ("MenuButton");
 
    // Null menu specification.
    //
@@ -270,6 +272,34 @@ QString QEMenuButton::getSubstitutionsProperty () const
    return this->getVariableNameSubstitutions ();
 }
 
+//------------------------------------------------------------------------------
+//
+void QEMenuButton::setLabelTextProperty( QString labelTextIn )
+{
+   this->button->setText (labelTextIn);
+}
+
+//------------------------------------------------------------------------------
+//
+QString QEMenuButton::getLabelTextProperty()
+{
+    return this->button->text();
+}
+
+//------------------------------------------------------------------------------
+//
+void QEMenuButton::setFont(const QFont &f)
+{
+    button->setFont(f);
+}
+
+//------------------------------------------------------------------------------
+//
+const QFont& QEMenuButton::font() const
+{
+    return button->font();
+}
+
 //------------------------------------------------------------------------------
 //
 void QEMenuButton::setMenuString (const QString& menuStringIn)

qeframeworkSup/project/widgets/QEMenuButton/QEMenuButton.h

@@ -70,6 +70,12 @@ class QE_FRAMEWORK_LIBRARY_SHARED_EXPORT QEMenuButton : public QEAbstractWidget
    //
    Q_PROPERTY (QString defaultSubstitutions READ getSubstitutionsProperty WRITE setSubstitutionsProperty)
 
+    /// Label Text
+    Q_PROPERTY(QString labelText READ getLabelTextProperty WRITE setLabelTextProperty)
+
+    /// Font
+    Q_PROPERTY(QFont font READ font WRITE setFont)
+
    // This property stores the user info.
    // The "Edit User Info..." context menu item must be used to edit this.
    /// Specifies the menu entry values, encoded and an XML string.
@@ -85,6 +91,14 @@ class QE_FRAMEWORK_LIBRARY_SHARED_EXPORT QEMenuButton : public QEAbstractWidget
    void setSubstitutionsProperty (const QString& substitutions);
    QString getSubstitutionsProperty () const;
 
+   // Label text must be mapped to the button
+   void setLabelTextProperty( QString labelTextIn );
+   QString getLabelTextProperty();
+
+   // Font must be mapped to the button
+   void setFont(const QFont &);
+   const QFont & font() const;
+
    void setMenuString (const QString& s);
    QString getMenuString () const;
 

qeframeworkSup/project/widgets/QERadioGroup/QERadioGroup.cpp

@@ -43,7 +43,7 @@ QERadioGroup::QERadioGroup (QWidget* parent) :
    QEAbstractWidget (parent),
    QESingleVariableMethods (this, PV_VARIABLE_INDEX)
 {
-   this->commonSetup (" QERadioGroup ");
+   this->commonSetup ("");
 }
 
 //-----------------------------------------------------------------------------
@@ -53,7 +53,7 @@ QERadioGroup::QERadioGroup (const QString& variableNameIn, QWidget* parent) :
    QEAbstractWidget (parent),
    QESingleVariableMethods (this, PV_VARIABLE_INDEX)
 {
-   this->commonSetup (" QERadioGroup ");
+   this->commonSetup ("");
    this->setVariableName (variableNameIn, PV_VARIABLE_INDEX);
    activate();
 }

qeframeworkSup/project/widgets/QERadioGroup/QRadioGroup.cpp

@@ -37,7 +37,7 @@
 // Constructor with no initialisation
 //
 QRadioGroup::QRadioGroup (QWidget* parent) :
-   QGroupBox (" QRadioGroup ", parent)
+   QGroupBox (parent)
 {
    this->commonSetup ();
 }

qepluginApp/project/QEMenuButton/QEMenuButtonManager.h

@@ -27,6 +27,17 @@
 #ifndef QE_MENU_BUTTON_MANAGER_H
 #define QE_MENU_BUTTON_MANAGER_H
 
+// The QT_VERSION check is in QEDesignerPluginCommon.h, but does not
+// work with moc unless restated here.  Possibly relevant:
+// https://stackoverflow.com/questions/4119688/macro-expansion-in-moc
+// Provide Qt version independent plugin-related includes.
+//
+#if (QT_VERSION >= 0x050500)
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
+#include <QDesignerCustomWidgetInterface>
+#endif
+
 #include <QEDesignerPluginCommon.h>
 #include <QDesignerTaskMenuExtension>
 #include <QEPluginLibrary_global.h>

qepluginApp/project/QEPeriodic/QEPeriodicManager.h

@@ -26,6 +26,17 @@
 #ifndef QE_PERIODIC_MANAGER_H
 #define QE_PERIODIC_MANAGER_H
 
+// The QT_VERSION check is in QEDesignerPluginCommon.h, but does not
+// work with moc unless restated here.  Possibly relevant:
+// https://stackoverflow.com/questions/4119688/macro-expansion-in-moc
+// Provide Qt version independent plugin-related includes.
+//
+#if (QT_VERSION >= 0x050500)
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
+#include <QDesignerCustomWidgetInterface>
+#endif
+
 #include <QEDesignerPluginCommon.h>
 #include <QEPluginLibrary_global.h>
 

qepluginApp/project/qeplugin/QEPluginWidgetManagers.h

@@ -26,6 +26,17 @@
 #ifndef QE_PLUGIN_WIDGET_MANAGERS_H
 #define QE_PLUGIN_WIDGET_MANAGERS_H
 
+// The QT_VERSION check is in QEDesignerPluginCommon.h, but does not
+// work with moc unless restated here.  Possibly relevant:
+// https://stackoverflow.com/questions/4119688/macro-expansion-in-moc
+// Provide Qt version independent plugin-related includes.
+//
+#if (QT_VERSION >= 0x050500)
+#include <QtUiPlugin/QDesignerCustomWidgetInterface>
+#else
+#include <QDesignerCustomWidgetInterface>
+#endif
+
 #include <QObject>
 #include <QEDesignerPluginCommon.h>
 #include <QEPluginLibrary_global.h>