Attachment #289395 for bug #385121

Lines 38-44 Link Here

(-)configure.in (-1 lines)
38	AM_MAINTAINER_MODE	38	AM_MAINTAINER_MODE
39		39
40	CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"	40	CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
41	CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
42	CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"	41	CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
43		42
44	CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"	43	CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"

Lines 631-636 Link Here

(-)src/ogmrip-profile-editor.c (-2 / +7 lines)
631	{	631	{
632	GType codec;	632	GType codec;
633	GtkTreeModel *model;	633	GtkTreeModel *model;
		634	GtkTreeIter iter;
634	gboolean exists;	635	gboolean exists;
635	gint active;	636	gint active;
636	gchar *name;	637	gchar *name;
Lines 641-651 Link Here
641	codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name);	642	codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name);
642	g_free (name);	643	g_free (name);
643		644
644	gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER);	645	if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER))
		646	gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
645		647
646	exists = ogmrip_options_plugin_exists (codec);	648	exists = ogmrip_options_plugin_exists (codec);
647	if (exists)	649	if (exists)
648	gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User"));	650	{
		651	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
		652	gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1);
		653	}
649		654
650	active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo));	655	active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo));
651		656




}

static void
ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale)
{
  if (event->button == 1)
  {
    gulong frame;
    gchar *text;

    frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
    text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
    gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
    g_free (text);

    ogmrip_crop_dialog_grab_frame (dialog, frame);
  }
}

G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)

  dialog->priv->label = glade_xml_get_widget (xml, "frame-label");

  dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");
  g_signal_connect_swapped (dialog->priv->scale, "button-release-event",
      G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog);
      G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog);

  g_object_unref (xml);
}

Lines 207-213 Link Here

(-)libogmrip-gtk/ogmrip-source-chooser-widget.c (+9 lines)
207	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);	207	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
208	gtk_widget_show (label);	208	gtk_widget_show (label);
209		209
		210	#if GTK_CHECK_VERSION(2,24,0)
		211	combo = gtk_combo_box_text_new ();
		212	#else
210	combo = gtk_combo_box_new_text ();	213	combo = gtk_combo_box_new_text ();
		214	#endif
		215
211	gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);	216	gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
212	gtk_widget_show (combo);	217	gtk_widget_show (combo);
213		218
Lines 231-237 Link Here
231	{	236	{
232	str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME],	237	str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME],
233	ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]);	238	ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]);
		239	#if GTK_CHECK_VERSION(2,24,0)
		240	gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str);
		241	#else
234	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str);	242	gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str);
		243	#endif
235	g_free (str);	244	g_free (str);
236		245
237	if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0)	246	if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0)

Lines 297-305 Link Here

(-)libogmrip-gtk/ogmrip-x264-options.c (-2 / +9 lines)
297	gtk_widget_set_sensitive (dialog->me_combo, x264_have_me);	297	gtk_widget_set_sensitive (dialog->me_combo, x264_have_me);
298		298
299	if (x264_have_me_tesa)	299	if (x264_have_me_tesa)
300	gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo),	300	{
301	_("Transformed Exhaustive search (tesa - even slower)"));	301	GtkTreeModel *model;
		302	GtkTreeIter iter;
302		303
		304	model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo));
		305	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
		306	gtk_list_store_set (GTK_LIST_STORE (model), &iter,
		307	0, _("Transformed Exhaustive search (tesa - even slower)"), -1);
		308	}
		309
303	dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin");	310	dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin");
304	gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me);	311	gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me);
305		312

Return to bug 385121

Lines 218-234 Link Here

(-)src/ogmrip-crop-dialog.c (-11 / +13 lines)
218	}	218	}
219		219
220	static void	220	static void
221	ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog dialog, GtkWidget scale)	221	ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog dialog, GdkEventButton event, GtkWidget *scale)
222	{	222	{
223	gulong frame;	223	if (event->button == 1)
224	gchar *text;	224	{
		225	gulong frame;
		226	gchar *text;
225		227
226	frame = (guint) gtk_range_get_value (GTK_RANGE (scale));	228	frame = (guint) gtk_range_get_value (GTK_RANGE (scale));
227	text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);	229	text = g_strdup_printf (_("Frame %lu of %lu"), frame, dialog->priv->length);
228	gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);	230	gtk_label_set_text (GTK_LABEL (dialog->priv->label), text);
229	g_free (text);	231	g_free (text);
230		232
231	ogmrip_crop_dialog_grab_frame (dialog, frame);	233	ogmrip_crop_dialog_grab_frame (dialog, frame);
		234	}
232	}	235	}
233		236
234	G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)	237	G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)
Lines 291-299 Link Here
291	dialog->priv->label = glade_xml_get_widget (xml, "frame-label");	294	dialog->priv->label = glade_xml_get_widget (xml, "frame-label");
292		295
293	dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");	296	dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");
294	gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED);	297	g_signal_connect_swapped (dialog->priv->scale, "button-release-event",
295	g_signal_connect_swapped (dialog->priv->scale, "value-changed",	298	G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog);
296	G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog);
297		299
298	g_object_unref (xml);	300	g_object_unref (xml);
299	}	301	}