diff options
| author | jstebbins <[email protected]> | 2009-11-23 04:18:10 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2009-11-23 04:18:10 +0000 |
| commit | 355d48a848b5a8ad687d14ad841121e200fc3fb9 (patch) | |
| tree | 7f429790fee630be09a3ae521484e4a09081b5c1 | |
| parent | e3c924c647f1fd26e799b9f6040d25145ead07fd (diff) | |
LinGui: adjust some widget sizes to prevent window resizing at random times
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2958 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | gtk/src/ghb.ui | 10 | ||||
| -rw-r--r-- | gtk/src/main.c | 8 | ||||
| -rw-r--r-- | gtk/src/preview.c | 6 |
3 files changed, 14 insertions, 10 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index 8056df6dc..226e68657 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -762,7 +762,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="xscale">0</property> - <property name="left_padding">16</property> + <property name="left_padding">8</property> <child> <object class="GtkHBox" id="hbox4"> <property name="visible">True</property> @@ -830,7 +830,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="xscale">0</property> - <property name="left_padding">16</property> + <property name="left_padding">8</property> <child> <object class="GtkHBox" id="hbox44"> <property name="visible">True</property> @@ -875,7 +875,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="xscale">0</property> - <property name="left_padding">16</property> + <property name="left_padding">8</property> <child> <object class="GtkHBox" id="hbox42"> <property name="visible">True</property> @@ -898,7 +898,7 @@ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="xalign">0</property> <property name="label" translatable="yes">hh:mm:ss</property> - <property name="width_chars">10</property> + <property name="width_chars">8</property> </object> <packing> <property name="expand">False</property> @@ -1070,7 +1070,7 @@ </child> <child> <object class="GtkCheckButton" id="Mp4LargeFile"> - <property name="label" translatable="yes">Large file size (>4GB)</property> + <property name="label" translatable="yes">Large file (>4GB)</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> diff --git a/gtk/src/main.c b/gtk/src/main.c index 7a08d2b63..421eac1c2 100644 --- a/gtk/src/main.c +++ b/gtk/src/main.c @@ -349,25 +349,25 @@ bind_audio_tree_model (signal_user_data_t *ud) column = gtk_tree_view_column_new_with_attributes( _("Codec"), cell, "text", 1, NULL); gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column)); - gtk_tree_view_column_set_min_width (column, 105); + gtk_tree_view_column_set_min_width (column, 120); cell = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( _("Bitrate"), cell, "text", 2, NULL); gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column)); - gtk_tree_view_column_set_min_width (column, 60); + gtk_tree_view_column_set_min_width (column, 80); cell = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( _("Sample Rate"), cell, "text", 3, NULL); gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column)); - gtk_tree_view_column_set_min_width (column, 105); + gtk_tree_view_column_set_min_width (column, 115); cell = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( _("Mix"), cell, "text", 4, NULL); gtk_tree_view_append_column(treeview, GTK_TREE_VIEW_COLUMN(column)); - gtk_tree_view_column_set_min_width (column, 120); + gtk_tree_view_column_set_min_width (column, 150); cell = gtk_cell_renderer_text_new(); column = gtk_tree_view_column_new_with_attributes( diff --git a/gtk/src/preview.c b/gtk/src/preview.c index 7d8b690fd..e85130e90 100644 --- a/gtk/src/preview.c +++ b/gtk/src/preview.c @@ -142,6 +142,8 @@ ghb_par_scale(signal_user_data_t *ud, gint *width, gint *height, gint par_n, gin void ghb_preview_init(signal_user_data_t *ud) { + GtkWidget *widget; + ud->preview = g_malloc0(sizeof(preview_t)); ud->preview->view = GHB_WIDGET(ud->builder, "preview_image"); gtk_widget_realize(ud->preview->view); @@ -151,7 +153,9 @@ ghb_preview_init(signal_user_data_t *ud) ud->preview->pause = TRUE; ud->preview->encode_frame = -1; ud->preview->live_id = -1; - + widget = GHB_WIDGET (ud->builder, "preview_button_image"); + gtk_widget_get_size_request(widget, &ud->preview->button_width, &ud->preview->button_height); + #if defined(_ENABLE_GST) GstBus *bus; GstElement *xover; |