From 213f5a897b6a9cf5d2ce9a84c39455e3590ada88 Mon Sep 17 00:00:00 2001 From: jstebbins Date: Sun, 14 Dec 2008 00:52:39 +0000 Subject: LinGui: make the destination file entry box wider. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2031 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- gtk/src/ghb.ui | 22 +++++++++++++++++++--- gtk/src/internal_defaults.xml | 2 +- gtk/src/queuehandler.c | 8 ++++++++ gtk/src/resource_data.h | 39 +++++++++++++++++++++++++++++++++------ gtk/src/resources.plist | 24 ++++++++++++++++++++---- 5 files changed, 81 insertions(+), 14 deletions(-) (limited to 'gtk/src') diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index b847674a2..9d9ac5edc 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -282,7 +282,7 @@ True - True + False show_presets Show Presets @@ -729,13 +729,14 @@ 2 1 2 + GTK_FILL True True - 30 + 40 @@ -743,6 +744,7 @@ 1 2 + GTK_FILL @@ -750,6 +752,9 @@ True File: + + GTK_FILL + @@ -787,6 +792,9 @@ + + GTK_FILL + @@ -795,12 +803,14 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 True 1 2 + GTK_FILL @@ -810,12 +820,14 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 True 1 2 + GTK_FILL @@ -825,6 +837,7 @@ True False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 True @@ -833,6 +846,7 @@ 2 1 2 + GTK_FILL @@ -2935,7 +2949,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1 - True + False GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 3 0 @@ -3091,11 +3105,13 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1 1 + False 2 + False diff --git a/gtk/src/internal_defaults.xml b/gtk/src/internal_defaults.xml index 942767fcb..7c167453f 100644 --- a/gtk/src/internal_defaults.xml +++ b/gtk/src/internal_defaults.xml @@ -117,7 +117,7 @@ preview_count 10 show_presets - + use_source_name update_skip_version diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index adf409e16..a47526f4e 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -997,6 +997,14 @@ ghb_reload_queue(signal_user_data_t *ud) gchar *message; g_debug("ghb_reload_queue"); + + // I really shouldn't have to do this, but at startup the + // initial window size is larger than it should be. This + // make it adjust to the proper size. + GtkWindow *hb_window; + hb_window = GTK_WINDOW(GHB_WIDGET (ud->builder, "hb_window")); + gtk_window_resize(hb_window, 16, 16); + queue = ghb_load_queue(); // Look for unfinished entries count = ghb_array_len(queue); diff --git a/gtk/src/resource_data.h b/gtk/src/resource_data.h index d78b1bdad..c18027751 100644 --- a/gtk/src/resource_data.h +++ b/gtk/src/resource_data.h @@ -393,8 +393,8 @@ "esets">\n" " <property name="visible">True</property&" "gt;\n" -" <property name="active">True</property&g" -"t;\n" +" <property name="active">False</property&" +"gt;\n" " <property name="name">show_presets</prop" "erty>\n" " <property name="label" translatable="yes&" @@ -1102,6 +1102,8 @@ "quot;>1</property>\n" " <property name="bottom_atta" "ch">2</property>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -1112,7 +1114,7 @@ " <property name="can_focus&q" "uot;>True</property>\n" " <property name="width_chars" -"">30</property>\n" +"">40</property>\n" " <signal name="changed"" " handler="dest_file_changed_cb"/>\n" " <signal name="grab_focus&qu" @@ -1125,6 +1127,8 @@ "">1</property>\n" " <property name="right_attac" "h">2</property>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -1135,6 +1139,10 @@ " <property name="label"" " translatable="yes">File:</property>\n" " </object>\n" +" <packing>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" +" </packing>\n" " </child>\n" " </object>\n" " <packing>\n" @@ -1191,6 +1199,10 @@ " </packing>\n" " </child>\n" " </object>\n" +" <packing>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" +" </packing>\n" " </child>\n" " <child>\n" " <object class="GtkCheckButton" @@ -1206,6 +1218,8 @@ " <property name="events"" ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="xalign"" +";>0</property>\n" " <property name="draw_indica" "tor">True</property>\n" " <signal name="toggled"" @@ -1216,6 +1230,8 @@ "">1</property>\n" " <property name="right_attac" "h">2</property>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -1232,6 +1248,8 @@ " <property name="events"" ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="xalign"" +";>0</property>\n" " <property name="draw_indica" "tor">True</property>\n" " <signal name="toggled"" @@ -1242,6 +1260,8 @@ "quot;>1</property>\n" " <property name="bottom_atta" "ch">2</property>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" " </packing>\n" " </child>\n" " <child>\n" @@ -1259,6 +1279,8 @@ " <property name="events"" ";>GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO" "N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>\n" +" <property name="xalign"" +";>0</property>\n" " <property name="draw_indica" "tor">True</property>\n" " <signal name="toggled"" @@ -1273,6 +1295,8 @@ "quot;>1</property>\n" " <property name="bottom_atta" "ch">2</property>\n" +" <property name="x_options&q" +"uot;>GTK_FILL</property>\n" " </packing>\n" " </child>\n" " </object>\n" @@ -4790,8 +4814,8 @@ " <child>\n" " <object class="GtkFrame" id="presets_frame&" "quot;>\n" -" <property name="visible">True</property&" -"gt;\n" +" <property name="visible">False</property" +">\n" " <property name="events">GDK_POINTER_MOTION_" "MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO" "N_RELEASE_MASK</property>\n" @@ -5057,11 +5081,14 @@ " <packing>\n" " <property name="position">1</property>" ";\n" +" <property name="expand">False</property&" +"gt;\n" " </packing>\n" " </child>\n" " </object>\n" " <packing>\n" " <property name="position">2</property>\n" +" <property name="expand">False</property>\n" " </packing>\n" " </child>\n" "\n" @@ -10808,7 +10835,7 @@ " reduce_hd_preview\n" " \n" " show_presets\n" -" \n" +" \n" " update_skip_version\n" " 0\n" " use_source_name\n" diff --git a/gtk/src/resources.plist b/gtk/src/resources.plist index 3f00755b7..a9c0605ec 100644 --- a/gtk/src/resources.plist +++ b/gtk/src/resources.plist @@ -287,7 +287,7 @@ <child> <object class="GtkToggleAction" id="show_presets"> <property name="visible">True</property> - <property name="active">True</property> + <property name="active">False</property> <property name="name">show_presets</property> <property name="label" translatable="yes">Show Presets</property> <signal handler="show_presets_toggled_cb" name="toggled"/> @@ -734,13 +734,14 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> <object class="GtkEntry" id="dest_file"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="width_chars">30</property> + <property name="width_chars">40</property> <signal name="changed" handler="dest_file_changed_cb"/> <signal name="grab_focus" handler="destination_grab_cb" after="yes"/> <accelerator key="d" signal="grab-focus" modifiers="GDK_MOD1_MASK"/> @@ -748,6 +749,7 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -755,6 +757,9 @@ <property name="visible">True</property> <property name="label" translatable="yes">File:</property> </object> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> </child> </object> <packing> @@ -792,6 +797,9 @@ </packing> </child> </object> + <packing> + <property name="x_options">GTK_FILL</property> + </packing> </child> <child> <object class="GtkCheckButton" id="Mp4iPodCompatible"> @@ -800,12 +808,14 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <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="draw_indicator">True</property> <signal name="toggled" handler="setting_widget_changed_cb"/> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -815,12 +825,14 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <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="draw_indicator">True</property> <signal name="toggled" handler="http_opt_changed_cb"/> </object> <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> @@ -830,6 +842,7 @@ <property name="can_focus">True</property> <property name="receives_default">False</property> <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="draw_indicator">True</property> <signal name="toggled" handler="setting_widget_changed_cb"/> </object> @@ -838,6 +851,7 @@ <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> </packing> </child> </object> @@ -2940,7 +2954,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property> </child> <child> <object class="GtkFrame" id="presets_frame"> - <property name="visible">True</property> + <property name="visible">False</property> <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> <property name="border_width">3</property> <property name="label_xalign">0</property> @@ -3096,11 +3110,13 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1</property> </object> <packing> <property name="position">1</property> + <property name="expand">False</property> </packing> </child> </object> <packing> <property name="position">2</property> + <property name="expand">False</property> </packing> </child> @@ -5359,7 +5375,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A reduce_hd_preview show_presets - + update_skip_version 0 use_source_name -- cgit v1.2.3