summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gtk/src/ghb.ui22
-rw-r--r--gtk/src/internal_defaults.xml2
-rw-r--r--gtk/src/queuehandler.c8
-rw-r--r--gtk/src/resource_data.h39
-rw-r--r--gtk/src/resources.plist24
5 files changed, 81 insertions, 14 deletions
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 @@
<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"/>
@@ -729,13 +729,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"/>
@@ -743,6 +744,7 @@
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -750,6 +752,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>
@@ -787,6 +792,9 @@
</packing>
</child>
</object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ </packing>
</child>
<child>
<object class="GtkCheckButton" id="Mp4iPodCompatible">
@@ -795,12 +803,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>
@@ -810,12 +820,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>
@@ -825,6 +837,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>
@@ -833,6 +846,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>
@@ -2935,7 +2949,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>
@@ -3091,11 +3105,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>
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 @@
<key>preview_count</key>
<integer>10</integer>
<key>show_presets</key>
- <true />
+ <false />
<key>use_source_name</key>
<true />
<key>update_skip_version</key>
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&quot;&gt;\n"
" &lt;property name=&quot;visible&quot;&gt;True&lt;/property&"
"gt;\n"
-" &lt;property name=&quot;active&quot;&gt;True&lt;/property&g"
-"t;\n"
+" &lt;property name=&quot;active&quot;&gt;False&lt;/property&"
+"gt;\n"
" &lt;property name=&quot;name&quot;&gt;show_presets&lt;/prop"
"erty&gt;\n"
" &lt;property name=&quot;label&quot; translatable=&quot;yes&"
@@ -1102,6 +1102,8 @@
"quot;&gt;1&lt;/property&gt;\n"
" &lt;property name=&quot;bottom_atta"
"ch&quot;&gt;2&lt;/property&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;child&gt;\n"
@@ -1112,7 +1114,7 @@
" &lt;property name=&quot;can_focus&q"
"uot;&gt;True&lt;/property&gt;\n"
" &lt;property name=&quot;width_chars"
-"&quot;&gt;30&lt;/property&gt;\n"
+"&quot;&gt;40&lt;/property&gt;\n"
" &lt;signal name=&quot;changed&quot;"
" handler=&quot;dest_file_changed_cb&quot;/&gt;\n"
" &lt;signal name=&quot;grab_focus&qu"
@@ -1125,6 +1127,8 @@
"&quot;&gt;1&lt;/property&gt;\n"
" &lt;property name=&quot;right_attac"
"h&quot;&gt;2&lt;/property&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;child&gt;\n"
@@ -1135,6 +1139,10 @@
" &lt;property name=&quot;label&quot;"
" translatable=&quot;yes&quot;&gt;File:&lt;/property&gt;\n"
" &lt;/object&gt;\n"
+" &lt;packing&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
+" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;/object&gt;\n"
" &lt;packing&gt;\n"
@@ -1191,6 +1199,10 @@
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;/object&gt;\n"
+" &lt;packing&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
+" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;child&gt;\n"
" &lt;object class=&quot;GtkCheckButton"
@@ -1206,6 +1218,8 @@
" &lt;property name=&quot;events&quot"
";&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
+" &lt;property name=&quot;xalign&quot"
+";&gt;0&lt;/property&gt;\n"
" &lt;property name=&quot;draw_indica"
"tor&quot;&gt;True&lt;/property&gt;\n"
" &lt;signal name=&quot;toggled&quot;"
@@ -1216,6 +1230,8 @@
"&quot;&gt;1&lt;/property&gt;\n"
" &lt;property name=&quot;right_attac"
"h&quot;&gt;2&lt;/property&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;child&gt;\n"
@@ -1232,6 +1248,8 @@
" &lt;property name=&quot;events&quot"
";&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
+" &lt;property name=&quot;xalign&quot"
+";&gt;0&lt;/property&gt;\n"
" &lt;property name=&quot;draw_indica"
"tor&quot;&gt;True&lt;/property&gt;\n"
" &lt;signal name=&quot;toggled&quot;"
@@ -1242,6 +1260,8 @@
"quot;&gt;1&lt;/property&gt;\n"
" &lt;property name=&quot;bottom_atta"
"ch&quot;&gt;2&lt;/property&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;child&gt;\n"
@@ -1259,6 +1279,8 @@
" &lt;property name=&quot;events&quot"
";&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTO"
"N_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;\n"
+" &lt;property name=&quot;xalign&quot"
+";&gt;0&lt;/property&gt;\n"
" &lt;property name=&quot;draw_indica"
"tor&quot;&gt;True&lt;/property&gt;\n"
" &lt;signal name=&quot;toggled&quot;"
@@ -1273,6 +1295,8 @@
"quot;&gt;1&lt;/property&gt;\n"
" &lt;property name=&quot;bottom_atta"
"ch&quot;&gt;2&lt;/property&gt;\n"
+" &lt;property name=&quot;x_options&q"
+"uot;&gt;GTK_FILL&lt;/property&gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;/object&gt;\n"
@@ -4790,8 +4814,8 @@
" &lt;child&gt;\n"
" &lt;object class=&quot;GtkFrame&quot; id=&quot;presets_frame&"
"quot;&gt;\n"
-" &lt;property name=&quot;visible&quot;&gt;True&lt;/property&"
-"gt;\n"
+" &lt;property name=&quot;visible&quot;&gt;False&lt;/property"
+"&gt;\n"
" &lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_"
"MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTO"
"N_RELEASE_MASK&lt;/property&gt;\n"
@@ -5057,11 +5081,14 @@
" &lt;packing&gt;\n"
" &lt;property name=&quot;position&quot;&gt;1&lt;/property&gt"
";\n"
+" &lt;property name=&quot;expand&quot;&gt;False&lt;/property&"
+"gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
" &lt;/object&gt;\n"
" &lt;packing&gt;\n"
" &lt;property name=&quot;position&quot;&gt;2&lt;/property&gt;\n"
+" &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;\n"
" &lt;/packing&gt;\n"
" &lt;/child&gt;\n"
"\n"
@@ -10808,7 +10835,7 @@
" <key>reduce_hd_preview</key>\n"
" <true />\n"
" <key>show_presets</key>\n"
-" <true />\n"
+" <false />\n"
" <key>update_skip_version</key>\n"
" <integer>0</integer>\n"
" <key>use_source_name</key>\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 @@
&lt;child&gt;
&lt;object class=&quot;GtkToggleAction&quot; id=&quot;show_presets&quot;&gt;
&lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
- &lt;property name=&quot;active&quot;&gt;True&lt;/property&gt;
+ &lt;property name=&quot;active&quot;&gt;False&lt;/property&gt;
&lt;property name=&quot;name&quot;&gt;show_presets&lt;/property&gt;
&lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;Show Presets&lt;/property&gt;
&lt;signal handler=&quot;show_presets_toggled_cb&quot; name=&quot;toggled&quot;/&gt;
@@ -734,13 +734,14 @@
&lt;property name=&quot;right_attach&quot;&gt;2&lt;/property&gt;
&lt;property name=&quot;top_attach&quot;&gt;1&lt;/property&gt;
&lt;property name=&quot;bottom_attach&quot;&gt;2&lt;/property&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
&lt;child&gt;
&lt;object class=&quot;GtkEntry&quot; id=&quot;dest_file&quot;&gt;
&lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
&lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
- &lt;property name=&quot;width_chars&quot;&gt;30&lt;/property&gt;
+ &lt;property name=&quot;width_chars&quot;&gt;40&lt;/property&gt;
&lt;signal name=&quot;changed&quot; handler=&quot;dest_file_changed_cb&quot;/&gt;
&lt;signal name=&quot;grab_focus&quot; handler=&quot;destination_grab_cb&quot; after=&quot;yes&quot;/&gt;
&lt;accelerator key=&quot;d&quot; signal=&quot;grab-focus&quot; modifiers=&quot;GDK_MOD1_MASK&quot;/&gt;
@@ -748,6 +749,7 @@
&lt;packing&gt;
&lt;property name=&quot;left_attach&quot;&gt;1&lt;/property&gt;
&lt;property name=&quot;right_attach&quot;&gt;2&lt;/property&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
&lt;child&gt;
@@ -755,6 +757,9 @@
&lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
&lt;property name=&quot;label&quot; translatable=&quot;yes&quot;&gt;File:&lt;/property&gt;
&lt;/object&gt;
+ &lt;packing&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
+ &lt;/packing&gt;
&lt;/child&gt;
&lt;/object&gt;
&lt;packing&gt;
@@ -792,6 +797,9 @@
&lt;/packing&gt;
&lt;/child&gt;
&lt;/object&gt;
+ &lt;packing&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
+ &lt;/packing&gt;
&lt;/child&gt;
&lt;child&gt;
&lt;object class=&quot;GtkCheckButton&quot; id=&quot;Mp4iPodCompatible&quot;&gt;
@@ -800,12 +808,14 @@
&lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
&lt;property name=&quot;receives_default&quot;&gt;False&lt;/property&gt;
&lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
+ &lt;property name=&quot;xalign&quot;&gt;0&lt;/property&gt;
&lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
&lt;signal name=&quot;toggled&quot; handler=&quot;setting_widget_changed_cb&quot;/&gt;
&lt;/object&gt;
&lt;packing&gt;
&lt;property name=&quot;left_attach&quot;&gt;1&lt;/property&gt;
&lt;property name=&quot;right_attach&quot;&gt;2&lt;/property&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
&lt;child&gt;
@@ -815,12 +825,14 @@
&lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
&lt;property name=&quot;receives_default&quot;&gt;False&lt;/property&gt;
&lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
+ &lt;property name=&quot;xalign&quot;&gt;0&lt;/property&gt;
&lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
&lt;signal name=&quot;toggled&quot; handler=&quot;http_opt_changed_cb&quot;/&gt;
&lt;/object&gt;
&lt;packing&gt;
&lt;property name=&quot;top_attach&quot;&gt;1&lt;/property&gt;
&lt;property name=&quot;bottom_attach&quot;&gt;2&lt;/property&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
&lt;child&gt;
@@ -830,6 +842,7 @@
&lt;property name=&quot;can_focus&quot;&gt;True&lt;/property&gt;
&lt;property name=&quot;receives_default&quot;&gt;False&lt;/property&gt;
&lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
+ &lt;property name=&quot;xalign&quot;&gt;0&lt;/property&gt;
&lt;property name=&quot;draw_indicator&quot;&gt;True&lt;/property&gt;
&lt;signal name=&quot;toggled&quot; handler=&quot;setting_widget_changed_cb&quot;/&gt;
&lt;/object&gt;
@@ -838,6 +851,7 @@
&lt;property name=&quot;right_attach&quot;&gt;2&lt;/property&gt;
&lt;property name=&quot;top_attach&quot;&gt;1&lt;/property&gt;
&lt;property name=&quot;bottom_attach&quot;&gt;2&lt;/property&gt;
+ &lt;property name=&quot;x_options&quot;&gt;GTK_FILL&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
&lt;/object&gt;
@@ -2940,7 +2954,7 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1&lt;/property&gt;
&lt;/child&gt;
&lt;child&gt;
&lt;object class=&quot;GtkFrame&quot; id=&quot;presets_frame&quot;&gt;
- &lt;property name=&quot;visible&quot;&gt;True&lt;/property&gt;
+ &lt;property name=&quot;visible&quot;&gt;False&lt;/property&gt;
&lt;property name=&quot;events&quot;&gt;GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK&lt;/property&gt;
&lt;property name=&quot;border_width&quot;&gt;3&lt;/property&gt;
&lt;property name=&quot;label_xalign&quot;&gt;0&lt;/property&gt;
@@ -3096,11 +3110,13 @@ no-fast-pskip=0:no-dct-decimate=0:cabac=1&lt;/property&gt;
&lt;/object&gt;
&lt;packing&gt;
&lt;property name=&quot;position&quot;&gt;1&lt;/property&gt;
+ &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
&lt;/object&gt;
&lt;packing&gt;
&lt;property name=&quot;position&quot;&gt;2&lt;/property&gt;
+ &lt;property name=&quot;expand&quot;&gt;False&lt;/property&gt;
&lt;/packing&gt;
&lt;/child&gt;
@@ -5359,7 +5375,7 @@ R2RrUAAABBgBAQACAAAAQAAAABAAAAAQ////AP///wD///8A////AP///wD///8A////AP///wD///8A
<key>reduce_hd_preview</key>
<true />
<key>show_presets</key>
- <true />
+ <false />
<key>update_skip_version</key>
<integer>0</integer>
<key>use_source_name</key>