From 11591030b43932140fc2e3d4cc922e58f8bb7c6d Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Thu, 6 Aug 2009 13:41:25 +0000
Subject: Made macros with prefilled values commitable. Fixed bug, where
innerwidget of altcombobox didn't get its value set.
---
client/widgets/widget.cc | 10 ++++++++++
client/widgets/widget.h | 3 +++
2 files changed, 13 insertions(+)
(limited to 'client/widgets')
diff --git a/client/widgets/widget.cc b/client/widgets/widget.cc
index 14d8c34..5899839 100644
--- a/client/widgets/widget.cc
+++ b/client/widgets/widget.cc
@@ -41,6 +41,10 @@ Widget::Widget(QDomNode &node, MacroWindow *macrowindow)
elem.tagName().toStdString().c_str());
}
+ if(elem.hasAttribute("prefilled")) {
+ prefilled = elem.attribute("prefilled");
+ }
+
if(elem.hasAttribute("script")) {
luaprogram = elem.attribute("script");
hasluaprogram = true;
@@ -96,6 +100,12 @@ void Widget::setInitialValue(QString value)
}
}
+bool Widget::hasInitialValue()
+{
+ return has_initial_value;
+}
+
+
void Widget::reset()
{
setValue(initial_value);
diff --git a/client/widgets/widget.h b/client/widgets/widget.h
index 2977e3a..bd84705 100644
--- a/client/widgets/widget.h
+++ b/client/widgets/widget.h
@@ -65,6 +65,7 @@ public:
virtual bool setKeyboardFocus() { return false; }
void setInitialValue(QString value);
+ bool hasInitialValue();
virtual void reset();
protected:
@@ -85,6 +86,8 @@ private:
QString initial_value;
bool has_initial_value;
+
+ QString prefilled;
};
#endif/*__PRACRO_WIDGET_H__*/
--
cgit v1.2.3