Merge branch 'master' of https://github.com/mate-desktop/mate-control-center

1 files changed, 50 insertions, 11 deletions

diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h
index 3ce72955..2dc7487f 100644
--- a/capplets/default-applications/mate-da-capplet.h
+++ b/capplets/default-applications/mate-da-capplet.h
@@ -2,6 +2,7 @@
  *  Authors: Luca Cavalli <[email protected]>
  *
  *  Copyright 2005-2006 Luca Cavalli
+ *  Copyright 2010 Perberos <[email protected]>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of version 2 of the GNU General Public License
@@ -61,6 +62,22 @@
 #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"
+
+#define DEFAULT_APPS_KEY_TEXT_PATH        "/desktop/mate/applications/text"
+#define DEFAULT_APPS_KEY_TEXT_EXEC        DEFAULT_APPS_KEY_TEXT_PATH"/exec"
+#define DEFAULT_APPS_KEY_TEXT_NEEDS_TERM  DEFAULT_APPS_KEY_TEXT_PATH"/needs_term"
+
+#define DEFAULT_APPS_KEY_FILE_PATH        "/desktop/mate/applications/file"
+#define DEFAULT_APPS_KEY_FILE_EXEC        DEFAULT_APPS_KEY_FILE_PATH"/exec"
+#define DEFAULT_APPS_KEY_FILE_NEEDS_TERM  DEFAULT_APPS_KEY_FILE_PATH"/needs_term"
+
 #define DEFAULT_APPS_KEY_VISUAL_PATH  "/desktop/mate/applications/at/visual"
 #define DEFAULT_APPS_KEY_VISUAL_EXEC  DEFAULT_APPS_KEY_VISUAL_PATH"/exec"
 #define DEFAULT_APPS_KEY_VISUAL_STARTUP DEFAULT_APPS_KEY_VISUAL_PATH"/startup"
@@ -69,9 +86,7 @@
 #define DEFAULT_APPS_KEY_MOBILITY_EXEC  DEFAULT_APPS_KEY_MOBILITY_PATH"/exec"
 #define DEFAULT_APPS_KEY_MOBILITY_STARTUP DEFAULT_APPS_KEY_MOBILITY_PATH"/startup"
 
-typedef struct _MateDACapplet MateDACapplet;
-
-struct _MateDACapplet {
+typedef struct _MateDACapplet {
 	GtkBuilder* builder;
 
 	GtkIconTheme* icon_theme;
@@ -82,11 +97,16 @@ 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 */
-	/*GtkWidget* filemanager_combo_box;*/
+	GtkWidget* file_combo_box;
+	GtkWidget* text_combo_box;
+	GtkWidget* image_combo_box;
 
+	/* navegador web
+	 * por el momento default,new_win,new_tab no se utilizan */
 	GtkWidget* web_browser_command_entry;
 	GtkWidget* web_browser_command_label;
 	GtkWidget* web_browser_terminal_checkbutton;
@@ -95,45 +115,64 @@ struct _MateDACapplet {
 	GtkWidget* new_tab_radiobutton;
 
 	/* Para el File Manager */
-	/*GtkWidget* file_manager_command_entry;
+	GtkWidget* file_manager_command_entry;
 	GtkWidget* file_manager_command_label;
 	GtkWidget* file_manager_terminal_checkbutton;
-	GtkWidget* file_manager_default_radiobutton;
-	GtkWidget* file_manager_new_win_radiobutton;
-	GtkWidget* file_manager_new_tab_radiobutton;*/
 
+	/* editor de texto */
+	GtkWidget* text_editor_command_entry;
+	GtkWidget* text_editor_command_label;
+	GtkWidget* text_editor_terminal_checkbutton;
 
+	/* cliente de correo */
 	GtkWidget* mail_reader_command_entry;
 	GtkWidget* mail_reader_command_label;
 	GtkWidget* mail_reader_terminal_checkbutton;
 
+	/* terminal */
 	GtkWidget* terminal_command_entry;
 	GtkWidget* terminal_command_label;
 	GtkWidget* terminal_exec_flag_entry;
 	GtkWidget* terminal_exec_flag_label;
 
+	/* visor de imagenes */
+	GtkWidget* image_viewer_command_entry;
+	GtkWidget* image_viewer_command_label;
+	GtkWidget* image_viewer_terminal_checkbutton;
+
+	/* reproductor de musica */
 	GtkWidget* media_player_command_entry;
 	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;
 	GtkWidget* visual_startup_checkbutton;
 
+	/* accesibilidad motriz */
 	GtkWidget* mobility_command_entry;
 	GtkWidget* mobility_command_label;
 	GtkWidget* mobility_startup_checkbutton;
 
+
 	MateConfClient* mateconf;
 
 	GList* web_browsers;
 	GList* mail_readers;
 	GList* terminals;
 	GList* media_players;
+	GList* video_players;
 	GList* visual_ats;
 	GList* mobility_ats;
-	/* Para el File Manager */
-	/*GList* file_managers;*/
-};
+	GList* file_managers;
+	GList* text_editors;
+	GList* image_viewers;
+} MateDACapplet;
 
 #endif