[gimp/soc-2009-dynamics: 91/93] Merge branch 'master' into soc-2009-dynamics
- From: Alexia Death <alexiade src gnome org>
- To: svn-commits-list gnome org
- Subject: [gimp/soc-2009-dynamics: 91/93] Merge branch 'master' into soc-2009-dynamics
- Date: Tue, 21 Jul 2009 18:19:19 +0000 (UTC)
commit cea52220ea623a976e9a3183ce9da5909ea42357
Merge: 8e0a214... e564cc2...
Author: Alexia Death <alexiadeath gmail com>
Date: Tue Jul 21 20:12:35 2009 +0300
Merge branch 'master' into soc-2009-dynamics
Conflicts:
.gitignore
NEWS
app/widgets/gimptagpopup.c
po/ru.po
.gitignore | 10 +-
NEWS | 6 +
app/actions/actions.c | 10 +-
app/actions/gradient-editor-commands.c | 6 +-
app/base/levels.c | 8 +-
app/config/gimpguiconfig.c | 20 +-
app/config/gimpguiconfig.h | 1 -
app/core/gimpfilteredcontainer.c | 3 +-
app/dialogs/about-dialog.c | 2 +-
app/dialogs/channel-options-dialog.c | 3 +-
app/dialogs/convert-dialog.c | 2 +-
app/dialogs/fade-dialog.c | 3 +-
app/dialogs/file-open-location-dialog.c | 2 +-
app/dialogs/grid-dialog.c | 2 +-
app/dialogs/image-merge-layers-dialog.c | 3 +-
app/dialogs/image-new-dialog.c | 2 +-
app/dialogs/image-properties-dialog.c | 4 +-
app/dialogs/keyboard-shortcuts-dialog.c | 3 +-
app/dialogs/layer-add-mask-dialog.c | 3 +-
app/dialogs/layer-options-dialog.c | 2 +-
app/dialogs/module-dialog.c | 3 +-
app/dialogs/offset-dialog.c | 2 +-
app/dialogs/palette-import-dialog.c | 2 +-
app/dialogs/preferences-dialog.c | 6 +-
app/dialogs/print-size-dialog.c | 2 +-
app/dialogs/resize-dialog.c | 3 +-
app/dialogs/resolution-calibrate-dialog.c | 3 +-
app/dialogs/scale-dialog.c | 3 +-
app/dialogs/stroke-dialog.c | 3 +-
app/dialogs/template-options-dialog.c | 3 +-
app/dialogs/tips-dialog.c | 2 +-
app/dialogs/user-install-dialog.c | 4 +-
app/dialogs/vectors-options-dialog.c | 3 +-
app/display/gimpdisplay-foreach.c | 3 +-
app/display/gimpdisplayshell-callbacks.c | 36 +-
app/display/gimpdisplayshell-coords.c | 6 +-
app/display/gimpdisplayshell-cursor.c | 2 +-
app/display/gimpdisplayshell-draw.c | 8 +-
app/display/gimpdisplayshell-filter-dialog.c | 3 +-
app/display/gimpdisplayshell-layer-select.c | 2 +-
app/display/gimpdisplayshell-preview.c | 8 +-
app/display/gimpdisplayshell-progress.c | 12 +-
app/display/gimpdisplayshell-scale-dialog.c | 2 +-
app/display/gimpdisplayshell-title.c | 6 +-
app/display/gimpnavigationeditor.c | 3 +-
app/display/gimpstatusbar.c | 11 +-
app/gegl/gimpoperationlevels.c | 8 +-
app/gui/gui.c | 3 +-
app/tools/gimpcolorpickertool.c | 4 +-
app/tools/gimpimagemaptool.c | 3 +-
app/tools/gimpmeasuretool.c | 3 +-
app/tools/gimpperspectivetool.c | 4 +-
app/tools/gimprotatetool.c | 4 +-
app/tools/gimpscaletool.c | 4 +-
app/tools/gimpsheartool.c | 4 +-
app/tools/gimptexttool.c | 2 +-
app/widgets/gimpactionfactory.c | 7 +-
app/widgets/gimpactionfactory.h | 5 +-
app/widgets/gimpactiongroup.c | 93 +-
app/widgets/gimpactiongroup.h | 2 -
app/widgets/gimpchanneltreeview.c | 46 +
app/widgets/gimpimagecommenteditor.c | 53 +-
app/widgets/gimplanguageentry.c | 7 +-
app/widgets/gimplayertreeview.c | 51 +-
app/widgets/gimptagentry.c | 4 +-
app/widgets/gimptagpopup.c | 128 +-
app/widgets/gimpvectorstreeview.c | 71 +-
data/tags/Makefile.am | 2 +-
data/tags/gimp-tags-default.xml.in | 84 +
libgimpwidgets/gimpcolorscale.c | 36 +-
libgimpwidgets/gimpunitmenu.c | 3 +-
libgimpwidgets/test-eevl.c | 9 +-
plug-ins/color-rotate/color-rotate-dialog.c | 4 +-
plug-ins/common/alien-map.c | 3 +-
plug-ins/common/align-layers.c | 4 +-
plug-ins/common/apply-canvas.c | 3 +-
plug-ins/common/blinds.c | 3 +-
plug-ins/common/blur-gauss-selective.c | 3 +-
plug-ins/common/blur-gauss.c | 3 +-
plug-ins/common/blur-motion.c | 3 +-
plug-ins/common/border-average.c | 3 +-
plug-ins/common/bump-map.c | 3 +-
plug-ins/common/cartoon.c | 3 +-
plug-ins/common/channel-mixer.c | 3 +-
plug-ins/common/checkerboard.c | 3 +-
plug-ins/common/cml-explorer.c | 8 +-
plug-ins/common/color-cube-analyze.c | 4 +-
plug-ins/common/color-exchange.c | 3 +-
plug-ins/common/color-to-alpha.c | 3 +-
plug-ins/common/colorify.c | 3 +-
plug-ins/common/colormap-remap.c | 3 +-
plug-ins/common/compose.c | 3 +-
plug-ins/common/contrast-retinex.c | 3 +-
plug-ins/common/convolution-matrix.c | 3 +-
plug-ins/common/cubism.c | 3 +-
plug-ins/common/curve-bend.c | 3 +-
plug-ins/common/decompose.c | 4 +-
plug-ins/common/deinterlace.c | 3 +-
plug-ins/common/depth-merge.c | 2 +-
plug-ins/common/despeckle.c | 3 +-
plug-ins/common/destripe.c | 3 +-
plug-ins/common/diffraction.c | 4 +-
plug-ins/common/displace.c | 3 +-
plug-ins/common/edge-dog.c | 3 +-
plug-ins/common/edge-neon.c | 3 +-
plug-ins/common/edge-sobel.c | 3 +-
plug-ins/common/edge.c | 3 +-
plug-ins/common/emboss.c | 3 +-
plug-ins/common/engrave.c | 3 +-
plug-ins/common/file-aa.c | 2 +-
plug-ins/common/file-csource.c | 3 +-
plug-ins/common/file-gbr.c | 3 +-
plug-ins/common/file-gif-save.c | 3 +-
plug-ins/common/file-gih.c | 3 +-
plug-ins/common/file-html-table.c | 4 +-
plug-ins/common/file-mng.c | 3 +-
plug-ins/common/file-pat.c | 3 +-
plug-ins/common/file-pdf.c | 3 +-
plug-ins/common/file-png.c | 4 +-
plug-ins/common/file-pnm.c | 2 +-
plug-ins/common/file-ps.c | 8 +-
plug-ins/common/file-psp.c | 2 +-
plug-ins/common/file-raw.c | 7 +-
plug-ins/common/file-sunras.c | 2 +-
plug-ins/common/file-svg.c | 4 +-
plug-ins/common/file-tga.c | 2 +-
plug-ins/common/file-tiff-load.c | 3 +-
plug-ins/common/file-tiff-save.c | 2 +-
plug-ins/common/file-wmf.c | 4 +-
plug-ins/common/file-xbm.c | 2 +-
plug-ins/common/file-xmc.c | 2 +-
plug-ins/common/file-xpm.c | 2 +-
plug-ins/common/film.c | 3 +-
plug-ins/common/filter-pack.c | 3 +-
plug-ins/common/fractal-trace.c | 3 +-
plug-ins/common/gee-zoom.c | 2 +-
plug-ins/common/gee.c | 2 +-
plug-ins/common/grid.c | 3 +-
plug-ins/common/hot.c | 3 +-
plug-ins/common/illusion.c | 3 +-
plug-ins/common/iwarp.c | 4 +-
plug-ins/common/jigsaw.c | 3 +-
plug-ins/common/lcms.c | 6 +-
plug-ins/common/lens-apply.c | 3 +-
plug-ins/common/lens-distortion.c | 3 +-
plug-ins/common/lens-flare.c | 3 +-
plug-ins/common/mail.c | 2 +-
plug-ins/common/max-rgb.c | 3 +-
plug-ins/common/mosaic.c | 3 +-
plug-ins/common/newsprint.c | 3 +-
plug-ins/common/nl-filter.c | 3 +-
plug-ins/common/noise-hsv.c | 3 +-
plug-ins/common/noise-randomize.c | 3 +-
plug-ins/common/noise-rgb.c | 3 +-
plug-ins/common/noise-solid.c | 3 +-
plug-ins/common/noise-spread.c | 3 +-
plug-ins/common/nova.c | 3 +-
plug-ins/common/oilify.c | 3 +-
plug-ins/common/photocopy.c | 3 +-
plug-ins/common/pixelize.c | 3 +-
plug-ins/common/plasma.c | 3 +-
plug-ins/common/plugin-browser.c | 2 +-
plug-ins/common/polar-coords.c | 3 +-
plug-ins/common/qbist.c | 4 +-
plug-ins/common/red-eye-removal.c | 3 +-
plug-ins/common/ripple.c | 3 +-
plug-ins/common/sample-colorize.c | 2 +-
plug-ins/common/screenshot.c | 4 +-
plug-ins/common/sharpen.c | 3 +-
plug-ins/common/shift.c | 3 +-
plug-ins/common/sinus.c | 4 +-
plug-ins/common/smooth-palette.c | 5 +-
plug-ins/common/softglow.c | 3 +-
plug-ins/common/sparkle.c | 3 +-
plug-ins/common/sphere-designer.c | 3 +-
plug-ins/common/threshold-alpha.c | 3 +-
plug-ins/common/tile-glass.c | 3 +-
plug-ins/common/tile-paper.c | 3 +-
plug-ins/common/tile-small.c | 4 +-
plug-ins/common/tile.c | 3 +-
plug-ins/common/unit-editor.c | 10 +-
plug-ins/common/unsharp-mask.c | 3 +-
plug-ins/common/value-propagate.c | 3 +-
plug-ins/common/van-gogh-lic.c | 3 +-
plug-ins/common/video.c | 3 +-
plug-ins/common/warp.c | 3 +-
plug-ins/common/waves.c | 3 +-
plug-ins/common/whirl-pinch.c | 3 +-
plug-ins/common/wind.c | 3 +-
plug-ins/file-bmp/bmp-write.c | 3 +-
plug-ins/file-fits/fits.c | 4 +-
plug-ins/file-fli/fli-gimp.c | 8 +-
plug-ins/file-ico/ico-dialog.c | 4 +-
plug-ins/file-jpeg/jpeg-exif.c | 2 +-
plug-ins/file-jpeg/jpeg-save.c | 6 +-
plug-ins/file-psd/psd-save.c | 2 +-
plug-ins/file-sgi/sgi.c | 2 +-
plug-ins/file-xjt/xjt.c | 3 +-
plug-ins/flame/flame.c | 8 +-
.../fractal-explorer/fractal-explorer-dialogs.c | 4 +-
plug-ins/fractal-explorer/fractal-explorer.c | 4 +-
plug-ins/gfig/gfig-dialog.c | 14 +-
plug-ins/gimpressionist/gimpressionist.c | 3 +-
plug-ins/gimpressionist/orientmap.c | 2 +-
plug-ins/gimpressionist/presets.c | 3 +-
plug-ins/gimpressionist/sizemap.c | 3 +-
plug-ins/gradient-flare/gradient-flare.c | 8 +-
plug-ins/ifs-compose/ifs-compose.c | 12 +-
plug-ins/imagemap/imap_default_dialog.c | 4 +-
plug-ins/lighting/lighting-ui.c | 4 +-
plug-ins/map-object/map-object-ui.c | 4 +-
plug-ins/maze/maze-dialog.c | 2 +-
plug-ins/metadata/interface.c | 4 +-
plug-ins/pagecurl/pagecurl.c | 2 +-
plug-ins/script-fu/script-fu-console.c | 4 +-
plug-ins/script-fu/script-fu-interface.c | 2 +-
plug-ins/script-fu/script-fu-server.c | 2 +-
plug-ins/selection-to-path/selection-to-path.c | 3 +-
plug-ins/win-snap/winsnap.c | 3 +-
po-libgimp/POTFILES.skip | 1 +
po-plug-ins/POTFILES.skip | 1 +
po-plug-ins/ru.po | 1611 ++++++++++----------
po-python/POTFILES.skip | 1 +
po-script-fu/POTFILES.skip | 1 +
po-tags/.gitignore | 1 +
po-tags/LINGUAS | 3 +
po-tags/POTFILES.in | 6 +
po-tags/sv.po | 23 +
po-tips/POTFILES.skip | 1 +
po/POTFILES.skip | 1 +
230 files changed, 1701 insertions(+), 1330 deletions(-)
---
diff --cc .gitignore
index f354cbf,dcf009f..5454dab
--- a/.gitignore
+++ b/.gitignore
@@@ -1,16 -1,7 +1,17 @@@
+/ChangeLog
-
-
+/.anjuta/
+/.anjuta_sym_db.db
+/TODO.tasks
+*.anjuta
+*.c~
+*.h~
+*.patch
+/app/
+
+ *.la
+ *.lo
+ *.o
-/ChangeLog
+
/Makefile
/Makefile.in
/aclocal.m4
diff --cc NEWS
index 2d5cf57,63334ca..846ba00
--- a/NEWS
+++ b/NEWS
@@@ -73,3 -73,10 +73,9 @@@ Core
PDB:
- Add procedures to manipulate size of text box
+
-
+ General:
+
+ - Changed licence to (L)GPLv3+
+ - Use the automake 1.11 feature 'silent build rules' by default
+ - Lots of bug fixes and cleanup
diff --cc app/widgets/gimptagpopup.c
index f26032d,6911ede..26a24e8
--- a/app/widgets/gimptagpopup.c
+++ b/app/widgets/gimptagpopup.c
@@@ -92,6 -92,8 +92,9 @@@ static gboolean gimp_tag_popup_list_eve
static gboolean gimp_tag_popup_is_in_tag (PopupTagData *tag_data,
gint x,
gint y);
++
+ static void gimp_tag_popup_queue_draw_tag (GimpTagPopup *widget,
+ PopupTagData *tag_data);
static void gimp_tag_popup_toggle_tag (GimpTagPopup *popup,
PopupTagData *tag_data);
static void gimp_tag_popup_check_can_toggle (GimpTagged *tagged,
@@@ -177,6 -179,19 +180,20 @@@ gimp_tag_popup_init (GimpTagPopup *popu
GDK_POINTER_MOTION_MASK);
gtk_container_add (GTK_CONTAINER (popup->alignment), popup->tag_area);
gtk_widget_show (popup->tag_area);
+
+ g_signal_connect (popup->alignment, "expose-event",
+ G_CALLBACK (gimp_tag_popup_border_expose),
+ popup);
+ g_signal_connect (popup, "event",
+ G_CALLBACK (gimp_tag_popup_border_event),
+ NULL);
+ g_signal_connect (popup->tag_area, "expose-event",
+ G_CALLBACK (gimp_tag_popup_list_expose),
+ popup);
+ g_signal_connect (popup->tag_area, "event",
+ G_CALLBACK (gimp_tag_popup_list_event),
+ popup);
++
}
static GObject *
@@@ -409,8 -411,7 +413,8 @@@ gimp_tag_popup_set_property (GObjec
switch (property_id)
{
case PROP_OWNER:
- popup->combo_entry = g_value_get_object (value);
- g_object_ref (popup->combo_entry);
++
+ popup->combo_entry = g_value_dup_object (value);
break;
default:
@@@ -567,13 -568,15 +571,16 @@@ gimp_tag_popup_border_expose (GtkWidge
GdkEventExpose *event,
GimpTagPopup *popup)
{
- GdkRectangle border;
- GdkRectangle upper;
- GdkRectangle lower;
- gint arrow_space;
- gint arrow_size;
+
- if (event->window != widget->window)
+ GdkWindow *window = gtk_widget_get_window (widget);
+ GtkStyle *style = gtk_widget_get_style (widget);
+ GdkRectangle border;
+ GdkRectangle upper;
+ GdkRectangle lower;
+ gint arrow_space;
+ gint arrow_size;
+
+ if (event->window != gtk_widget_get_window (widget))
return FALSE;
get_arrows_visible_area (popup, &border, &upper, &lower, &arrow_space);
@@@ -677,15 -675,13 +679,14 @@@ gimp_tag_popup_border_event (GtkWidget
else if (event->type == GDK_MOTION_NOTIFY)
{
GdkEventMotion *motion_event = (GdkEventMotion *) event;
+
- if (motion_event->window == widget->window)
- {
- gint x = motion_event->x + widget->allocation.x;
- gint y = motion_event->y + widget->allocation.y;
+ gint x, y;
- gimp_tag_popup_handle_scrolling (popup, x, y,
- popup->scroll_timeout_id == 0, TRUE);
- }
+ gdk_window_get_pointer (gtk_widget_get_window (widget), &x, &y, NULL);
+
+ gimp_tag_popup_handle_scrolling (popup, x, y,
+ motion_event->window == widget->window,
+ TRUE);
}
else if (event->type == GDK_BUTTON_RELEASE)
{
@@@ -880,6 -876,7 +881,9 @@@ gimp_tag_popup_list_event (GtkWidge
else if (event->type == GDK_MOTION_NOTIFY)
{
GdkEventMotion *motion_event = (GdkEventMotion *) event;
++
+ PopupTagData *prelight = NULL;
++
gint x;
gint y;
gint i;
@@@ -1180,6 -1194,6 +1201,7 @@@ gimp_tag_popup_scroll_by (GimpTagPopup
{
arrow_state = (popup->upper_arrow_prelight ?
GTK_STATE_PRELIGHT : GTK_STATE_NORMAL);
++
}
if (arrow_state != popup->upper_arrow_state)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
