Revision: 5669 http://geany.svn.sourceforge.net/geany/?rev=5669&view=rev Author: ntrel Date: 2011-04-01 11:56:09 +0000 (Fri, 01 Apr 2011)
Log Message: ----------- Use mimetype icon in File Properties dialog.
Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/toolbar.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-04-01 11:31:29 UTC (rev 5668) +++ trunk/ChangeLog 2011-04-01 11:56:09 UTC (rev 5669) @@ -2,6 +2,8 @@
* src/interface.c, src/interface.h, geany.glade: Rename Preferences dialog Interface subtab More -> Notebook tabs. + * src/toolbar.c, src/dialogs.c: + Use mimetype icon in File Properties dialog.
2011-04-01 Colomban Wendling <colomban(at)geany(dot)org>
Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2011-04-01 11:31:29 UTC (rev 5668) +++ trunk/src/dialogs.c 2011-04-01 11:56:09 UTC (rev 5669) @@ -1126,6 +1126,7 @@ GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check, *vbox; gchar *file_size, *title, *base_name, *time_changed, *time_modified, *time_accessed, *enctext; gchar *short_name; + GdkPixbuf *pixbuf; #ifdef HAVE_SYS_TYPES_H struct stat st; off_t filesize; @@ -1205,7 +1206,9 @@ label = ui_label_new_bold(base_name); gtk_label_set_selectable(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); - image = gtk_image_new_from_stock("gtk-file", GTK_ICON_SIZE_BUTTON); + pixbuf = ui_get_mime_icon(doc->file_type->mime_type, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_pixbuf(pixbuf); + g_object_unref(pixbuf); gtk_misc_set_alignment(GTK_MISC(image), 1.0, 0.5); hbox = gtk_hbox_new(FALSE, 6); gtk_label_set_use_markup(GTK_LABEL(label), TRUE);
Modified: trunk/src/toolbar.c =================================================================== --- trunk/src/toolbar.c 2011-04-01 11:31:29 UTC (rev 5668) +++ trunk/src/toolbar.c 2011-04-01 11:56:09 UTC (rev 5669) @@ -313,7 +313,6 @@ if (entry != NULL) g_signal_connect(entry, "motion-notify-event", G_CALLBACK(on_motion_event), NULL);
- return main_widgets.toolbar; }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.