[gnote] Replace Boxes with Grids in HIG dialog

[Aurimas Černius <aurimasc src gnome org>]

commit c34088f7e02edb13f8a5221800522054bb17ad6c
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun May 26 14:47:55 2013 +0300

    Replace Boxes with Grids in HIG dialog

 src/utils.cpp |   23 ++++++++++++++---------
 src/utils.hpp |    3 ++-
 2 files changed, 16 insertions(+), 10 deletions(-)
---
diff --git a/src/utils.cpp b/src/utils.cpp
index b9f5d1a..0928579 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -315,9 +315,11 @@ namespace gnote {
       m_accel_group = Glib::RefPtr<Gtk::AccelGroup>(Gtk::AccelGroup::create());
       add_accel_group(m_accel_group);
 
-      Gtk::HBox *hbox = manage(new Gtk::HBox (false, 12));
+      Gtk::Grid *hbox = manage(new Gtk::Grid);
+      hbox->set_column_spacing(12);
       hbox->set_border_width(5);
       hbox->show();
+      int hbox_col = 0;
       get_vbox()->pack_start(*hbox, false, false, 0);
 
       switch (msg_type) {
@@ -346,12 +348,14 @@ namespace gnote {
         Gtk::manage(m_image);
         m_image->show();
         m_image->property_yalign().set_value(0);
-        hbox->pack_start(*m_image, false, false, 0);
+        hbox->attach(*m_image, hbox_col++, 0, 1, 1);
       }
 
-      Gtk::VBox *label_vbox = manage(new Gtk::VBox (false, 0));
+      Gtk::Grid *label_vbox = manage(new Gtk::Grid);
       label_vbox->show();
-      hbox->pack_start(*label_vbox, true, true, 0);
+      int label_vbox_row = 0;
+      label_vbox->set_hexpand(true);
+      hbox->attach(*label_vbox, hbox_col++, 0, 1, 1);
 
       std::string title = str(boost::format("<span weight='bold' size='larger'>%1%"
                                             "</span>\n") % header.c_str());
@@ -364,7 +368,7 @@ namespace gnote {
       label->set_line_wrap(true);
       label->set_alignment (0.0f, 0.5f);
       label->show();
-      label_vbox->pack_start(*label, false, false, 0);
+      label_vbox->attach(*label, 0, label_vbox_row++, 1, 1);
 
       label = manage(new Gtk::Label(msg));
       label->set_use_markup(true);
@@ -372,11 +376,12 @@ namespace gnote {
       label->set_line_wrap(true);
       label->set_alignment (0.0f, 0.5f);
       label->show();
-      label_vbox->pack_start(*label, false, false, 0);
+      label_vbox->attach(*label, 0, label_vbox_row++, 1, 1);
       
-      m_extra_widget_vbox = manage(new Gtk::VBox (false, 0));
+      m_extra_widget_vbox = manage(new Gtk::Grid);
       m_extra_widget_vbox->show();
-      label_vbox->pack_start(*m_extra_widget_vbox, true, true, 12);
+      m_extra_widget_vbox->set_margin_left(12);
+      label_vbox->attach(*m_extra_widget_vbox, 0, label_vbox_row++, 1, 1);
 
       switch (btn_type) {
       case Gtk::BUTTONS_NONE:
@@ -464,7 +469,7 @@ namespace gnote {
         
       m_extra_widget = value;
       m_extra_widget->show_all ();
-      m_extra_widget_vbox->pack_start (*m_extra_widget, true, true, 0);
+      m_extra_widget_vbox->attach(*m_extra_widget, 0, 0, 1, 1);
     }
 
 
diff --git a/src/utils.hpp b/src/utils.hpp
index b77120a..9c191d4 100644
--- a/src/utils.hpp
+++ b/src/utils.hpp
@@ -28,6 +28,7 @@
 #include <gdkmm/pixbuf.h>
 #include <gtkmm/applicationwindow.h>
 #include <gtkmm/dialog.h>
+#include <gtkmm/grid.h>
 #include <gtkmm/image.h>
 #include <gtkmm/menu.h>
 #include <gtkmm/messagedialog.h>
@@ -100,7 +101,7 @@ namespace gnote {
       void set_extra_widget(Gtk::Widget *);
     private:
       Glib::RefPtr<Gtk::AccelGroup> m_accel_group;
-      Gtk::VBox *m_extra_widget_vbox;
+      Gtk::Grid *m_extra_widget_vbox;
       Gtk::Widget *m_extra_widget;
       Gtk::Image *m_image;