[med-svn] [aghermann] 01/14: make widgets reappear on Empty Experiment splash

[andrei zavada]

This is an automated email from the git hooks/post-receive script.

hmmr-guest pushed a commit to branch WIP
in repository aghermann.

commit abdc0ee716c5cc7f031b12116dda600c7be71a8b
Author: andrei zavada <hmmr at ra>
Date:   Fri Jul 17 04:56:38 2015 +0300

    make widgets reappear on Empty Experiment splash
---
 upstream/src/aghermann/ui/mw/splash.cc  | 38 ++++++++++++++++++++++-----------
 upstream/src/aghermann/ui/mw/widgets.hh |  2 +-
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/upstream/src/aghermann/ui/mw/splash.cc b/upstream/src/aghermann/ui/mw/splash.cc
index 641b260..c38a0cc 100644
--- a/upstream/src/aghermann/ui/mw/splash.cc
+++ b/upstream/src/aghermann/ui/mw/splash.cc
@@ -67,6 +67,12 @@ show_empty_experiment_blurb()
                 (GtkContainer*)cMeasurements,
                 (GtkCallback) gtk_widget_destroy,
                 NULL);
+
+        g_object_set( (GObject*)cMeasurements,
+                      "margin", 20,
+                      NULL);
+        gtk_grid_set_row_spacing(cMeasurements, 20);
+
         const char *blurb =
                 "<b><big>Empty experiment\n</big></b>\n"
                 "When you have your recordings ready as a set of .edf files,\n"
@@ -84,10 +90,12 @@ show_empty_experiment_blurb()
         GtkLabel *blurb_label = (GtkLabel*)gtk_label_new( "");
         gtk_label_set_markup( blurb_label, blurb);
 
-        gtk_box_pack_start(
-                (GtkBox*)cMeasurements,
+        gtk_grid_insert_row(
+                cMeasurements, 0);
+        gtk_grid_attach(
+                cMeasurements,
                 (GtkWidget*)blurb_label,
-                TRUE, TRUE, 10);
+                0, 0, 1, 1);
         GtkWidget *bDownload = gtk_button_new_with_label("  Get sample dataset  ");
         g_object_set(
                 (GObject*)bDownload,
@@ -98,16 +106,21 @@ show_empty_experiment_blurb()
                 bDownload, "clicked",
                 (GCallback)bDownload_clicked_cb,
                 this);
-        gtk_box_pack_start(
-                (GtkBox*)cMeasurements,
+
+        gtk_grid_insert_row(
+                cMeasurements, 1);
+        gtk_grid_attach(
+                cMeasurements,
                 bDownload,
-                FALSE, FALSE, 0);
+                0, 1, 1, 1);
 
-        gtk_box_pack_start(
-                (GtkBox*)cMeasurements,
+        gtk_grid_insert_row(
+                (GtkGrid*)cMeasurements, 2);
+        gtk_grid_attach(
+                cMeasurements,
                 (GtkWidget*)gtk_image_new_from_file(
                         PACKAGE_DATADIR "/aghermann/idle-bg.svg"),
-                TRUE, FALSE, 0);
+                0, 2, 1, 1);
 
         gtk_widget_show_all( (GtkWidget*)cMeasurements);
 }
@@ -128,10 +141,11 @@ try_download()
                 tTerm, "child-exited",
                 (GCallback)download_process_child_exited_cb,
                 this);
-        gtk_box_pack_start(
-                (GtkBox*)cMeasurements,
+        gtk_grid_insert_row(cMeasurements, 0);
+        gtk_grid_attach(
+                cMeasurements,
                 (GtkWidget*)tTerm,
-                TRUE, FALSE, 0);
+                0, 0, 1, 1);
         set_wMainWindow_interactive( false, true);
         // punch a hole for VteTerminal for any user ^C
         gtk_widget_set_sensitive( (GtkWidget*)cMeasurements, TRUE);
diff --git a/upstream/src/aghermann/ui/mw/widgets.hh b/upstream/src/aghermann/ui/mw/widgets.hh
index 47b734a..6308d0e 100644
--- a/upstream/src/aghermann/ui/mw/widgets.hh
+++ b/upstream/src/aghermann/ui/mw/widgets.hh
@@ -154,7 +154,7 @@ struct SExpDesignUIWidgets {
                 *eMsmtSession;
 
         // main area
-        GtkVBox
+        GtkGrid
                 *cMeasurements;
         GtkStatusbar
                 *sbMainStatusBar;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/aghermann.git