Merge from trunk

(bzr r9508.1.89)

1 files changed, 129 insertions, 0 deletions

diff --git a/src/ui/widget/spinbutton.cpp b/src/ui/widget/spinbutton.cpp
new file mode 100644
index 000000000..32090f96c
--- /dev/null
+++ b/src/ui/widget/spinbutton.cpp
@@ -0,0 +1,129 @@
+/**
+ * \brief SpinButton widget, that allows entry of both '.' and ',' for the decimal, even when in numeric mode.
+ */
+/*
+ * Author:
+ *   Johan B. C. Engelen
+ *
+ * Copyright (C) 2011 Author
+ *
+ * Released under GNU GPL.  Read the file 'COPYING' for more information.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "spinbutton.h"
+
+#include "unit-menu.h"
+#include "util/expression-evaluator.h"
+#include "event-context.h"
+
+namespace Inkscape {
+namespace UI {
+namespace Widget {
+
+
+void
+SpinButton::connect_signals() {
+    signal_input().connect(sigc::mem_fun(*this, &SpinButton::on_input));
+    signal_focus_in_event().connect(sigc::mem_fun(*this, &SpinButton::on_my_focus_in_event));
+    signal_key_press_event().connect(sigc::mem_fun(*this, &SpinButton::on_my_key_press_event));
+};
+
+/**
+ * This callback function should try to convert the entered text to a number and write it to newvalue.
+ * It calls a method to evaluate the (potential) mathematical expression.
+ *
+ * @retval false No conversion done, continue with default handler.
+ * @retval true  Conversion successful, don't call default handler. 
+ */
+int
+SpinButton::on_input(double* newvalue)
+{
+    try {
+        Inkscape::Util::GimpEevlQuantity result;
+        if (_unit_menu) {
+            Unit unit = _unit_menu->getUnit();
+            result = Inkscape::Util::gimp_eevl_evaluate (get_text().c_str(), &unit);
+            // check if output dimension corresponds to input unit
+            if (result.dimension != (unit.isAbsolute() ? 1 : 0) ) {
+                throw Inkscape::Util::EvaluatorException("Input dimensions do not match with parameter dimensions.","");
+            }
+        } else {
+            result = Inkscape::Util::gimp_eevl_evaluate (get_text().c_str(), NULL);
+        }
+
+        *newvalue = result.value;
+    }
+    catch(Inkscape::Util::EvaluatorException &e) {
+        g_message ("%s", e.what());
+
+        return false;
+    }
+
+    return true;
+}
+
+/** When focus is obtained, save the value to enable undo later.
+ * @retval false continue with default handler.
+ * @retval true  don't call default handler. 
+*/
+bool
+SpinButton::on_my_focus_in_event(GdkEventFocus* /*event*/)
+{
+    on_focus_in_value = get_value();
+    return false; // do not consume the event
+}
+
+/** Handle specific keypress events, like Ctrl+Z
+ * @retval false continue with default handler.
+ * @retval true  don't call default handler. 
+*/
+bool
+SpinButton::on_my_key_press_event(GdkEventKey* event)
+{
+    switch (get_group0_keyval (event)) {
+    case GDK_Escape:
+        undo();
+        return true; // I consumed the event
+        break;
+    case GDK_z:
+    case GDK_Z:
+        if (event->state & GDK_CONTROL_MASK) {
+            undo();
+            return true; // I consumed the event
+        }
+        break;
+    default:
+        break;
+    }
+
+    return false; // do not consume the event
+}
+
+/**
+ * Undo the editing, by resetting the value upon when the spinbutton got focus.
+ */
+void
+SpinButton::undo()
+{
+    set_value(on_focus_in_value);
+}
+
+
+} // namespace Widget
+} // namespace UI
+} // namespace Inkscape
+
+/* 
+  Local Variables:
+  mode:c++
+  c-file-style:"stroustrup"
+  c-file-offsets:((innamespace . 0)(inline-open . 0))
+  indent-tabs-mode:nil
+  fill-column:99
+  End:
+*/
+// vim: filetype=c++:expandtab:shiftwidth=4:tabstop=8:softtabstop=4 :