You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
149 lines
5.0 KiB
149 lines
5.0 KiB
--- configure.in
|
|
+++ configure.in
|
|
@@ -38,7 +38,6 @@
|
|
AM_MAINTAINER_MODE
|
|
|
|
CFLAGS="$CFLAGS -g -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
|
|
-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"
|
|
CFLAGS="$CFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
|
|
|
|
CPPFLAGS="$CPPFLAGS -I/usr/local/include -I.. -Wall -D_FORTIFY_SOURCE=2"
|
|
--- ChangeLog
|
|
+++ ChangeLog
|
|
@@ -1,5 +1,15 @@
|
|
-19 Aug 2011 Olivier Rolland <billl@users.sf.net>
|
|
+9 Oct 2011 Olivier Rolland <billl@users.sf.net>
|
|
|
|
+ * configure.in
|
|
+ * src/ogmrip-profile-editor.c
|
|
+ * src/ogmrip-crop-dialog.c
|
|
+ * libogmrip-gtk/ogmrip-source-chooser-widget.c
|
|
+ * libogmrip-gtk/ogmrip-x264-options.c
|
|
+
|
|
+ Removed deprecated GTK+ functions
|
|
+
|
|
+19 Sep 2011 Olivier Rolland <billl@users.sf.net>
|
|
+
|
|
Released OGMRip-0.13.7
|
|
|
|
19 Sep 2011 Olivier Rolland <billl@users.sf.net>
|
|
--- src/ogmrip-profile-editor.c
|
|
+++ src/ogmrip-profile-editor.c
|
|
@@ -631,6 +631,7 @@
|
|
{
|
|
GType codec;
|
|
GtkTreeModel *model;
|
|
+ GtkTreeIter iter;
|
|
gboolean exists;
|
|
gint active;
|
|
gchar *name;
|
|
@@ -641,11 +642,15 @@
|
|
codec = ogmrip_profile_editor_dialog_get_video_codec_type (dialog, name);
|
|
g_free (name);
|
|
|
|
- gtk_combo_box_remove_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), OGMRIP_VIDEO_PRESET_USER);
|
|
+ if (gtk_tree_model_iter_nth_child (model, &iter, NULL, OGMRIP_VIDEO_PRESET_USER))
|
|
+ gtk_list_store_remove (GTK_LIST_STORE (model), &iter);
|
|
|
|
exists = ogmrip_options_plugin_exists (codec);
|
|
if (exists)
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->priv->video_preset_combo), _("User"));
|
|
+ {
|
|
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
|
|
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter, 0, _("User"), -1);
|
|
+ }
|
|
|
|
active = gtk_combo_box_get_active (GTK_COMBO_BOX (dialog->priv->video_preset_combo));
|
|
|
|
--- src/ogmrip-crop-dialog.c
|
|
+++ src/ogmrip-crop-dialog.c
|
|
@@ -218,17 +218,20 @@
|
|
}
|
|
|
|
static void
|
|
-ogmrip_crop_dialog_scale_value_changed (OGMRipCropDialog *dialog, GtkWidget *scale)
|
|
+ogmrip_crop_dialog_scale_button_released (OGMRipCropDialog *dialog, GdkEventButton *event, GtkWidget *scale)
|
|
{
|
|
- gulong frame;
|
|
- gchar *text;
|
|
+ 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);
|
|
+ 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);
|
|
+ ogmrip_crop_dialog_grab_frame (dialog, frame);
|
|
+ }
|
|
}
|
|
|
|
G_DEFINE_TYPE (OGMRipCropDialog, ogmrip_crop_dialog, GTK_TYPE_DIALOG)
|
|
@@ -291,9 +294,8 @@
|
|
dialog->priv->label = glade_xml_get_widget (xml, "frame-label");
|
|
|
|
dialog->priv->scale = glade_xml_get_widget (xml, "frame-scale");
|
|
- gtk_range_set_update_policy (GTK_RANGE (dialog->priv->scale), GTK_UPDATE_DELAYED);
|
|
- g_signal_connect_swapped (dialog->priv->scale, "value-changed",
|
|
- G_CALLBACK (ogmrip_crop_dialog_scale_value_changed), dialog);
|
|
+ g_signal_connect_swapped (dialog->priv->scale, "button-release-event",
|
|
+ G_CALLBACK (ogmrip_crop_dialog_scale_button_released), dialog);
|
|
|
|
g_object_unref (xml);
|
|
}
|
|
--- libogmrip-gtk/ogmrip-source-chooser-widget.c
|
|
+++ libogmrip-gtk/ogmrip-source-chooser-widget.c
|
|
@@ -207,7 +207,12 @@
|
|
gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
|
|
gtk_widget_show (label);
|
|
|
|
+#if GTK_CHECK_VERSION(2,24,0)
|
|
+ combo = gtk_combo_box_text_new ();
|
|
+#else
|
|
combo = gtk_combo_box_new_text ();
|
|
+#endif
|
|
+
|
|
gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
|
|
gtk_widget_show (combo);
|
|
|
|
@@ -231,7 +236,11 @@
|
|
{
|
|
str = g_strdup_printf ("%s (%s)", ogmdvd_languages[i][OGMDVD_LANGUAGE_NAME],
|
|
ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1]);
|
|
+#if GTK_CHECK_VERSION(2,24,0)
|
|
+ gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), str);
|
|
+#else
|
|
gtk_combo_box_append_text (GTK_COMBO_BOX (combo), str);
|
|
+#endif
|
|
g_free (str);
|
|
|
|
if (strncmp (ogmdvd_languages[i][OGMDVD_LANGUAGE_ISO639_1], lang, 2) == 0)
|
|
--- libogmrip-gtk/ogmrip-x264-options.c
|
|
+++ libogmrip-gtk/ogmrip-x264-options.c
|
|
@@ -299,9 +299,16 @@
|
|
gtk_widget_set_sensitive (dialog->me_combo, x264_have_me);
|
|
|
|
if (x264_have_me_tesa)
|
|
- gtk_combo_box_append_text (GTK_COMBO_BOX (dialog->me_combo),
|
|
- _("Transformed Exhaustive search (tesa - even slower)"));
|
|
+ {
|
|
+ GtkTreeModel *model;
|
|
+ GtkTreeIter iter;
|
|
|
|
+ model = gtk_combo_box_get_model (GTK_COMBO_BOX (dialog->me_combo));
|
|
+ gtk_list_store_append (GTK_LIST_STORE (model), &iter);
|
|
+ gtk_list_store_set (GTK_LIST_STORE (model), &iter,
|
|
+ 0, _("Transformed Exhaustive search (tesa - even slower)"), -1);
|
|
+ }
|
|
+
|
|
dialog->merange_spin = glade_xml_get_widget (xml, "merange-spin");
|
|
gtk_widget_set_sensitive (dialog->merange_spin, x264_have_me);
|
|
|