[gthumb: 22/23] Merge branch 'contact-sheet'
- From: Paolo Bacchilega <paobac src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gthumb: 22/23] Merge branch 'contact-sheet'
- Date: Sun, 26 Dec 2010 19:21:34 +0000 (UTC)
commit fcb54d73596ef9183f2099efd616847df3bccd0c
Merge: 8a75eaf e9351b8
Author: Paolo Bacchilega <paobac src gnome org>
Date: Sun Dec 26 20:06:28 2010 +0100
Merge branch 'contact-sheet'
configure.ac | 4 +
extensions/Makefile.am | 4 +-
extensions/contact_sheet/Makefile.am | 77 ++
extensions/contact_sheet/actions.c | 48 +
extensions/contact_sheet/actions.h | 31 +
extensions/contact_sheet/callbacks.c | 98 ++
extensions/contact_sheet/callbacks.h | 29 +
.../contact_sheet/contact_sheet.extension.in.in | 12 +
extensions/contact_sheet/data/Makefile.am | 18 +
.../data/contact_sheet_themes/Makefile.am | 10 +
.../data/contact_sheet_themes/default.cst | 25 +
.../data/contact_sheet_themes/minimalist.cst | 23 +
.../data/contact_sheet_themes/rainbow.cst | 26 +
.../data/gthumb_contact_sheet.schemas.in | 213 ++++
extensions/contact_sheet/data/ui/Makefile.am | 5 +
.../contact_sheet/data/ui/contact-sheet-creator.ui | 1082 ++++++++++++++++
.../data/ui/contact-sheet-theme-properties.ui | 684 ++++++++++
extensions/contact_sheet/dlg-contact-sheet.c | 827 ++++++++++++
extensions/contact_sheet/dlg-contact-sheet.h | 30 +
.../contact_sheet/gth-contact-sheet-creator.c | 1328 ++++++++++++++++++++
.../contact_sheet/gth-contact-sheet-creator.h | 88 ++
.../contact_sheet/gth-contact-sheet-theme-dialog.c | 433 +++++++
.../contact_sheet/gth-contact-sheet-theme-dialog.h | 57 +
extensions/contact_sheet/gth-contact-sheet-theme.c | 619 +++++++++
extensions/contact_sheet/gth-contact-sheet-theme.h | 104 ++
extensions/contact_sheet/main.c | 52 +
extensions/contact_sheet/preferences.h | 48 +
extensions/webalbums/gth-web-exporter.c | 108 +--
gthumb/Makefile.am | 2 +
gthumb/cairo-utils.c | 301 +++++
gthumb/cairo-utils.h | 80 ++
gthumb/gio-utils.c | 3 +-
gthumb/gth-cell-renderer-thumbnail.c | 83 +--
gthumb/gth-icon-cache.c | 2 +-
gthumb/gth-main.c | 1 +
gthumb/pixbuf-utils.c | 329 ++++-
gthumb/pixbuf-utils.h | 85 +-
37 files changed, 6678 insertions(+), 291 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]