adding support for video players

4 files changed, 130 insertions, 8 deletions

diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c
index 6fff57ad..69061efd 100644
--- a/capplets/default-applications/mate-da-capplet.c
+++ b/capplets/default-applications/mate-da-capplet.c
@@ -325,7 +325,7 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
     gboolean is_custom_active;
 
     current_index = gtk_combo_box_get_active (combo);
-    is_custom_active = (current_index >= g_list_length (capplet->media_players));
+    is_custom_active = (current_index >= g_list_length(capplet->media_players));
 
 	if (current_index != -1)
 	{
@@ -348,10 +348,12 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
 					{
 						/* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-vorbis+ogg", NULL);
 						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-scpls", NULL);
 						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/mpeg", NULL);
 						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-wav", NULL);
 						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "audio/x-mpegurl", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/webm", NULL);
 					}
 				}
 
@@ -367,6 +369,59 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
     gtk_widget_set_sensitive(capplet->media_player_terminal_checkbutton, is_custom_active);
 }
 
+static void video_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
+{
+    guint current_index;
+    gboolean is_custom_active;
+
+    current_index = gtk_combo_box_get_active (combo);
+    is_custom_active = (current_index >= g_list_length(capplet->video_players));
+
+	if (current_index != -1)
+	{
+		MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->video_players, current_index);
+
+		if (item != NULL)
+		{
+			/* Para obtener la lista de elementos, y si está en la lista, agregar ese
+			 * item.
+			 * De lo contrario, se crea un elemento especial. */
+			GList* recommended = g_app_info_get_recommended_for_type("video/x-ogm+ogg");
+
+			if (recommended!= NULL)
+			{
+				GList* app;
+
+				for (app = recommended; app != NULL; app = app->next)
+				{
+					/* nice hack bro */
+					if (strcmp(item->executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0)
+					{
+						/* por alguna extraña razon, solo se usa mailto, en vez de mail. */
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/mpeg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-mpeg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/msvideo", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/quicktime", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-avi", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-ogm+ogg", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-matroska", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/webm", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/mp4", NULL);
+						g_app_info_set_as_default_for_type((GAppInfo*) app->data, "video/x-flv", NULL);
+					}
+				}
+
+				g_list_free_full(recommended, g_object_unref);
+			}
+		}
+	}
+
+	/* Si, aun falta para poder crear personalizables... */
+	is_custom_active = FALSE;
+    gtk_widget_set_sensitive(capplet->video_player_command_entry, is_custom_active);
+    gtk_widget_set_sensitive(capplet->video_player_command_label, is_custom_active);
+    gtk_widget_set_sensitive(capplet->video_player_terminal_checkbutton, is_custom_active);
+}
 static void terminal_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet)
 {
     guint current_index;
@@ -1006,6 +1061,10 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	capplet->media_player_command_label = get_widget("media_player_command_label");
 	capplet->media_player_terminal_checkbutton = get_widget("media_player_terminal_checkbutton");
 
+	capplet->video_player_command_entry = get_widget("video_command_entry");
+	capplet->video_player_command_label = get_widget("video_command_label");
+	capplet->video_player_terminal_checkbutton = get_widget("video_terminal_checkbox");
+
 	capplet->visual_command_entry = get_widget("visual_command_entry");
 	capplet->visual_command_label = get_widget("visual_command_label");
 	capplet->visual_startup_checkbutton = get_widget("visual_start_checkbutton");
@@ -1030,9 +1089,9 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	capplet->mail_combo_box = get_widget("mail_reader_combobox");
 	capplet->term_combo_box = get_widget("terminal_combobox");
 	capplet->media_combo_box = get_widget("media_player_combobox");
+	capplet->video_combo_box = get_widget("video_combobox");
 	capplet->visual_combo_box = get_widget("visual_combobox");
 	capplet->mobility_combo_box = get_widget("mobility_combobox");
-
 	capplet->text_combo_box = get_widget("text_combobox");
 	capplet->file_combo_box = get_widget("filemanager_combobox");
 	capplet->image_combo_box = get_widget("image_combobox");
@@ -1045,6 +1104,7 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mail_combo_box), capplet->mail_readers);
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->term_combo_box), capplet->terminals);
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->media_combo_box), capplet->media_players);
+	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->video_combo_box), capplet->video_players);
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats);
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats);
 	fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->image_combo_box), capplet->image_viewers);
