From: Andrea Zagli Date: Thu, 29 Dec 2011 15:40:58 +0000 (+0100) Subject: Aggiunta la funzione SolipaUtils::file_get_icon_as_pixbuf. X-Git-Tag: 0.5.0~10 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=4b1140eb8f9f5d4e0d6252e382b95f2de57aaccd;p=solipa%2Flibsolipa Aggiunta la funzione SolipaUtils::file_get_icon_as_pixbuf. Visualizzata l'icona del file in SolipaAllegato (closes #210). --- diff --git a/.cproject b/.cproject index d6f39d1..fe70b0e 100644 --- a/.cproject +++ b/.cproject @@ -27,9 +27,12 @@ diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui index 13f5561..d626534 100644 --- a/data/libsolipa/gui/libsolipa.ui +++ b/data/libsolipa/gui/libsolipa.ui @@ -806,9 +806,6 @@ 2 5 5 - - - True @@ -825,7 +822,7 @@ True False - 5 + 3 True @@ -867,11 +864,18 @@ - ... False True True True + + + True + False + gtk-find + 1 + + False @@ -1002,6 +1006,9 @@ GTK_FILL + + + diff --git a/src/allegato.c b/src/allegato.c index 836f332..a25062d 100644 --- a/src/allegato.c +++ b/src/allegato.c @@ -20,6 +20,7 @@ #include #endif +#include #include #include @@ -243,7 +244,6 @@ solipa_allegato_get_salva_in_db (SolipaAllegato *solipa_allegato) void solipa_allegato_apri_allegato (GtkWindow *transient, const gchar *filename) { - GtkWidget *dialog; GFile *gfile; GAppInfo *gappinfo; GError *error; @@ -252,13 +252,10 @@ solipa_allegato_apri_allegato (GtkWindow *transient, const gchar *filename) gfile = g_file_new_for_commandline_arg (filename); if (gfile == NULL) { - dialog = gtk_message_dialog_new (transient, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, - "Impossibile aprire l'allegato selezionato."); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + solipa_message_dialog (GTK_WIDGET (transient), + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Impossibile aprire l'allegato selezionato."); return; } @@ -266,14 +263,11 @@ solipa_allegato_apri_allegato (GtkWindow *transient, const gchar *filename) gappinfo = g_file_query_default_handler (gfile, NULL, &error); if (gappinfo == NULL) { - dialog = gtk_message_dialog_new (transient, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, - "Impossibile aprire l'allegato selezionato: %s.", - (error != NULL && error->message != NULL ? error->message : "nessun dettaglio")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + solipa_message_dialog (GTK_WIDGET (transient), + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + g_strdup_printf ("Impossibile aprire l'allegato selezionato: %s.", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio")); return; } @@ -283,14 +277,11 @@ solipa_allegato_apri_allegato (GtkWindow *transient, const gchar *filename) error = NULL; if (!g_app_info_launch (gappinfo, lfiles, NULL, &error)) { - dialog = gtk_message_dialog_new (transient, - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, - "Impossibile aprire l'allegato selezionato: %s.", - (error != NULL && error->message != NULL ? error->message : "nessun dettaglio")); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + solipa_message_dialog (GTK_WIDGET (transient), + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + g_strdup_printf ("Impossibile aprire l'allegato selezionato: %s.", + error != NULL && error->message != NULL ? error->message : "nessun dettaglio")); } } @@ -491,6 +482,8 @@ solipa_allegato_on_btn_file_clicked (GtkButton *button, { struct tm *tm; + GdkPixbuf *pixbuf; + tm = localtime (&buf.st_mtime); gtk_entry_set_text (GTK_ENTRY (priv->txt_percorso), filename); @@ -499,27 +492,33 @@ solipa_allegato_on_btn_file_clicked (GtkButton *button, tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900, tm->tm_hour, tm->tm_min, tm->tm_sec)); gtk_entry_set_text (GTK_ENTRY (priv->txt_dimensione_nascosto), g_strdup_printf ("%d", buf.st_size)); + + pixbuf = solipa_file_get_icon_as_pixbuf (filename, priv->txt_percorso, GTK_ICON_SIZE_MENU); + + gtk_entry_set_icon_from_pixbuf (GTK_ENTRY (priv->txt_percorso), GTK_ENTRY_ICON_PRIMARY, pixbuf); } else { /* file non esistente */ /* non dovrebbe succedere */ gtk_widget_destroy (dialog); - dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_ancestor (priv->widget, GTK_TYPE_WINDOW)), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_WARNING, - GTK_BUTTONS_OK, - "Il file selezionato non esiste."); - gtk_dialog_run (GTK_DIALOG (dialog)); + solipa_message_dialog (GTK_WIDGET (gtk_widget_get_ancestor (priv->widget, GTK_TYPE_WINDOW)), + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + "Il file selezionato non esiste."); gtk_entry_set_text (GTK_ENTRY (priv->txt_percorso), ""); gtk_entry_set_text (GTK_ENTRY (priv->txt_data), ""); gtk_entry_set_text (GTK_ENTRY (priv->txt_dimensione_nascosto), "0"); + gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->txt_percorso), GTK_ENTRY_ICON_PRIMARY, NULL); } g_free (filename); } - gtk_widget_destroy (dialog); + if (GTK_IS_DIALOG (dialog)) + { + gtk_widget_destroy (dialog); + } } static void diff --git a/src/mailui.c b/src/mailui.c index 401cacd..2084f9b 100644 --- a/src/mailui.c +++ b/src/mailui.c @@ -915,19 +915,25 @@ solipa_mail_ui_on_btn_attachment_add_clicked (GtkButton *button, SolipaMailUIPrivate *priv = SOLIPA_MAIL_UI_GET_PRIVATE (solipa_mail_ui); GtkWidget *dialog; + GtkWidget *transient; gchar *filename; GtkTreeIter iter; - GError *error; GFile *file; - GFileInfo *file_info; - GIcon *icon; - GInputStream *istream; GdkPixbuf *pixbuf; + if (gtk_widget_get_parent (priv->widget) == NULL) + { + transient = priv->dialog; + } + else + { + transient = gtk_widget_get_toplevel (priv->widget); + } + dialog = gtk_file_chooser_dialog_new ("Choose a file to attach.", - NULL, + GTK_WINDOW (transient), GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, @@ -935,67 +941,29 @@ solipa_mail_ui_on_btn_attachment_add_clicked (GtkButton *button, if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) { filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + gtk_widget_destroy (dialog); if (filename == NULL) { - gtk_widget_destroy (dialog); + solipa_message_dialog (transient, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + g_strdup_printf ("The file «%s» doesn't exist.", + filename)); return; } file = g_file_new_for_path (filename); if (!g_file_query_exists (file, NULL)) { - gtk_widget_destroy (dialog); + solipa_message_dialog (transient, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + g_strdup_printf ("The file «%s» doesn't exist.", + filename)); return; } - error = NULL; - file_info = g_file_query_info (file, - G_FILE_ATTRIBUTE_STANDARD_ICON, - 0, - NULL, - &error); - - pixbuf = NULL; - icon = g_file_info_get_icon (file_info); - if (icon != NULL) - { - if (G_IS_THEMED_ICON (icon)) - { - GtkIconTheme *theme; - const gchar * const *names; - - theme = gtk_icon_theme_get_default (); - names = g_themed_icon_get_names (G_THEMED_ICON (icon)); - - error = NULL; - pixbuf = gtk_icon_theme_load_icon (theme, - names[0], - 64, - GTK_ICON_LOOKUP_USE_BUILTIN, - &error); - } - else - { - error = NULL; - istream = g_loadable_icon_load (G_LOADABLE_ICON (G_FILE_ICON (icon)), - 64, - NULL, NULL, - &error); - error = NULL; - pixbuf = gdk_pixbuf_new_from_stream (istream, NULL, &error); - } - } - if (pixbuf == NULL) - { - GtkIconSet *icon_set; - icon_set = gtk_icon_factory_lookup_default ("gtk-file"); - pixbuf = gtk_icon_set_render_icon (icon_set, - gtk_widget_get_style (priv->iv_attachments), - GTK_TEXT_DIR_NONE, - GTK_STATE_NORMAL, - GTK_ICON_SIZE_DND, - priv->iv_attachments, NULL); - } + pixbuf = solipa_file_get_icon_as_pixbuf (filename, priv->iv_attachments, GTK_ICON_SIZE_DND); gtk_list_store_append (priv->lstore_attachments, &iter); gtk_list_store_set (priv->lstore_attachments, &iter, @@ -1005,7 +973,10 @@ solipa_mail_ui_on_btn_attachment_add_clicked (GtkButton *button, -1); g_free (filename); } - gtk_widget_destroy (dialog); + if (GTK_IS_DIALOG (dialog)) + { + gtk_widget_destroy (dialog); + } } static void diff --git a/src/utils.c b/src/utils.c index 7d6d090..cbd7c5d 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1745,6 +1745,95 @@ GtkWidget return infobar; } +GdkPixbuf +*solipa_file_get_icon_as_pixbuf (const gchar *filename, + GtkWidget *widget, + GtkIconSize size) +{ + GdkPixbuf *pixbuf; + + GError *error; + GFile *file; + GFileInfo *file_info; + GIcon *icon; + GInputStream *istream; + + pixbuf = NULL; + + file = g_file_new_for_path (filename); + if (!g_file_query_exists (file, NULL)) + { + return NULL; + } + + error = NULL; + file_info = g_file_query_info (file, + G_FILE_ATTRIBUTE_STANDARD_ICON, + 0, + NULL, + &error); + if (file_info == NULL || error != NULL) + { + g_warning ("Unable to get file info."); + return NULL; + } + + icon = g_file_info_get_icon (file_info); + if (icon != NULL) + { + GtkSettings *settings; + gint width; + gint height; + + settings = gtk_settings_get_default (); + if (!gtk_icon_size_lookup_for_settings (settings, size, + &width, &height)) + { + width = 16; + } + + if (G_IS_THEMED_ICON (icon)) + { + GtkIconTheme *theme; + const gchar * const *names; + + theme = gtk_icon_theme_get_default (); + names = g_themed_icon_get_names (G_THEMED_ICON (icon)); + + error = NULL; + pixbuf = gtk_icon_theme_load_icon (theme, + names[0], + width, + GTK_ICON_LOOKUP_USE_BUILTIN, + &error); + } + else + { + error = NULL; + istream = g_loadable_icon_load (G_LOADABLE_ICON (G_FILE_ICON (icon)), + width, + NULL, NULL, + &error); + error = NULL; + pixbuf = gdk_pixbuf_new_from_stream (istream, NULL, &error); + } + } + + if (pixbuf == NULL) + { + GtkIconSet *icon_set; + icon_set = gtk_icon_factory_lookup_default ("gtk-file"); + pixbuf = gtk_icon_set_render_icon (icon_set, + gtk_widget_get_style (widget), + GTK_TEXT_DIR_NONE, + GTK_STATE_NORMAL, + size, + widget, NULL); + } + + return pixbuf; +} + /** * This function is copied from * http://bugzilla.gnome.org/show_bug.cgi?id=524831. diff --git a/src/utils.h b/src/utils.h index 22737ea..d677525 100644 --- a/src/utils.h +++ b/src/utils.h @@ -19,6 +19,7 @@ #ifndef __SOLIPA_UTILS_H__ #define __SOLIPA_UTILS_H__ +#include #include #include "solipa.h" @@ -98,6 +99,8 @@ gint solipa_message_dialog (GtkWidget *transient, GtkWidget *solipa_info_bar (GtkMessageType type, const gchar *message_text); +GdkPixbuf *solipa_file_get_icon_as_pixbuf (const gchar *filename, GtkWidget *widget, GtkIconSize size); + gchar *g_mkdtemp (gchar *tmpl);