From 12eae9fdc68e3186b290b3779842d313aed89454 Mon Sep 17 00:00:00 2001 From: Perberos Date: Mon, 5 Dec 2011 06:16:26 -0300 Subject: moving default-applications icon to mate-icon-theme --- capplets/default-applications/Makefile.am | 24 --------------------- .../preferences-desktop-default-applications.png | Bin 748 -> 0 bytes .../preferences-desktop-default-applications.png | Bin 1310 -> 0 bytes .../preferences-desktop-default-applications.png | Bin 1340 -> 0 bytes .../preferences-desktop-default-applications.png | Bin 1727 -> 0 bytes .../preferences-desktop-default-applications.png | Bin 2825 -> 0 bytes 6 files changed, 24 deletions(-) delete mode 100644 capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png delete mode 100644 capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png delete mode 100644 capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png delete mode 100644 capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png delete mode 100644 capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png (limited to 'capplets/default-applications') diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index b6487ec7..8ad7740d 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -45,30 +45,6 @@ INCLUDES = \ -DMATECC_UI_DIR=\""$(uidir)"\" \ -DMATECC_APPS_DIR=\""$(xmldatadir)"\" -icons16dir = $(datadir)/icons/mate/16x16/apps -dist_icons16_DATA = icons/16x16/preferences-desktop-default-applications.png -icons22dir = $(datadir)/icons/mate/22x22/apps -dist_icons22_DATA = icons/22x22/preferences-desktop-default-applications.png -icons24dir = $(datadir)/icons/mate/24x24/apps -dist_icons24_DATA = icons/24x24/preferences-desktop-default-applications.png -icons32dir = $(datadir)/icons/mate/32x32/apps -dist_icons32_DATA = icons/32x32/preferences-desktop-default-applications.png -icons48dir = $(datadir)/icons/mate/48x48/apps -dist_icons48_DATA = icons/48x48/preferences-desktop-default-applications.png - -gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor -uninstall-hook: update-icon-cache -install-data-hook: update-icon-cache -update-icon-cache: - @-if test -z "$(DESTDIR)"; then \ - echo "Updating Gtk icon cache."; \ - $(gtk_update_icon_cache); \ - else \ - echo "*** Icon cache not updated. After install, run this:"; \ - echo "*** $(gtk_update_icon_cache)"; \ - fi - - CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(xmldata_DATA) $(autostart_DATA) $(bin_SCRIPTS) EXTRA_DIST = $(xmldata_in_files) mate-default-applications.pc.in diff --git a/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png b/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png deleted file mode 100644 index 41a765aa..00000000 Binary files a/capplets/default-applications/icons/16x16/preferences-desktop-default-applications.png and /dev/null differ diff --git a/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png b/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png deleted file mode 100644 index 83b6826c..00000000 Binary files a/capplets/default-applications/icons/22x22/preferences-desktop-default-applications.png and /dev/null differ diff --git a/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png b/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png deleted file mode 100644 index 630ea040..00000000 Binary files a/capplets/default-applications/icons/24x24/preferences-desktop-default-applications.png and /dev/null differ diff --git a/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png b/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png deleted file mode 100644 index 23718f78..00000000 Binary files a/capplets/default-applications/icons/32x32/preferences-desktop-default-applications.png and /dev/null differ diff --git a/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png b/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png deleted file mode 100644 index ac25569d..00000000 Binary files a/capplets/default-applications/icons/48x48/preferences-desktop-default-applications.png and /dev/null differ -- cgit v1.2.1 From efae0c7ddeba8f96fe6d6c6d1a1bcae582f8836b Mon Sep 17 00:00:00 2001 From: Perberos Date: Mon, 5 Dec 2011 06:31:39 -0300 Subject: fixing xdg issue with web browsers and email clients on default applications.\n Adding useless file-manager,instant-message, text-editor tabs for future use. --- capplets/default-applications/mate-da-capplet.c | 625 +++-- capplets/default-applications/mate-da-capplet.h | 10 +- capplets/default-applications/mate-da-item.h | 4 +- capplets/default-applications/mate-da-xml.c | 69 +- .../mate-default-applications-properties.ui | 2916 ++++++++++---------- .../mate-default-applications.xml.in | 816 +++--- 6 files changed, 2331 insertions(+), 2109 deletions(-) (limited to 'capplets/default-applications') diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c index 37a01359..0f2950c2 100644 --- a/capplets/default-applications/mate-da-capplet.c +++ b/capplets/default-applications/mate-da-capplet.c @@ -3,6 +3,7 @@ * * Copyright 2005-2006 Luca Cavalli * Copyright 2008 Thomas Wood + * Copyright 2010 Perberos * * 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 @@ -20,7 +21,7 @@ */ #ifdef HAVE_CONFIG_H -#include + #include #endif #include @@ -52,11 +53,11 @@ static void close_cb(GtkWidget* window, gint response, gpointer user_data) } } -static void set_icon (GtkImage* image, GtkIconTheme* theme, const char* name) +static void set_icon(GtkImage* image, GtkIconTheme* theme, const char* name) { - GdkPixbuf* pixbuf; + GdkPixbuf* pixbuf = gtk_icon_theme_load_icon(theme, name, 48, 0, NULL); - if ((pixbuf = gtk_icon_theme_load_icon(theme, name, 48, 0, NULL))) + if (pixbuf) { gtk_image_set_from_pixbuf(image, pixbuf); g_object_unref(pixbuf); @@ -65,38 +66,80 @@ static void set_icon (GtkImage* image, GtkIconTheme* theme, const char* name) static void web_radiobutton_toggled_cb(GtkWidget* togglebutton, MateDACapplet* capplet) { - gint index; - MateDAWebItem *item; - const gchar *command; - GError *error = NULL; + gint index; + MateDAWebItem* item; + const gchar* command; + GError* error = NULL; - index = gtk_combo_box_get_active (GTK_COMBO_BOX (capplet->web_combo_box)); + index = gtk_combo_box_get_active(GTK_COMBO_BOX(capplet->web_combo_box)); - if (index == -1) - return; + if (index == -1) + { + return; + } - item = (MateDAWebItem *) g_list_nth_data (capplet->web_browsers, index); - if (item == NULL) - return; + item = (MateDAWebItem*) g_list_nth_data(capplet->web_browsers, index); - if (togglebutton == capplet->new_win_radiobutton) { - command = item->win_command; - } - else if (togglebutton == capplet->new_tab_radiobutton) { - command = item->tab_command; - } - else { - command = item->generic.command; - } + if (item == NULL) + { + return; + } - mateconf_client_set_string (capplet->mateconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); + if (togglebutton == capplet->new_win_radiobutton) + { + command = item->win_command; + } + else if (togglebutton == capplet->new_tab_radiobutton) + { + command = item->tab_command; + } + else + { + command = item->generic.command; + } - gtk_entry_set_text (GTK_ENTRY (capplet->web_browser_command_entry), command); + mateconf_client_set_string(capplet->mateconf, DEFAULT_APPS_KEY_HTTP_EXEC, command, &error); - if (error != NULL) { - g_warning (_("Error saving configuration: %s"), error->message); - g_error_free (error); - } + if (error != NULL) + { + g_warning(_("Error saving configuration: %s"), error->message); + g_error_free(error); + } + + /* 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("x-scheme-handler/http"); + + if (recommended!= NULL) + { + GList* app; + + for (app = recommended; app != NULL; app = app->next) + { + /* nice hack bro */ + if (strcmp(item->generic.executable, g_app_info_get_executable((GAppInfo*) app->data)) == 0) + { + /* establecemos el item */ + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/http", NULL); + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/https", NULL); + + /* about:config es usado por mozilla firefox y algunos otros con + * webtoolkit */ + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "x-scheme-handler/about", NULL); + } + } + + g_list_free_full(recommended, g_object_unref); + } + + gtk_entry_set_text(GTK_ENTRY(capplet->web_browser_command_entry), command); + + if (error != NULL) + { + g_warning(_("Error saving configuration: %s"), error->message); + g_error_free(error); + } } static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) @@ -104,41 +147,48 @@ static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) guint current_index; gboolean is_custom_active; gboolean has_net_remote; - MateDAWebItem *item; - GtkWidget *active = NULL; - - current_index = gtk_combo_box_get_active (combo); - - if (current_index < g_list_length (capplet->web_browsers)) { + MateDAWebItem* item; + GtkWidget* active = NULL; - item = (MateDAWebItem*) g_list_nth_data (capplet->web_browsers, current_index); - has_net_remote = item->netscape_remote; - is_custom_active = FALSE; + current_index = gtk_combo_box_get_active(combo); + if (current_index < g_list_length(capplet->web_browsers)) + { + item = (MateDAWebItem*) g_list_nth_data(capplet->web_browsers, current_index); + has_net_remote = item->netscape_remote; + is_custom_active = FALSE; } - else { + else + { has_net_remote = FALSE; is_custom_active = TRUE; } - gtk_widget_set_sensitive (capplet->default_radiobutton, has_net_remote); - gtk_widget_set_sensitive (capplet->new_win_radiobutton, has_net_remote); - gtk_widget_set_sensitive (capplet->new_tab_radiobutton, has_net_remote); - gtk_widget_set_sensitive (capplet->web_browser_command_entry, is_custom_active); - gtk_widget_set_sensitive (capplet->web_browser_command_label, is_custom_active); - gtk_widget_set_sensitive (capplet->web_browser_terminal_checkbutton, is_custom_active); + gtk_widget_set_sensitive(capplet->default_radiobutton, has_net_remote); + gtk_widget_set_sensitive(capplet->new_win_radiobutton, has_net_remote); + gtk_widget_set_sensitive(capplet->new_tab_radiobutton, has_net_remote); - if (has_net_remote) { + gtk_widget_set_sensitive(capplet->web_browser_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->web_browser_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->web_browser_terminal_checkbutton, is_custom_active); - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_win_radiobutton))) + if (has_net_remote) + { + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(capplet->new_win_radiobutton))) + { active = capplet->new_win_radiobutton; - else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (capplet->new_tab_radiobutton))) + } + else if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(capplet->new_tab_radiobutton))) + { active = capplet->new_tab_radiobutton; + } else + { active = capplet->default_radiobutton; + } } - web_radiobutton_toggled_cb (active, capplet); + web_radiobutton_toggled_cb(active, capplet); } /* FIXME: Refactor these two functions below into one... */ @@ -147,12 +197,42 @@ static void mail_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->mail_readers)); + current_index = gtk_combo_box_get_active(combo); + is_custom_active = (current_index >= g_list_length(capplet->mail_readers)); - gtk_widget_set_sensitive (capplet->mail_reader_command_entry, is_custom_active); - gtk_widget_set_sensitive (capplet->mail_reader_command_label, is_custom_active); - gtk_widget_set_sensitive (capplet->mail_reader_terminal_checkbutton, is_custom_active); + if (current_index != -1) + { + MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->mail_readers, 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("x-scheme-handler/mailto"); + + 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, "x-scheme-handler/mailto", NULL); + } + } + + g_list_free_full(recommended, g_object_unref); + } + } + } + + gtk_widget_set_sensitive(capplet->mail_reader_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->mail_reader_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->mail_reader_terminal_checkbutton, is_custom_active); } static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) @@ -163,9 +243,9 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) current_index = gtk_combo_box_get_active (combo); is_custom_active = (current_index >= g_list_length (capplet->media_players)); - gtk_widget_set_sensitive (capplet->media_player_command_entry, is_custom_active); - gtk_widget_set_sensitive (capplet->media_player_command_label, is_custom_active); - gtk_widget_set_sensitive (capplet->media_player_terminal_checkbutton, is_custom_active); + gtk_widget_set_sensitive(capplet->media_player_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->media_player_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->media_player_terminal_checkbutton, is_custom_active); } static void terminal_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) @@ -173,13 +253,13 @@ static void terminal_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->terminals)); + current_index = gtk_combo_box_get_active(combo); + is_custom_active = (current_index >= g_list_length(capplet->terminals)); - gtk_widget_set_sensitive (capplet->terminal_command_entry, is_custom_active); - gtk_widget_set_sensitive (capplet->terminal_command_label, is_custom_active); - gtk_widget_set_sensitive (capplet->terminal_exec_flag_entry, is_custom_active); - gtk_widget_set_sensitive (capplet->terminal_exec_flag_label, is_custom_active); + gtk_widget_set_sensitive(capplet->terminal_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->terminal_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->terminal_exec_flag_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->terminal_exec_flag_label, is_custom_active); } static void visual_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) @@ -187,11 +267,11 @@ static void visual_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->visual_ats)); + current_index = gtk_combo_box_get_active(combo); + is_custom_active = (current_index >= g_list_length(capplet->visual_ats)); - gtk_widget_set_sensitive (capplet->visual_command_entry, is_custom_active); - gtk_widget_set_sensitive (capplet->visual_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->visual_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->visual_command_label, is_custom_active); } static void mobility_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) @@ -233,41 +313,39 @@ static void refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box, } static struct { - const gchar* name; - const gchar* icon; + const char* name; + const char* icon; } icons[] = { - {"web_browser_image", "web-browser"}, - {"mail_reader_image", "emblem-mail"}, - {"media_player_image", "applications-multimedia"}, - {"visual_image", "zoom-best-fit"}, - {"mobility_image", "preferences-desktop-accessibility"}, - /* - {"messenger_image", "im"}, - {"file_manager_image", "file-manager"}, - {"image_image", "image-viewer"}, - {"video_image", "mate-multimedia"}, - {"text_image", "text-editor"}, - */ - {"terminal_image", "mate-terminal"} + {"web_browser_image", "web-browser"}, + {"mail_reader_image", "emblem-mail"}, + {"media_player_image", "audio-x-generic"}, /* applications-multimedia */ + {"visual_image", "zoom-best-fit"}, + {"mobility_image", "preferences-desktop-accessibility"}, + {"messenger_image", "user-idle"}, + {"filemanager_image", "file-manager"}, + {"imageviewer_image", "eog"}, /* no hay otra... */ + {"video_image", "video-x-generic"}, + {"text_image", "text-editor"}, + {"terminal_image", "terminal"}, }; static void theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet) { - GObject *icon; + GObject* icon; gint i; - for (i = 0; i < G_N_ELEMENTS (icons); i++) + for (i = 0; i < G_N_ELEMENTS(icons); i++) { - icon = gtk_builder_get_object (capplet->builder, icons[i].name); + icon = gtk_builder_get_object(capplet->builder, icons[i].name); set_icon (GTK_IMAGE (icon), theme, icons[i].icon); } - refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); - refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mail_combo_box), capplet->mail_readers); - refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->media_combo_box), capplet->media_players); - refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->term_combo_box), capplet->terminals); - refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->visual_combo_box), capplet->visual_ats); - refresh_combo_box_icons (theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mail_combo_box), capplet->mail_readers); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->media_combo_box), capplet->media_players); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->term_combo_box), capplet->terminals); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats); } static void screen_changed_cb(GtkWidget* widget, GdkScreen* screen, MateDACapplet* capplet) @@ -322,63 +400,65 @@ static void web_mateconf_changed_cb(MateConfPropertyEditor* peditor, gchar* key, * should also use the same value as HTTP */ - if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) { - gchar *short_browser, *pos; - const gchar *value_str = mateconf_value_get_string (value); + if (strcmp (key, DEFAULT_APPS_KEY_HTTP_EXEC) == 0) + { + gchar *short_browser, *pos; + const gchar *value_str = mateconf_value_get_string (value); - cs = mateconf_change_set_new (); + cs = mateconf_change_set_new (); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value); - pos = strstr (value_str, " "); - if (pos == NULL) - short_browser = g_strdup (value_str); - else - short_browser = g_strndup (value_str, pos - value_str); - mateconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser); - g_free (short_browser); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_EXEC, value); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_EXEC, value); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_EXEC, value); + pos = strstr (value_str, " "); + if (pos == NULL) + short_browser = g_strdup (value_str); + else + short_browser = g_strndup (value_str, pos - value_str); + mateconf_change_set_set_string (cs, DEFAULT_APPS_KEY_BROWSER_EXEC, short_browser); + g_free (short_browser); - list_entry = g_list_find_custom (capplet->web_browsers, - value_str, - (GCompareFunc) web_item_comp); + list_entry = g_list_find_custom (capplet->web_browsers, + value_str, + (GCompareFunc) web_item_comp); - if (list_entry) { - MateDAWebItem *item = (MateDAWebItem *) list_entry->data; + if (list_entry) { + MateDAWebItem *item = (MateDAWebItem *) list_entry->data; - mateconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote); - } + mateconf_change_set_set_bool (cs, DEFAULT_APPS_KEY_BROWSER_NREMOTE, item->netscape_remote); + } - mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error); + mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error); - if (error != NULL) { - g_warning (_("Error saving configuration: %s"), error->message); - g_error_free (error); - error = NULL; - } + if (error != NULL) { + g_warning (_("Error saving configuration: %s"), error->message); + g_error_free (error); + error = NULL; + } - mateconf_change_set_unref (cs); + mateconf_change_set_unref (cs); } - else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) { - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton), - mateconf_value_get_bool (value)); + else if (strcmp (key, DEFAULT_APPS_KEY_HTTP_NEEDS_TERM) == 0) + { + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (capplet->web_browser_terminal_checkbutton), + mateconf_value_get_bool (value)); - cs = mateconf_change_set_new (); + cs = mateconf_change_set_new (); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); - mateconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_HTTPS_NEEDS_TERM, value); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_UNKNOWN_NEEDS_TERM, value); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_ABOUT_NEEDS_TERM, value); + mateconf_change_set_set (cs, DEFAULT_APPS_KEY_BROWSER_NEEDS_TERM, value); - mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error); + mateconf_client_commit_change_set (capplet->mateconf, cs, TRUE, &error); - if (error != NULL) { - g_warning (_("Error saving configuration: %s"), error->message); - g_error_free (error); - error = NULL; - } + if (error != NULL) { + g_warning (_("Error saving configuration: %s"), error->message); + g_error_free (error); + error = NULL; + } - mateconf_change_set_unref (cs); + mateconf_change_set_unref (cs); } } @@ -592,127 +672,131 @@ static MateConfValue* combo_conv_from_widget_term_flag (MateConfPropertyEditor * } } -static MateConfValue* combo_conv_to_widget_term_flag (MateConfPropertyEditor *peditor, const MateConfValue *value) +static MateConfValue* combo_conv_to_widget_term_flag(MateConfPropertyEditor* peditor, const MateConfValue* value) { - MateConfValue *ret; - GtkComboBox *combo; + GtkComboBox* combo = GTK_COMBO_BOX(mateconf_property_editor_get_ui_control(peditor)); - combo = GTK_COMBO_BOX (mateconf_property_editor_get_ui_control (peditor)); + MateConfValue* ret = mateconf_value_new(MATECONF_VALUE_INT); - ret = mateconf_value_new (MATECONF_VALUE_INT); - mateconf_value_set_int (ret, gtk_combo_box_get_active (combo)); - return ret; + mateconf_value_set_int(ret, gtk_combo_box_get_active (combo)); + + return ret; } -static gboolean is_separator (GtkTreeModel *model, GtkTreeIter *iter, gpointer sep_index) +static gboolean is_separator(GtkTreeModel* model, GtkTreeIter* iter, gpointer sep_index) { - GtkTreePath *path; - gboolean result; + GtkTreePath* path = gtk_tree_model_get_path(model, iter); + + gboolean result = gtk_tree_path_get_indices(path)[0] == GPOINTER_TO_INT(sep_index); - path = gtk_tree_model_get_path (model, iter); - result = gtk_tree_path_get_indices (path)[0] == GPOINTER_TO_INT (sep_index); - gtk_tree_path_free (path); + gtk_tree_path_free(path); return result; } -static void fill_combo_box (GtkIconTheme *theme, GtkComboBox *combo_box, GList *app_list) +static void fill_combo_box (GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list) { - GList *entry; - GtkTreeModel *model; - GtkCellRenderer *renderer; - GtkTreeIter iter; - GdkPixbuf *pixbuf; + GList* entry; + GtkTreeModel* model; + GtkCellRenderer* renderer; + GtkTreeIter iter; + GdkPixbuf* pixbuf; - if (theme == NULL) { - theme = gtk_icon_theme_get_default (); - } + if (theme == NULL) + { + theme = gtk_icon_theme_get_default(); + } - gtk_combo_box_set_row_separator_func (combo_box, is_separator, - GINT_TO_POINTER (g_list_length (app_list)), NULL); + gtk_combo_box_set_row_separator_func(combo_box, is_separator, GINT_TO_POINTER(g_list_length(app_list)), NULL); - model = GTK_TREE_MODEL (gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); - gtk_combo_box_set_model (combo_box, model); + model = GTK_TREE_MODEL(gtk_list_store_new (2, GDK_TYPE_PIXBUF, G_TYPE_STRING)); + gtk_combo_box_set_model(combo_box, model); - renderer = gtk_cell_renderer_pixbuf_new (); + renderer = gtk_cell_renderer_pixbuf_new (); - /* not all cells have a pixbuf, this prevents the combo box to shrink */ - gtk_cell_renderer_set_fixed_size (renderer, -1, 22); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, FALSE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, - "pixbuf", PIXBUF_COL, - NULL); + /* not all cells have a pixbuf, this prevents the combo box to shrink */ + gtk_cell_renderer_set_fixed_size(renderer, -1, 22); + gtk_cell_layout_pack_start(GTK_CELL_LAYOUT(combo_box), renderer, FALSE); + gtk_cell_layout_set_attributes(GTK_CELL_LAYOUT(combo_box), renderer, + "pixbuf", PIXBUF_COL, + NULL); - renderer = gtk_cell_renderer_text_new (); - gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); - gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, - "text", TEXT_COL, - NULL); + renderer = gtk_cell_renderer_text_new(); - for (entry = app_list; entry != NULL; entry = g_list_next (entry)) { - MateDAItem *item; - item = (MateDAItem *) entry->data; + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE); + gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer, + "text", TEXT_COL, + NULL); - pixbuf = gtk_icon_theme_load_icon (theme, item->icon_name, 22, 0, NULL); + for (entry = app_list; entry != NULL; entry = g_list_next (entry)) + { + MateDAItem* item = (MateDAItem*) entry->data; - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - PIXBUF_COL, pixbuf, - TEXT_COL, item->name, - -1); + pixbuf = gtk_icon_theme_load_icon(theme, item->icon_name, 22, 0, NULL); - item->icon_path = gtk_tree_model_get_string_from_iter (model, &iter); + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + PIXBUF_COL, pixbuf, + TEXT_COL, item->name, + -1); - if (pixbuf) - g_object_unref (pixbuf); - } + item->icon_path = gtk_tree_model_get_string_from_iter(model, &iter); - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, -1); - gtk_list_store_append (GTK_LIST_STORE (model), &iter); - gtk_list_store_set (GTK_LIST_STORE (model), &iter, - PIXBUF_COL, NULL, - TEXT_COL, _("Custom"), - -1); + if (pixbuf) + { + g_object_unref(pixbuf); + } + } + + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, -1); + gtk_list_store_append(GTK_LIST_STORE(model), &iter); + gtk_list_store_set(GTK_LIST_STORE(model), &iter, + PIXBUF_COL, NULL, + TEXT_COL, _("Custom"), + -1); } -static GtkWidget* _gtk_builder_get_widget (GtkBuilder *builder, const gchar *name) +static GtkWidget* _gtk_builder_get_widget(GtkBuilder* builder, const gchar* name) { - return GTK_WIDGET (gtk_builder_get_object (builder, name)); + return GTK_WIDGET(gtk_builder_get_object(builder, name)); } -static void show_dialog (MateDACapplet* capplet, const gchar* start_page) +static void show_dialog(MateDACapplet* capplet, const gchar* start_page) { - GObject *obj; - GtkBuilder *builder; + GObject* obj; + GtkBuilder* builder; guint builder_result; capplet->builder = builder = gtk_builder_new (); - if (g_file_test (MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) { - builder_result = gtk_builder_add_from_file (builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL); + if (g_file_test(MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) + { + builder_result = gtk_builder_add_from_file(builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL); } - else { - builder_result = gtk_builder_add_from_file (builder, "./mate-default-applications-properties.ui", NULL); + else + { + builder_result = gtk_builder_add_from_file(builder, "./mate-default-applications-properties.ui", NULL); } - if (builder_result == 0) { - GtkWidget *dialog; - - dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, - _("Could not load the main interface")); - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - _("Please make sure that the applet " - "is properly installed")); - gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - exit (EXIT_FAILURE); + if (builder_result == 0) + { + GtkWidget* dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not load the main interface")); + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Please make sure that the applet is properly installed")); + gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); + + gtk_dialog_run(GTK_DIALOG(dialog)); + + gtk_widget_destroy(dialog); + exit(EXIT_FAILURE); } capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); - g_signal_connect (capplet->window, "response", G_CALLBACK (close_cb), NULL); + + g_signal_connect(capplet->window, "response", G_CALLBACK (close_cb), NULL); + + #define _gtk_builder_get_widget(builder, name) GTK_WIDGET(gtk_builder_get_object(builder, name)) capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry"); capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label"); @@ -742,34 +826,40 @@ static void show_dialog (MateDACapplet* capplet, const gchar* start_page) capplet->mobility_command_label = _gtk_builder_get_widget (builder, "mobility_command_label"); capplet->mobility_startup_checkbutton = _gtk_builder_get_widget (builder, "mobility_start_checkbutton"); - capplet->web_combo_box = _gtk_builder_get_widget (builder, "web_browser_combobox"); - capplet->mail_combo_box = _gtk_builder_get_widget (builder, "mail_reader_combobox"); - capplet->term_combo_box = _gtk_builder_get_widget (builder, "terminal_combobox"); - capplet->media_combo_box = _gtk_builder_get_widget (builder, "media_player_combobox"); - capplet->visual_combo_box = _gtk_builder_get_widget (builder, "visual_combobox"); - capplet->mobility_combo_box = _gtk_builder_get_widget (builder, "mobility_combobox"); + capplet->web_combo_box = _gtk_builder_get_widget(builder, "web_browser_combobox"); + capplet->mail_combo_box = _gtk_builder_get_widget(builder, "mail_reader_combobox"); + capplet->term_combo_box = _gtk_builder_get_widget(builder, "terminal_combobox"); + capplet->media_combo_box = _gtk_builder_get_widget(builder, "media_player_combobox"); + capplet->visual_combo_box = _gtk_builder_get_widget(builder, "visual_combobox"); + capplet->mobility_combo_box = _gtk_builder_get_widget(builder, "mobility_combobox"); + + capplet->text_combo_box = _gtk_builder_get_widget(builder, "text_combobox"); + capplet->file_combo_box = _gtk_builder_get_widget(builder, "file_combobox"); + + #undef _gtk_builder_get_widget - g_signal_connect (capplet->window, "screen-changed", G_CALLBACK (screen_changed_cb), capplet); - screen_changed_cb (capplet->window, gdk_screen_get_default (), capplet); - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->web_combo_box), capplet->web_browsers); - 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->visual_combo_box), capplet->visual_ats); - fill_combo_box (capplet->icon_theme, GTK_COMBO_BOX (capplet->mobility_combo_box), capplet->mobility_ats); + g_signal_connect(capplet->window, "screen-changed", G_CALLBACK(screen_changed_cb), capplet); + screen_changed_cb(capplet->window, gdk_screen_get_default(), capplet); - g_signal_connect (capplet->web_combo_box, "changed", G_CALLBACK (web_combo_changed_cb), capplet); - 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->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); + fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers); + 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->visual_combo_box), capplet->visual_ats); + fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats); + g_signal_connect(capplet->web_combo_box, "changed", G_CALLBACK(web_combo_changed_cb), capplet); + 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->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->default_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); - g_signal_connect (capplet->new_win_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); - g_signal_connect (capplet->new_tab_radiobutton, "toggled", G_CALLBACK (web_radiobutton_toggled_cb), capplet); + + g_signal_connect(capplet->default_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); + g_signal_connect(capplet->new_win_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); + g_signal_connect(capplet->new_tab_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); /* Setup MateConfPropertyEditors */ @@ -898,40 +988,39 @@ static void show_dialog (MateDACapplet* capplet, const gchar* start_page) capplet->mobility_startup_checkbutton, NULL); - gtk_window_set_icon_name (GTK_WINDOW (capplet->window), - "preferences-desktop-default-applications"); + gtk_window_set_icon_name (GTK_WINDOW (capplet->window), "preferences-desktop-default-applications"); - if (start_page != NULL) { - gchar *page_name; - GtkWidget *w; + if (start_page != NULL) + { + gchar* page_name; + GtkWidget* w; page_name = g_strconcat (start_page, "_vbox", NULL); w = _gtk_builder_get_widget (builder, page_name); - if (w != NULL) { + + if (w != NULL) + { GtkNotebook *nb; gint pindex; - nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder, - "preferred_apps_notebook")); + nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder, "preferred_apps_notebook")); pindex = gtk_notebook_page_num (nb, w); if (pindex != -1) gtk_notebook_set_current_page (nb, pindex); } - g_free (page_name); + + g_free(page_name); } - gtk_widget_show (capplet->window); + gtk_widget_show(capplet->window); } -int main (int argc, char** argv) +int main(int argc, char** argv) { - MateDACapplet* capplet; - - gchar* start_page = NULL; + gchar* start_page = NULL; - GOptionContext* context; - GOptionEntry option_entries[] = { + GOptionEntry option_entries[] = { { "show-page", 'p', @@ -943,28 +1032,28 @@ int main (int argc, char** argv) N_("page") }, {NULL} - }; + }; - context = g_option_context_new(_("- MATE Default Applications")); - g_option_context_add_main_entries (context, option_entries, GETTEXT_PACKAGE); + GOptionContext* context = g_option_context_new(_("- MATE Default Applications")); + g_option_context_add_main_entries(context, option_entries, GETTEXT_PACKAGE); - capplet_init (context, &argc, &argv); + capplet_init (context, &argc, &argv); - capplet = g_new0(MateDACapplet, 1); - capplet->mateconf = mateconf_client_get_default(); - mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/url-handlers", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL); - mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/applications", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL); + MateDACapplet* capplet = g_new0(MateDACapplet, 1); + capplet->mateconf = mateconf_client_get_default(); + mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/url-handlers", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL); + mateconf_client_add_dir(capplet->mateconf, "/desktop/mate/applications", MATECONF_CLIENT_PRELOAD_RECURSIVE, NULL); - mate_da_xml_load_list(capplet); + mate_da_xml_load_list(capplet); - show_dialog(capplet, start_page); - g_free(start_page); + show_dialog(capplet, start_page); + g_free(start_page); - gtk_main(); + gtk_main(); - g_object_unref(capplet->mateconf); + g_object_unref(capplet->mateconf); - mate_da_xml_free(capplet); + mate_da_xml_free(capplet); - return 0; + return 0; } diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h index 3ce72955..e19dd70e 100644 --- a/capplets/default-applications/mate-da-capplet.h +++ b/capplets/default-applications/mate-da-capplet.h @@ -85,7 +85,9 @@ struct _MateDACapplet { 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* web_browser_command_entry; GtkWidget* web_browser_command_label; @@ -95,12 +97,12 @@ 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;*/ + GtkWidget* file_manager_new_tab_radiobutton; GtkWidget* mail_reader_command_entry; @@ -133,7 +135,7 @@ struct _MateDACapplet { GList* visual_ats; GList* mobility_ats; /* Para el File Manager */ - /*GList* file_managers;*/ + GList* file_managers; }; #endif diff --git a/capplets/default-applications/mate-da-item.h b/capplets/default-applications/mate-da-item.h index 81223f4e..d3bfb4ca 100644 --- a/capplets/default-applications/mate-da-item.h +++ b/capplets/default-applications/mate-da-item.h @@ -43,8 +43,8 @@ struct _MateDAWebItem { MateDAItem generic; gboolean run_in_terminal; gboolean netscape_remote; - gchar *tab_command; - gchar *win_command; + gchar* tab_command; + gchar* win_command; }; struct _MateDASimpleItem { diff --git a/capplets/default-applications/mate-da-xml.c b/capplets/default-applications/mate-da-xml.c index 288495c7..4105f2ce 100644 --- a/capplets/default-applications/mate-da-xml.c +++ b/capplets/default-applications/mate-da-xml.c @@ -47,10 +47,10 @@ mate_da_xml_get_bool (const xmlNode *parent, const gchar *val_name) if (!xmlStrncmp (element->name, xml_val_name, len)) { xmlChar *cont = xmlNodeGetContent (element); - if (!xmlStrcasecmp (cont, "true") || !xmlStrcasecmp (cont, "1")) - ret_val = TRUE; + if (!xmlStrcasecmp(cont, (const xmlChar*) "true") || !xmlStrcasecmp(cont, (const xmlChar*) "1")) + ret_val = TRUE; else - ret_val = FALSE; + ret_val = FALSE; xmlFree (cont); } @@ -91,7 +91,7 @@ mate_da_xml_get_string (const xmlNode *parent, const gchar *val_name) } else { for (i = 0; sys_langs[i] != NULL; i++) { - if (!strcmp (sys_langs[i], node_lang)) { + if (!strcmp(sys_langs[i], (char*) node_lang)) { ret_val = (gchar *) xmlNodeGetContent (element); /* since sys_langs is sorted from most desirable to * least desirable, exit at first match @@ -144,9 +144,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) root = xmlDocGetRootElement (xml_doc); for (section = root->children; section != NULL; section = section->next) { - if (!xmlStrncmp (section->name, "web-browsers", 12)) { + if (!xmlStrncmp(section->name, (const xmlChar*) "web-browsers", strlen("web-browsers"))) { for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, "web-browser", 11)) { + if (!xmlStrncmp (element->name, (const xmlChar*) "web-browser", strlen("web-browser"))) { executable = mate_da_xml_get_string (element, "executable"); if (is_executable_valid (executable)) { web_item = mate_da_web_item_new (); @@ -170,9 +170,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) } } } - else if (!xmlStrncmp (section->name, "mail-readers", 12)) { + else if (!xmlStrncmp (section->name, (const xmlChar*) "mail-readers", strlen("mail-readers"))) { for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, "mail-reader", 11)) { + if (!xmlStrncmp (element->name, (const xmlChar*) "mail-reader", strlen("mail-reader"))) { executable = mate_da_xml_get_string (element, "executable"); if (is_executable_valid (executable)) { mail_item = mate_da_simple_item_new (); @@ -191,9 +191,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) } } } - else if (!xmlStrncmp (section->name, "terminals", 9)) { + else if (!xmlStrncmp (section->name, (const xmlChar*) "terminals", strlen("terminals"))) { for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, "terminal", 8)) { + if (!xmlStrncmp (element->name, (const xmlChar*) "terminal", strlen("terminal"))) { executable = mate_da_xml_get_string (element, "executable"); if (is_executable_valid (executable)) { term_item = mate_da_term_item_new (); @@ -212,9 +212,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) } } } - else if (!xmlStrncmp (section->name, "media-players", 13)) { + else if (!xmlStrncmp (section->name, (const xmlChar*) "music-players", strlen("music-players"))) { for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, "media-player", 12)) { + if (!xmlStrncmp (element->name, (const xmlChar*) "music-player", strlen("music-player"))) { executable = mate_da_xml_get_string (element, "executable"); if (is_executable_valid (executable)) { media_item = mate_da_simple_item_new (); @@ -233,9 +233,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) } } } - else if (!xmlStrncmp (section->name, "a11y-visual", 11)) { + else if (!xmlStrncmp (section->name, (const xmlChar*) "a11y-visual", strlen("a11y-visual"))) { for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, "visual", 6)) { + if (!xmlStrncmp (element->name, (const xmlChar*) "visual", strlen("visual"))) { executable = mate_da_xml_get_string (element,"executable"); if (is_executable_valid (executable)) { visual_item = mate_da_visual_item_new (); @@ -254,9 +254,9 @@ mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) } } } - else if (!xmlStrncmp (section->name, "a11y-mobility", 13)) { + else if (!xmlStrncmp (section->name, (const xmlChar*) "a11y-mobility", strlen("a11y-mobility"))) { for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, "mobility", 8)) { + if (!xmlStrncmp (element->name, (const xmlChar*) "mobility", strlen("mobility"))) { executable = mate_da_xml_get_string (element,"executable"); if (is_executable_valid (executable)) { mobility_item = mate_da_mobility_item_new (); @@ -305,23 +305,24 @@ void mate_da_xml_load_list(MateDACapplet* capplet) } } -void -mate_da_xml_free (MateDACapplet *capplet) +void mate_da_xml_free(MateDACapplet* capplet) { - g_list_foreach (capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL); - 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->visual_ats, (GFunc) mate_da_visual_item_free, NULL); - g_list_foreach (capplet->mobility_ats, (GFunc) mate_da_mobility_item_free, NULL); - - g_list_free (capplet->web_browsers); - g_list_free (capplet->mail_readers); - g_list_free (capplet->terminals); - g_list_free (capplet->media_players); - g_list_free (capplet->visual_ats); - g_list_free (capplet->mobility_ats); - - g_object_unref (capplet->builder); - g_free (capplet); + g_list_foreach(capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL); + 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->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->filemanagers, (GFunc) mate_da_filemanager_item_free, NULL); + + g_list_free(capplet->web_browsers); + g_list_free(capplet->mail_readers); + g_list_free(capplet->terminals); + g_list_free(capplet->media_players); + g_list_free(capplet->visual_ats); + g_list_free(capplet->mobility_ats); + //g_list_free(capplet->filemanagers); + + g_object_unref(capplet->builder); + g_free(capplet); } diff --git a/capplets/default-applications/mate-default-applications-properties.ui b/capplets/default-applications/mate-default-applications-properties.ui index 4edc2968..bf1073c1 100644 --- a/capplets/default-applications/mate-default-applications-properties.ui +++ b/capplets/default-applications/mate-default-applications-properties.ui @@ -1,1196 +1,1477 @@ - - - - 5 - Preferred Applications - False - dialog - False - - - True - - - True - True - 5 - - - True - 12 - 18 - - - True - 6 - - - True - 0 - Web Browser - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 4 - 3 - 12 - 6 - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - 3 - 4 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - 3 - 4 - GTK_FILL - - - - - - Open link with web browser _default - True - False - True - False - True - True - True - - - 3 - GTK_FILL - - - - - - Open link in new _tab - True - False - True - False - True - True - web_browser_default_radiobutton - - - 3 - 2 - 3 - GTK_FILL - - - - - - Open link in new _window - True - False - True - False - True - True - web_browser_default_radiobutton - - - 3 - 1 - 2 - GTK_FILL - - - - - - True - False - 0 - C_ommand: - True - web_browser_command_entry - - - 3 - 4 - GTK_FILL - - - - - - False - False - 1 - - - - - 1 - - - - - 1 - - - - - False - 0 - - - - - True - 6 - - - True - 0 - Mail Reader - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 3 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - mail_reader_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 1 - - - - - 6 - - - True - 0 - Instant Messenger - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 3 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - messenger_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 2 - - - - - - - True - Internet - - - False - - - - - True - 12 - 18 - - - 6 - - - True - 0 - Image Viewer - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 3 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - image_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 0 - - - - - True - 6 - - - True - 0 - Multimedia Player - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 3 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - media_player_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 1 - - - - - 6 - - - True - 0 - Video Player - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 3 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - video_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 2 - - - - - 1 - - - - - True - Multimedia - - - 1 - False - - - - - True - 12 - 18 - - - 6 - - - True - 0 - Text Editor - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 3 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - text_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - Run in t_erminal - True - False - True - False - True - True - - - 2 - 3 - GTK_FILL - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 0 - - - - - True - 6 - - - True - 0 - Terminal Emulator - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - True - 2 - 2 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - terminal_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - True - False - 0 - E_xecute flag: - True - terminal_exec_flag_entry - - - 1 - 2 - GTK_FILL - - - - - - True - True - - - 1 - 2 - 1 - 2 - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - False - 1 - - - - + + 5 + Preferred Applications + False + dialog + False + + + True - + True - 6 + True + 5 - + + True + 12 + 18 + + + True + 6 + + + True + 0 + Web Browser + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 4 + 3 + 12 + 6 + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + 3 + 4 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + 3 + 4 + GTK_FILL + + + + + + Open link with web browser _default + True + False + True + False + True + True + True + + + 3 + GTK_FILL + + + + + + Open link in new _tab + True + False + True + False + True + True + web_browser_default_radiobutton + + + 3 + 2 + 3 + GTK_FILL + + + + + + Open link in new _window + True + False + True + False + True + True + web_browser_default_radiobutton + + + 3 + 1 + 2 + GTK_FILL + + + + + + True + False + 0 + C_ommand: + True + web_browser_command_entry + + + 3 + 4 + GTK_FILL + + + + + + False + False + 1 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + Mail Reader + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + mail_reader_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + True + 6 + + + True + 0 + Instant Messenger + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + messenger_command_entry + + + GTK_FILL + + + + + + True + False + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 2 + + + + + + True - 0 - File Manager - - - + Internet - False - False - 0 + False - + True - 12 + 12 + 18 + + + - + True - 0 + 6 + + + True + 0 + Image Viewer + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + image_command_entry + + + GTK_FILL + + + + + + True + False + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + False - False 0 + + + - + True 6 - + True + 0 + Multimedia Player + + + False + False 0 - + True - 2 - 2 - 12 - 6 + 12 - + True - False - 0 - Co_mmand: - True - filemanager_command_entry + 0 - GTK_FILL - + False + False + 0 - + True - True - All %s occurrences will be replaced with actual link + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + media_player_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + - 1 - 2 - + 1 + + + 1 + + + + + False + 1 + + + + + + + + True + 6 + + + True + 0 + Video Player + + + + + + False + False + 0 + + + + + True + 12 - + True - False - 0 - E_xecute flag: - True - filemanager_exec_flag_entry + 0 - 1 - 2 - GTK_FILL - + False + False + 0 - + True - True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + video_command_entry + + + GTK_FILL + + + + + + True + False + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + - 1 - 2 - 1 - 2 - + 1 - - 1 - - - - - 1 - - - - - 1 - + + 1 + + + + + False + 2 + + + + + + + 1 + + + + + True + Multimedia + + + 1 + False + + + + + True + 12 + 18 + + + + + True + 6 + + + True + 0 + Text Editor + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + text_command_entry + + + GTK_FILL + + + + + + True + False + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + + + + True + 6 + + + True + 0 + Terminal Emulator + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 2 + 2 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + terminal_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + True + False + 0 + E_xecute flag: + True + terminal_exec_flag_entry + + + 1 + 2 + GTK_FILL + + + + + + True + True + + + 1 + 2 + 1 + 2 + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + + + + + True + 6 + + + True + 0 + File Manager + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + True + 3 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + filemanager_command_entry + + + GTK_FILL + + + + + + True + False + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + Run in t_erminal + True + False + True + False + True + True + + + 2 + 3 + GTK_FILL + + + + + + 1 + + + + + 1 + + + + + 1 + + + + + False + 2 + + + + + + 2 + + + + + True + System + + + 2 + False + + + + + True + 12 + 18 + + + True + 6 + + + True + 0 + Visual + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + _Run at start + True + True + False + True + True + + + 1 + + + + + True + 2 + 12 + 6 + + + True + False + 0 + C_ommand: + True + image_command_entry + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + 2 + + + + + 1 + + + + + 1 + + + + + False + 0 + + + + + True + 6 + + + True + 0 + Mobility + + + + + + False + False + 0 + + + + + True + 12 + + + True + 0 + + + False + False + 0 + + + + + True + 6 + + + True + + + False + 0 + + + + + Run at st_art + True + True + False + True + True + + + 1 + + + + + True + 2 + 12 + 6 + + + True + False + 0 + Co_mmand: + True + + + GTK_FILL + + + + + + True + True + All %s occurrences will be replaced with actual link + + + 1 + 2 + + + + + + 2 + + + + + 1 + + + + + 1 + + + + + False + 1 + + + + + 3 + + + + + True + Accessibility + + + 3 + False + @@ -1198,321 +1479,52 @@ 1 - - < ! -- / el file manager --> - - - - 2 - - - - - True - System - - - 2 - False - - - - - True - 12 - 18 - - - True - 6 - - - True - 0 - Visual - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - _Run at start - True - True - False - True - True - - - 1 - - - - - True - 2 - 12 - 6 - - - True - False - 0 - C_ommand: - True - image_command_entry - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - 2 - - - - - 1 - - - - - 1 - - - - - False - 0 - - - - - True - 6 - - - True - 0 - Mobility - - - - - - False - False - 0 - - - - - True - 12 - - - True - 0 - - - False - False - 0 - - - - - True - 6 - - - True - - - False - 0 - - - - - Run at st_art - True - True - False - True - True - - - 1 - - - - - True - 2 - 12 - 6 - - - True - False - 0 - Co_mmand: - True - - - GTK_FILL - - - - - - True - True - All %s occurrences will be replaced with actual link - - - 1 - 2 - - - - - - 2 - - - - - 1 - - - - - 1 - - - - - False - 1 - - - - - 3 - - - - - True - Accessibility - - - 3 - False - - - - - False - 1 - - - - - True - end - - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - - - gtk-close - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - helpbutton1 - closebutton1 - - + + + True + end + + + gtk-help + True + True + True + False + True + + + False + False + 0 + + + + + gtk-close + True + True + True + False + True + + + False + False + 1 + + + + + False + end + 0 + + + + + + helpbutton1 + closebutton1 + + diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in index 4bd2f8b9..616912e9 100644 --- a/capplets/default-applications/mate-default-applications.xml.in +++ b/capplets/default-applications/mate-default-applications.xml.in @@ -4,249 +4,289 @@ - - - <_name>Opera - opera - opera %s - opera - false - true - opera -newpage %s - opera -newwindow %s - - - <_name>Debian Sensible Browser - sensible-browser - sensible-browser %s - - false - false - - - <_name>Epiphany Web Browser - epiphany - epiphany %s - web-browser - false - true - epiphany --new-tab %s - epiphany --new-window %s - - - <_name>Galeon - galeon - galeon %s - galeon - false - true - galeon -n %s - galeon -w %s - - - <_name>Encompass - encompass - encompass %s - encompass - false - false - - - <_name>Firebird - mozilla-firebird - mozilla-firebird %s - - false - true - mozilla-firebird -remote "openurl(%s,new-tab)" - mozilla-firebird -remote "openurl(%s,new-window)" - - - <_name>Firefox - firefox - firefox %s - firefox - false - true - firefox -new-tab "%s" - firefox -new-window "%s" - - - <_name>Iceweasel - iceweasel - iceweasel %s - iceweasel - false - true - iceweasel -new-tab "%s" - iceweasel -new-window "%s" - - - <_name>Mozilla 1.6 - mozilla-1.6 - mozilla-1.6 %s - mozilla-icon - false - true - mozilla-1.6 -remote "openurl(%s,new-tab)" - mozilla-1.6 -remote "openurl(%s,new-window)" - - - <_name>Mozilla - mozilla - mozilla %s - mozilla-icon - false - true - mozilla -remote "openurl(%s,new-tab)" - mozilla -remote "openurl(%s,new-window)" - - - <_name>SeaMonkey - seamonkey - seamonkey %s - seamonkey - false - true - seamonkey -remote "openurl(%s,new-tab)" - seamonkey -remote "openurl(%s,new-window)" - - - <_name>Iceape - iceape - iceape %s - iceape - false - true - iceape -remote "openurl(%s,new-tab)" - iceape -remote "openurl(%s,new-window)" - - - <_name>Netscape Communicator - netscape - netscape %s - netscape - false - true - netscape -remote "openurl(%s,new-tab)" - netscape -remote "openurl(%s,new-window)" - - - <_name>Konqueror - konqueror - konqueror %s - konqueror - false - false - - - <_name>Midori - midori - midori %s - web-browser - false - false - - - - - - <_name>Evolution Mail Reader - evolution - evolution %s - evolution - false - - - <_name>Balsa - balsa - balsa -m %s - mate-balsa2 - false - - - <_name>KMail - kmail - kmail %s - kmail - false - - - <_name>Icedove - icedove - icedove %s - icedove - false - - - <_name>Thunderbird - thunderbird - thunderbird %s - thunderbird - false - - - <_name>Mozilla Thunderbird - mozilla-thunderbird - mozilla-thunderbird %s - thunderbird - false - - - <_name>Mozilla Mail - mozilla - mozilla -mail %s - mozilla-mail-icon - false - - - <_name>SeaMonkey Mail - seamonkey - seamonkey -mail %s - seamonkey - false - - - <_name>Iceape Mail - iceape - iceape -mail %s - iceape - false - - - <_name>Mutt - mutt - mutt %s - mate-mime-application-x-executable - true - - - <_name>Claws Mail - claws-mail - claws-mail --compose %s - claws-mail - false - - - <_name>Sylpheed-Claws - sylpheed-claws - sylpheed-claws --compose %s - sylpheed - false - - - <_name>Sylpheed - sylpheed - sylpheed --compose %s - sylpheed - false - - + + + + <_name>Opera + opera + opera %s + opera + false + true + opera -newpage %s + opera -newwindow %s + + + + <_name>Debian Sensible Browser + sensible-browser + sensible-browser %s + + false + false + + + + <_name>Epiphany Web Browser + epiphany + epiphany %s + web-browser + false + true + epiphany --new-tab %s + epiphany --new-window %s + + + + <_name>Galeon + galeon + galeon %s + galeon + false + true + galeon -n %s + galeon -w %s + + + + <_name>Encompass + encompass + encompass %s + encompass + false + false + + + + <_name>Firebird + mozilla-firebird + mozilla-firebird %s + + false + true + mozilla-firebird -remote "openurl(%s,new-tab)" + mozilla-firebird -remote "openurl(%s,new-window)" + + + + <_name>Firefox + firefox + firefox %s + firefox + false + true + firefox -new-tab "%s" + firefox -new-window "%s" + + + + <_name>Iceweasel + iceweasel + iceweasel %s + iceweasel + false + true + iceweasel -new-tab "%s" + iceweasel -new-window "%s" + + + + <_name>Mozilla 1.6 + mozilla-1.6 + mozilla-1.6 %s + mozilla-icon + false + true + mozilla-1.6 -remote "openurl(%s,new-tab)" + mozilla-1.6 -remote "openurl(%s,new-window)" + + + + <_name>Mozilla + mozilla + mozilla %s + mozilla-icon + false + true + mozilla -remote "openurl(%s,new-tab)" + mozilla -remote "openurl(%s,new-window)" + + + + <_name>SeaMonkey + seamonkey + seamonkey %s + seamonkey + false + true + seamonkey -remote "openurl(%s,new-tab)" + seamonkey -remote "openurl(%s,new-window)" + + + + <_name>Iceape + iceape + iceape %s + iceape + false + true + iceape -remote "openurl(%s,new-tab)" + iceape -remote "openurl(%s,new-window)" + + + + <_name>Netscape Communicator + netscape + netscape %s + netscape + false + true + netscape -remote "openurl(%s,new-tab)" + netscape -remote "openurl(%s,new-window)" + + + + <_name>Konqueror + konqueror + konqueror %s + konqueror + false + false + + + + <_name>Midori + midori + midori %s + midori + false + false + + + + <_name>Chromium + chromium + chromium %s + chromium + false + false + + + + <_name>Google Chrome + google-chrome + google-chrome %s + google-chrome + false + false + + + + + + + + <_name>Thunderbird + thunderbird + thunderbird %s + thunderbird + false + + + + <_name>Evolution Mail Reader + evolution + evolution %s + evolution + false + + + + <_name>Balsa + balsa + balsa -m %s + mate-balsa2 + false + + + + <_name>KMail + kmail + kmail %s + kmail + false + + + + <_name>Icedove + icedove + icedove %s + icedove + false + + + + <_name>Mozilla Thunderbird + mozilla-thunderbird + mozilla-thunderbird %s + thunderbird + false + + + + <_name>Mozilla Mail + mozilla + mozilla -mail %s + mozilla-mail-icon + false + + + + <_name>SeaMonkey Mail + seamonkey + seamonkey -mail %s + seamonkey + false + + + + <_name>Iceape Mail + iceape + iceape -mail %s + iceape + false + + + + <_name>Mutt + mutt + mutt %s + application-x-executable + true + + + + <_name>Claws Mail + claws-mail + claws-mail --compose %s + claws-mail + false + + + + <_name>Sylpheed + sylpheed + sylpheed --compose %s + sylpheed + false + + + - <_name>Mate File Manager + <_name>MATE File Manager caja false caja %s @@ -271,77 +311,87 @@ - - - <_name>Debian Terminal Emulator - x-terminal-emulator - x-terminal-emulator - mate-mime-application-x-executable - -e - - - <_name>MATE Terminal - mate-terminal - mate-terminal - utilities-terminal - -x - - - <_name>GNOME Terminal - gnome-terminal - gnome-terminal - gnome-terminal - -x - - - <_name>Terminator - terminator - terminator - terminator - -x - - - <_name>Standard XTerminal - xterm - xterm - mate-mime-application-x-executable - -e - - - <_name>NXterm - nxterm - nxterm - mate-mime-application-x-executable - -e - - - <_name>RXVT - rxvt - rxvt - mate-mime-application-x-executable - -e - - - <_name>aterm - aterm - aterm - mate-mime-application-x-executable - -e - - - <_name>ETerm - ETerm - ETerm - mate-mime-application-x-executable - -e - - - <_name>Konsole - konsole - konsole - konsole - -e - + + + <_name>Debian Terminal Emulator + x-terminal-emulator + x-terminal-emulator + application-x-executable + -e + + + + <_name>MATE Terminal + mate-terminal + mate-terminal + utilities-terminal + -x + + + + <_name>GNOME Terminal + gnome-terminal + gnome-terminal + gnome-terminal + -x + + + + <_name>Terminator + terminator + terminator + terminator + -x + + + + <_name>Standard XTerminal + xterm + xterm + application-x-executable + -e + + + + <_name>NXterm + nxterm + nxterm + application-x-executable + -e + + + + <_name>RXVT + rxvt + rxvt + application-x-executable + -e + + + + <_name>aterm + aterm + aterm + application-x-executable + -e + + + + <_name>ETerm + ETerm + ETerm + application-x-executable + -e + + + + <_name>Konsole + konsole + konsole + konsole + -e + + <_name>Terminal terminal @@ -349,6 +399,7 @@ utilities-terminal -e + <_name>Sakura sakura @@ -356,45 +407,112 @@ terminal-tango -e - - - - - <_name>Banshee Music Player - banshee - banshee - music-player-banshee - false - - - <_name>Muine Music Player - muine - muine - muine - false - - - <_name>Rhythmbox Music Player - rhythmbox - rhythmbox - rhythmbox - false - - - <_name>Totem Movie Player - totem - totem - totem - false - - - <_name>Listen - listen - listen - listen - false - - + + + + + + <_name>MATE image viewer + eom + eog %s + eom + false + + + + <_name>Eye of GNOME + eog + eog %s + eog + false + + + + + + + + + <_name>DeaDBeeF + deadbeef + deadbeef %s + deadbeef + false + + + + <_name>VLC + vlc + vlc %s + vlc + false + + + + <_name>Rhythmbox Music Player + rhythmbox + rhythmbox + rhythmbox + false + + + + <_name>Totem Movie Player + totem + totem + totem + false + + + + <_name>Banshee Music Player + banshee + banshee + music-player-banshee + false + + + + <_name>Muine Music Player + muine + muine + muine + false + + + + + <_name>Listen + listen + listen + listen + false + + + + + + + + + <_name>VLC + vlc + vlc %s + vlc + false + + + + <_name>Totem Movie Player + totem + totem + totem + false + + + + + -- cgit v1.2.1 From d4d97389b3a30d43edadcd059ffcf584a4f4d914 Mon Sep 17 00:00:00 2001 From: Perberos Date: Mon, 5 Dec 2011 11:58:30 -0300 Subject: adding support for image viewers on default applications (please, check the list of image viewers and fill it!) --- capplets/default-applications/mate-da-capplet.c | 530 ++++++++++++--------- capplets/default-applications/mate-da-capplet.h | 12 + capplets/default-applications/mate-da-item.c | 180 +++---- capplets/default-applications/mate-da-item.h | 112 ++--- capplets/default-applications/mate-da-xml.c | 391 +++++++++------ capplets/default-applications/mate-da-xml.h | 4 +- .../mate-default-applications.xml.in | 40 ++ 7 files changed, 741 insertions(+), 528 deletions(-) (limited to 'capplets/default-applications') diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c index 0f2950c2..8810caec 100644 --- a/capplets/default-applications/mate-da-capplet.c +++ b/capplets/default-applications/mate-da-capplet.c @@ -286,6 +286,55 @@ static void mobility_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active); } + +static void image_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->image_viewers)); + + if (current_index != -1) + { + MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->image_viewers, 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("image/png"); + + 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, "image/png", NULL); + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/jpeg", NULL); + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/gif", NULL); + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/bmp", NULL); + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "image/tiff", NULL); + } + } + + g_list_free_full(recommended, g_object_unref); + } + } + } + + gtk_widget_set_sensitive(capplet->image_viewer_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->image_viewer_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->image_viewer_terminal_checkbutton, is_custom_active); +} + + static void refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list) { GList *entry; @@ -757,31 +806,34 @@ static void fill_combo_box (GtkIconTheme* theme, GtkComboBox* combo_box, GList* -1); } +/* not used static GtkWidget* _gtk_builder_get_widget(GtkBuilder* builder, const gchar* name) { return GTK_WIDGET(gtk_builder_get_object(builder, name)); -} +}*/ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) { - GObject* obj; - GtkBuilder* builder; - guint builder_result; + #define get_widget(name) GTK_WIDGET(gtk_builder_get_object(builder, name)) - capplet->builder = builder = gtk_builder_new (); + GObject* obj; + GtkBuilder* builder; + guint builder_result; - if (g_file_test(MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) - { + capplet->builder = builder = gtk_builder_new (); + + if (g_file_test(MATECC_UI_DIR "/mate-default-applications-properties.ui", G_FILE_TEST_EXISTS) != FALSE) + { builder_result = gtk_builder_add_from_file(builder, MATECC_UI_DIR "/mate-default-applications-properties.ui", NULL); - } - else - { + } + else + { builder_result = gtk_builder_add_from_file(builder, "./mate-default-applications-properties.ui", NULL); - } + } - if (builder_result == 0) - { + if (builder_result == 0) + { GtkWidget* dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Could not load the main interface")); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), _("Please make sure that the applet is properly installed")); gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK); @@ -790,230 +842,254 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) gtk_widget_destroy(dialog); exit(EXIT_FAILURE); - } + } + + capplet->window = get_widget("preferred_apps_dialog"); + + g_signal_connect(capplet->window, "response", G_CALLBACK(close_cb), NULL); + + capplet->web_browser_command_entry = get_widget("web_browser_command_entry"); + capplet->web_browser_command_label = get_widget("web_browser_command_label"); + capplet->web_browser_terminal_checkbutton = get_widget("web_browser_terminal_checkbutton"); + capplet->default_radiobutton = get_widget("web_browser_default_radiobutton"); + capplet->new_win_radiobutton = get_widget("web_browser_new_win_radiobutton"); + capplet->new_tab_radiobutton = get_widget("web_browser_new_tab_radiobutton"); + + capplet->mail_reader_command_entry = get_widget("mail_reader_command_entry"); + capplet->mail_reader_command_label = get_widget("mail_reader_command_label"); + capplet->mail_reader_terminal_checkbutton = get_widget("mail_reader_terminal_checkbutton"); + + capplet->terminal_command_entry = get_widget("terminal_command_entry"); + capplet->terminal_command_label = get_widget("terminal_command_label"); + capplet->terminal_exec_flag_entry = get_widget("terminal_exec_flag_entry"); + capplet->terminal_exec_flag_label = get_widget("terminal_exec_flag_label"); + + capplet->media_player_command_entry = get_widget("media_player_command_entry"); + capplet->media_player_command_label = get_widget("media_player_command_label"); + capplet->media_player_terminal_checkbutton = get_widget("media_player_terminal_checkbutton"); + + 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"); + + capplet->image_viewer_command_entry = get_widget("image_command_entry"); + capplet->image_viewer_command_label = get_widget("image_command_label"); + capplet->image_viewer_terminal_checkbutton = get_widget("image_terminal_checkbox"); + + capplet->mobility_command_entry = get_widget("mobility_command_entry"); + capplet->mobility_command_label = get_widget("mobility_command_label"); + capplet->mobility_startup_checkbutton = get_widget("mobility_start_checkbutton"); + + capplet->web_combo_box = get_widget("web_browser_combobox"); + 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->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("file_combobox"); + capplet->image_combo_box = get_widget("image_combobox"); + + + g_signal_connect(capplet->window, "screen-changed", G_CALLBACK(screen_changed_cb), capplet); + screen_changed_cb(capplet->window, gdk_screen_get_default(), capplet); + + fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers); + 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->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); + + g_signal_connect(capplet->web_combo_box, "changed", G_CALLBACK(web_combo_changed_cb), capplet); + 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->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); + + + g_signal_connect(capplet->default_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); + g_signal_connect(capplet->new_win_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); + g_signal_connect(capplet->new_tab_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); + + /* Setup MateConfPropertyEditors */ + + /* Web Browser */ + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_HTTP_EXEC, + capplet->web_combo_box, + "conv-from-widget-cb", web_combo_conv_from_widget, + "conv-to-widget-cb", web_combo_conv_to_widget, + "data", capplet, + NULL); + + obj = mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_HTTP_EXEC, + capplet->web_browser_command_entry, + NULL); + g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet); + + obj = mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, + capplet->web_browser_terminal_checkbutton, + NULL); + g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet); + + /* Mailer */ + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_MAILER_EXEC, + capplet->mail_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->mail_readers, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_MAILER_EXEC, + capplet->mail_reader_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, + capplet->mail_reader_terminal_checkbutton, + NULL); + + /* Media player */ + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_MEDIA_EXEC, + capplet->media_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->media_players, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_MEDIA_EXEC, + capplet->media_player_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, + capplet->media_player_terminal_checkbutton, + NULL); + + /* Image viewer */ + mateconf_peditor_new_combo_box(NULL, + DEFAULT_APPS_KEY_IMAGE_EXEC, + capplet->image_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->image_viewers, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_IMAGE_EXEC, + capplet->image_viewer_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_IMAGE_NEEDS_TERM, + capplet->image_viewer_terminal_checkbutton, + NULL); + + /* Terminal */ + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_TERMINAL_EXEC, + capplet->term_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->terminals, + NULL); - capplet->window = _gtk_builder_get_widget (builder,"preferred_apps_dialog"); - - g_signal_connect(capplet->window, "response", G_CALLBACK (close_cb), NULL); - - #define _gtk_builder_get_widget(builder, name) GTK_WIDGET(gtk_builder_get_object(builder, name)) - - capplet->web_browser_command_entry = _gtk_builder_get_widget (builder, "web_browser_command_entry"); - capplet->web_browser_command_label = _gtk_builder_get_widget (builder, "web_browser_command_label"); - capplet->web_browser_terminal_checkbutton = _gtk_builder_get_widget(builder, "web_browser_terminal_checkbutton"); - capplet->default_radiobutton = _gtk_builder_get_widget (builder, "web_browser_default_radiobutton"); - capplet->new_win_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_win_radiobutton"); - capplet->new_tab_radiobutton = _gtk_builder_get_widget (builder, "web_browser_new_tab_radiobutton"); - - capplet->mail_reader_command_entry = _gtk_builder_get_widget (builder, "mail_reader_command_entry"); - capplet->mail_reader_command_label = _gtk_builder_get_widget (builder, "mail_reader_command_label"); - capplet->mail_reader_terminal_checkbutton = _gtk_builder_get_widget (builder, "mail_reader_terminal_checkbutton"); - - capplet->terminal_command_entry = _gtk_builder_get_widget (builder, "terminal_command_entry"); - capplet->terminal_command_label = _gtk_builder_get_widget (builder, "terminal_command_label"); - capplet->terminal_exec_flag_entry = _gtk_builder_get_widget (builder, "terminal_exec_flag_entry"); - capplet->terminal_exec_flag_label = _gtk_builder_get_widget (builder, "terminal_exec_flag_label"); - - capplet->media_player_command_entry = _gtk_builder_get_widget (builder, "media_player_command_entry"); - capplet->media_player_command_label = _gtk_builder_get_widget (builder, "media_player_command_label"); - capplet->media_player_terminal_checkbutton = _gtk_builder_get_widget (builder, "media_player_terminal_checkbutton"); - - capplet->visual_command_entry = _gtk_builder_get_widget (builder, "visual_command_entry"); - capplet->visual_command_label = _gtk_builder_get_widget (builder, "visual_command_label"); - capplet->visual_startup_checkbutton = _gtk_builder_get_widget (builder, "visual_start_checkbutton"); - - capplet->mobility_command_entry = _gtk_builder_get_widget (builder, "mobility_command_entry"); - capplet->mobility_command_label = _gtk_builder_get_widget (builder, "mobility_command_label"); - capplet->mobility_startup_checkbutton = _gtk_builder_get_widget (builder, "mobility_start_checkbutton"); - - capplet->web_combo_box = _gtk_builder_get_widget(builder, "web_browser_combobox"); - capplet->mail_combo_box = _gtk_builder_get_widget(builder, "mail_reader_combobox"); - capplet->term_combo_box = _gtk_builder_get_widget(builder, "terminal_combobox"); - capplet->media_combo_box = _gtk_builder_get_widget(builder, "media_player_combobox"); - capplet->visual_combo_box = _gtk_builder_get_widget(builder, "visual_combobox"); - capplet->mobility_combo_box = _gtk_builder_get_widget(builder, "mobility_combobox"); - - capplet->text_combo_box = _gtk_builder_get_widget(builder, "text_combobox"); - capplet->file_combo_box = _gtk_builder_get_widget(builder, "file_combobox"); - - #undef _gtk_builder_get_widget - - - g_signal_connect(capplet->window, "screen-changed", G_CALLBACK(screen_changed_cb), capplet); - screen_changed_cb(capplet->window, gdk_screen_get_default(), capplet); - - fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers); - 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->visual_combo_box), capplet->visual_ats); - fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats); - - g_signal_connect(capplet->web_combo_box, "changed", G_CALLBACK(web_combo_changed_cb), capplet); - 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->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->default_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); - g_signal_connect(capplet->new_win_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); - g_signal_connect(capplet->new_tab_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); - - /* Setup MateConfPropertyEditors */ - - /* Web Browser */ - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_HTTP_EXEC, - capplet->web_combo_box, - "conv-from-widget-cb", web_combo_conv_from_widget, - "conv-to-widget-cb", web_combo_conv_to_widget, - "data", capplet, - NULL); - - obj = mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_HTTP_EXEC, - capplet->web_browser_command_entry, - NULL); - g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet); - - obj = mateconf_peditor_new_boolean (NULL, - DEFAULT_APPS_KEY_HTTP_NEEDS_TERM, - capplet->web_browser_terminal_checkbutton, - NULL); - g_signal_connect (obj, "value-changed", G_CALLBACK (web_mateconf_changed_cb), capplet); - - /* Mailer */ - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_MAILER_EXEC, - capplet->mail_combo_box, - "conv-from-widget-cb", combo_conv_from_widget, - "conv-to-widget-cb", combo_conv_to_widget, - "data", capplet->mail_readers, - NULL); - - mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_MAILER_EXEC, - capplet->mail_reader_command_entry, - NULL); - - mateconf_peditor_new_boolean (NULL, - DEFAULT_APPS_KEY_MAILER_NEEDS_TERM, - capplet->mail_reader_terminal_checkbutton, - NULL); - - /* Media player */ - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_MEDIA_EXEC, - capplet->media_combo_box, - "conv-from-widget-cb", combo_conv_from_widget, - "conv-to-widget-cb", combo_conv_to_widget, - "data", capplet->media_players, - NULL); - - mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_MEDIA_EXEC, - capplet->media_player_command_entry, - NULL); - - mateconf_peditor_new_boolean (NULL, - DEFAULT_APPS_KEY_MEDIA_NEEDS_TERM, - capplet->media_player_terminal_checkbutton, - NULL); - - /* Terminal */ - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_TERMINAL_EXEC, - capplet->term_combo_box, - "conv-from-widget-cb", combo_conv_from_widget, - "conv-to-widget-cb", combo_conv_to_widget, - "data", capplet->terminals, - NULL); - - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, - capplet->term_combo_box, - "conv-from-widget-cb", combo_conv_from_widget_term_flag, - "conv-to-widget-cb", combo_conv_to_widget_term_flag, - "data", capplet->terminals, - NULL); - - mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_TERMINAL_EXEC, - capplet->terminal_command_entry, - NULL); - mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, - capplet->terminal_exec_flag_entry, - NULL); - - - /* Visual */ - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_VISUAL_EXEC, - capplet->visual_combo_box, - "conv-from-widget-cb", combo_conv_from_widget, - "conv-to-widget-cb", combo_conv_to_widget, - "data", capplet->visual_ats, - NULL); - - mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_VISUAL_EXEC, - capplet->visual_command_entry, - NULL); - - mateconf_peditor_new_boolean (NULL, - DEFAULT_APPS_KEY_VISUAL_STARTUP, - capplet->visual_startup_checkbutton, - NULL); - - - /* Mobility */ - mateconf_peditor_new_combo_box (NULL, - DEFAULT_APPS_KEY_MOBILITY_EXEC, - capplet->mobility_combo_box, - "conv-from-widget-cb", combo_conv_from_widget, - "conv-to-widget-cb", combo_conv_to_widget, - "data", capplet->mobility_ats, - NULL); - - mateconf_peditor_new_string (NULL, - DEFAULT_APPS_KEY_MOBILITY_EXEC, - capplet->mobility_command_entry, - NULL); - - mateconf_peditor_new_boolean (NULL, - DEFAULT_APPS_KEY_MOBILITY_STARTUP, - capplet->mobility_startup_checkbutton, - NULL); + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, + capplet->term_combo_box, + "conv-from-widget-cb", combo_conv_from_widget_term_flag, + "conv-to-widget-cb", combo_conv_to_widget_term_flag, + "data", capplet->terminals, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_TERMINAL_EXEC, + capplet->terminal_command_entry, + NULL); + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_TERMINAL_EXEC_ARG, + capplet->terminal_exec_flag_entry, + NULL); + + + /* Visual */ + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_VISUAL_EXEC, + capplet->visual_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->visual_ats, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_VISUAL_EXEC, + capplet->visual_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_VISUAL_STARTUP, + capplet->visual_startup_checkbutton, + NULL); + + + /* Mobility */ + mateconf_peditor_new_combo_box (NULL, + DEFAULT_APPS_KEY_MOBILITY_EXEC, + capplet->mobility_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->mobility_ats, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_MOBILITY_EXEC, + capplet->mobility_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_MOBILITY_STARTUP, + capplet->mobility_startup_checkbutton, + NULL); gtk_window_set_icon_name (GTK_WINDOW (capplet->window), "preferences-desktop-default-applications"); - if (start_page != NULL) - { - gchar* page_name; - GtkWidget* w; + if (start_page != NULL) + { + gchar* page_name; + GtkWidget* w; - page_name = g_strconcat (start_page, "_vbox", NULL); + page_name = g_strconcat (start_page, "_vbox", NULL); - w = _gtk_builder_get_widget (builder, page_name); + w = get_widget(page_name); - if (w != NULL) - { - GtkNotebook *nb; - gint pindex; + if (w != NULL) + { + GtkNotebook *nb; + gint pindex; + + nb = GTK_NOTEBOOK (get_widget("preferred_apps_notebook")); + pindex = gtk_notebook_page_num (nb, w); + if (pindex != -1) + gtk_notebook_set_current_page (nb, pindex); + } - nb = GTK_NOTEBOOK (_gtk_builder_get_widget (builder, "preferred_apps_notebook")); - pindex = gtk_notebook_page_num (nb, w); - if (pindex != -1) - gtk_notebook_set_current_page (nb, pindex); - } + g_free(page_name); + } - g_free(page_name); - } + gtk_widget_show(capplet->window); - gtk_widget_show(capplet->window); + #undef get_widget } int main(int argc, char** argv) diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h index e19dd70e..e149e39b 100644 --- a/capplets/default-applications/mate-da-capplet.h +++ b/capplets/default-applications/mate-da-capplet.h @@ -2,6 +2,7 @@ * Authors: Luca Cavalli * * Copyright 2005-2006 Luca Cavalli + * Copyright 2010 Perberos * * 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,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_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_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" @@ -87,6 +92,7 @@ struct _MateDACapplet { /* Para el File Manager */ GtkWidget* file_combo_box; GtkWidget* text_combo_box; + GtkWidget* image_combo_box; GtkWidget* web_browser_command_entry; @@ -126,6 +132,11 @@ struct _MateDACapplet { GtkWidget* mobility_command_label; GtkWidget* mobility_startup_checkbutton; + + GtkWidget* image_viewer_command_entry; + GtkWidget* image_viewer_command_label; + GtkWidget* image_viewer_terminal_checkbutton; + MateConfClient* mateconf; GList* web_browsers; @@ -136,6 +147,7 @@ struct _MateDACapplet { GList* mobility_ats; /* Para el File Manager */ GList* file_managers; + GList* image_viewers; }; #endif diff --git a/capplets/default-applications/mate-da-item.c b/capplets/default-applications/mate-da-item.c index 06bda549..7cdfa768 100644 --- a/capplets/default-applications/mate-da-item.c +++ b/capplets/default-applications/mate-da-item.c @@ -21,128 +21,134 @@ #include "mate-da-capplet.h" #include "mate-da-item.h" -MateDAWebItem* -mate_da_web_item_new (void) +MateDAWebItem* mate_da_web_item_new(void) { - MateDAWebItem *item = NULL; + MateDAWebItem* item = g_new0(MateDAWebItem, 1); - item = g_new0 (MateDAWebItem, 1); - - return item; + return item; } -MateDASimpleItem* -mate_da_simple_item_new (void) +MateDASimpleItem* mate_da_simple_item_new(void) { - MateDASimpleItem *item = NULL; - - item = g_new0 (MateDASimpleItem, 1); + MateDASimpleItem* item = g_new0(MateDASimpleItem, 1); - return item; + return item; } -MateDATermItem* -mate_da_term_item_new (void) +MateDATermItem* mate_da_term_item_new(void) { - MateDATermItem *item = NULL; - - item = g_new0 (MateDATermItem, 1); + MateDATermItem* item = g_new0(MateDATermItem, 1); - return item; + return item; } -MateDAVisualItem* -mate_da_visual_item_new (void) +MateDAVisualItem* mate_da_visual_item_new(void) { - MateDAVisualItem *item = NULL; + MateDAVisualItem* item = g_new0(MateDAVisualItem, 1); - item = g_new0 (MateDAVisualItem, 1); - - return item; + return item; } -MateDAMobilityItem* -mate_da_mobility_item_new (void) +MateDAImageItem* mate_da_image_item_new(void) { - MateDAMobilityItem *item = NULL; - - item = g_new0 (MateDAMobilityItem, 1); + MateDAImageItem* item = g_new0(MateDAImageItem, 1); - return item; + return item; } -void -mate_da_web_item_free (MateDAWebItem *item) +MateDAMobilityItem* mate_da_mobility_item_new(void) { - g_return_if_fail (item != NULL); + MateDAMobilityItem* item = g_new0(MateDAMobilityItem, 1); - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - - g_free (item->tab_command); - g_free (item->win_command); - - g_free (item); + return item; } -void -mate_da_simple_item_free (MateDASimpleItem *item) +void mate_da_web_item_free(MateDAWebItem* item) { - g_return_if_fail (item != NULL); - - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - - g_free (item); + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item->tab_command); + g_free(item->win_command); + + g_free(item); + } } -void -mate_da_term_item_free (MateDATermItem *item) +void mate_da_simple_item_free(MateDASimpleItem* item) { - g_return_if_fail (item != NULL); - - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - - g_free (item->exec_flag); - - g_free (item); + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item); + } } -void -mate_da_visual_item_free (MateDAVisualItem *item) +void mate_da_image_item_free(MateDAImageItem* item) { - g_return_if_fail (item != NULL); - - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); - - g_free (item); + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item); + } } -void -mate_da_mobility_item_free (MateDAMobilityItem *item) +void mate_da_term_item_free(MateDATermItem* item) { - g_return_if_fail (item != NULL); + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item->exec_flag); + + g_free(item); + } +} - g_free (item->generic.name); - g_free (item->generic.executable); - g_free (item->generic.command); - g_free (item->generic.icon_name); - g_free (item->generic.icon_path); +void mate_da_visual_item_free(MateDAVisualItem* item) +{ + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item); + } +} - g_free (item); +void mate_da_mobility_item_free (MateDAMobilityItem *item) +{ + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item); + } } diff --git a/capplets/default-applications/mate-da-item.h b/capplets/default-applications/mate-da-item.h index d3bfb4ca..3462840c 100644 --- a/capplets/default-applications/mate-da-item.h +++ b/capplets/default-applications/mate-da-item.h @@ -23,59 +23,63 @@ #include -typedef struct _MateDAItem MateDAItem; - -typedef struct _MateDAWebItem MateDAWebItem; -typedef struct _MateDATermItem MateDATermItem; -typedef struct _MateDASimpleItem MateDASimpleItem; -typedef struct _MateDAVisualItem MateDAVisualItem; -typedef struct _MateDAMobilityItem MateDAMobilityItem; - -struct _MateDAItem { - gchar *name; - gchar *executable; - gchar *command; - gchar *icon_name; - gchar *icon_path; -}; - -struct _MateDAWebItem { - MateDAItem generic; - gboolean run_in_terminal; - gboolean netscape_remote; - gchar* tab_command; - gchar* win_command; -}; - -struct _MateDASimpleItem { - MateDAItem generic; - gboolean run_in_terminal; -}; - -struct _MateDATermItem { - MateDAItem generic; - gchar *exec_flag; -}; - -struct _MateDAVisualItem { - MateDAItem generic; - gboolean run_at_startup; -}; - -struct _MateDAMobilityItem { - MateDAItem generic; - gboolean run_at_startup; -}; - -MateDAWebItem* mate_da_web_item_new (void); -MateDATermItem* mate_da_term_item_new (void); -MateDASimpleItem* mate_da_simple_item_new (void); -MateDAVisualItem* mate_da_visual_item_new (void); -MateDAMobilityItem* mate_da_mobility_item_new (void); -void mate_da_web_item_free (MateDAWebItem *item); -void mate_da_term_item_free (MateDATermItem *item); -void mate_da_simple_item_free (MateDASimpleItem *item); -void mate_da_visual_item_free (MateDAVisualItem *item); -void mate_da_mobility_item_free (MateDAMobilityItem *item); +typedef struct _MateDAItem { + gchar* name; + gchar* executable; + gchar* command; + gchar* icon_name; + gchar* icon_path; +} MateDAItem; + +typedef struct _MateDAWebItem { + MateDAItem generic; + gboolean run_in_terminal; + gboolean netscape_remote; + gchar* tab_command; + gchar* win_command; +} MateDAWebItem; + +typedef struct _MateDASimpleItem { + MateDAItem generic; + gboolean run_in_terminal; +} MateDASimpleItem; + +typedef struct _MateDAImageItem { + MateDAItem generic; + gboolean run_in_terminal; +} MateDAImageItem; + +typedef struct _MateDATermItem { + MateDAItem generic; + gchar* exec_flag; +} MateDATermItem; + +typedef struct _MateDAVisualItem { + MateDAItem generic; + gboolean run_at_startup; +} MateDAVisualItem; + +typedef struct _MateDAMobilityItem { + MateDAItem generic; + gboolean run_at_startup; +} MateDAMobilityItem; + +MateDAWebItem* mate_da_web_item_new(void); +void mate_da_web_item_free(MateDAWebItem* item); + +MateDATermItem* mate_da_term_item_new(void); +void mate_da_term_item_free(MateDATermItem* item); + +MateDASimpleItem* mate_da_simple_item_new(void); +void mate_da_simple_item_free(MateDASimpleItem* item); + +MateDAVisualItem* mate_da_visual_item_new(void); +void mate_da_visual_item_free(MateDAVisualItem* item); + +MateDAImageItem* mate_da_image_item_new(void); +void mate_da_image_item_free(MateDAImageItem* item); + +MateDAMobilityItem* mate_da_mobility_item_new(void); +void mate_da_mobility_item_free(MateDAMobilityItem* item); #endif diff --git a/capplets/default-applications/mate-da-xml.c b/capplets/default-applications/mate-da-xml.c index 4105f2ce..ba41aa1f 100644 --- a/capplets/default-applications/mate-da-xml.c +++ b/capplets/default-applications/mate-da-xml.c @@ -2,6 +2,7 @@ * Authors: Luca Cavalli * * Copyright 2005-2006 Luca Cavalli + * Copyright 2010 Perberos * * 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 @@ -28,8 +29,7 @@ #include "mate-da-item.h" -static gboolean -mate_da_xml_get_bool (const xmlNode *parent, const gchar *val_name) +static gboolean mate_da_xml_get_bool(const xmlNode* parent, const gchar* val_name) { xmlNode *element; gboolean ret_val = FALSE; @@ -60,8 +60,7 @@ mate_da_xml_get_bool (const xmlNode *parent, const gchar *val_name) return ret_val; } -static gchar* -mate_da_xml_get_string (const xmlNode *parent, const gchar *val_name) +static gchar* mate_da_xml_get_string(const xmlNode* parent, const gchar* val_name) { const gchar * const *sys_langs; xmlChar *node_lang; @@ -108,176 +107,250 @@ mate_da_xml_get_string (const xmlNode *parent, const gchar *val_name) return ret_val; } -static gboolean -is_executable_valid (gchar *executable) +static gboolean is_executable_valid(gchar* executable) { - gchar *path; + gchar* path = g_find_program_in_path(executable); - path = g_find_program_in_path (executable); - - if (path) { - g_free (path); - return TRUE; - } + if (path) + { + g_free (path); + return TRUE; + } - return FALSE; + return FALSE; } -static void -mate_da_xml_load_xml (MateDACapplet *capplet, const gchar * filename) +static void mate_da_xml_load_xml(MateDACapplet* capplet, const gchar* filename) { - xmlDoc *xml_doc; - xmlNode *root, *section, *element; - gchar *executable; - MateDAWebItem *web_item; - MateDASimpleItem *mail_item; - MateDASimpleItem *media_item; - MateDATermItem *term_item; - MateDAVisualItem *visual_item; - MateDAMobilityItem *mobility_item; - - xml_doc = xmlParseFile (filename); - - if (!xml_doc) - return; - - root = xmlDocGetRootElement (xml_doc); - - for (section = root->children; section != NULL; section = section->next) { - if (!xmlStrncmp(section->name, (const xmlChar*) "web-browsers", strlen("web-browsers"))) { - for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, (const xmlChar*) "web-browser", strlen("web-browser"))) { - executable = mate_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - web_item = mate_da_web_item_new (); - - web_item->generic.name = mate_da_xml_get_string (element, "name"); - web_item->generic.executable = executable; - web_item->generic.command = mate_da_xml_get_string (element, "command"); - web_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); - - web_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal"); - web_item->netscape_remote = mate_da_xml_get_bool (element, "netscape-remote"); - if (web_item->netscape_remote) { - web_item->tab_command = mate_da_xml_get_string (element, "tab-command"); - web_item->win_command = mate_da_xml_get_string (element, "win-command"); - } - - capplet->web_browsers = g_list_append (capplet->web_browsers, web_item); - } - else - g_free (executable); - } - } + xmlDoc* xml_doc; + xmlNode* root; + xmlNode* section; + xmlNode* element; + gchar* executable; + MateDAWebItem* web_item; + MateDASimpleItem* mail_item; + MateDASimpleItem* media_item; + MateDATermItem* term_item; + MateDAVisualItem* visual_item; + MateDAMobilityItem* mobility_item; + MateDAImageItem* image_item; + + xml_doc = xmlParseFile(filename); + + if (!xml_doc) + { + return; } - else if (!xmlStrncmp (section->name, (const xmlChar*) "mail-readers", strlen("mail-readers"))) { - for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, (const xmlChar*) "mail-reader", strlen("mail-reader"))) { - executable = mate_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - mail_item = mate_da_simple_item_new (); - mail_item->generic.name = mate_da_xml_get_string (element, "name"); - mail_item->generic.executable = executable; - mail_item->generic.command = mate_da_xml_get_string (element, "command"); - mail_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); + root = xmlDocGetRootElement(xml_doc); - mail_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal"); - - capplet->mail_readers = g_list_append (capplet->mail_readers, mail_item); - } - else - g_free (executable); + for (section = root->children; section != NULL; section = section->next) + { + if (!xmlStrncmp(section->name, (const xmlChar*) "web-browsers", strlen("web-browsers"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp (element->name, (const xmlChar*) "web-browser", strlen("web-browser"))) + { + executable = mate_da_xml_get_string (element, "executable"); + + if (is_executable_valid (executable)) + { + web_item = mate_da_web_item_new(); + + web_item->generic.name = mate_da_xml_get_string(element, "name"); + web_item->generic.executable = executable; + web_item->generic.command = mate_da_xml_get_string(element, "command"); + web_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + web_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal"); + web_item->netscape_remote = mate_da_xml_get_bool(element, "netscape-remote"); + if (web_item->netscape_remote) + { + web_item->tab_command = mate_da_xml_get_string(element, "tab-command"); + web_item->win_command = mate_da_xml_get_string(element, "win-command"); + } + + capplet->web_browsers = g_list_append(capplet->web_browsers, web_item); + } + else + { + g_free(executable); + } + } + } } - } - } - else if (!xmlStrncmp (section->name, (const xmlChar*) "terminals", strlen("terminals"))) { - for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, (const xmlChar*) "terminal", strlen("terminal"))) { - executable = mate_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - term_item = mate_da_term_item_new (); - - term_item->generic.name = mate_da_xml_get_string (element, "name"); - term_item->generic.executable = executable; - term_item->generic.command = mate_da_xml_get_string (element, "command"); - term_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); - - term_item->exec_flag = mate_da_xml_get_string (element, "exec-flag"); - - capplet->terminals = g_list_append (capplet->terminals, term_item); - } - else - g_free (executable); + else if (!xmlStrncmp(section->name, (const xmlChar*) "mail-readers", strlen("mail-readers"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp (element->name, (const xmlChar*) "mail-reader", strlen("mail-reader"))) + { + executable = mate_da_xml_get_string(element, "executable"); + + if (is_executable_valid(executable)) + { + mail_item = mate_da_simple_item_new(); + + mail_item->generic.name = mate_da_xml_get_string(element, "name"); + mail_item->generic.executable = executable; + mail_item->generic.command = mate_da_xml_get_string(element, "command"); + mail_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + mail_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal"); + + capplet->mail_readers = g_list_append(capplet->mail_readers, mail_item); + } + else + { + g_free (executable); + } + } + } } - } - } - else if (!xmlStrncmp (section->name, (const xmlChar*) "music-players", strlen("music-players"))) { - for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, (const xmlChar*) "music-player", strlen("music-player"))) { - executable = mate_da_xml_get_string (element, "executable"); - if (is_executable_valid (executable)) { - media_item = mate_da_simple_item_new (); - - media_item->generic.name = mate_da_xml_get_string (element, "name"); - media_item->generic.executable = executable; - media_item->generic.command = mate_da_xml_get_string (element, "command"); - media_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); - - media_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal"); - - capplet->media_players = g_list_append (capplet->media_players, media_item); - } - else - g_free (executable); + else if (!xmlStrncmp(section->name, (const xmlChar*) "terminals", strlen("terminals"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp (element->name, (const xmlChar*) "terminal", strlen("terminal"))) + { + executable = mate_da_xml_get_string(element, "executable"); + + if (is_executable_valid(executable)) + { + term_item = mate_da_term_item_new(); + + term_item->generic.name = mate_da_xml_get_string(element, "name"); + term_item->generic.executable = executable; + term_item->generic.command = mate_da_xml_get_string(element, "command"); + term_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + term_item->exec_flag = mate_da_xml_get_string(element, "exec-flag"); + + capplet->terminals = g_list_append(capplet->terminals, term_item); + } + else + { + g_free(executable); + } + } + } } - } - } - else if (!xmlStrncmp (section->name, (const xmlChar*) "a11y-visual", strlen("a11y-visual"))) { - for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, (const xmlChar*) "visual", strlen("visual"))) { - executable = mate_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - visual_item = mate_da_visual_item_new (); - - visual_item->generic.name = mate_da_xml_get_string (element, "name"); - visual_item->generic.executable = executable; - visual_item->generic.command = mate_da_xml_get_string (element, "command"); - visual_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); - - visual_item->run_at_startup = mate_da_xml_get_bool (element, "run-at-startup"); - - capplet->visual_ats = g_list_append (capplet->visual_ats, visual_item); - } - else - g_free (executable); + else if (!xmlStrncmp(section->name, (const xmlChar*) "music-players", strlen("music-players"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp (element->name, (const xmlChar*) "music-player", strlen("music-player"))) + { + executable = mate_da_xml_get_string(element, "executable"); + + if (is_executable_valid(executable)) + { + media_item = mate_da_simple_item_new(); + + media_item->generic.name = mate_da_xml_get_string (element, "name"); + media_item->generic.executable = executable; + media_item->generic.command = mate_da_xml_get_string (element, "command"); + media_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); + + media_item->run_in_terminal = mate_da_xml_get_bool (element, "run-in-terminal"); + + capplet->media_players = g_list_append (capplet->media_players, media_item); + } + else + { + g_free(executable); + } + } + } } - } - } - else if (!xmlStrncmp (section->name, (const xmlChar*) "a11y-mobility", strlen("a11y-mobility"))) { - for (element = section->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, (const xmlChar*) "mobility", strlen("mobility"))) { - executable = mate_da_xml_get_string (element,"executable"); - if (is_executable_valid (executable)) { - mobility_item = mate_da_mobility_item_new (); - - mobility_item->generic.name = mate_da_xml_get_string (element, "name"); - mobility_item->generic.executable = executable; - mobility_item->generic.command = mate_da_xml_get_string (element, "command"); - mobility_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); - - mobility_item->run_at_startup = mate_da_xml_get_bool (element, "run-at-startup"); - - capplet->mobility_ats = g_list_append (capplet->mobility_ats, mobility_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) + { + if (!xmlStrncmp(element->name, (const xmlChar*) "image-viewer", strlen("image-viewer"))) + { + executable = mate_da_xml_get_string(element, "executable"); + + if (is_executable_valid(executable)) + { + image_item = mate_da_image_item_new(); + + image_item->generic.name = mate_da_xml_get_string(element, "name"); + image_item->generic.executable = executable; + image_item->generic.command = mate_da_xml_get_string(element, "command"); + image_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + image_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal"); + + capplet->image_viewers = g_list_append(capplet->image_viewers, image_item); + } + else + { + g_free(executable); + } + } + } + } + else if (!xmlStrncmp(section->name, (const xmlChar*) "a11y-visual", strlen("a11y-visual"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp (element->name, (const xmlChar*) "visual", strlen("visual"))) + { + executable = mate_da_xml_get_string (element,"executable"); + + if (is_executable_valid (executable)) + { + visual_item = mate_da_visual_item_new(); + + visual_item->generic.name = mate_da_xml_get_string(element, "name"); + visual_item->generic.executable = executable; + visual_item->generic.command = mate_da_xml_get_string(element, "command"); + visual_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + visual_item->run_at_startup = mate_da_xml_get_bool(element, "run-at-startup"); + + capplet->visual_ats = g_list_append(capplet->visual_ats, visual_item); + } + else + { + g_free(executable); + } + } + } + } + else if (!xmlStrncmp(section->name, (const xmlChar*) "a11y-mobility", strlen("a11y-mobility"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp(element->name, (const xmlChar*) "mobility", strlen("mobility"))) + { + executable = mate_da_xml_get_string(element,"executable"); + + if (is_executable_valid (executable)) + { + mobility_item = mate_da_mobility_item_new (); + + mobility_item->generic.name = mate_da_xml_get_string (element, "name"); + mobility_item->generic.executable = executable; + mobility_item->generic.command = mate_da_xml_get_string (element, "command"); + mobility_item->generic.icon_name = mate_da_xml_get_string (element, "icon-name"); + + mobility_item->run_at_startup = mate_da_xml_get_bool (element, "run-at-startup"); + + capplet->mobility_ats = g_list_append (capplet->mobility_ats, mobility_item); + } + else + { + g_free (executable); + } + } + } } - } } - } - xmlFreeDoc (xml_doc); + xmlFreeDoc(xml_doc); } void mate_da_xml_load_list(MateDACapplet* capplet) @@ -314,6 +387,7 @@ void mate_da_xml_free(MateDACapplet* capplet) 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->filemanagers, (GFunc) mate_da_filemanager_item_free, NULL); + g_list_foreach(capplet->image_viewers, (GFunc) mate_da_image_item_free, NULL); g_list_free(capplet->web_browsers); g_list_free(capplet->mail_readers); @@ -321,6 +395,7 @@ void mate_da_xml_free(MateDACapplet* capplet) g_list_free(capplet->media_players); g_list_free(capplet->visual_ats); g_list_free(capplet->mobility_ats); + g_list_free(capplet->image_viewers); //g_list_free(capplet->filemanagers); g_object_unref(capplet->builder); diff --git a/capplets/default-applications/mate-da-xml.h b/capplets/default-applications/mate-da-xml.h index b209355c..2016b930 100644 --- a/capplets/default-applications/mate-da-xml.h +++ b/capplets/default-applications/mate-da-xml.h @@ -21,7 +21,7 @@ #ifndef _MATE_DA_XML_H_ #define _MATE_DA_XML_H_ -void mate_da_xml_load_list (MateDACapplet *capplet); -void mate_da_xml_free (MateDACapplet *capplet); +void mate_da_xml_load_list(MateDACapplet* capplet); +void mate_da_xml_free(MateDACapplet* capplet); #endif diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in index 616912e9..b4c1c6d7 100644 --- a/capplets/default-applications/mate-default-applications.xml.in +++ b/capplets/default-applications/mate-default-applications.xml.in @@ -427,6 +427,46 @@ false + + <_name>Shotwell + shotwell + shotwell %s + shotwell + false + + + + <_name>MComix + mcomix + mcomix %s + mcomix + false + + + + <_name>gThumb + gthumb + gthumb %s + gthumb + false + + + + <_name>Gwenview + gwenview + gwenview %s + gwenview + false + + + + <_name>Ristretto + ristretto + ristretto %s + ristretto + false + + -- cgit v1.2.1 From 06d81df2871a25a93cdf7cffaf87f5cd4f15fe84 Mon Sep 17 00:00:00 2001 From: Perberos Date: Tue, 6 Dec 2011 08:07:40 -0300 Subject: adding support for select text editor and file manager --- capplets/default-applications/mate-da-capplet.c | 304 +++++++++++++++++---- capplets/default-applications/mate-da-capplet.h | 40 ++- capplets/default-applications/mate-da-item.c | 42 +++ capplets/default-applications/mate-da-item.h | 16 ++ capplets/default-applications/mate-da-xml.c | 226 +++++++++------ .../mate-default-applications-properties.ui | 2 +- .../mate-default-applications.xml.in | 56 +++- 7 files changed, 535 insertions(+), 151 deletions(-) (limited to 'capplets/default-applications') diff --git a/capplets/default-applications/mate-da-capplet.c b/capplets/default-applications/mate-da-capplet.c index 8810caec..6fff57ad 100644 --- a/capplets/default-applications/mate-da-capplet.c +++ b/capplets/default-applications/mate-da-capplet.c @@ -44,23 +44,12 @@ static void close_cb(GtkWidget* window, gint response, gpointer user_data) { if (response == GTK_RESPONSE_HELP) { - capplet_help (GTK_WINDOW (window), "prefs-preferredapps"); + capplet_help(GTK_WINDOW (window), "prefs-preferredapps"); } else { - gtk_widget_destroy (window); - gtk_main_quit (); - } -} - -static void set_icon(GtkImage* image, GtkIconTheme* theme, const char* name) -{ - GdkPixbuf* pixbuf = gtk_icon_theme_load_icon(theme, name, 48, 0, NULL); - - if (pixbuf) - { - gtk_image_set_from_pixbuf(image, pixbuf); - g_object_unref(pixbuf); + gtk_widget_destroy(window); + gtk_main_quit(); } } @@ -164,6 +153,9 @@ static void web_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) is_custom_active = TRUE; } + /* Si, aun falta para poder crear personalizables... */ + has_net_remote = FALSE; + is_custom_active = FALSE; gtk_widget_set_sensitive(capplet->default_radiobutton, has_net_remote); gtk_widget_set_sensitive(capplet->new_win_radiobutton, has_net_remote); gtk_widget_set_sensitive(capplet->new_tab_radiobutton, has_net_remote); @@ -230,11 +222,103 @@ static void mail_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) } } + /* Si, aun falta para poder crear personalizables... */ + is_custom_active = FALSE; gtk_widget_set_sensitive(capplet->mail_reader_command_entry, is_custom_active); gtk_widget_set_sensitive(capplet->mail_reader_command_label, is_custom_active); gtk_widget_set_sensitive(capplet->mail_reader_terminal_checkbutton, is_custom_active); } +static void file_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->file_managers)); + + if (current_index != -1) + { + MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->file_managers, 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("inode/directory"); + + 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) + { + /* falta agregar más mime-types */ + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "inode/directory", 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->file_manager_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->file_manager_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->file_manager_terminal_checkbutton, is_custom_active); +} + +static void text_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->text_editors)); + + if (current_index != -1) + { + MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->text_editors, 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("text/plain"); + + 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) + { + /* falta agregar más mime-types */ + g_app_info_set_as_default_for_type((GAppInfo*) app->data, "text/plain", 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->text_editor_command_entry, is_custom_active); + gtk_widget_set_sensitive(capplet->text_editor_command_label, is_custom_active); + gtk_widget_set_sensitive(capplet->text_editor_terminal_checkbutton, is_custom_active); +} + static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) { guint current_index; @@ -243,6 +327,41 @@ static void media_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) current_index = gtk_combo_box_get_active (combo); is_custom_active = (current_index >= g_list_length (capplet->media_players)); + if (current_index != -1) + { + MateDAItem* item = (MateDAItem*) g_list_nth_data(capplet->media_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("audio/x-vorbis+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, "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_list_free_full(recommended, g_object_unref); + } + } + } + + /* Si, aun falta para poder crear personalizables... */ + is_custom_active = FALSE; gtk_widget_set_sensitive(capplet->media_player_command_entry, is_custom_active); gtk_widget_set_sensitive(capplet->media_player_command_label, is_custom_active); gtk_widget_set_sensitive(capplet->media_player_terminal_checkbutton, is_custom_active); @@ -286,7 +405,6 @@ static void mobility_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet gtk_widget_set_sensitive (capplet->mobility_command_label, is_custom_active); } - static void image_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) { guint current_index; @@ -334,7 +452,6 @@ static void image_combo_changed_cb(GtkComboBox* combo, MateDACapplet* capplet) gtk_widget_set_sensitive(capplet->image_viewer_terminal_checkbutton, is_custom_active); } - static void refresh_combo_box_icons(GtkIconTheme* theme, GtkComboBox* combo_box, GList* app_list) { GList *entry; @@ -386,7 +503,14 @@ static void theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet) for (i = 0; i < G_N_ELEMENTS(icons); i++) { icon = gtk_builder_get_object(capplet->builder, icons[i].name); - set_icon (GTK_IMAGE (icon), theme, icons[i].icon); + + GdkPixbuf* pixbuf = gtk_icon_theme_load_icon(theme, icons[i].icon, 48, 0, NULL); + + if (pixbuf) + { + gtk_image_set_from_pixbuf(GTK_IMAGE(icon), pixbuf); + g_object_unref(pixbuf); + } } refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->web_combo_box), capplet->web_browsers); @@ -395,6 +519,8 @@ static void theme_changed_cb(GtkIconTheme* theme, MateDACapplet* capplet) refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->term_combo_box), capplet->terminals); refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->visual_combo_box), capplet->visual_ats); refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->mobility_combo_box), capplet->mobility_ats); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->file_combo_box), capplet->file_managers); + refresh_combo_box_icons(theme, GTK_COMBO_BOX(capplet->text_combo_box), capplet->text_editors); } static void screen_changed_cb(GtkWidget* widget, GdkScreen* screen, MateDACapplet* capplet) @@ -414,29 +540,36 @@ static void screen_changed_cb(GtkWidget* widget, GdkScreen* screen, MateDACapple capplet->icon_theme = theme; } -static gint generic_item_comp(gconstpointer list_item, gconstpointer command) +static gint generic_item_comp(const void* list_item, const void* command) { - return (strcmp (((MateDAItem *) list_item)->command, (gchar *) command)); + return (strcmp(((MateDAItem*) list_item)->command, (char*) command)); } -static gint web_item_comp(gconstpointer item, gconstpointer command) +static int web_item_comp(const void* item, const void* command) { - MateDAWebItem *web_list_item; + MateDAWebItem* web_list_item; - web_list_item = (MateDAWebItem *) item; + web_list_item = (MateDAWebItem*) item; - if (strcmp (web_list_item->generic.command, (gchar *) command) == 0) - return 0; + if (strcmp (web_list_item->generic.command, (char*) command) == 0) + { + return 0; + } - if (web_list_item->netscape_remote) { - if (strcmp (web_list_item->tab_command, (gchar *) command) == 0) - return 0; + if (web_list_item->netscape_remote) + { + if (strcmp (web_list_item->tab_command, (char*) command) == 0) + { + return 0; + } - if (strcmp (web_list_item->win_command, (gchar *) command) == 0) - return 0; + if (strcmp (web_list_item->win_command, (char*) command) == 0) + { + return 0; + } } - return (strcmp (web_list_item->generic.command, (gchar *) command)); + return (strcmp(web_list_item->generic.command, (char*) command)); } static void web_mateconf_changed_cb(MateConfPropertyEditor* peditor, gchar* key, MateConfValue* value, MateDACapplet* capplet) @@ -558,37 +691,42 @@ static void web_browser_update_radio_buttons(MateDACapplet* capplet, const gchar static MateConfValue* web_combo_conv_to_widget (MateConfPropertyEditor *peditor, const MateConfValue *value) { - MateConfValue *ret; - GList *entry, *handlers; - const gchar *command; - gint index; - MateDACapplet *capplet; + MateConfValue *ret; + GList *entry, *handlers; + const gchar *command; + gint index; + MateDACapplet *capplet; - g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); + g_object_get (G_OBJECT (peditor), "data", &capplet, NULL); - command = mateconf_value_get_string (value); - handlers = capplet->web_browsers; + command = mateconf_value_get_string (value); + handlers = capplet->web_browsers; - if (handlers) - { - entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp); - if (entry) - index = g_list_position (handlers, entry); - else - index = g_list_length (handlers) + 1; - } - else - { - /* if the item has no handlers lsit then select the Custom item */ - index = 1; - } + if (handlers) + { + entry = g_list_find_custom (handlers, command, (GCompareFunc) web_item_comp); + + if (entry) + { + index = g_list_position (handlers, entry); + } + else + { + index = g_list_length (handlers) + 1; + } + } + else + { + /* if the item has no handlers lsit then select the Custom item */ + index = 1; + } - web_browser_update_radio_buttons (capplet, command); + web_browser_update_radio_buttons (capplet, command); - ret = mateconf_value_new (MATECONF_VALUE_INT); - mateconf_value_set_int (ret, index); + ret = mateconf_value_new (MATECONF_VALUE_INT); + mateconf_value_set_int (ret, index); - return ret; + return ret; } static MateConfValue* web_combo_conv_from_widget (MateConfPropertyEditor *peditor, const MateConfValue *value) @@ -876,6 +1014,14 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) capplet->image_viewer_command_label = get_widget("image_command_label"); capplet->image_viewer_terminal_checkbutton = get_widget("image_terminal_checkbox"); + capplet->text_editor_command_entry = get_widget("text_command_entry"); + capplet->text_editor_command_label = get_widget("text_command_label"); + capplet->text_editor_terminal_checkbutton = get_widget("text_terminal_checkbox"); + + capplet->file_manager_command_entry = get_widget("filemanager_command_entry"); + capplet->file_manager_command_label = get_widget("filemanager_command_label"); + capplet->file_manager_terminal_checkbutton = get_widget("filemanager_terminal_checkbox"); + capplet->mobility_command_entry = get_widget("mobility_command_entry"); capplet->mobility_command_label = get_widget("mobility_command_label"); capplet->mobility_startup_checkbutton = get_widget("mobility_start_checkbutton"); @@ -888,7 +1034,7 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) capplet->mobility_combo_box = get_widget("mobility_combobox"); capplet->text_combo_box = get_widget("text_combobox"); - capplet->file_combo_box = get_widget("file_combobox"); + capplet->file_combo_box = get_widget("filemanager_combobox"); capplet->image_combo_box = get_widget("image_combobox"); @@ -902,6 +1048,8 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) 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); + fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->text_combo_box), capplet->text_editors); + fill_combo_box(capplet->icon_theme, GTK_COMBO_BOX(capplet->file_combo_box), capplet->file_managers); g_signal_connect(capplet->web_combo_box, "changed", G_CALLBACK(web_combo_changed_cb), capplet); g_signal_connect(capplet->mail_combo_box, "changed", G_CALLBACK(mail_combo_changed_cb), capplet); @@ -910,6 +1058,8 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) 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); + g_signal_connect(capplet->text_combo_box, "changed", G_CALLBACK(text_combo_changed_cb), capplet); + g_signal_connect(capplet->file_combo_box, "changed", G_CALLBACK(file_combo_changed_cb), capplet); g_signal_connect(capplet->default_radiobutton, "toggled", G_CALLBACK(web_radiobutton_toggled_cb), capplet); @@ -996,6 +1146,46 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) capplet->image_viewer_terminal_checkbutton, NULL); + /* File manager */ + mateconf_peditor_new_combo_box(NULL, + DEFAULT_APPS_KEY_FILE_EXEC, + capplet->file_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->file_managers, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_FILE_EXEC, + capplet->file_manager_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_FILE_NEEDS_TERM, + capplet->file_manager_terminal_checkbutton, + NULL); + + + /* Text editors */ + mateconf_peditor_new_combo_box(NULL, + DEFAULT_APPS_KEY_TEXT_EXEC, + capplet->text_combo_box, + "conv-from-widget-cb", combo_conv_from_widget, + "conv-to-widget-cb", combo_conv_to_widget, + "data", capplet->text_editors, + NULL); + + mateconf_peditor_new_string (NULL, + DEFAULT_APPS_KEY_TEXT_EXEC, + capplet->text_editor_command_entry, + NULL); + + mateconf_peditor_new_boolean (NULL, + DEFAULT_APPS_KEY_TEXT_NEEDS_TERM, + capplet->text_editor_terminal_checkbutton, + NULL); + + /* Terminal */ mateconf_peditor_new_combo_box (NULL, DEFAULT_APPS_KEY_TERMINAL_EXEC, @@ -1062,7 +1252,7 @@ static void show_dialog(MateDACapplet* capplet, const gchar* start_page) capplet->mobility_startup_checkbutton, NULL); - gtk_window_set_icon_name (GTK_WINDOW (capplet->window), "preferences-desktop-default-applications"); + gtk_window_set_icon_name(GTK_WINDOW (capplet->window), "preferences-desktop-default-applications"); if (start_page != NULL) { diff --git a/capplets/default-applications/mate-da-capplet.h b/capplets/default-applications/mate-da-capplet.h index e149e39b..3b9d328f 100644 --- a/capplets/default-applications/mate-da-capplet.h +++ b/capplets/default-applications/mate-da-capplet.h @@ -66,6 +66,14 @@ #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" @@ -74,9 +82,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; @@ -94,7 +100,8 @@ struct _MateDACapplet { 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; @@ -106,37 +113,44 @@ struct _MateDACapplet { 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; + /* 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; - GtkWidget* image_viewer_command_entry; - GtkWidget* image_viewer_command_label; - GtkWidget* image_viewer_terminal_checkbutton; - MateConfClient* mateconf; GList* web_browsers; @@ -145,9 +159,9 @@ struct _MateDACapplet { GList* media_players; GList* visual_ats; GList* mobility_ats; - /* Para el File Manager */ GList* file_managers; + GList* text_editors; GList* image_viewers; -}; +} MateDACapplet; #endif diff --git a/capplets/default-applications/mate-da-item.c b/capplets/default-applications/mate-da-item.c index 7cdfa768..ab3803de 100644 --- a/capplets/default-applications/mate-da-item.c +++ b/capplets/default-applications/mate-da-item.c @@ -56,6 +56,20 @@ MateDAImageItem* mate_da_image_item_new(void) return item; } +MateDATextItem* mate_da_text_item_new(void) +{ + MateDATextItem* item = g_new0(MateDATextItem, 1); + + return item; +} + +MateDAFileItem* mate_da_file_item_new(void) +{ + MateDAFileItem* item = g_new0(MateDAFileItem, 1); + + return item; +} + MateDAMobilityItem* mate_da_mobility_item_new(void) { MateDAMobilityItem* item = g_new0(MateDAMobilityItem, 1); @@ -108,6 +122,34 @@ void mate_da_image_item_free(MateDAImageItem* item) } } +void mate_da_text_item_free(MateDATextItem* item) +{ + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item); + } +} + +void mate_da_file_item_free(MateDAFileItem* item) +{ + if (item != NULL) + { + g_free(item->generic.name); + g_free(item->generic.executable); + g_free(item->generic.command); + g_free(item->generic.icon_name); + g_free(item->generic.icon_path); + + g_free(item); + } +} + void mate_da_term_item_free(MateDATermItem* item) { if (item != NULL) diff --git a/capplets/default-applications/mate-da-item.h b/capplets/default-applications/mate-da-item.h index 3462840c..b6a3b573 100644 --- a/capplets/default-applications/mate-da-item.h +++ b/capplets/default-applications/mate-da-item.h @@ -49,6 +49,16 @@ typedef struct _MateDAImageItem { gboolean run_in_terminal; } MateDAImageItem; +typedef struct _MateDATextItem { + MateDAItem generic; + gboolean run_in_terminal; +} MateDATextItem; + +typedef struct _MateDAFileItem { + MateDAItem generic; + gboolean run_in_terminal; +} MateDAFileItem; + typedef struct _MateDATermItem { MateDAItem generic; gchar* exec_flag; @@ -79,6 +89,12 @@ void mate_da_visual_item_free(MateDAVisualItem* item); MateDAImageItem* mate_da_image_item_new(void); void mate_da_image_item_free(MateDAImageItem* item); +MateDATextItem* mate_da_text_item_new(void); +void mate_da_text_item_free(MateDATextItem* item); + +MateDAFileItem* mate_da_file_item_new(void); +void mate_da_file_item_free(MateDAFileItem* item); + MateDAMobilityItem* mate_da_mobility_item_new(void); void mate_da_mobility_item_free(MateDAMobilityItem* item); diff --git a/capplets/default-applications/mate-da-xml.c b/capplets/default-applications/mate-da-xml.c index ba41aa1f..eba290db 100644 --- a/capplets/default-applications/mate-da-xml.c +++ b/capplets/default-applications/mate-da-xml.c @@ -31,80 +31,92 @@ static gboolean mate_da_xml_get_bool(const xmlNode* parent, const gchar* val_name) { - xmlNode *element; + xmlNode* element; gboolean ret_val = FALSE; - xmlChar *xml_val_name; + xmlChar* xml_val_name; gint len; - g_return_val_if_fail (parent != NULL, FALSE); - g_return_val_if_fail (parent->children != NULL, ret_val); - g_return_val_if_fail (val_name != NULL, FALSE); + if (parent != NULL && parent->children != NULL && val_name == NULL) + { + xml_val_name = xmlCharStrdup(val_name); + len = xmlStrlen(xml_val_name); - xml_val_name = xmlCharStrdup (val_name); - len = xmlStrlen (xml_val_name); + for (element = parent->children; element != NULL; element = element->next) + { + if (!xmlStrncmp(element->name, xml_val_name, len)) + { + xmlChar* cont = xmlNodeGetContent(element); - for (element = parent->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, xml_val_name, len)) { - xmlChar *cont = xmlNodeGetContent (element); + if (!xmlStrcasecmp(cont, (const xmlChar*) "true") || !xmlStrcasecmp(cont, (const xmlChar*) "1")) + { + ret_val = TRUE; + } + else + { + ret_val = FALSE; + } - if (!xmlStrcasecmp(cont, (const xmlChar*) "true") || !xmlStrcasecmp(cont, (const xmlChar*) "1")) - ret_val = TRUE; - else - ret_val = FALSE; + xmlFree(cont); + } + } - xmlFree (cont); + xmlFree(xml_val_name); } - } - xmlFree (xml_val_name); return ret_val; } static gchar* mate_da_xml_get_string(const xmlNode* parent, const gchar* val_name) { - const gchar * const *sys_langs; - xmlChar *node_lang; - xmlNode *element; - gchar *ret_val = NULL; - xmlChar *xml_val_name; - gint len; - gint i; - - g_return_val_if_fail (parent != NULL, ret_val); - g_return_val_if_fail (parent->children != NULL, ret_val); - g_return_val_if_fail (val_name != NULL, ret_val); - -#if GLIB_CHECK_VERSION (2, 6, 0) - sys_langs = g_get_language_names (); -#endif - - xml_val_name = xmlCharStrdup (val_name); - len = xmlStrlen (xml_val_name); - - for (element = parent->children; element != NULL; element = element->next) { - if (!xmlStrncmp (element->name, xml_val_name, len)) { - node_lang = xmlNodeGetLang (element); - - if (node_lang == NULL) { - ret_val = (gchar *) xmlNodeGetContent (element); - } - else { - for (i = 0; sys_langs[i] != NULL; i++) { - if (!strcmp(sys_langs[i], (char*) node_lang)) { - ret_val = (gchar *) xmlNodeGetContent (element); - /* since sys_langs is sorted from most desirable to - * least desirable, exit at first match - */ - break; - } + const gchar* const* sys_langs; + xmlChar* node_lang; + xmlNode* element; + gchar* ret_val = NULL; + xmlChar* xml_val_name; + gint len; + gint i; + + if (parent != NULL && parent->children != NULL && val_name != NULL) + { + #if GLIB_CHECK_VERSION (2, 6, 0) + sys_langs = g_get_language_names(); + #endif + + xml_val_name = xmlCharStrdup(val_name); + len = xmlStrlen(xml_val_name); + + for (element = parent->children; element != NULL; element = element->next) + { + if (!xmlStrncmp(element->name, xml_val_name, len)) + { + node_lang = xmlNodeGetLang(element); + + if (node_lang == NULL) + { + ret_val = (gchar *) xmlNodeGetContent(element); + } + else + { + for (i = 0; sys_langs[i] != NULL; i++) + { + if (!strcmp(sys_langs[i], (char*) node_lang)) + { + ret_val = (gchar*) xmlNodeGetContent(element); + /* since sys_langs is sorted from most desirable to + * least desirable, exit at first match */ + break; + } + } + } + + xmlFree(node_lang); + } } - } - xmlFree (node_lang); + + xmlFree(xml_val_name); } - } - xmlFree (xml_val_name); - return ret_val; + return ret_val; } static gboolean is_executable_valid(gchar* executable) @@ -134,6 +146,8 @@ static void mate_da_xml_load_xml(MateDACapplet* capplet, const gchar* filename) MateDAVisualItem* visual_item; MateDAMobilityItem* mobility_item; MateDAImageItem* image_item; + MateDATextItem* text_item; + MateDAFileItem* file_item; xml_doc = xmlParseFile(filename); @@ -292,6 +306,62 @@ static void mate_da_xml_load_xml(MateDACapplet* capplet, const gchar* filename) } } } + else if (!xmlStrncmp(section->name, (const xmlChar*) "text-editors", strlen("text-editors"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp(element->name, (const xmlChar*) "text-editor", strlen("text-editor"))) + { + executable = mate_da_xml_get_string(element, "executable"); + + if (is_executable_valid(executable)) + { + text_item = mate_da_text_item_new(); + + text_item->generic.name = mate_da_xml_get_string(element, "name"); + text_item->generic.executable = executable; + text_item->generic.command = mate_da_xml_get_string(element, "command"); + text_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + text_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal"); + + capplet->text_editors = g_list_append(capplet->text_editors, text_item); + } + else + { + g_free(executable); + } + } + } + } + else if (!xmlStrncmp(section->name, (const xmlChar*) "file-managers", strlen("file-managers"))) + { + for (element = section->children; element != NULL; element = element->next) + { + if (!xmlStrncmp(element->name, (const xmlChar*) "file-manager", strlen("file-manager"))) + { + executable = mate_da_xml_get_string(element, "executable"); + + if (is_executable_valid(executable)) + { + file_item = mate_da_file_item_new(); + + file_item->generic.name = mate_da_xml_get_string(element, "name"); + file_item->generic.executable = executable; + file_item->generic.command = mate_da_xml_get_string(element, "command"); + file_item->generic.icon_name = mate_da_xml_get_string(element, "icon-name"); + + file_item->run_in_terminal = mate_da_xml_get_bool(element, "run-in-terminal"); + + capplet->file_managers = g_list_append(capplet->file_managers, file_item); + } + else + { + g_free(executable); + } + } + } + } else if (!xmlStrncmp(section->name, (const xmlChar*) "a11y-visual", strlen("a11y-visual"))) { for (element = section->children; element != NULL; element = element->next) @@ -380,24 +450,26 @@ void mate_da_xml_load_list(MateDACapplet* capplet) void mate_da_xml_free(MateDACapplet* capplet) { - g_list_foreach(capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL); - 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->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->filemanagers, (GFunc) mate_da_filemanager_item_free, NULL); - g_list_foreach(capplet->image_viewers, (GFunc) mate_da_image_item_free, NULL); - - g_list_free(capplet->web_browsers); - g_list_free(capplet->mail_readers); - g_list_free(capplet->terminals); - g_list_free(capplet->media_players); - g_list_free(capplet->visual_ats); - g_list_free(capplet->mobility_ats); - g_list_free(capplet->image_viewers); - //g_list_free(capplet->filemanagers); - - g_object_unref(capplet->builder); - g_free(capplet); + g_list_foreach(capplet->web_browsers, (GFunc) mate_da_web_item_free, NULL); + 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->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); + g_list_foreach(capplet->text_editors, (GFunc) mate_da_text_item_free, NULL); + g_list_foreach(capplet->file_managers, (GFunc) mate_da_file_item_free, NULL); + + g_list_free(capplet->web_browsers); + g_list_free(capplet->mail_readers); + g_list_free(capplet->terminals); + g_list_free(capplet->media_players); + g_list_free(capplet->visual_ats); + g_list_free(capplet->mobility_ats); + g_list_free(capplet->image_viewers); + g_list_free(capplet->text_editors); + g_list_free(capplet->file_managers); + + g_object_unref(capplet->builder); + g_free(capplet); } diff --git a/capplets/default-applications/mate-default-applications-properties.ui b/capplets/default-applications/mate-default-applications-properties.ui index bf1073c1..0da56bc6 100644 --- a/capplets/default-applications/mate-default-applications-properties.ui +++ b/capplets/default-applications/mate-default-applications-properties.ui @@ -321,7 +321,7 @@ - True + 6 diff --git a/capplets/default-applications/mate-default-applications.xml.in b/capplets/default-applications/mate-default-applications.xml.in index b4c1c6d7..204e562a 100644 --- a/capplets/default-applications/mate-default-applications.xml.in +++ b/capplets/default-applications/mate-default-applications.xml.in @@ -286,7 +286,7 @@ - <_name>MATE File Manager + <_name>MATE file manager caja false caja %s @@ -303,10 +303,10 @@ <_name>Thunar - thunar + Thunar false thunar %s - thunar + Thunar @@ -552,7 +552,57 @@ + + + <_name>Gedit + gedit + gedit %s + accessories-text-editor + false + + + + <_name>MATE text editor + pluma + pluma %s + accessories-text-editor + false + + + + + + <_name>leafpad + leafpad + leafpad %s + leafpad + false + + + + + + + -- cgit v1.2.1 From 0e3c4a26638e0685da1c9ad21546ad5c962d3e5c Mon Sep 17 00:00:00 2001 From: Perberos Date: Tue, 6 Dec 2011 08:42:47 -0300 Subject: adding support for video players --- capplets/default-applications/mate-da-capplet.c | 84 +++++++++++++++++++++- capplets/default-applications/mate-da-capplet.h | 11 +++ capplets/default-applications/mate-da-xml.c | 31 ++++++++ .../mate-default-applications.xml.in | 12 ++-- 4 files changed, 130 insertions(+), 8 deletions(-) (limited to 'capplets/default-applications') 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 @@ - + - + <_name>VLC vlc vlc %s vlc false - + - + <_name>Totem Movie Player totem totem totem false - + - + -- cgit v1.2.1