@@ -1055,6 +1115,7 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 	g_signal_connect(capplet->mail_combo_box, "changed", G_CALLBACK(mail_combo_changed_cb), capplet);
 	g_signal_connect(capplet->term_combo_box, "changed", G_CALLBACK(terminal_combo_changed_cb), capplet);
 	g_signal_connect(capplet->media_combo_box, "changed", G_CALLBACK(media_combo_changed_cb), capplet);
+	g_signal_connect(capplet->video_combo_box, "changed", G_CALLBACK(video_combo_changed_cb), capplet);
 	g_signal_connect(capplet->visual_combo_box, "changed", G_CALLBACK(visual_combo_changed_cb), capplet);
 	g_signal_connect(capplet->mobility_combo_box, "changed", G_CALLBACK(mobility_combo_changed_cb), capplet);
 	g_signal_connect(capplet->image_combo_box, "changed", G_CALLBACK(image_combo_changed_cb), capplet);
@@ -1127,6 +1188,25 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page)
 		capplet->media_player_terminal_checkbutton,
 		NULL);
 
+	/* Video player */
+	mateconf_peditor_new_combo_box (NULL,
+		DEFAULT_APPS_KEY_VIDEO_EXEC,
+		capplet->video_combo_box,
+		"conv-from-widget-cb", combo_conv_from_widget,
+		"conv-to-widget-cb", combo_conv_to_widget,
+		"data", capplet->video_players,
+		NULL);
+
+	mateconf_peditor_new_string (NULL,
+		DEFAULT_APPS_KEY_VIDEO_EXEC,
+		capplet->video_player_command_entry,
+		NULL);
+
+	mateconf_peditor_new_boolean (NULL,
+		DEFAULT_APPS_KEY_VIDEO_NEEDS_TERM,
+		capplet->video_player_terminal_checkbutton,
+		NULL);
+
 	/* Image viewer */
 	mateconf_peditor_new_combo_box(NULL,
 		DEFAULT_APPS_KEY_IMAGE_EXEC,
diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h
index 3b9d328f..2dc7487f 100644
--- a/capplets/default-applications/mate-da-capplet.h
+++ b/capplets/default-applications/mate-da-capplet.h
@@ -62,6 +62,10 @@
 #define DEFAULT_APPS_KEY_MEDIA_EXEC        DEFAULT_APPS_KEY_MEDIA_PATH"/exec"
 #define DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM  DEFAULT_APPS_KEY_MEDIA_PATH"/needs_term"
 
+#define DEFAULT_APPS_KEY_VIDEO_PATH        "/desktop/mate/applications/video"
+#define DEFAULT_APPS_KEY_VIDEO_EXEC        DEFAULT_APPS_KEY_VIDEO_PATH"/exec"
+#define DEFAULT_APPS_KEY_VIDEO_NEEDS_TERM  DEFAULT_APPS_KEY_VIDEO_PATH"/needs_term"
+
 #define DEFAULT_APPS_KEY_IMAGE_PATH        "/desktop/mate/applications/image"
 #define DEFAULT_APPS_KEY_IMAGE_EXEC        DEFAULT_APPS_KEY_IMAGE_PATH"/exec"
 #define DEFAULT_APPS_KEY_IMAGE_NEEDS_TERM  DEFAULT_APPS_KEY_IMAGE_PATH"/needs_term"
@@ -93,6 +97,7 @@ typedef struct _MateDACapplet {
 	GtkWidget* mail_combo_box;
 	GtkWidget* term_combo_box;
 	GtkWidget* media_combo_box;
+	GtkWidget* video_combo_box;
 	GtkWidget* visual_combo_box;
 	GtkWidget* mobility_combo_box;
 	/* Para el File Manager */
@@ -140,6 +145,11 @@ typedef struct _MateDACapplet {
 	GtkWidget* media_player_command_label;
 	GtkWidget* media_player_terminal_checkbutton;
 
+	/* reproductor de videos */
+	GtkWidget* video_player_command_entry;
+	GtkWidget* video_player_command_label;
+	GtkWidget* video_player_terminal_checkbutton;
+
 	/* accesibilidad visual */
 	GtkWidget* visual_command_entry;
 	GtkWidget* visual_command_label;
@@ -157,6 +167,7 @@ typedef struct _MateDACapplet {
 	GList* mail_readers;
 	GList* terminals;
 	GList* media_players;
+	GList* video_players;
 	GList* visual_ats;
 	GList* mobility_ats;
 	GList* file_managers;
diff --git a/capplets/default-applications/mate-da-xml.c b/capplets/default-applications/mate-da-xml.c
index eba290db..46b31789 100644
--- a/capplets/default-applications/mate-da-xml.c
+++ b/capplets/default-applications/mate-da-xml.c
@@ -148,6 +148,7 @@ static void mate_da_xml_load_xml(MateDACapplet* capplet, const gchar* filename)
 	MateDAImageItem* image_item;
 	MateDATextItem* text_item;
 	MateDAFileItem* file_item;
+	MateDASimpleItem* video_item;
 
 	xml_doc = xmlParseFile(filename);
 
@@ -278,6 +279,34 @@ static void mate_da_xml_load_xml(MateDACapplet* capplet, const gchar* filename)
 				}
 			}
 		}
+		else if (!xmlStrncmp(section->name, (const xmlChar*) "video-players", strlen("video-players")))
+		{
+			for (element = section->children; element != NULL; element = element->next)
+			{
+				if (!xmlStrncmp (element->name, (const xmlChar*) "video-player", strlen("video-player")))
+				{
+					executable = mate_da_xml_get_string(element, "executable");
+
+					if (is_executable_valid(executable))
+					{
+						video_item = mate_da_simple_item_new();
+
+						video_item->generic.name = mate_da_xml_get_string (element, "name");
+						video_item->generic.executable = executable;
+						video_item->generic.command = mate_da_xml_get_string (element, "command");
+						video_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name");
+
+						video_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal");
+
+						capplet->video_players = g_list_append (capplet->video_players, video_item);
+					}
+					else
+					{
+						g_free(executable);
+					}
+				}
+			}
+		}
 		else if (!xmlStrncmp(section->name, (const xmlChar*) "image-viewers", strlen("image-viewers")))
 		{
 			for (element = section->children; element != NULL; element = element->next)
@@ -454,6 +483,7 @@ void mate_da_xml_free(MateDACapplet* capplet)
 	g_list_foreach(capplet->mail_readers, (GFunc) mate_da_simple_item_free, NULL);
 	g_list_foreach(capplet->terminals, (GFunc) mate_da_term_item_free, NULL);
 	g_list_foreach(capplet->media_players, (GFunc) mate_da_simple_item_free, NULL);
+	g_list_foreach(capplet->video_players, (GFunc) mate_da_simple_item_free, NULL);
 	g_list_foreach(capplet->visual_ats, (GFunc) mate_da_visual_item_free, NULL);
 	g_list_foreach(capplet->mobility_ats, (GFunc) mate_da_mobility_item_free, NULL);
 	g_list_foreach(capplet->image_viewers, (GFunc) mate_da_image_item_free, NULL);
@@ -464,6 +494,7 @@ void mate_da_xml_free(MateDACapplet* capplet)
 	g_list_free(capplet->mail_readers);
 	g_list_free(capplet->terminals);
 	g_list_free(capplet->media_players);
+	g_list_free(capplet->video_players);
 	g_list_free(capplet->visual_ats);
 	g_list_free(capplet->mobility_ats);
 	g_list_free(capplet->image_viewers);
diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in
index 204e562a..43438ae2 100644
--- a/capplets/default-applications/mate-default-applications.xml.in
+++ b/capplets/default-applications/mate-default-applications.xml.in
@@ -532,25 +532,25 @@
 		<!-- se necesita agregar los otros reproductores de musica -->
 	</music-players>
 
-	<media-players>
+	<video-players>
 
-		<media-player>
+		<video-player>
 			<_name>VLC</_name>
 			<executable>vlc</executable>
 			<command>vlc %s</command>
 			<icon-name>vlc</icon-name>
 			<run-in-terminal>false</run-in-terminal>
-		</media-player>
+		</video-player>
 
-		<media-player>
+		<video-player>
 			<_name>Totem Movie Player</_name>
 			<executable>totem</executable>
 			<command>totem</command>
 			<icon-name>totem</icon-name>
 			<run-in-terminal>false</run-in-terminal>
-		</media-player>
+		</video-player>
 
-	</media-players>
+	</video-players>
 
 	<text-editors>