commit 1118d7a54636caf28308e26dd2b0b30a07ef614d
author Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Fri Feb 05 15:52:55 2016 -0500
committer Stepan Salenikovich <stepan.salenikovich@savoirfairelinux.com> Fri Feb 12 12:23:15 2016 -0500
tree 7d25bf0d7a26888b774f75f1f4338b31c5691ac4
parent ab0f5be6f914c6b645a3145c276d1d5476133c3a

Align comboboxes in media settings view.

Also places the the camera preview all the way to the right of all
the settings, not just the camera settings.

Tuleap: #353
Change-Id: I209ec21526f47be8395a2293de040b90426b6091

src/mediasettingsview.cpp

diff --git a/src/mediasettingsview.cpp b/src/mediasettingsview.cpp
index dc08193..28c9c04 100644
--- a/src/mediasettingsview.cpp
+++ b/src/mediasettingsview.cpp
@@ -46,6 +46,8 @@
 
 struct _MediaSettingsViewPrivate
 {
+    GtkWidget *vbox_main;
+
     /* audio settings */
     GtkWidget *combobox_manager;
     GtkWidget *combobox_ringtone;
@@ -62,7 +64,6 @@
     GtkWidget *combobox_channel;
     GtkWidget *combobox_resolution;
     GtkWidget *combobox_framerate;
-    GtkWidget *hbox_camera;
     GtkWidget *video_widget;
 
     /* this is used to keep track of the state of the preview when the settings
@@ -228,6 +229,7 @@
     gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS (klass),
                                                 "/cx/ring/RingGnome/mediasettingsview.ui");
 
+    gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, vbox_main);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_manager);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_ringtone);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_output);
@@ -236,7 +238,6 @@
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_channel);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_resolution);
     gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, combobox_framerate);
-    gtk_widget_class_bind_template_child_private(GTK_WIDGET_CLASS (klass), MediaSettingsView, hbox_camera);
 }
 
 GtkWidget *
@@ -263,7 +264,9 @@
         /* put video widget in */
         priv->video_widget = video_widget_new();
         gtk_widget_show_all(priv->video_widget);
-        gtk_box_pack_start(GTK_BOX(priv->hbox_camera), priv->video_widget, TRUE, TRUE, 0);
+        gtk_box_pack_start(GTK_BOX(priv->vbox_main), priv->video_widget, TRUE, TRUE, 0);
+        // set minimum size for video so it doesn't shrink too much
+        gtk_widget_set_size_request(priv->video_widget, 300, -1);
 
         if (Video::PreviewManager::instance().isPreviewing()) {
             priv->video_started_by_settings = FALSE;
@@ -293,7 +296,7 @@
         }
 
         if (priv->video_widget && IS_VIDEO_WIDGET(priv->video_widget))
-            gtk_container_remove(GTK_CONTAINER(priv->hbox_camera), priv->video_widget);
+            gtk_container_remove(GTK_CONTAINER(priv->vbox_main), priv->video_widget);
         priv->video_widget = NULL;
     }