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 d6f39d16f6df3fdabdc4feac42744c6200af702e..fe70b0e34df15163445d8696a5fa1641aa6f360b 100644 (file)
--- a/.cproject
+++ b/.cproject
@@ -27,9 +27,12 @@
                                                        <tool id="cdt.managedbuild.tool.gnu.c.compiler.mingw.base.2108842943" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.mingw.base">
                                                                <option id="gnu.c.compiler.option.include.paths.783512568" name="Include paths (-I)" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\gdk-pixbuf-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\glib-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\gtk-2.0&quot;"/>
                                                                        <listOptionValue builtIn="false" value="&quot;C:\mingw\include\evolution-data-server-2.32&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libgda-4.0&quot;"/>
+                                                                       <listOptionValue builtIn="false" value="&quot;C:\mingw\include\libgda-4.0\libgda&quot;"/>
                                                                </option>
                                                                <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1341682187" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
                                                        </tool>

diff --git a/data/libsolipa/gui/libsolipa.ui b/data/libsolipa/gui/libsolipa.ui
index 13f55613327dd72a29eedd566d916acce56e8e98..d62653435c0ae9380379824ba2e253c03cc5d4d1 100644 (file)
--- a/data/libsolipa/gui/libsolipa.ui
+++ b/data/libsolipa/gui/libsolipa.ui
@@ -806,9 +806,6 @@
         <property name="n_columns">2</property>
         <property name="column_spacing">5</property>
         <property name="row_spacing">5</property>
-        <child>
-          <placeholder/>
-        </child>
         <child>
           <object class="GtkLabel" id="label139">
             <property name="visible">True</property>
@@ -825,7 +822,7 @@
           <object class="GtkHBox" id="hbox13">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="spacing">5</property>
+            <property name="spacing">3</property>
             <child>
               <object class="GtkEntry" id="entry42">
                 <property name="visible">True</property>
@@ -867,11 +864,18 @@
             </child>
             <child>
               <object class="GtkButton" id="button144">
-                <property name="label" translatable="yes">...</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <child>
+                  <object class="GtkImage" id="image2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="stock">gtk-find</property>
+                    <property name="icon-size">1</property>
+                  </object>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -1002,6 +1006,9 @@
             <property name="y_options">GTK_FILL</property>
           </packing>
         </child>
+        <child>
+          <placeholder/>
+        </child>
       </object>
     </child>
   </object>

diff --git a/src/allegato.c b/src/allegato.c
index 836f332151dcdcf377b7a4a3bf2453b38a438fcf..a25062d8b76f91e70ac9f3f14d971b990d6d2170 100644 (file)
--- a/src/allegato.c
+++ b/src/allegato.c
@@ -20,6 +20,7 @@
        #include <config.h>
 #endif
 
+#include <libgda/libgda.h>
 #include <sql-parser/gda-sql-parser.h>
 
 #include <libgtkform/field.h>
@@ -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 401cacdb25be68122f1d482fe8b5f1344c8ec8bb..2084f9b5a58e7e4d3ce3ad9c1ecd0f7b33b38ac5 100644 (file)
--- 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 7d6d09002a544294eadba0d23912e5011eddadb7..cbd7c5d45b67a2becf8ecbdb0901d884a3646424 100644 (file)
--- 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 22737ea0c9fa9de331db7b72b2715cab90e9ec98..d677525ef131cafad0c00c84dd6b9962b574723e 100644 (file)
--- a/src/utils.h
+++ b/src/utils.h
@@ -19,6 +19,7 @@
 #ifndef __SOLIPA_UTILS_H__
 #define __SOLIPA_UTILS_H__
 
+#include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gtk/gtk.h>
 
 #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);