update german translation

[ardour.git] / libs / gtkmm2ext / window_proxy.cc

diff --git a/libs/gtkmm2ext/window_proxy.cc b/libs/gtkmm2ext/window_proxy.cc
index ee91b7e26607cc5ba2a83dfc96c6e84bf2be676f..9e5105a81b8acb73347ddafd07c9ab5c96336573 100644 (file)
--- a/libs/gtkmm2ext/window_proxy.cc
+++ b/libs/gtkmm2ext/window_proxy.cc
@@ -20,14 +20,13 @@
 #include <gtkmm/action.h>
 #include <gtkmm/window.h>
 
-#include "pbd/convert.h"
 #include "pbd/xml++.h"
 #include "pbd/stacktrace.h"
 
 #include "gtkmm2ext/window_proxy.h"
 #include "gtkmm2ext/visibility_tracker.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -89,8 +88,9 @@ WindowProxy::set_state (const XMLNode& node, int /* version */)
 
        while (i != children.end()) {
                child = *i;
-               XMLProperty const * prop = child->property (X_("name"));
-               if (child->name() == X_("Window") && prop && prop->value() == _name) {
+               std::string name;
+               if (child->name () == X_("Window") && child->get_property (X_("name"), name) &&
+                   name == _name) {
                        break;
                }
 
@@ -99,25 +99,13 @@ WindowProxy::set_state (const XMLNode& node, int /* version */)
 
        if (i != children.end()) {
 
-               XMLProperty const * prop;
                child = *i;
 
-               if ((prop = child->property (X_("visible"))) != 0) {
-                       _visible = PBD::string_is_affirmative (prop->value ());
-               }
-
-               if ((prop = child->property (X_("x-off"))) != 0) {
-                       _x_off = atoi (prop->value());
-               }
-               if ((prop = child->property (X_("y-off"))) != 0) {
-                       _y_off = atoi (prop->value());
-               }
-               if ((prop = child->property (X_("x-size"))) != 0) {
-                       _width = atoi (prop->value());
-               }
-               if ((prop = child->property (X_("y-size"))) != 0) {
-                       _height = atoi (prop->value());
-               }
+               child->get_property (X_("visible"), _visible);
+               child->get_property (X_("x-off"), _x_off);
+               child->get_property (X_("y-off"), _y_off);
+               child->get_property (X_("x-size"), _width);
+               child->get_property (X_("y-size"), _height);
        }
 
        if (_window) {
@@ -180,9 +168,8 @@ XMLNode&
 WindowProxy::get_state ()
 {
        XMLNode* node = new XMLNode (xml_node_name());
-       char buf[32];
 
-       node->add_property (X_("name"), _name);
+       node->set_property (X_("name"), _name);
 
        if (_window && vistracker) {
 
@@ -211,15 +198,11 @@ WindowProxy::get_state ()
                h = -1;
        }
 
-       node->add_property (X_("visible"), _visible? X_("yes") : X_("no"));
-       snprintf (buf, sizeof (buf), "%d", x);
-       node->add_property (X_("x-off"), buf);
-       snprintf (buf, sizeof (buf), "%d", y);
-       node->add_property (X_("y-off"), buf);
-       snprintf (buf, sizeof (buf), "%d", w);
-       node->add_property (X_("x-size"), buf);
-       snprintf (buf, sizeof (buf), "%d", h);
-       node->add_property (X_("y-size"), buf);
+       node->set_property (X_("visible"), _visible);
+       node->set_property (X_("x-off"), x);
+       node->set_property (X_("y-off"), y);
+       node->set_property (X_("x-size"), w);
+       node->set_property (X_("y-size"), h);
 
        return *node;
 }
@@ -230,6 +213,8 @@ WindowProxy::drop_window ()
        if (_window) {
                delete_connection.disconnect ();
                configure_connection.disconnect ();
+               map_connection.disconnect ();
+               unmap_connection.disconnect ();
                _window->hide ();
                delete _window;
                _window = 0;
@@ -255,10 +240,26 @@ WindowProxy::setup ()
 
        delete_connection = _window->signal_delete_event().connect (sigc::mem_fun (*this, &WindowProxy::delete_event_handler));
        configure_connection = _window->signal_configure_event().connect (sigc::mem_fun (*this, &WindowProxy::configure_handler), false);
+       map_connection = _window->signal_map().connect (sigc::mem_fun (*this, &WindowProxy::map_handler), false);
+       unmap_connection = _window->signal_unmap().connect (sigc::mem_fun (*this, &WindowProxy::unmap_handler), false);
 
        set_pos_and_size ();
 }
 
+void
+WindowProxy::map_handler ()
+{
+       /* emit our own signal */
+       signal_map ();
+}
+
+void
+WindowProxy::unmap_handler ()
+{
+       /* emit out own signal */
+       signal_unmap ();
+}
+
 bool
 WindowProxy::configure_handler (GdkEventConfigure* ev)
 {
@@ -268,6 +269,9 @@ WindowProxy::configure_handler (GdkEventConfigure* ev)
 
           the difference is generally down to window manager framing.
        */
+       if (!visible() || !_window->is_mapped()) {
+               return false;
+       }
        save_pos_and_size ();
        return false;
 }