diff options
| -rw-r--r-- | gtk/src/ghb.ui | 10 | ||||
| -rw-r--r-- | gtk/src/queuehandler.c | 36 |
2 files changed, 36 insertions, 10 deletions
diff --git a/gtk/src/ghb.ui b/gtk/src/ghb.ui index a9a9c3255..77d989922 100644 --- a/gtk/src/ghb.ui +++ b/gtk/src/ghb.ui @@ -3659,7 +3659,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox42"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment60"> <property name="visible">True</property> @@ -3748,7 +3747,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox5"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="use_source_name"> <property name="label" translatable="yes">Use automatic naming (uses DVD name)</property> @@ -3770,7 +3768,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox29"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="chapters_in_destination"> <property name="label" translatable="yes">Add chapters to destination name</property> @@ -3912,7 +3909,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox18"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment61"> <property name="visible">True</property> @@ -3924,7 +3920,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox7"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkHBox" id="hbox81"> <property name="visible">True</property> @@ -3967,7 +3962,6 @@ no-dct-decimate=0:cabac=1</property> <object class="GtkVBox" id="vbox49"> <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> - <property name="orientation">vertical</property> <child> <object class="GtkRadioButton" id="AudioDUB"> <property name="label" translatable="yes">DUB Foreign language audio</property> @@ -4048,7 +4042,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox1"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkAlignment" id="alignment3"> <property name="visible">True</property> @@ -4058,7 +4051,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox3"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="constant_rate_factor"> <property name="label" translatable="yes">Use CRF (Instead of CQP) for Constant Quality encodes</property> @@ -4151,7 +4143,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="EncodeLogLocation"> <property name="label" translatable="yes">Put individual encode logs in same location as movie</property> @@ -4278,7 +4269,6 @@ no-dct-decimate=0:cabac=1</property> <child> <object class="GtkVBox" id="vbox4"> <property name="visible">True</property> - <property name="orientation">vertical</property> <child> <object class="GtkCheckButton" id="allow_tweaks"> <property name="label" translatable="yes">Allow Tweaks</property> diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c index c019f2125..fbe7cce98 100644 --- a/gtk/src/queuehandler.c +++ b/gtk/src/queuehandler.c @@ -1105,31 +1105,67 @@ ghb_queue_buttons_grey(signal_user_data_t *ud) if (show_stop) { gtk_action_set_sensitive (action, TRUE); +#if GTK_CHECK_VERSION(2, 16, 0) gtk_action_set_icon_name(action, "hb-stop"); gtk_action_set_label(action, "S_top Queue"); gtk_action_set_tooltip(action, "Stop Encoding"); +#else + g_object_set_property(G_OBJECT(action), "icon-name", + ghb_string_value("hb-stop")); + g_object_set_property(G_OBJECT(action), "label", + ghb_string_value("S_top Queue")); + g_object_set_property(G_OBJECT(action), "tooltip", + ghb_string_value("Stop Encoding")); +#endif } else { gtk_action_set_sensitive (action, show_start); +#if GTK_CHECK_VERSION(2, 16, 0) gtk_action_set_icon_name(action, "hb-play"); gtk_action_set_label(action, "_Start Queue"); gtk_action_set_tooltip(action, "Start Encoding"); +#else + g_object_set_property(G_OBJECT(action), "icon-name", + ghb_string_value("hb-play")); + g_object_set_property(G_OBJECT(action), "label", + ghb_string_value("_Start Queue")); + g_object_set_property(G_OBJECT(action), "tooltip", + ghb_string_value("Start Encoding")); +#endif } action = GHB_ACTION (ud->builder, "queue_pause_menu"); if (paused) { gtk_action_set_sensitive (action, show_start); +#if GTK_CHECK_VERSION(2, 16, 0) gtk_action_set_icon_name(action, "hb-play"); gtk_action_set_label(action, "_Resume Queue"); gtk_action_set_tooltip(action, "Resume Encoding"); +#else + g_object_set_property(G_OBJECT(action), "icon-name", + ghb_string_value("hb-play")); + g_object_set_property(G_OBJECT(action), "label", + ghb_string_value("_Resume Queue")); + g_object_set_property(G_OBJECT(action), "tooltip", + ghb_string_value("Resume Encoding")); +#endif } else { gtk_action_set_sensitive (action, show_stop); +#if GTK_CHECK_VERSION(2, 16, 0) gtk_action_set_icon_name(action, "hb-pause"); gtk_action_set_label(action, "_Pause Queue"); gtk_action_set_tooltip(action, "Pause Encoding"); +#else + g_object_set_property(G_OBJECT(action), "icon-name", + ghb_string_value("hb-pause")); + g_object_set_property(G_OBJECT(action), "label", + ghb_string_value("_Pause Queue")); + g_object_set_property(G_OBJECT(action), "tooltip", + ghb_string_value("Pause Encoding")); +#endif } } |