From 8a9644c257d821341ca6ebe94b31be553971a07d Mon Sep 17 00:00:00 2001
From: jstebbins <jstebbins.hb@gmail.com>
Date: Thu, 16 Jul 2009 00:29:34 +0000
Subject: LinGui: shuffle things around on the picture tab a bit

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2696 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 gtk/src/ghb.ui    | 55 +++++++++++++++++++++----------------------------------
 gtk/src/preview.c |  7 ++++++-
 2 files changed, 27 insertions(+), 35 deletions(-)

(limited to 'gtk')

diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui
index f5015376b..2c5779000 100644
--- a/gtk/src/ghb.ui
+++ b/gtk/src/ghb.ui
@@ -1514,26 +1514,19 @@
                     <child>
                       <object class="GtkAlignment" id="alignment56">
                         <property name="visible">True</property>
-                        <property name="right_padding">10</property>
+                        <property name="right_padding">12</property>
+                        <property name="top_padding">12</property>
 
                     <child>
                       <object class="GtkVBox" id="vbox9">
                         <property name="visible">True</property>
                         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <child>
-                          <object class="GtkLabel" id="label73">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
 
                         <child>
                           <object class="GtkFrame" id="frame8">
                             <property name="visible">True</property>
                             <property name="label_xalign">0</property>
-                            <property name="shadow_type">etched-in</property>
+                            <property name="shadow_type">none</property>
                             <child>
                               <object class="GtkAlignment" id="alignment19">
                                 <property name="visible">True</property>
@@ -1542,8 +1535,8 @@
                                 <property name="right_padding">4</property>
                                 <child>
                                   <object class="GtkImage" id="preview_button_image">
-                                    <property name="width_request">240</property>
-                                    <property name="height_request">120</property>
+                                    <property name="width_request">400</property>
+                                    <property name="height_request">200</property>
                                     <property name="visible">True</property>
                                     <property name="icon_name">hb-icon</property>
                                     <property name="icon-size">6</property>
@@ -1552,13 +1545,6 @@
                                 </child>
                               </object>
                             </child>
-                            <child type="label">
-                              <object class="GtkLabel" id="label21">
-                                <property name="visible">True</property>
-                                <property name="use_markup">True</property>
-                              </object>
-                            </child>
-
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -1567,6 +1553,11 @@
                           </packing>
                         </child>
 
+                    <child>
+                      <object class="GtkAlignment" id="alignment57">
+                        <property name="visible">True</property>
+                        <property name="xscale">0</property>
+                        <property name="yscale">0</property>
                         <child>
                           <object class="GtkHBox" id="hbox7">
                             <property name="visible">True</property>
@@ -1578,7 +1569,7 @@
                                 <property name="justify">right</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="position">0</property>
                               </packing>
                             </child>
@@ -1591,26 +1582,22 @@
                                 <property name="label" translatable="yes">--</property>
                               </object>
                               <packing>
-                                <property name="expand">True</property>
+                                <property name="expand">False</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
 
                           </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label8">
-                            <property name="visible">True</property>
-                          </object>
-                          <packing>
-                            <property name="position">3</property>
-                          </packing>
                         </child>
+
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+
                       </object>
                     </child>
 
diff --git a/gtk/src/preview.c b/gtk/src/preview.c
index 7b975e8ce..8748fae38 100644
--- a/gtk/src/preview.c
+++ b/gtk/src/preview.c
@@ -714,9 +714,14 @@ ghb_set_preview_image(signal_user_data_t *ud)
 	g_free(text);
 	
 	g_debug("preview %d x %d", preview_width, preview_height);
-	target_height = MIN(ud->preview->button_height, 128);
+	target_height = MIN(ud->preview->button_height, 200);
 	height = target_height;
 	width = preview_width * height / preview_height;
+	if (width > 400)
+	{
+		width = 400;
+		height = preview_height * width / preview_width;
+	}
 
 	if ((height >= 16) && (width >= 16))
 	{
-- 
cgit v1.2.3