#include "enum.h"
-using namespace boost;
-using namespace std;
+using std::pair;
+using std::vector;
namespace pv {
namespace prop {
_values(values),
_selector(NULL)
{
+ for (vector< pair<GVariant*, QString> >::const_iterator i =
+ _values.begin(); i != _values.end(); i++)
+ g_variant_ref((*i).first);
}
Enum::~Enum()
{
- for (unsigned int i = 0; i < _values.size(); i++)
- g_variant_unref(_values[i].first);
+ for (vector< pair<GVariant*, QString> >::const_iterator i =
+ _values.begin(); i != _values.end(); i++)
+ g_variant_unref((*i).first);
}
-QWidget* Enum::get_widget(QWidget *parent)
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
{
if (_selector)
return _selector;
GVariant *const value = _getter ? _getter() : NULL;
+ if (!value)
+ return NULL;
_selector = new QComboBox(parent);
for (unsigned int i = 0; i < _values.size(); i++) {
const pair<GVariant*, QString> &v = _values[i];
_selector->addItem(v.second, qVariantFromValue((void*)v.first));
- if (value && g_variant_compare(v.first, value) == 0)
+ if (value && g_variant_equal(v.first, value))
_selector->setCurrentIndex(i);
}
g_variant_unref(value);
+ if (auto_commit)
+ connect(_selector, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_current_item_changed(int)));
+
return _selector;
}
_setter((GVariant*)_selector->itemData(index).value<void*>());
}
+void Enum::on_current_item_changed(int)
+{
+ commit();
+}
+
} // prop
} // pv