Merge branch 'master' into 'gtk3'

Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.

rtgui/guiutils.h

@@ -90,6 +90,22 @@ public:
 
 #pragma GCC diagnostic pop
 
+class ConnectionBlocker
+{
+public:
+    ConnectionBlocker (sigc::connection& connection) : connection (connection)
+    {
+        wasBlocked = connection.block();
+    }
+    ~ConnectionBlocker ()
+    {
+        connection.block(wasBlocked);
+    }
+private:
+    sigc::connection& connection;
+    bool wasBlocked;
+};
+
 /**
  * @brief Glue box to control visibility of the MyExpender's content ; also handle the frame around it
  */
@@ -410,7 +426,8 @@ private:
 
 public:
     MyImageMenuItem (Glib::ustring label, Glib::ustring imageFileName);
-    const RTImage *getImage();
+    const RTImage *getImage () const;
+    const Gtk::Label* getLabel () const;
 };
 
 /**
@@ -563,4 +580,12 @@ public:
     }
 };
 
+inline void setActiveTextOrIndex (Gtk::ComboBoxText& comboBox, const Glib::ustring& text, int index)
+{
+    comboBox.set_active_text (text);
+
+    if (comboBox.get_active_row_number () < 0)
+        comboBox.set_active (index);
+}
+
 #endif